+traits for player and meter

This commit is contained in:
Wiktor Mazur
2019-09-13 13:40:30 +02:00
parent b625d7b847
commit 74503083a0
8 changed files with 166 additions and 177 deletions
+4 -4
View File
@@ -15,7 +15,7 @@ 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 get_instance_session():
def get_zone_session():
if TESTING_ENABLED:
session = [
{'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
@@ -24,12 +24,12 @@ def get_instance_session():
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
]
else:
session = libmeter.get_instance_session()
session = libmeter.get_zone_session()
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
def reset_instance_session():
libmeter.reset_instance_session()
def new_zone_session():
libmeter.new_zone_session()
def initialize():
if TESTING_ENABLED:
+7 -7
View File
@@ -12,8 +12,8 @@ from PySide2.QtWidgets import QLabel
import clipboard
from table import Table
from engine import get_instance_session
from engine import reset_instance_session
from engine import get_zone_session
from engine import new_zone_session
class BottomButtons(QWidget):
def __init__(self, table):
@@ -40,7 +40,7 @@ class BottomButtons(QWidget):
self.close_button.setObjectName('BottomButtons')
def copy(self):
clip = "Damage: Current instance\n"
clip = "Damage: Current zone\n"
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 +48,7 @@ class BottomButtons(QWidget):
clipboard.copy(clip)
def reset(self):
reset_instance_session()
new_zone_session()
def close(self):
sys.exit(0)
@@ -59,7 +59,7 @@ class MainWidget(QWidget):
self.mouse_pos = None
self.phoneLabel = QLabel("Damage: Current instance", self)
self.phoneLabel = QLabel("Damage: Current zone", self)
self.table = Table()
self.bottom_buttons = BottomButtons(self.table)
@@ -70,10 +70,10 @@ class MainWidget(QWidget):
self.layout.addWidget(self.bottom_buttons)
self.setLayout(self.layout)
self.table.fill(get_instance_session())
self.table.fill(get_zone_session())
timer = QTimer(self)
timer.timeout.connect(lambda: self.table.fill(get_instance_session()))
timer.timeout.connect(lambda: self.table.fill(get_zone_session()))
timer.start(500)
def mousePressEvent(self, event):