GUI: + config file & choosing a metric mode
This commit is contained in:
+2
-1
@@ -4,4 +4,5 @@ lib/**/target
|
|||||||
damage-meter.log
|
damage-meter.log
|
||||||
*.so
|
*.so
|
||||||
.vscode
|
.vscode
|
||||||
__pycache__
|
__pycache__
|
||||||
|
albion-online-stats.cfg
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
pyside2~=5.13
|
pyside2~=5.13
|
||||||
pyinstaller
|
pyinstaller
|
||||||
clipboard
|
clipboard
|
||||||
|
toml~=0.10
|
||||||
@@ -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 {}
|
||||||
+40
-3
@@ -4,6 +4,7 @@ import libmeter
|
|||||||
|
|
||||||
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
||||||
|
|
||||||
|
|
||||||
class Stat:
|
class Stat:
|
||||||
def __init__(self, name, damage, time_in_combat, dps):
|
def __init__(self, name, damage, time_in_combat, dps):
|
||||||
self.name = name
|
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
|
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():
|
def get_zone_session():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
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': 'B', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
||||||
{'player': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
{'player': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
||||||
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||||
@@ -26,11 +32,42 @@ def get_zone_session():
|
|||||||
else:
|
else:
|
||||||
session = libmeter.get_zone_session()
|
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():
|
def new_zone_session():
|
||||||
libmeter.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():
|
def initialize():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
return
|
return
|
||||||
@@ -38,4 +75,4 @@ def initialize():
|
|||||||
try:
|
try:
|
||||||
libmeter.initialize()
|
libmeter.initialize()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|||||||
+38
-13
@@ -8,17 +8,22 @@ from PySide2.QtWidgets import QPushButton
|
|||||||
from PySide2.QtWidgets import QVBoxLayout
|
from PySide2.QtWidgets import QVBoxLayout
|
||||||
from PySide2.QtWidgets import QWidget
|
from PySide2.QtWidgets import QWidget
|
||||||
from PySide2.QtWidgets import QLabel
|
from PySide2.QtWidgets import QLabel
|
||||||
|
from PySide2.QtWidgets import QComboBox
|
||||||
|
|
||||||
import clipboard
|
import clipboard
|
||||||
|
|
||||||
from table import Table
|
from table import Table
|
||||||
from engine import get_zone_session
|
import engine
|
||||||
from engine import new_zone_session
|
|
||||||
|
class Mode:
|
||||||
|
CURRENT_ZONE = 'Damage: Current zone'
|
||||||
|
OVERALL = 'Damage: Overall'
|
||||||
|
LAST_FIGHT = 'Damage: Last fight'
|
||||||
|
|
||||||
class BottomButtons(QWidget):
|
class BottomButtons(QWidget):
|
||||||
def __init__(self, table):
|
def __init__(self, table, mode):
|
||||||
QWidget.__init__(self)
|
QWidget.__init__(self)
|
||||||
|
self.mode = mode
|
||||||
self.table = table
|
self.table = table
|
||||||
self.layout = QHBoxLayout()
|
self.layout = QHBoxLayout()
|
||||||
|
|
||||||
@@ -40,7 +45,7 @@ class BottomButtons(QWidget):
|
|||||||
self.close_button.setObjectName('BottomButtons')
|
self.close_button.setObjectName('BottomButtons')
|
||||||
|
|
||||||
def copy(self):
|
def copy(self):
|
||||||
clip = "Damage: Current zone\n"
|
clip = "{}\n".format(self.mode())
|
||||||
for i in range(self.table.rowCount()):
|
for i in range(self.table.rowCount()):
|
||||||
clip += '{}. {} {}-{}'.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())
|
), self.table.item(i, 1).text(), self.table.item(i, 2).text())
|
||||||
@@ -48,7 +53,14 @@ class BottomButtons(QWidget):
|
|||||||
clipboard.copy(clip)
|
clipboard.copy(clip)
|
||||||
|
|
||||||
def reset(self):
|
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):
|
def close(self):
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
@@ -58,22 +70,25 @@ class MainWidget(QWidget):
|
|||||||
QWidget.__init__(self)
|
QWidget.__init__(self)
|
||||||
|
|
||||||
self.mouse_pos = None
|
self.mouse_pos = None
|
||||||
|
self.mode = QComboBox()
|
||||||
self.phoneLabel = QLabel("Damage: Current zone", self)
|
self.mode.minimumContentsLength()
|
||||||
|
|
||||||
self.table = Table()
|
self.table = Table()
|
||||||
self.bottom_buttons = BottomButtons(self.table)
|
self.bottom_buttons = BottomButtons(self.table, lambda : self.mode.currentText())
|
||||||
|
|
||||||
self.layout = QVBoxLayout()
|
self.layout = QVBoxLayout()
|
||||||
self.layout.addWidget(self.phoneLabel)
|
self.layout.addWidget(self.mode)
|
||||||
self.layout.addWidget(self.table)
|
self.layout.addWidget(self.table)
|
||||||
self.layout.addWidget(self.bottom_buttons)
|
self.layout.addWidget(self.bottom_buttons)
|
||||||
self.setLayout(self.layout)
|
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 = QTimer(self)
|
||||||
timer.timeout.connect(lambda: self.table.fill(get_zone_session()))
|
timer.timeout.connect(lambda: self.table.fill(self.session()))
|
||||||
timer.start(500)
|
timer.start(500)
|
||||||
|
|
||||||
def mousePressEvent(self, event):
|
def mousePressEvent(self, event):
|
||||||
@@ -85,3 +100,13 @@ class MainWidget(QWidget):
|
|||||||
newpos = self.pos() + diff
|
newpos = self.pos() + diff
|
||||||
|
|
||||||
self.move(newpos)
|
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
@@ -8,12 +8,17 @@ import libmeter
|
|||||||
from main import MainWidget
|
from main import MainWidget
|
||||||
from engine import initialize
|
from engine import initialize
|
||||||
from styling import style
|
from styling import style
|
||||||
|
from config import config
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
initialize()
|
initialize()
|
||||||
|
|
||||||
WIDTH = 256
|
conf = config()
|
||||||
HEIGHT = 200
|
window_config = conf['window']
|
||||||
|
|
||||||
|
WIDTH = window_config['width']
|
||||||
|
HEIGHT = window_config['height']
|
||||||
|
|
||||||
app = QApplication(sys.argv)
|
app = QApplication(sys.argv)
|
||||||
|
|
||||||
@@ -22,7 +27,7 @@ if __name__ == "__main__":
|
|||||||
geometry = app.screens()[0].size()
|
geometry = app.screens()[0].size()
|
||||||
|
|
||||||
widget = MainWidget()
|
widget = MainWidget()
|
||||||
widget.setWindowOpacity(0.5)
|
widget.setWindowOpacity(window_config['opacity'])
|
||||||
widget.resize(WIDTH, HEIGHT)
|
widget.resize(WIDTH, HEIGHT)
|
||||||
widget.move(0, geometry.height() - HEIGHT - 280)
|
widget.move(0, geometry.height() - HEIGHT - 280)
|
||||||
|
|
||||||
|
|||||||
+11
-3
@@ -1,5 +1,13 @@
|
|||||||
|
from config import config
|
||||||
|
|
||||||
|
cfg = config()
|
||||||
|
font_size = cfg['window']['font-size']
|
||||||
|
|
||||||
style = """
|
style = """
|
||||||
QWidget {
|
QWidget {
|
||||||
font-size: 10px;
|
font-size: %s;
|
||||||
}
|
}
|
||||||
"""
|
QListView {
|
||||||
|
min-height: 100px;
|
||||||
|
}
|
||||||
|
""" % (font_size)
|
||||||
|
|||||||
Reference in New Issue
Block a user