diff --git a/gui/meter.py b/gui/meter.py index edbb32a..c8fd29d 100644 --- a/gui/meter.py +++ b/gui/meter.py @@ -1,12 +1,15 @@ -import libmeter - import sys import random + +import clipboard + from PySide2.QtWidgets import (QApplication, QLabel, QPushButton, QVBoxLayout, QWidget, QTableWidget, QHeaderView, QHBoxLayout, - QTableWidgetItem) + QTableWidgetItem, QMenu, QAction) from PySide2.QtCore import Slot, Qt +from PySide2 import QtGui + from PySide2.QtCore import QTimer import libmeter @@ -15,9 +18,9 @@ import libmeter class Stat: def __init__(self, name, damage, time_in_combat, dps): self.name = name - self.damage = str(damage) - self.time_in_combat = str(time_in_combat) - self.dps = str(dps) + self.damage = '{0:.2f}'.format(damage) + self.time_in_combat = '{0:.2f}'.format(time_in_combat) + self.dps = '{0:.2f}'.format(dps) def __eq__(self, other): return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps @@ -26,61 +29,96 @@ class Stat: def get_instance_session(): session = libmeter.get_instance_session() # session = [ - # {'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12}, + # {'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': 12} + # {'player': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13}, + # {'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0} # ] return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session] +class Table(QTableWidget): + def __init__(self): + QTableWidget.__init__(self) + + self.session = None + + self.setColumnCount(3) + self.setHorizontalHeaderLabels(["Player", "Damage", "DPS"]) + self.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) + + def fill(self, new_session): + if not self._session_changed(new_session): + return + + self.session = new_session + + session = sorted(new_session, key=lambda s: float( + s.damage), reverse=True) + session = [s for s in session if float(s.damage) > 0] + + self._align_rows(len(session)) + + for idx, stats in enumerate(session): + self.setItem(idx, 0, QTableWidgetItem(stats.name)) + self.setItem(idx, 1, QTableWidgetItem(stats.damage)) + self.setItem(idx, 2, QTableWidgetItem(stats.dps)) + + def _align_rows(self, new_row_count): + row_count = self.rowCount() + diff = row_count - new_row_count + + if diff < 0: + for i in range(row_count, row_count - diff): + self.insertRow(i) + else: + for i in range(0, diff): + self.removeRow(0) + + def _session_changed(self, session): + return self.session != session + + class MyWidget(QWidget): def __init__(self): QWidget.__init__(self) - self.session = None + self.copy_button = QPushButton("&Copy stats", self) + self.refresh_button = QPushButton("&Refresh stats", self) + self.table = Table() - self.table = QTableWidget() - self.table.setColumnCount(3) - self.table.setHorizontalHeaderLabels(["Player", "Damage", "DPS"]) - self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) - - self.layout = QHBoxLayout() + self.layout = QVBoxLayout() self.layout.addWidget(self.table) + self.layout.addWidget(self.copy_button) + self.layout.addWidget(self.refresh_button) self.setLayout(self.layout) - self.fill_table() + self.table.fill(get_instance_session()) + self.copy_button.clicked.connect(self.copy) + self.refresh_button.clicked.connect(self.clear) timer = QTimer(self) - timer.timeout.connect(self.fill_table) + timer.timeout.connect(lambda: self.table.fill(get_instance_session())) timer.start(5000) - def session_changed(self, session): - return self.session != session + def copy(self): + clip = "AO Damage Meter: \n" + for i in range(self.table.rowCount()): + clip += '{}. \t Player: {} \t Damage: {} \t DPS: {}'.format(i+1, self.table.item(i, 0).text( + ), self.table.item(i, 1).text(), self.table.item(i, 2).text()) + clip += "\n" + clipboard.copy(clip) - def fill_table(self, data=None): - new_session = get_instance_session() - - if not self.session_changed(new_session): - return - - self.session = new_session - - session = sorted(new_session, key=lambda s: float(s.damage), reverse=True) - - for idx, stats in enumerate(session): - self.table.removeRow(idx) - self.table.insertRow(idx) - self.table.setItem(idx, 0, QTableWidgetItem(stats.name)) - self.table.setItem(idx, 1, QTableWidgetItem(stats.damage)) - self.table.setItem(idx, 2, QTableWidgetItem(stats.dps)) + def clear(self): + self.table.fill([]) if __name__ == "__main__": libmeter.initialize() - WIDTH = 512 - HEIGHT = 180 + WIDTH = 256 + HEIGHT = 200 app = QApplication(sys.argv) geometry = app.screens()[0].size() diff --git a/gui/requirements.txt b/gui/requirements.txt index 029b693..d92a12a 100644 --- a/gui/requirements.txt +++ b/gui/requirements.txt @@ -1,2 +1,3 @@ pyside2~=5.13 -pyinstaller \ No newline at end of file +pyinstaller +clipboard \ No newline at end of file diff --git a/meter.py b/meter.py index f8c5858..c8fd29d 100644 --- a/meter.py +++ b/meter.py @@ -1,12 +1,15 @@ -import libmeter - import sys import random + +import clipboard + from PySide2.QtWidgets import (QApplication, QLabel, QPushButton, QVBoxLayout, QWidget, QTableWidget, QHeaderView, QHBoxLayout, - QTableWidgetItem) + QTableWidgetItem, QMenu, QAction) from PySide2.QtCore import Slot, Qt +from PySide2 import QtGui + from PySide2.QtCore import QTimer import libmeter @@ -15,9 +18,9 @@ import libmeter class Stat: def __init__(self, name, damage, time_in_combat, dps): self.name = name - self.damage = str(damage) - self.time_in_combat = str(time_in_combat) - self.dps = str(dps) + self.damage = '{0:.2f}'.format(damage) + self.time_in_combat = '{0:.2f}'.format(time_in_combat) + self.dps = '{0:.2f}'.format(dps) def __eq__(self, other): return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps @@ -26,62 +29,96 @@ class Stat: def get_instance_session(): session = libmeter.get_instance_session() # session = [ - # {'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': 23.02, 'time_in_combat': 12.0, 'dps': 0} + # {'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} # ] return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session] +class Table(QTableWidget): + def __init__(self): + QTableWidget.__init__(self) + + self.session = None + + self.setColumnCount(3) + self.setHorizontalHeaderLabels(["Player", "Damage", "DPS"]) + self.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) + + def fill(self, new_session): + if not self._session_changed(new_session): + return + + self.session = new_session + + session = sorted(new_session, key=lambda s: float( + s.damage), reverse=True) + session = [s for s in session if float(s.damage) > 0] + + self._align_rows(len(session)) + + for idx, stats in enumerate(session): + self.setItem(idx, 0, QTableWidgetItem(stats.name)) + self.setItem(idx, 1, QTableWidgetItem(stats.damage)) + self.setItem(idx, 2, QTableWidgetItem(stats.dps)) + + def _align_rows(self, new_row_count): + row_count = self.rowCount() + diff = row_count - new_row_count + + if diff < 0: + for i in range(row_count, row_count - diff): + self.insertRow(i) + else: + for i in range(0, diff): + self.removeRow(0) + + def _session_changed(self, session): + return self.session != session + + class MyWidget(QWidget): def __init__(self): QWidget.__init__(self) - self.session = None + self.copy_button = QPushButton("&Copy stats", self) + self.refresh_button = QPushButton("&Refresh stats", self) + self.table = Table() - self.table = QTableWidget() - self.table.setColumnCount(3) - self.table.setHorizontalHeaderLabels(["Player", "Damage", "DPS"]) - self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) - - self.layout = QHBoxLayout() + self.layout = QVBoxLayout() self.layout.addWidget(self.table) + self.layout.addWidget(self.copy_button) + self.layout.addWidget(self.refresh_button) self.setLayout(self.layout) - self.fill_table() + self.table.fill(get_instance_session()) + self.copy_button.clicked.connect(self.copy) + self.refresh_button.clicked.connect(self.clear) timer = QTimer(self) - timer.timeout.connect(self.fill_table) + timer.timeout.connect(lambda: self.table.fill(get_instance_session())) timer.start(5000) - def session_changed(self, session): - return self.session != session + def copy(self): + clip = "AO Damage Meter: \n" + for i in range(self.table.rowCount()): + clip += '{}. \t Player: {} \t Damage: {} \t DPS: {}'.format(i+1, self.table.item(i, 0).text( + ), self.table.item(i, 1).text(), self.table.item(i, 2).text()) + clip += "\n" + clipboard.copy(clip) - def fill_table(self, data=None): - new_session = get_instance_session() - - if not self.session_changed(new_session): - return - - self.session = new_session - - session = sorted(new_session, key=lambda s: float(s.damage), reverse=True) - - for idx, stats in enumerate(session): - self.table.removeRow(idx) - self.table.insertRow(idx) - self.table.setItem(idx, 0, QTableWidgetItem(stats.name)) - self.table.setItem(idx, 1, QTableWidgetItem(stats.damage)) - self.table.setItem(idx, 2, QTableWidgetItem(stats.dps)) + def clear(self): + self.table.fill([]) if __name__ == "__main__": libmeter.initialize() - WIDTH = 512 - HEIGHT = 180 + WIDTH = 256 + HEIGHT = 200 app = QApplication(sys.argv) geometry = app.screens()[0].size() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d92a12a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +pyside2~=5.13 +pyinstaller +clipboard \ No newline at end of file