Calculate graph data only once

eos/graph/__init__.py

@@ -55,6 +55,7 @@ class Graph:
 
 
 class Data:
+
     def __init__(self, name, dataString, step=None):
         self.name = name
         self.step = step
@@ -84,6 +85,7 @@ class Data:
 
 
 class Constant:
+
     def __init__(self, const):
         if isinstance(const, str):
             self.value = None if const == "" else float(const)
@@ -109,7 +111,7 @@ class Range:
     def __iter__(self):
         current = start = self.start
         end = self.end
-        step = self.step or (end - start) / 50.0
+        step = self.step or (end - start) / 200
         i = 0
         while current < end:
             current = start + i * step

eos/graph/fitDmgTime.py

@@ -33,12 +33,33 @@ class FitDmgTimeGraph(Graph):
     def __init__(self, fit, data=None):
         Graph.__init__(self, fit, self.calcDmg, data if data is not None else self.defaults)
         self.fit = fit
+        self.__cache = {}
 
     def calcDmg(self, data):
+        time = data["time"] * 1000
+        closestTime = max((t for t in self.__cache if t <= time), default=None)
+        if closestTime is None:
+            return 0
+        return self.__cache[closestTime]
+
+    def recalc(self):
+
+        def addDmg(addedTime, addedDmg):
+            if addDmg == 0:
+                return
+            if addedTime not in self.__cache:
+                prevTime = max((t for t in self.__cache if t < addedTime), default=None)
+                if prevTime is None:
+                    self.__cache[addedTime] = 0
+                else:
+                    self.__cache[addedTime] = self.__cache[prevTime]
+            for time in (t for t in self.__cache if t >= addedTime):
+                self.__cache[time] += addedDmg
+
+        self.__cache.clear()
         fit = self.fit
         # We'll handle calculations in milliseconds
-        maxTime = data["time"] * 1000
-        currentDmg = 0
+        maxTime = self.data["time"].data[0].end * 1000
         for mod in fit.modules:
             cycleParams = mod.getCycleParameters(reloadOverride=True)
             if cycleParams is None:
@@ -49,7 +70,7 @@ class FitDmgTimeGraph(Graph):
                 volleyParams = mod.getVolleyParameters(spoolOptions=SpoolOptions(SpoolType.CYCLES, nonstopCycles, True))
                 for volleyTime, volley in volleyParams.items():
                     if currentTime + volleyTime <= maxTime:
-                        currentDmg += volley.total
+                        addDmg(currentTime + volleyTime, volley.total)
                 currentTime += cycleTime
                 currentTime += inactiveTime
                 if inactiveTime == 0:
@@ -67,7 +88,7 @@ class FitDmgTimeGraph(Graph):
             for cycleTime, inactiveTime in cycleParams.iterCycles():
                 for volleyTime, volley in volleyParams.items():
                     if currentTime + volleyTime <= maxTime:
-                        currentDmg += volley.total
+                        addDmg(currentTime + volleyTime, volley.total)
                 currentTime += cycleTime
                 currentTime += inactiveTime
                 if currentTime > maxTime:
@@ -85,9 +106,8 @@ class FitDmgTimeGraph(Graph):
                 for cycleTime, inactiveTime in abilityCycleParams.iterCycles():
                     for volleyTime, volley in abilityVolleyParams.items():
                         if currentTime + volleyTime <= maxTime:
-                            currentDmg += volley.total
+                            addDmg(currentTime + volleyTime, volley.total)
                     currentTime += cycleTime
                     currentTime += inactiveTime
                     if currentTime > maxTime:
                         break
-        return currentDmg

gui/builtinGraphs/fitDmgTime.py

@@ -72,6 +72,7 @@ class FitDmgTimeGraph(Graph):
 
         x = []
         y = []
+        fitDmgTime.recalc()
         for point, val in fitDmgTime.getIterator():
             x.append(point[variable])
             y.append(val)