Pretty numbers

This commit is contained in:
Wiktor Mazur
2019-10-24 19:24:21 +02:00
parent 9a73ad9b86
commit 1d0575a6cf
7 changed files with 86 additions and 15 deletions
+1
View File
@@ -8,6 +8,7 @@ damage-meter.log
# Python
.pytest_cache
*.spec
env
**/build
+5 -1
View File
@@ -116,7 +116,11 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
if let Some(m) = meter.get() {
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()))
+4 -5
View File
@@ -26,8 +26,8 @@ class DmgList(QListView):
def update(self, player):
self.name = player.name
self.damage = player.damage
self.dps = float("{0:.2f}".format(player.dps))
self.percentage = float("{0:.2f}".format(player.percentage))
self.dps = player.dps
self.percentage = player.percentage
self.best_damage = player.best_damage
self.setText("{} {}({}, {}%)".format(
self.name, self.damage, self.dps, self.percentage
@@ -35,8 +35,7 @@ class DmgList(QListView):
self.refresh()
def refresh(self):
value = self.damage / self.best_damage
value = round(self.damage / self.best_damage, 2)
QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
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):
l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row())
return int(l.percentage) < int(r.percentage)
return l.percentage < r.percentage
class DmgItemModel(QStandardItemModel):
def __init__(self, view):
+13 -9
View File
@@ -3,6 +3,7 @@ import os
import aostats
from .config import config
from .number import Number
TESTING_ENABLED = bool(os.getenv('TESTING'))
@@ -17,11 +18,11 @@ class StatType:
class DamageStat:
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage):
self.name = name
self.damage = damage
self.time_in_combat = time_in_combat
self.dps = dps
self.percentage = percentage
self.best_damage = best_damage
self.damage = Number(damage)
self.time_in_combat = Number(time_in_combat)
self.dps = Number(dps)
self.percentage = Number(percentage)
self.best_damage = Number(best_damage)
def __str__(self):
return "Name {} Damage {} DPS {} percentage {}".format(self.name, self.damage, self.dps, self.percentage)
@@ -32,7 +33,7 @@ class DamageStat:
class FameStat:
def __init__(self, fame, fame_per_minute):
self.fame = '{0:.2f}'.format(fame)
self.fame = fame
self.fame_per_minute = fame_per_minute
@@ -50,9 +51,12 @@ def stats(session):
if len(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:
fame = FameStat(0.0, 0.0)
fame = FameStat(Number(0.0), Number(0.0))
return statistics, fame
@@ -78,7 +82,7 @@ def zone_stats():
{'player': 'A'*20, 'damage': 1234.02,
'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': '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}
]
else:
+25
View File
@@ -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)
+3
View File
@@ -0,0 +1,3 @@
import sys
sys.path.append('../src')
+35
View File
@@ -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