More compact copied stats

This commit is contained in:
Wiktor Mazur
2019-09-12 11:47:40 +02:00
parent f6b74dbb20
commit f28cdc0d63
2 changed files with 18 additions and 9 deletions
+16 -7
View File
@@ -1,5 +1,9 @@
import os
import libmeter
TESTING_ENABLED = bool(os.getenv('TESTING'))
class Stat:
def __init__(self, name, damage, time_in_combat, dps):
self.name = name
@@ -12,13 +16,15 @@ class Stat:
def get_instance_session():
session = libmeter.get_instance_session()
# session = [
# {'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
# {'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}
# ]
if TESTING_ENABLED:
session = [
{'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
{'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}
]
else:
session = libmeter.get_instance_session()
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
@@ -26,6 +32,9 @@ def reset_instance_session():
libmeter.reset_instance_session()
def initialize():
if TESTING_ENABLED:
return
try:
libmeter.initialize()
except:
+2 -2
View File
@@ -40,9 +40,9 @@ class BottomButtons(QWidget):
self.close_button.setObjectName('BottomButtons')
def copy(self):
clip = "AO Damage Meter: \n"
clip = "Damage: Current instance\n"
for i in range(self.table.rowCount()):
clip += '{}. \t Player: {} \t Damage: {} \t DPS: {}'.format(i+1, self.table.item(i, 0).text(
clip += '{}. {} {}-{}'.format(i+1, self.table.item(i, 0).text(
), self.table.item(i, 1).text(), self.table.item(i, 2).text())
clip += "\n"
clipboard.copy(clip)