Gui rearranged

Refactoring in progress :)
This commit is contained in:
Wiktor Mazur
2020-03-03 19:28:16 +01:00
parent 10f02971e9
commit 1ae62a9ad9
4 changed files with 104 additions and 64 deletions
@@ -0,0 +1 @@
from .list import List as List
@@ -0,0 +1,169 @@
from ....utils import assets
from ....utils import names
from ....utils import async_request
from ....utils import weapon
from PIL import Image, ImageQt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2.QtCore import Qt
from PySide2.QtGui import QStandardItem
from PySide2.QtGui import QStandardItemModel
from PySide2.QtWidgets import QApplication
from PySide2.QtWidgets import QComboBox
from PySide2.QtWidgets import QHBoxLayout
from PySide2.QtWidgets import QLabel
from PySide2.QtWidgets import QListView
from PySide2.QtWidgets import QMessageBox
from PySide2.QtWidgets import QProgressBar
from PySide2.QtWidgets import QPushButton
from PySide2.QtWidgets import QVBoxLayout
from io import BytesIO
import collections
import functools
import re
Style = collections.namedtuple('Style', 'bg')
enchant_re = re.compile(r"(.*)@(\d+)")
def map_name(name):
match = enchant_re.match(name)
if match:
return names.map_name(match[1])
return names.map_name(name)
def player_style(items):
weapon_type = weapon.get_weapon_type(items)
if weapon_type == weapon.WeaponType.Arcane:
return Style(bg='#f032e6')
elif weapon_type == weapon.WeaponType.Axe:
return Style(bg='#800000')
elif weapon_type == weapon.WeaponType.Bow:
return Style(bg='#469990')
elif weapon_type == weapon.WeaponType.Crossbow:
return Style(bg='#000075')
elif weapon_type == weapon.WeaponType.Curse:
return Style(bg='#911eb4')
elif weapon_type == weapon.WeaponType.Dagger:
return Style(bg='#4d5f20')
elif weapon_type == weapon.WeaponType.Fire:
return Style(bg='#e6194B')
elif weapon_type == weapon.WeaponType.Frost:
return Style(bg='#4363d8')
elif weapon_type == weapon.WeaponType.Hammer:
return Style(bg='#9A6324')
elif weapon_type == weapon.WeaponType.Holy:
return Style(bg='#42d4f4')
elif weapon_type == weapon.WeaponType.Mace:
return Style(bg='#808000')
elif weapon_type == weapon.WeaponType.Nature:
return Style(bg='#3cb44b')
elif weapon_type == weapon.WeaponType.Quarterstaff:
return Style(bg='#f58231')
elif weapon_type == weapon.WeaponType.Spear:
return Style(bg='#a9a9a9')
elif weapon_type == weapon.WeaponType.Sword:
return Style(bg='#b59d00')
else:
return Style(bg='#42413c')
def player_icon(weapon):
url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}'
try:
r = async_request.get(url)
img = Image.open(BytesIO(r.content))
img_qt = ImageQt.ImageQt(img)
pix = QtGui.QPixmap.fromImage(img_qt)
return QtGui.QIcon(pix)
except Exception:
return None
class List(QListView):
class Item(QtGui.QStandardItem):
def __init__(self, player, parent):
QtGui.QStandardItem .__init__(self)
self.parent = parent
self.player = player
self.update(player)
self.setTextAlignment(
QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter)
def update(self, player):
self.player = player
self.setText("{} {} ({}, {}%)".format(
self.player.name, self.player.damage, self.player.dps, self.player.percentage
))
self.refresh()
def refresh(self):
value = round(self.player.damage / self.player.best_damage, 2)
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(player_style(self.player.items).bg))
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)
icon = player_icon(self.player.items['weapon'])
self.setToolTip('\n'.join(
[f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v]))
if icon:
self.setIcon(icon)
class SortProxyModel(QtCore.QSortFilterProxyModel):
def lessThan(self, left, right):
l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row())
return l.player.percentage < r.player.percentage
class ItemModel(QStandardItemModel):
def __init__(self, view):
QStandardItemModel .__init__(self, view)
def __init__(self):
QListView .__init__(self)
self.setIconSize(QtCore.QSize(20, 20))
self.model = self.ItemModel(self)
self.proxy = self.SortProxyModel()
self.proxy.setSourceModel(self.model)
self.setModel(self.proxy)
def update(self, players):
if not players:
self.model.clear()
return
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.player.name == player.name), None)
if found:
found.update(player)
else:
self.model.appendRow(self.Item(player, self))
visible_names.append(player.name)
for i in range(self.model.rowCount()):
item = self.model.item(i)
if hasattr(item, 'player') and hasattr(item.player, 'name') and item.player.name not in visible_names:
self.model.removeRow(i)
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
+215
View File
@@ -0,0 +1,215 @@
import sys
import functools
import datetime
from PySide2.QtCore import QTimer
from PySide2.QtCore import Qt
from PySide2.QtWidgets import QHBoxLayout
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
from PySide2 import QtGui
from PySide2 import QtCore
from .list_view import List
from . import about
from ... import engine
from ...utils import assets
from ...utils.config import config
class Mode:
DMG_CURRENT_ZONE = 'Stats (dmg): Current zone'
DMG_OVERALL = 'Stats (dmg): Overall'
DMG_LAST_FIGHT = 'Stats (dmg): Last fight'
CURRENT_ZONE = 'Stats (all): Current zone'
OVERALL = 'Stats (all): Overall'
LAST_FIGHT = 'Stats (all): Last fight'
class CopyButton(QPushButton):
def __init__(self, clipboard, players, mode, fame):
QPushButton.__init__(self)
self.clipboard = clipboard
self.players = players
self.mode = mode
self.fame = fame
self.clicked.connect(self.copy)
self.setIcon(QtGui.QIcon(assets.path('copy.png')))
self.setToolTip("Copy to clipboard")
def copy(self):
clip = "{}, FPH: {}\nDMG: \n".format(
self.mode(), self.fame())
for index, i in enumerate(self.players()[:3]):
clip += '{}. {}-{}/{}-{}%'.format(index+1,
i.name, i.damage, i.dps, i.percentage)
clip += "\n"
clip += "(AOStats https://git.io/JeBD1)"
self.clipboard.clear(mode=self.clipboard.Clipboard)
self.clipboard.setText(clip, mode=self.clipboard.Clipboard)
class ResetButton(QPushButton):
def __init__(self, mode):
QPushButton.__init__(self)
self.mode = mode
self.setIcon(QtGui.QIcon(assets.path('reset.png')))
self.setToolTip("Reset")
self.clicked.connect(self.reset)
def reset(self):
reset = {
Mode.DMG_CURRENT_ZONE: engine.reset_zone_stats,
Mode.DMG_LAST_FIGHT: engine.reset_last_fight_stats,
Mode.DMG_OVERALL: engine.reset_stats,
Mode.CURRENT_ZONE: engine.reset_zone_stats,
Mode.LAST_FIGHT: engine.reset_last_fight_stats,
Mode.OVERALL: engine.reset_stats,
}
reset[self.mode()]()
class AboutButton(QPushButton):
def __init__(self):
QPushButton.__init__(self)
self.about = about.About()
self.setIcon(QtGui.QIcon(assets.path('about.png')))
self.setToolTip("About")
self.clicked.connect(self.about.show)
class CloseButton(QPushButton):
def __init__(self):
QPushButton.__init__(self)
self.setIcon(QtGui.QIcon(assets.path('close.png')))
self.setToolTip("Close")
self.clicked.connect(self.close)
def close(self):
sys.exit(0)
class InteractiveBar(QWidget):
def __init__(self, table, clipboard):
QWidget.__init__(self)
self.mode = ModeWidget()
self.table = table
self.layout = QHBoxLayout()
self.fame_per_hour = 0.0
self.layout.addWidget(self.mode)
self.copy_button = CopyButton(
clipboard, self.get_players, self.get_mode, self.get_fame_per_hour)
self.layout.addWidget(self.copy_button)
self.reset_button = ResetButton(self.get_mode)
self.layout.addWidget(self.reset_button)
self.about_button = AboutButton()
self.layout.addWidget(self.about_button)
if config()['window']['frameless']:
self.close_button = CloseButton()
self.layout.addWidget(self.close_button)
self.setLayout(self.layout)
def get_mode(self):
return self.mode.currentText()
def get_fame_per_hour(self):
return self.fame_per_hour
def get_players(self):
model = self.table.model
return sorted(
[model.item(i).player for i in range(model.rowCount())],
key=lambda i: i.damage,
reverse=True)
def set_fame_per_hour(self, fpm):
self.fame_per_hour = fpm
def close(self):
sys.exit(0)
class ModeWidget(QComboBox):
def __init__(self):
QComboBox.__init__(self)
self.addItem(Mode.DMG_CURRENT_ZONE)
self.addItem(Mode.DMG_OVERALL)
self.addItem(Mode.DMG_LAST_FIGHT)
self.addItem(Mode.CURRENT_ZONE)
self.addItem(Mode.OVERALL)
self.addItem(Mode.LAST_FIGHT)
class MainWidget(QWidget):
def __init__(self, clipboard):
QWidget.__init__(self)
self.mouse_pos = None
self.table = List()
self.fame_label = QLabel()
self.fame_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter)
self.bar = InteractiveBar(self.table, clipboard)
self.layout = QVBoxLayout()
self.layout.addWidget(self.bar)
self.layout.addWidget(self.fame_label)
self.layout.addWidget(self.table)
self.setLayout(self.layout)
self.refresh()
timer = QTimer(self)
timer.timeout.connect(self.refresh)
timer.start(500)
def refresh(self):
damage_session, fame_stat, elapsed = self.session()
self.table.update(damage_session)
self.bar.set_fame_per_hour(fame_stat.fame_per_hour)
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPH <b>{}</b>".format(
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_hour))
def mousePressEvent(self, event):
self.mouse_pos = event.pos()
def mouseMoveEvent(self, event):
if self.bar.geometry().contains(event.pos()):
return
if not self.mouse_pos:
return
if event.buttons() & Qt.LeftButton:
diff = event.pos() - self.mouse_pos
newpos = self.pos() + diff
self.move(newpos)
def session(self):
sessions = {
Mode.DMG_CURRENT_ZONE: functools.partial(engine.zone_stats, with_damage=True),
Mode.DMG_LAST_FIGHT: functools.partial(engine.last_fight_stats, with_damage=True),
Mode.DMG_OVERALL: functools.partial(engine.overall_stats, with_damage=True),
Mode.CURRENT_ZONE: engine.zone_stats,
Mode.LAST_FIGHT: engine.last_fight_stats,
Mode.OVERALL: engine.overall_stats
}
return sessions[self.bar.mode.currentText()]()