diff --git a/appveyor.yml b/appveyor.yml index 66d3325..8906631 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ build_script: - python -m venv env - ps: .\env\Scripts\activate.ps1 - pip install -v -r frontend\requirements.txt - - pyinstaller -F -w -i assets\albion-stats-icon.ico frontend\albion-online-stats.py + - pyinstaller -F -w -i assets\albion-stats-icon.ico --add-data frontend\src\assets;src\assets frontend\albion-online-stats.py - ps: deactivate after_build: - ps: mv dist\albion-online-stats.exe albion-online-stats.exe diff --git a/frontend/src/config.py b/frontend/src/config.py index ac1a75e..3d304c7 100644 --- a/frontend/src/config.py +++ b/frontend/src/config.py @@ -7,7 +7,7 @@ CFG_VERSION = '0.2' default = """ [window] width = 300 -height = 230 +height = 180 font-size = '10px' opacity = 0.5 @@ -37,7 +37,6 @@ def config(): with open(conf_file, "r") as cfg_file: cfg = toml.load(cfg_file) if cfg['config']['version'] != CFG_VERSION: - print('version changed') raise Exception('Version changed') return cfg except(Exception) as e: diff --git a/frontend/src/engine.py b/frontend/src/engine.py index 3643062..a4388c4 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -79,10 +79,14 @@ def with_percentage(session): def zone_stats(): if TESTING_ENABLED: session = [ - {'player': 'A'*20, 'damage': 1234.02, + {'player': 'John Wick', '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': 2300000.02, 'time_in_combat': 12.0, 'dps': 13}, + {'player': 'The Warrior', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12}, + {'player': 'The Mage', 'damage': 23000.02, 'time_in_combat': 12.0, 'dps': 13}, + {'player': 'Someone', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13}, + {'player': 'The chosen one', 'damage': 230.02, 'time_in_combat': 12.0, 'dps': 13}, + {'player': 'Party filler', 'damage': 20.02, 'time_in_combat': 12.0, 'dps': 13}, + {'player': 'OneMoreToGo', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13}, {'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0} ] else: diff --git a/frontend/src/main.py b/frontend/src/main.py index 574bdc6..1853d56 100644 --- a/frontend/src/main.py +++ b/frontend/src/main.py @@ -20,7 +20,7 @@ from .dmg_list import DmgList from . import about from . import engine -assets_path = os.path.join(os.path.dirname(sys.argv[0]), 'src', 'assets') +assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets') class Mode: CURRENT_ZONE = 'Statistics: Current zone' @@ -35,6 +35,7 @@ class InteractiveBar(QWidget): self.table = table self.layout = QHBoxLayout() self.about = about.About() + self.fame_per_minute = 0.0 self.copy_button = QPushButton(self) self.copy_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'copy.png'))) @@ -61,19 +62,21 @@ class InteractiveBar(QWidget): self.about_button.clicked.connect(self.about.show) def copy(self): - clip = "{}\n".format(self.mode.currentText()) model = self.table.model items = sorted( [model.item(i) for i in range(model.rowCount())], key=lambda i: i.damage, reverse=True) + clip = "{}, Fame/min: {}\nDmg\n".format(self.mode.currentText(), self.fame_per_minute) for index, i in enumerate(items): clip += '{}. {}-{}%'.format(index+1, i.name, i.percentage) clip += "\n" clip += "(AOStats https://git.io/JeBD1)" - print(clip) clipboard.copy(clip) + def set_fame_per_minute(self, fpm): + self.fame_per_minute = fpm + def reset(self): reset = { Mode.CURRENT_ZONE: engine.reset_zone_stats, @@ -120,6 +123,7 @@ class MainWidget(QWidget): def refresh(self): damage_session, fame_stat = self.session() self.table.update(damage_session) + self.bar.set_fame_per_minute(fame_stat.fame_per_minute) self.fame_label.setText("Fame {} | Fame per minute {} | Party members {}".format( fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members()))) @@ -127,7 +131,7 @@ class MainWidget(QWidget): self.mouse_pos = event.pos() def mouseMoveEvent(self, event): - if self.bar.mode.geometry().contains(event.pos()): + if self.bar.geometry().contains(event.pos()): return if not self.mouse_pos: return diff --git a/frontend/src/styling.py b/frontend/src/styling.py index f485392..2242c59 100644 --- a/frontend/src/styling.py +++ b/frontend/src/styling.py @@ -17,4 +17,8 @@ style = """ QListView::item:selected:active { background-color: black; } + + QListView::item:selected { + background-color: black; + } """ % (font_size)