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

Re-enable DPS graph and make few fixes

Browse Source
This commit is contained in:
DarkPhoenix
2019-06-28 10:13:03 +03:00
parent 66ff4d827c
commit c2017f3cb9
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinGraphs/__init__.py
View File

@@ -1,6 +1,6 @@
# noinspection PyUnresolvedReferences # noinspection PyUnresolvedReferences
from gui.builtinGraphs import ( # noqa: E402,F401 from gui.builtinGraphs import ( # noqa: E402,F401
# fitDamageStats, fitDamageStats,
# fitDmgVsTime, # fitDmgVsTime,
# fitShieldRegenVsShieldPerc, # fitShieldRegenVsShieldPerc,
# fitShieldAmountVsTime, # fitShieldAmountVsTime,

3
gui/builtinGraphs/base.py
View File

@@ -96,8 +96,7 @@ class Graph(metaclass=ABCMeta):
self._cache.clear() self._cache.clear()
elif key in self._cache: elif key in self._cache:
del self._cache[key] del self._cache[key]
for yDef in self.yDefs: self._eosGraph.clearCache(key=key)
getattr(self, yDef.eosGraph).clearCache(key=key)
YDef = namedtuple('YDef', ('handle', 'unit', 'label')) YDef = namedtuple('YDef', ('handle', 'unit', 'label'))

2
gui/graphFrame/frame.py
View File

@@ -206,7 +206,7 @@ class GraphFrame(wx.Frame):
fits = self.ctrlPanel.fits fits = self.ctrlPanel.fits
if view.hasTargets: if view.hasTargets:
targets = self.ctrlPanel.targets targets = self.ctrlPanel.targets
iterList = tuple(itertools.combinations(fits, targets)) iterList = tuple(itertools.product(fits, targets))
else: else:
iterList = tuple((f, None) for f in fits) iterList = tuple((f, None) for f in fits)
for fit, target in iterList: for fit, target in iterList: