Pretty numbers
This commit is contained in:
@@ -8,6 +8,7 @@ damage-meter.log
|
|||||||
|
|
||||||
|
|
||||||
# Python
|
# Python
|
||||||
|
.pytest_cache
|
||||||
*.spec
|
*.spec
|
||||||
env
|
env
|
||||||
**/build
|
**/build
|
||||||
|
|||||||
+5
-1
@@ -116,7 +116,11 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
|
|||||||
|
|
||||||
if let Some(m) = meter.get() {
|
if let Some(m) = meter.get() {
|
||||||
let meter = &mut *m.lock().unwrap();
|
let meter = &mut *m.lock().unwrap();
|
||||||
return Ok(core::stats(&meter, stat_type).into_py_object(py))
|
return Ok(core::stats(&meter, stat_type)
|
||||||
|
.into_iter()
|
||||||
|
.filter(|s| s.damage != 0.0 || s.fame != 0.0)
|
||||||
|
.collect::<Vec<meter::PlayerStatistics>>()
|
||||||
|
.into_py_object(py))
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
|
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ class DmgList(QListView):
|
|||||||
def update(self, player):
|
def update(self, player):
|
||||||
self.name = player.name
|
self.name = player.name
|
||||||
self.damage = player.damage
|
self.damage = player.damage
|
||||||
self.dps = float("{0:.2f}".format(player.dps))
|
self.dps = player.dps
|
||||||
self.percentage = float("{0:.2f}".format(player.percentage))
|
self.percentage = player.percentage
|
||||||
self.best_damage = player.best_damage
|
self.best_damage = player.best_damage
|
||||||
self.setText("{} {}({}, {}%)".format(
|
self.setText("{} {}({}, {}%)".format(
|
||||||
self.name, self.damage, self.dps, self.percentage
|
self.name, self.damage, self.dps, self.percentage
|
||||||
@@ -35,8 +35,7 @@ class DmgList(QListView):
|
|||||||
self.refresh()
|
self.refresh()
|
||||||
|
|
||||||
def refresh(self):
|
def refresh(self):
|
||||||
value = self.damage / self.best_damage
|
value = round(self.damage / self.best_damage, 2)
|
||||||
|
|
||||||
QRectF = QtCore.QRectF(self.parent.rect())
|
QRectF = QtCore.QRectF(self.parent.rect())
|
||||||
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
|
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
|
||||||
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor('#42413c'))
|
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor('#42413c'))
|
||||||
@@ -51,7 +50,7 @@ class DmgList(QListView):
|
|||||||
def lessThan(self, left, right):
|
def lessThan(self, left, right):
|
||||||
l = self.sourceModel().item(left.row())
|
l = self.sourceModel().item(left.row())
|
||||||
r = self.sourceModel().item(right.row())
|
r = self.sourceModel().item(right.row())
|
||||||
return int(l.percentage) < int(r.percentage)
|
return l.percentage < r.percentage
|
||||||
|
|
||||||
class DmgItemModel(QStandardItemModel):
|
class DmgItemModel(QStandardItemModel):
|
||||||
def __init__(self, view):
|
def __init__(self, view):
|
||||||
|
|||||||
+13
-9
@@ -3,6 +3,7 @@ import os
|
|||||||
import aostats
|
import aostats
|
||||||
|
|
||||||
from .config import config
|
from .config import config
|
||||||
|
from .number import Number
|
||||||
|
|
||||||
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
||||||
|
|
||||||
@@ -17,11 +18,11 @@ class StatType:
|
|||||||
class DamageStat:
|
class DamageStat:
|
||||||
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage):
|
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage):
|
||||||
self.name = name
|
self.name = name
|
||||||
self.damage = damage
|
self.damage = Number(damage)
|
||||||
self.time_in_combat = time_in_combat
|
self.time_in_combat = Number(time_in_combat)
|
||||||
self.dps = dps
|
self.dps = Number(dps)
|
||||||
self.percentage = percentage
|
self.percentage = Number(percentage)
|
||||||
self.best_damage = best_damage
|
self.best_damage = Number(best_damage)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Name {} Damage {} DPS {} percentage {}".format(self.name, self.damage, self.dps, self.percentage)
|
return "Name {} Damage {} DPS {} percentage {}".format(self.name, self.damage, self.dps, self.percentage)
|
||||||
@@ -32,7 +33,7 @@ class DamageStat:
|
|||||||
|
|
||||||
class FameStat:
|
class FameStat:
|
||||||
def __init__(self, fame, fame_per_minute):
|
def __init__(self, fame, fame_per_minute):
|
||||||
self.fame = '{0:.2f}'.format(fame)
|
self.fame = fame
|
||||||
self.fame_per_minute = fame_per_minute
|
self.fame_per_minute = fame_per_minute
|
||||||
|
|
||||||
|
|
||||||
@@ -50,9 +51,12 @@ def stats(session):
|
|||||||
|
|
||||||
if len(stats_with_fame) > 0:
|
if len(stats_with_fame) > 0:
|
||||||
stat_with_fame = stats_with_fame[0]
|
stat_with_fame = stats_with_fame[0]
|
||||||
fame = FameStat(stat_with_fame['fame'], stat_with_fame['fame_per_minute'])
|
fame = FameStat(
|
||||||
|
Number(stat_with_fame['fame']),
|
||||||
|
Number(stat_with_fame['fame_per_minute'])
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
fame = FameStat(0.0, 0.0)
|
fame = FameStat(Number(0.0), Number(0.0))
|
||||||
|
|
||||||
return statistics, fame
|
return statistics, fame
|
||||||
|
|
||||||
@@ -78,7 +82,7 @@ def zone_stats():
|
|||||||
{'player': 'A'*20, 'damage': 1234.02,
|
{'player': 'A'*20, 'damage': 1234.02,
|
||||||
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30},
|
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30},
|
||||||
{'player': 'B'*20, 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
{'player': 'B'*20, 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
||||||
{'player': 'C'*20, 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
{'player': 'C'*20, 'damage': 2300000.02, 'time_in_combat': 12.0, 'dps': 13},
|
||||||
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
class Number:
|
||||||
|
def __init__(self, number):
|
||||||
|
self.number = number
|
||||||
|
|
||||||
|
def __eq__(self, other):
|
||||||
|
return self.number == other
|
||||||
|
|
||||||
|
def __lt__(self, other):
|
||||||
|
if isinstance(other, Number):
|
||||||
|
return self.number < other.number
|
||||||
|
return self.number < other
|
||||||
|
|
||||||
|
def __truediv__(self, other):
|
||||||
|
if isinstance(other, Number):
|
||||||
|
return self.number / other.number
|
||||||
|
return self.number / other
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
if self.number / 1000 < 1:
|
||||||
|
return "{0:.2f}".format(self.number)
|
||||||
|
elif self.number / 1000000 >= 1:
|
||||||
|
return "{0:.2f}M".format(self.number / 1000000)
|
||||||
|
elif self.number / 1000 >= 1:
|
||||||
|
return "{0:.2f}K".format(self.number / 1000)
|
||||||
|
return "{0:.2f}".format(self.number)
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import sys
|
||||||
|
|
||||||
|
sys.path.append('../src')
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
|
from number import Number
|
||||||
|
|
||||||
|
def test_number_equality():
|
||||||
|
n = 10
|
||||||
|
number = Number(10)
|
||||||
|
|
||||||
|
assert number == n
|
||||||
|
|
||||||
|
other = Number(n)
|
||||||
|
|
||||||
|
assert number == other
|
||||||
|
|
||||||
|
def test_less_comparator():
|
||||||
|
assert Number(10) < Number(20)
|
||||||
|
assert Number(10) < 20
|
||||||
|
|
||||||
|
def test_div():
|
||||||
|
assert Number(10) / Number(10) == 1
|
||||||
|
assert Number(10) / 10 == 1
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('num,text', [
|
||||||
|
(10, '10.00'),
|
||||||
|
(100, '100.00'),
|
||||||
|
(100.01, '100.01'),
|
||||||
|
(100.01123432123, '100.01'),
|
||||||
|
(1000, '1.00K'),
|
||||||
|
(10000, '10.00K'),
|
||||||
|
(120010.12332, '120.01K'),
|
||||||
|
(100000, '100.00K'),
|
||||||
|
(5000000, '5.00M')
|
||||||
|
])
|
||||||
|
def test_str_repr(num, text):
|
||||||
|
assert str(Number(num)) == text
|
||||||
Reference in New Issue
Block a user