Improved DMG list

This commit is contained in:
Wiktor Mazur
2019-10-23 22:55:48 +02:00
parent 97f8250045
commit 9a73ad9b86
8 changed files with 130 additions and 67 deletions
+2 -2
View File
@@ -282,9 +282,9 @@ impl OverallStats for Meter {
impl GameStats for Meter {
fn reset_stats(&mut self) -> Option<()> {
self.zone_history = PlayerStatisticsVec::new();
self.zone_session = None;
let last_session = self.zone_session_mut()?;
self.zone_session = Some(Session::from(&last_session));
self.last_fight_session = Session::new();
self.main_player_id = None;
Some(())
}
-3
View File
@@ -1,3 +0,0 @@
if __name__ == "__main__":
from src import run
run()
+1 -1
View File
@@ -12,7 +12,7 @@ font-size = '10px'
opacity = 0.5
[app]
skip_non_party_players = true
skip_non_party_players = false
[config]
# do not change
+84
View File
@@ -0,0 +1,84 @@
from PySide2.QtCore import Qt
from PySide2.QtWidgets import QApplication
from PySide2.QtWidgets import QMessageBox
from PySide2.QtWidgets import QHBoxLayout
from PySide2.QtWidgets import QPushButton
from PySide2.QtWidgets import QVBoxLayout
from PySide2.QtWidgets import QLabel
from PySide2.QtWidgets import QComboBox
from PySide2.QtWidgets import QProgressBar
from PySide2.QtWidgets import QListView
from PySide2.QtGui import QStandardItemModel
from PySide2.QtGui import QStandardItem
from PySide2 import QtGui
from PySide2 import QtCore
class DmgList(QListView):
class DmgItem(QtGui.QStandardItem):
def __init__(self, player, parent):
QtGui.QStandardItem .__init__(self)
self.parent = parent
self.update(player)
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter)
def update(self, player):
self.name = player.name
self.damage = player.damage
self.dps = float("{0:.2f}".format(player.dps))
self.percentage = float("{0:.2f}".format(player.percentage))
self.best_damage = player.best_damage
self.setText("{} {}({}, {}%)".format(
self.name, self.damage, self.dps, self.percentage
))
self.refresh()
def refresh(self):
value = self.damage / self.best_damage
QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor('#42413c'))
gradient.setColorAt(value, QtGui.QColor('#000000'))
gradient.setColorAt(value+0.001 if value < 1 else 1, QtGui.QColor('#000000'))
brush = QtGui.QBrush(gradient)
self.setBackground(brush)
class SortProxyModel(QtCore.QSortFilterProxyModel):
def lessThan(self, left, right):
l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row())
return int(l.percentage) < int(r.percentage)
class DmgItemModel(QStandardItemModel):
def __init__(self, view):
QStandardItemModel .__init__(self, view)
def __init__(self):
QListView .__init__(self)
self.model = self.DmgItemModel(self)
self.proxy = self.SortProxyModel()
self.proxy.setSourceModel(self.model)
self.setModel(self.proxy)
def update(self, players):
visible_names = []
for player in players:
items = (self.model.item(i) for i in range(self.model.rowCount()))
found = next((i for i in items if i.name == player.name), None)
if found:
found.update(player)
else:
self.model.appendRow(self.DmgItem(player, self))
visible_names.append(player.name)
for i in range(self.model.rowCount()):
item = self.model.item(i)
if hasattr(item, 'name') and item.name not in visible_names:
self.model.removeRow(i)
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
+25 -11
View File
@@ -15,12 +15,16 @@ class StatType:
class DamageStat:
def __init__(self, name, damage, time_in_combat, dps, precentage):
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage):
self.name = name
self.damage = '{0:.2f}'.format(damage)
self.time_in_combat = '{0:.2f}'.format(time_in_combat)
self.dps = '{0:.2f}'.format(dps)
self.precentage = '{0:.2f}'.format(precentage)
self.damage = damage
self.time_in_combat = time_in_combat
self.dps = dps
self.percentage = percentage
self.best_damage = best_damage
def __str__(self):
return "Name {} Damage {} DPS {} percentage {}".format(self.name, self.damage, self.dps, self.percentage)
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
@@ -34,8 +38,14 @@ class FameStat:
def stats(session):
with_damage = [s for s in session if s['damage'] != 0.0]
extended_session = with_precentage(with_damage)
statistics = [DamageStat(s['player'], s['damage'], s['time_in_combat'], s['dps'], s['dmg_precentage']) for s in extended_session]
extended_session = with_percentage(with_damage)
statistics = [DamageStat(
s['player'],
s['damage'],
s['time_in_combat'],
s['dps'],
s['dmg_percentage'],
s['best_damage']) for s in extended_session]
stats_with_fame = [p for p in session if 'fame' in p and p['fame'] != 0.0]
if len(stats_with_fame) > 0:
@@ -47,14 +57,18 @@ def stats(session):
return statistics, fame
def with_precentage(session):
def with_percentage(session):
best_damage = 0.0
damage_done = 0.0
for s in session:
damage_done += s['damage']
damage = s['damage']
if damage > best_damage:
best_damage = damage
damage_done += damage
for s in session:
s['dmg_precentage'] = s['damage'] / damage_done * 100
s['dmg_percentage'] = s['damage'] / damage_done * 100
s['best_damage'] = best_damage
return session
+12 -6
View File
@@ -12,7 +12,7 @@ from PySide2.QtWidgets import QComboBox
import clipboard
from .table import Table
from .dmg_list import DmgList
from . import about
from . import engine
@@ -52,10 +52,16 @@ class BottomButtons(QWidget):
def copy(self):
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(), self.table.item(i, 3).text())
model = self.table.model
items = sorted(
[model.item(i) for i in range(model.rowCount())],
key=lambda i: i.damage,
reverse=True)
for index, i in enumerate(items):
clip += '{}. {}-{}%'.format(index+1, i.name, i.percentage)
clip += "\n"
clip += "(AOStats https://git.io/JeBD1)"
print(clip)
clipboard.copy(clip)
def reset(self):
@@ -85,7 +91,7 @@ class MainWidget(QWidget):
self.mouse_pos = None
self.mode = ModeWidget()
self.table = Table()
self.table = DmgList()
self.fame_label = QLabel()
self.bottom_buttons = BottomButtons(
self.table, lambda: self.mode.currentText())
@@ -105,7 +111,7 @@ class MainWidget(QWidget):
def refresh(self):
damage_session, fame_stat = self.session()
self.table.fill(damage_session)
self.table.update(damage_session)
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())))
+6
View File
@@ -6,6 +6,8 @@ font_size = cfg['window']['font-size']
style = """
QWidget {
font-size: %s;
background-color: black;
color: white;
}
QListView {
min-height: 100px;
@@ -13,4 +15,8 @@ style = """
QPushButton {
max-width: 60px;
}
QListView::item:selected:active {
background-color: black;
}
""" % (font_size)
-44
View File
@@ -1,44 +0,0 @@
from PySide2.QtWidgets import QTableWidget
from PySide2.QtWidgets import QHeaderView
from PySide2.QtWidgets import QTableWidgetItem
class Table(QTableWidget):
def __init__(self):
QTableWidget.__init__(self)
self.session = None
self.setColumnCount(4)
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)
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))
self.setItem(idx, 3, QTableWidgetItem(stats.precentage))
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