diff --git a/gui/builtinGraphs/__init__.py b/gui/builtinGraphs/__init__.py index ea8b49783..6c7beeef6 100644 --- a/gui/builtinGraphs/__init__.py +++ b/gui/builtinGraphs/__init__.py @@ -1,6 +1,6 @@ # noinspection PyUnresolvedReferences from gui.builtinGraphs import ( # noqa: E402,F401 - # fitDamageStats, + fitDamageStats, # fitDmgVsTime, # fitShieldRegenVsShieldPerc, # fitShieldAmountVsTime, diff --git a/gui/builtinGraphs/base.py b/gui/builtinGraphs/base.py index 21eb0f1c1..11dce9d51 100644 --- a/gui/builtinGraphs/base.py +++ b/gui/builtinGraphs/base.py @@ -96,8 +96,7 @@ class Graph(metaclass=ABCMeta): self._cache.clear() elif key in self._cache: del self._cache[key] - for yDef in self.yDefs: - getattr(self, yDef.eosGraph).clearCache(key=key) + self._eosGraph.clearCache(key=key) YDef = namedtuple('YDef', ('handle', 'unit', 'label')) diff --git a/gui/graphFrame/frame.py b/gui/graphFrame/frame.py index 9451c028d..0a360eaf3 100644 --- a/gui/graphFrame/frame.py +++ b/gui/graphFrame/frame.py @@ -206,7 +206,7 @@ class GraphFrame(wx.Frame): fits = self.ctrlPanel.fits if view.hasTargets: targets = self.ctrlPanel.targets - iterList = tuple(itertools.combinations(fits, targets)) + iterList = tuple(itertools.product(fits, targets)) else: iterList = tuple((f, None) for f in fits) for fit, target in iterList: