GUI: + config file & choosing a metric mode

This commit is contained in:
Wiktor Mazur
2019-09-19 20:04:31 +02:00
parent 28e2886a13
commit fbd57745ed
7 changed files with 136 additions and 24 deletions
+1
View File
@@ -5,3 +5,4 @@ damage-meter.log
*.so
.vscode
__pycache__
albion-online-stats.cfg
+1
View File
@@ -1,3 +1,4 @@
pyside2~=5.13
pyinstaller
clipboard
toml~=0.10
+35
View File
@@ -0,0 +1,35 @@
import os
import toml
CFG_VERSION = '0.1'
default = """
[window]
width = 300
height = 200
font-size = '10px'
opacity = 0.5
[config]
# do not change
version = '%s'
""" % (CFG_VERSION)
def config():
conf_file = os.path.join(os.path.dirname(
os.path.realpath(__file__)), 'albion-online-stats.cfg')
try:
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:
with open(conf_file, "w") as cfg_file:
cfg_file.write(default)
return toml.loads(default)
return {}
+39 -2
View File
@@ -4,6 +4,7 @@ import libmeter
TESTING_ENABLED = bool(os.getenv('TESTING'))
class Stat:
def __init__(self, name, damage, time_in_combat, dps):
self.name = name
@@ -15,10 +16,15 @@ class Stat:
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]
def get_zone_session():
if TESTING_ENABLED:
session = [
{'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
{'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}
@@ -26,11 +32,42 @@ def get_zone_session():
else:
session = libmeter.get_zone_session()
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
return stats(session)
def get_overall_session():
if TESTING_ENABLED:
session = [
{'player': 'overall', 'damage': 1234.02,
'time_in_combat': 12.0, 'dps': 12.4234},
]
else:
session = libmeter.get_overall_session()
return stats(session)
def get_last_fight_session():
if TESTING_ENABLED:
session = [
{'player': 'last fight', 'damage': 1234.02,
'time_in_combat': 12.0, 'dps': 12.4234},
]
else:
session = libmeter.get_last_fight_session()
return stats(session)
def new_zone_session():
libmeter.new_zone_session()
def new_last_fight_session():
libmeter.new_last_fight_session()
def reset_sessions():
libmeter.reset_sessions()
def initialize():
if TESTING_ENABLED:
return
+38 -13
View File
@@ -8,17 +8,22 @@ from PySide2.QtWidgets import QPushButton
from PySide2.QtWidgets import QVBoxLayout
from PySide2.QtWidgets import QWidget
from PySide2.QtWidgets import QLabel
from PySide2.QtWidgets import QComboBox
import clipboard
from table import Table
from engine import get_zone_session
from engine import new_zone_session
import engine
class Mode:
CURRENT_ZONE = 'Damage: Current zone'
OVERALL = 'Damage: Overall'
LAST_FIGHT = 'Damage: Last fight'
class BottomButtons(QWidget):
def __init__(self, table):
def __init__(self, table, mode):
QWidget.__init__(self)
self.mode = mode
self.table = table
self.layout = QHBoxLayout()
@@ -40,7 +45,7 @@ class BottomButtons(QWidget):
self.close_button.setObjectName('BottomButtons')
def copy(self):
clip = "Damage: Current zone\n"
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())
@@ -48,7 +53,14 @@ class BottomButtons(QWidget):
clipboard.copy(clip)
def reset(self):
new_zone_session()
reset = {
Mode.CURRENT_ZONE: engine.new_zone_session,
Mode.LAST_FIGHT: engine.new_last_fight_session,
Mode.OVERALL: engine.reset_sessions
}
reset[self.mode()]()
def close(self):
sys.exit(0)
@@ -58,22 +70,25 @@ class MainWidget(QWidget):
QWidget.__init__(self)
self.mouse_pos = None
self.phoneLabel = QLabel("Damage: Current zone", self)
self.mode = QComboBox()
self.mode.minimumContentsLength()
self.table = Table()
self.bottom_buttons = BottomButtons(self.table)
self.bottom_buttons = BottomButtons(self.table, lambda : self.mode.currentText())
self.layout = QVBoxLayout()
self.layout.addWidget(self.phoneLabel)
self.layout.addWidget(self.mode)
self.layout.addWidget(self.table)
self.layout.addWidget(self.bottom_buttons)
self.setLayout(self.layout)
self.table.fill(get_zone_session())
self.mode.addItem(Mode.CURRENT_ZONE)
self.mode.addItem(Mode.OVERALL)
self.mode.addItem(Mode.LAST_FIGHT)
self.table.fill(self.session())
timer = QTimer(self)
timer.timeout.connect(lambda: self.table.fill(get_zone_session()))
timer.timeout.connect(lambda: self.table.fill(self.session()))
timer.start(500)
def mousePressEvent(self, event):
@@ -85,3 +100,13 @@ class MainWidget(QWidget):
newpos = self.pos() + diff
self.move(newpos)
def session(self):
sessions = {
Mode.CURRENT_ZONE: engine.get_zone_session,
Mode.LAST_FIGHT: engine.get_last_fight_session,
Mode.OVERALL: engine.get_overall_session
}
return sessions[self.mode.currentText()]()
+8 -3
View File
@@ -8,12 +8,17 @@ import libmeter
from main import MainWidget
from engine import initialize
from styling import style
from config import config
if __name__ == "__main__":
initialize()
WIDTH = 256
HEIGHT = 200
conf = config()
window_config = conf['window']
WIDTH = window_config['width']
HEIGHT = window_config['height']
app = QApplication(sys.argv)
@@ -22,7 +27,7 @@ if __name__ == "__main__":
geometry = app.screens()[0].size()
widget = MainWidget()
widget.setWindowOpacity(0.5)
widget.setWindowOpacity(window_config['opacity'])
widget.resize(WIDTH, HEIGHT)
widget.move(0, geometry.height() - HEIGHT - 280)
+10 -2
View File
@@ -1,5 +1,13 @@
from config import config
cfg = config()
font_size = cfg['window']['font-size']
style = """
QWidget {
font-size: 10px;
font-size: %s;
}
"""
QListView {
min-height: 100px;
}
""" % (font_size)