dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' into fit_export_options

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-12 12:16:58 +03:00
parent 980c84b911 dfc0a896c4
commit 143606d8f8
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eos/gamedata.py
View File

@@ -459,7 +459,10 @@ class Item(EqBase):
pyfalog.debug("Creating a price for {}".format(self.ID))
self.__price = types_Price(self.ID)
eos.db.add(self.__price)
eos.db.commit()
# Commented out by DarkPhoenix: it caused issues when opening stats for item with many
# variations, as each commit takes ~50 ms, for items with 30 variations time to open stats
# window could reach 2 seconds. Hopefully just adding it is sufficient.
# eos.db.commit()
else:
self.__price = db_price

24
gui/builtinItemStatsViews/itemMutator.py
View File

@@ -31,22 +31,22 @@ class ItemMutator(wx.Panel):
for m in sorted(stuff.mutators.values(), key=lambda x: x.attribute.displayName):
# Format: [raw value, modifier applied to base raw value, display value]
range1 = (m.minValue, m.attribute.unit.SimplifyValue(m.minValue))
range2 = (m.maxValue, m.attribute.unit.SimplifyValue(m.maxValue))
minRange = (m.minValue, m.attribute.unit.SimplifyValue(m.minValue))
maxRange = (m.maxValue, m.attribute.unit.SimplifyValue(m.maxValue))
if (m.highIsGood and range1[0] >= range2[0]) or (not m.highIsGood and range1[0] <= range2[0]):
betterRange = range1
worseRange = range2
if (m.highIsGood and minRange[0] >= maxRange[0]) or (not m.highIsGood and minRange[0] <= maxRange[0]):
betterRange = minRange
worseRange = maxRange
else:
betterRange = range2
worseRange = range1
betterRange = maxRange
worseRange = minRange
if range1[1] >= range2[1]:
displayMaxRange = range1
displayMinRange = range2
if minRange[1] >= maxRange[1]:
displayMaxRange = minRange
displayMinRange = maxRange
else:
displayMaxRange = range2
displayMinRange = range1
displayMaxRange = maxRange
displayMinRange = minRange
# If base value is outside of mutation range, make sure that center of slider
# corresponds to the value which is closest available to actual base value. It's