items tooltip

This commit is contained in:
Wiktor Mazur
2019-12-16 21:58:28 +01:00
parent 7e6644ad9a
commit 6e9e1f06c0
2 changed files with 22 additions and 6 deletions
+19 -3
View File
@@ -2,6 +2,7 @@ import collections
import functools
from PIL import Image, ImageQt
from io import BytesIO
import re
from PySide2.QtCore import Qt
@@ -26,6 +27,20 @@ from . import async_request
Style = collections.namedtuple('Style', 'bg')
def weapon_info(items):
tier_re = re.compile(r"(T\d+).*")
enchant_re = re.compile(r".*@(\d+)")
if 'weapon' in items:
tier = tier_re.match(items['weapon'])
enchant = enchant_re.match(items['weapon'])
if tier:
return f'{tier[1] if tier else ""}@{enchant[1] if enchant else 0}'
return ''
# T8_MAIN_NATURESTAFF@3
# T8_MAIN_NATURESTAF
def player_style(items):
weapon_type = weapon.get_weapon_type(items)
@@ -82,7 +97,6 @@ class DmgList(QListView):
QtGui.QStandardItem .__init__(self)
self.parent = parent
self.player = player
self.player_style = player_style(player.items)
self.update(player)
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter)
@@ -98,7 +112,7 @@ class DmgList(QListView):
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(self.player_style.bg))
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'))
@@ -106,9 +120,11 @@ class DmgList(QListView):
self.setBackground(brush)
icon = player_icon(self.player.items['weapon'])
self.setToolTip('\n'.join([f'{k}: {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())
@@ -121,7 +137,7 @@ class DmgList(QListView):
def __init__(self):
QListView .__init__(self)
self.setIconSize(QtCore.QSize(30, 30))
self.setIconSize(QtCore.QSize(20, 20))
self.model = self.DmgItemModel(self)
self.proxy = self.SortProxyModel()
self.proxy.setSourceModel(self.model)
+3 -3
View File
@@ -109,13 +109,13 @@ def zone_stats(with_damage=False):
session = {
'players': [
{'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': {
'weapon': 'T3_MAIN_ARCANESTAFF'
'weapon': 'T4_MAIN_ARCANESTAFF@3'
}},
{'player': 'Cursed', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12, 'items': {
'weapon': 'T5_MAIN_CURSEDSTAFF'
'weapon': 'T5_MAIN_CURSEDSTAFF@2'
}},
{'player': 'Fire', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_MAIN_FIRESTAFF'
'weapon': 'T5_MAIN_FIRESTAFF@1'
}},
{'player': 'Frost', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_MAIN_FROSTSTAFF@1'