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

Restore functionality of dmg vs time graph

Browse Source
This commit is contained in:
DarkPhoenix
2019-05-17 18:44:52 +03:00
parent fb5eb220fd
commit 2a04e60ae0
7 changed files with 97 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eos/graph/__init__.py
View File

@@ -47,11 +47,11 @@ class Graph(metaclass=ABCMeta):
yield current
current += step
def clearCache(self, fitID=None):
if fitID is None:
def clearCache(self, key=None):
if key is None:
self.cache.clear()
elif fitID in self.cache:
del self.cache[fitID]
elif key in self.cache:
del self.cache[key]
class SmoothGraph(Graph, metaclass=ABCMeta):

63
eos/graph/fitDmgTime.py → eos/graph/fitDmgVsTime.py
View File

@@ -17,49 +17,62 @@
# along with eos. If not, see <http://www.gnu.org/licenses/>.
# ===============================================================================
from logbook import Logger
from eos.graph import Graph
from eos.utils.spoolSupport import SpoolType, SpoolOptions
pyfalog = Logger(__name__)
class FitDmgVsTimeGraph(Graph):
def getPlotPoints(self, fit, extraData, xRange, xAmount):
# We deliberately ignore xAmount here to build graph which will reflect
# all steps of building up the damage
maxTime = xRange[1]
if fit.ID not in self.cache:
self.__generateCache(fit, maxTime)
currentY = 0
xs = [0]
ys = [0]
cache = self.cache[fit.ID]
for time in sorted(cache):
prevY = currentY
currentX = time / 1000
currentY = cache[time]
if currentY != prevY:
xs.append(currentX)
ys.append(prevY)
xs.append(currentX)
ys.append(currentY)
if maxTime > max(xs):
xs.append(maxTime)
ys.append(ys[-1])
return xs, ys
class FitDmgTimeGraph(Graph):
defaults = {"time": 0}
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)
def getYForX(self, fit, extraData, x):
time = x * 1000
cache = self.cache[fit.ID]
closestTime = max((t for t in cache if t <= time), default=None)
if closestTime is None:
return 0
return self.__cache[closestTime]
return cache[closestTime]
def recalc(self):
def __generateCache(self, fit, maxTime):
cache = self.cache[fit.ID] = {}
def addDmg(addedTime, addedDmg):
if addedDmg == 0:
return
if addedTime not in self.__cache:
prevTime = max((t for t in self.__cache if t < addedTime), default=None)
if addedTime not in cache:
prevTime = max((t for t in cache if t < addedTime), default=None)
if prevTime is None:
self.__cache[addedTime] = 0
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
cache[addedTime] = cache[prevTime]
for time in (t for t in cache if t >= addedTime):
cache[time] += addedDmg
self.__cache.clear()
fit = self.fit
# We'll handle calculations in milliseconds
maxTime = self.data["time"].data[0].end * 1000
maxTime = maxTime * 1000
for mod in fit.modules:
cycleParams = mod.getCycleParameters(reloadOverride=True)
if cycleParams is None:

2
gui/builtinGraphs/__init__.py
View File

@@ -2,7 +2,7 @@
from gui.builtinGraphs import ( # noqa: E402,F401
# fitDpsRange,
# fitDpsTime,
# fitDmgTime,
fitDmgVsTime,
# fitShieldRegenAmount,
# fitShieldAmountTime,
fitCapRegenVsCapPerc,

82
gui/builtinGraphs/fitDmgTime.py
View File

@@ -1,82 +0,0 @@
# =============================================================================
# Copyright (C) 2010 Diego Duclos
#
# This file is part of pyfa.
#
# pyfa is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# pyfa is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with pyfa. If not, see <http://www.gnu.org/licenses/>.
# =============================================================================
import gui.mainFrame
from eos.graph import Data
from eos.graph.fitDmgTime import FitDmgTimeGraph as EosFitDmgTimeGraph
from gui.bitmap_loader import BitmapLoader
from gui.graph import Graph
from service.attribute import Attribute
class FitDmgTimeGraph(Graph):
propertyLabelMap = {"time": "Time (seconds)"}
defaults = EosFitDmgTimeGraph.defaults.copy()
def __init__(self):
Graph.__init__(self)
self.defaults["time"] = "0-80"
self.name = "Damage Inflicted vs Time"
self.eosGraph = None
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def getFields(self):
return self.defaults
def getLabels(self):
return self.propertyLabelMap
def getIcons(self):
iconFile = Attribute.getInstance().getAttributeInfo('duration').iconID
bitmap = BitmapLoader.getBitmap(iconFile, "icons")
return {"time": bitmap}
def getPoints(self, fit, fields):
eosGraph = getattr(self, "eosGraph", None)
if eosGraph is None or eosGraph.fit != fit:
eosGraph = self.eosGraph = EosFitDmgTimeGraph(fit)
eosGraph.clearData()
variable = None
for fieldName, value in fields.items():
d = Data(fieldName, value)
if not d.isConstant():
if variable is None:
variable = fieldName
else:
# We can't handle more then one variable atm, OOPS FUCK OUT
return False, "Can only handle 1 variable"
eosGraph.setData(d)
if variable is None:
return False, "No variable"
x = []
y = []
eosGraph.recalc()
for point, val in eosGraph.getIterator():
x.append(point[variable])
y.append(val)
return x, y
FitDmgTimeGraph.register()

43
gui/builtinGraphs/fitDmgVsTime.py Normal file
View File

@@ -0,0 +1,43 @@
# =============================================================================
# Copyright (C) 2010 Diego Duclos
#
# This file is part of pyfa.
#
# pyfa is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# pyfa is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with pyfa. If not, see <http://www.gnu.org/licenses/>.
# =============================================================================
from collections import OrderedDict
from eos.graph.fitDmgVsTime import FitDmgVsTimeGraph as EosGraphDmg
from gui.graph import Graph, XDef, YDef
class FitDmgVsTimeGraph(Graph):
name = 'Damage vs Time'
def __init__(self):
self.eosGraphDmg = EosGraphDmg()
@property
def xDef(self):
return XDef(inputDefault='0-80', inputLabel='Time (seconds)', inputIconID=1392, axisLabel='Time, s')
@property
def yDefs(self):
return OrderedDict([('damage', YDef(switchLabel='Damage inflicted', axisLabel='Damage', eosGraph='eosGraphDmg'))])
FitDmgVsTimeGraph.register()

14
gui/graph.py
View File

@@ -64,12 +64,16 @@ class Graph(metaclass=ABCMeta):
m = re.match('\s*(?P<first>\d+(\.\d+)?)\s*(-\s*(?P<second>\d+(\.\d+)?))?', string)
if m is None:
return (0, 0)
first = m.group('first')
first = float(m.group('first'))
second = m.group('second')
if not second:
return (0, float(first))
else:
return (float(first), float(second))
second = float(second) if second is not None else 0
low = min(first, second)
high = max(first, second)
return (low, high)
def clearCache(self, *args, **kwargs):
for yDef in self.yDefs.values():
getattr(self, yDef.eosGraph).clearCache(*args, **kwargs)
XDef = namedtuple('XDef', ('inputDefault', 'inputLabel', 'inputIconID', 'axisLabel'))

2
gui/graphFrame.py
View File

@@ -286,6 +286,8 @@ class GraphFrame(wx.Frame):
values = self.getValues()
view = self.getView()
# todo: we just drop cache so far, need to drop it only for removed/changed fits
view.clearCache()
self.subplot.clear()
self.subplot.grid(True)
legend = []