Cache graph values on GUI graphs so they do not get recalculated when graph options are changed

gui/builtinGraphs/fitCapAmountVsTime.py

@@ -29,6 +29,7 @@ class FitCapAmountVsTimeGraph(Graph):
     name = 'Cap Amount vs Time'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
 
     @property

gui/builtinGraphs/fitCapRegenVsCapPerc.py

@@ -29,6 +29,7 @@ class FitCapRegenVsCapPercGraph(Graph):
     name = 'Cap Regen vs Cap Amount'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
 
     @property

gui/builtinGraphs/fitDmgVsTime.py

@@ -30,6 +30,7 @@ class FitDmgVsTimeGraph(Graph):
     name = 'Damage vs Time'
 
     def __init__(self):
+        super().__init__()
         self.eosGraphDmg = EosGraphDmg()
         self.eosGraphDps = EosGraphDps()
 

gui/builtinGraphs/fitDpsVsRange.py

@@ -29,6 +29,7 @@ class FitDpsVsRangeGraph(Graph):
     name = 'DPS vs Range'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
 
     @property

gui/builtinGraphs/fitMobilityVsTime.py

@@ -30,6 +30,7 @@ class FitMobilityVsTimeGraph(Graph):
     name = 'Mobility vs Time'
 
     def __init__(self):
+        super().__init__()
         self.eosGraphSpeed = EosGraphSpeed()
         self.eosGraphDistance = EosGraphDistance()
 

gui/builtinGraphs/fitShieldAmountVsTime.py

@@ -30,6 +30,7 @@ class FitShieldAmountVsTimeGraph(Graph):
     name = 'Shield Amount vs Time'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 

gui/builtinGraphs/fitShieldRegenVsShieldPerc.py

@@ -30,6 +30,7 @@ class FitShieldRegenVsShieldPercGraph(Graph):
     name = 'Shield Regen vs Shield Amount'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 

gui/builtinGraphs/fitWarpTimeVsDistance.py

@@ -29,6 +29,7 @@ class FitWarpTimeVsDistanceGraph(Graph):
     name = 'Warp Time vs Distance'
 
     def __init__(self):
+        super().__init__()
         self.eosGraph = EosGraph()
 
     @property

gui/graph.py

@@ -32,6 +32,9 @@ class Graph(metaclass=ABCMeta):
     def register(cls):
         Graph.views.append(cls)
 
+    def __init__(self):
+        self._cache = {}
+
     @property
     @abstractmethod
     def name(self):
@@ -56,10 +59,16 @@ class Graph(metaclass=ABCMeta):
         return False
 
     def getPlotPoints(self, fit, extraData, xRange, xAmount, yType):
-        xRange = self.parseRange(xRange)
-        extraData = {k: float(v) if v else None for k, v in extraData.items()}
-        graph = getattr(self, self.yDefs[yType].eosGraph, None)
-        return graph.getPlotPoints(fit, extraData, xRange, xAmount)
+        try:
+            plotData = self._cache[fit.ID][yType]
+        except KeyError:
+            xRange = self.parseRange(xRange)
+            extraData = {k: float(v) if v else None for k, v in extraData.items()}
+            graph = getattr(self, self.yDefs[yType].eosGraph, None)
+            plotData = graph.getPlotPoints(fit, extraData, xRange, xAmount)
+            fitCache = self._cache.setdefault(fit.ID, {})
+            fitCache[yType] = plotData
+        return plotData
 
     def parseRange(self, string):
         m = re.match('\s*(?P<first>\d+(\.\d+)?)\s*(-\s*(?P<second>\d+(\.\d+)?))?', string)
@@ -72,9 +81,13 @@ class Graph(metaclass=ABCMeta):
         high = max(first, second)
         return (low, high)
 
-    def clearCache(self, *args, **kwargs):
+    def clearCache(self, key=None):
+        if key is None:
+            self._cache.clear()
+        elif key in self._cache:
+            del self._cache[key]
         for yDef in self.yDefs.values():
-            getattr(self, yDef.eosGraph).clearCache(*args, **kwargs)
+            getattr(self, yDef.eosGraph).clearCache(key=key)
 
 
 XDef = namedtuple('XDef', ('inputDefault', 'inputLabel', 'inputIconID', 'axisLabel'))