+ fame statistics

This commit is contained in:
Wiktor Mazur
2019-09-28 23:18:07 +02:00
parent 9cd00e236f
commit 3a465e49c9
12 changed files with 278 additions and 21 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ CFG_VERSION = '0.2'
default = """
[window]
width = 300
height = 200
height = 230
font-size = '10px'
opacity = 0.5
+37 -7
View File
@@ -1,30 +1,60 @@
import os
import libmeter
from config import config
TESTING_ENABLED = bool(os.getenv('TESTING'))
class Stat:
def __init__(self, name, damage, time_in_combat, dps):
class DamageStat:
def __init__(self, name, damage, time_in_combat, dps, precentage):
self.name = name
self.damage = '{0:.2f}'.format(damage)
self.time_in_combat = '{0:.2f}'.format(time_in_combat)
self.dps = '{0:.2f}'.format(dps)
self.precentage = '{0:.2f}'.format(precentage)
def __eq__(self, other):
return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps
def stats(session):
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
class FameStat:
def __init__(self, fame, fame_per_minute):
self.fame = fame
self.fame_per_minute = fame_per_minute
def stats(session):
with_damage = [s for s in session if s['damage'] != 0.0]
extended_session = with_precentage(with_damage)
statistics = [DamageStat(s['player'], s['damage'], s['time_in_combat'], s['dps'], s['dmg_precentage']) for s in extended_session]
stats_with_fame = [p for p in extended_session if 'fame' in p and p['fame'] != 0.0]
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'])
else:
fame = FameStat(0.0, 0.0)
return statistics, fame
def with_precentage(session):
damage_done = 0.0
for s in session:
damage_done += s['damage']
for s in session:
s['dmg_precentage'] = s['damage'] / damage_done * 100
return session
def get_zone_session():
if TESTING_ENABLED:
session = [
{'player': 'A', 'damage': 1234.02,
'time_in_combat': 12.0, 'dps': 12.4234},
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30},
{'player': 'B', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
{'player': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
@@ -71,8 +101,8 @@ def reset_sessions():
def initialize():
if TESTING_ENABLED:
return
cfg = config()
try:
libmeter.initialize()
libmeter.initialize(cfg['app']['skip_non_party_players'])
except:
pass
+14 -7
View File
@@ -17,9 +17,9 @@ import engine
class Mode:
CURRENT_ZONE = 'Damage: Current zone'
OVERALL = 'Damage: Overall'
LAST_FIGHT = 'Damage: Last fight'
CURRENT_ZONE = 'Statistics: Current zone'
OVERALL = 'Statistics: Overall'
LAST_FIGHT = 'Statistics: Last fight'
class BottomButtons(QWidget):
@@ -49,8 +49,8 @@ class BottomButtons(QWidget):
def copy(self):
clip = "{}\n".format(self.mode())
for i in range(self.table.rowCount()):
clip += '{}. {} {}-{}'.format(i+1, self.table.item(i, 0).text(
), self.table.item(i, 1).text(), self.table.item(i, 2).text())
clip += '{}. {} {}-{}-{}%'.format(i+1, self.table.item(i, 0).text(
), self.table.item(i, 1).text(), self.table.item(i, 2).text(), self.table.item(i, 3).text())
clip += "\n"
clipboard.copy(clip)
@@ -83,21 +83,28 @@ class MainWidget(QWidget):
self.mouse_pos = None
self.mode = ModeWidget()
self.table = Table()
self.fame_label = QLabel()
self.bottom_buttons = BottomButtons(
self.table, lambda: self.mode.currentText())
self.layout = QVBoxLayout()
self.layout.addWidget(self.mode)
self.layout.addWidget(self.fame_label)
self.layout.addWidget(self.table)
self.layout.addWidget(self.bottom_buttons)
self.setLayout(self.layout)
self.table.fill(self.session())
self.refresh()
timer = QTimer(self)
timer.timeout.connect(lambda: self.table.fill(self.session()))
timer.timeout.connect(self.refresh)
timer.start(500)
def refresh(self):
damage_session, fame_stat = self.session()
self.table.fill(damage_session)
self.fame_label.setText("Fame <b>{}</b>, Fame per minute <b>{}</b>".format(fame_stat.fame, fame_stat.fame_per_minute))
def mousePressEvent(self, event):
self.mouse_pos = event.pos()
+3 -3
View File
@@ -8,8 +8,8 @@ class Table(QTableWidget):
self.session = None
self.setColumnCount(3)
self.setHorizontalHeaderLabels(["Player", "Damage", "DPS"])
self.setColumnCount(4)
self.setHorizontalHeaderLabels(["Player", "Damage", "DPS", "%"])
self.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
def fill(self, new_session):
@@ -20,7 +20,6 @@ class Table(QTableWidget):
session = sorted(new_session, key=lambda s: float(
s.damage), reverse=True)
session = [s for s in session if float(s.damage) > 0]
self._align_rows(len(session))
@@ -28,6 +27,7 @@ class Table(QTableWidget):
self.setItem(idx, 0, QTableWidgetItem(stats.name))
self.setItem(idx, 1, QTableWidgetItem(stats.damage))
self.setItem(idx, 2, QTableWidgetItem(stats.dps))
self.setItem(idx, 3, QTableWidgetItem(stats.precentage))
def _align_rows(self, new_row_count):
row_count = self.rowCount()