diff --git a/gui/src/engine.py b/gui/src/engine.py index 8f4abdf..c9f5c02 100644 --- a/gui/src/engine.py +++ b/gui/src/engine.py @@ -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: diff --git a/gui/src/main.py b/gui/src/main.py index a88d922..5533fa7 100644 --- a/gui/src/main.py +++ b/gui/src/main.py @@ -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)