Prints removed, assets included

This commit is contained in:
Wiktor Mazur
2019-10-25 17:50:43 +02:00
parent fa8c6acfcf
commit 2579b45831
5 changed files with 21 additions and 10 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ build_script:
- python -m venv env - python -m venv env
- ps: .\env\Scripts\activate.ps1 - ps: .\env\Scripts\activate.ps1
- pip install -v -r frontend\requirements.txt - 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 - ps: deactivate
after_build: after_build:
- ps: mv dist\albion-online-stats.exe albion-online-stats.exe - ps: mv dist\albion-online-stats.exe albion-online-stats.exe
+1 -2
View File
@@ -7,7 +7,7 @@ CFG_VERSION = '0.2'
default = """ default = """
[window] [window]
width = 300 width = 300
height = 230 height = 180
font-size = '10px' font-size = '10px'
opacity = 0.5 opacity = 0.5
@@ -37,7 +37,6 @@ def config():
with open(conf_file, "r") as cfg_file: with open(conf_file, "r") as cfg_file:
cfg = toml.load(cfg_file) cfg = toml.load(cfg_file)
if cfg['config']['version'] != CFG_VERSION: if cfg['config']['version'] != CFG_VERSION:
print('version changed')
raise Exception('Version changed') raise Exception('Version changed')
return cfg return cfg
except(Exception) as e: except(Exception) as e:
+7 -3
View File
@@ -79,10 +79,14 @@ def with_percentage(session):
def zone_stats(): def zone_stats():
if TESTING_ENABLED: if TESTING_ENABLED:
session = [ 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}, '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': 'The Warrior', '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 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} {'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
] ]
else: else:
+8 -4
View File
@@ -20,7 +20,7 @@ from .dmg_list import DmgList
from . import about from . import about
from . import engine 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: class Mode:
CURRENT_ZONE = 'Statistics: Current zone' CURRENT_ZONE = 'Statistics: Current zone'
@@ -35,6 +35,7 @@ class InteractiveBar(QWidget):
self.table = table self.table = table
self.layout = QHBoxLayout() self.layout = QHBoxLayout()
self.about = about.About() self.about = about.About()
self.fame_per_minute = 0.0
self.copy_button = QPushButton(self) self.copy_button = QPushButton(self)
self.copy_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'copy.png'))) 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) self.about_button.clicked.connect(self.about.show)
def copy(self): def copy(self):
clip = "{}\n".format(self.mode.currentText())
model = self.table.model model = self.table.model
items = sorted( items = sorted(
[model.item(i) for i in range(model.rowCount())], [model.item(i) for i in range(model.rowCount())],
key=lambda i: i.damage, key=lambda i: i.damage,
reverse=True) reverse=True)
clip = "{}, Fame/min: {}\nDmg\n".format(self.mode.currentText(), self.fame_per_minute)
for index, i in enumerate(items): for index, i in enumerate(items):
clip += '{}. {}-{}%'.format(index+1, i.name, i.percentage) clip += '{}. {}-{}%'.format(index+1, i.name, i.percentage)
clip += "\n" clip += "\n"
clip += "(AOStats https://git.io/JeBD1)" clip += "(AOStats https://git.io/JeBD1)"
print(clip)
clipboard.copy(clip) clipboard.copy(clip)
def set_fame_per_minute(self, fpm):
self.fame_per_minute = fpm
def reset(self): def reset(self):
reset = { reset = {
Mode.CURRENT_ZONE: engine.reset_zone_stats, Mode.CURRENT_ZONE: engine.reset_zone_stats,
@@ -120,6 +123,7 @@ class MainWidget(QWidget):
def refresh(self): def refresh(self):
damage_session, fame_stat = self.session() damage_session, fame_stat = self.session()
self.table.update(damage_session) self.table.update(damage_session)
self.bar.set_fame_per_minute(fame_stat.fame_per_minute)
self.fame_label.setText("Fame <b>{}</b> | Fame per minute <b>{}</b> | Party members <b>{}</b>".format( self.fame_label.setText("Fame <b>{}</b> | Fame per minute <b>{}</b> | Party members <b>{}</b>".format(
fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members()))) 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() self.mouse_pos = event.pos()
def mouseMoveEvent(self, event): def mouseMoveEvent(self, event):
if self.bar.mode.geometry().contains(event.pos()): if self.bar.geometry().contains(event.pos()):
return return
if not self.mouse_pos: if not self.mouse_pos:
return return
+4
View File
@@ -17,4 +17,8 @@ style = """
QListView::item:selected:active { QListView::item:selected:active {
background-color: black; background-color: black;
} }
QListView::item:selected {
background-color: black;
}
""" % (font_size) """ % (font_size)