diff --git a/eos b/eos index 3ac319cba..013e73348 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 3ac319cba012f9570b36c698aeb1c4f3d4a12819 +Subproject commit 013e733489dceda2e9d5a2c9dbf642ffef817fe9 diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 8c26d0a7a..b5565dff9 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -165,10 +165,10 @@ class ResistancesViewFull(StatsView): damagePattern = fit.damagePattern if fit is not None else None for damageType in ("em", "thermal", "kinetic", "explosive"): lbl = getattr(self, "labelResistanceDamagepattern%s" % damageType.capitalize()) - if damagePattern: - lbl.SetLabel("%.2f" % getattr(damagePattern, "%sAmount" % damageType)) + if damagePattern is not None: + lbl.SetValue(getattr(damagePattern, "%sAmount" % damageType)) else: - lbl.SetLabel("0.00") + lbl.SetValue(0) self.panel.Layout() diff --git a/service/__init__.py b/service/__init__.py index acb3d6854..81588591b 100644 --- a/service/__init__.py +++ b/service/__init__.py @@ -2,4 +2,5 @@ from service.market import Market from service.fit import Fit from service.attribute import Attribute from service.character import Character +from service.damagePattern import DamagePattern import service.prefetch \ No newline at end of file diff --git a/service/damagePattern.py b/service/damagePattern.py new file mode 100755 index 000000000..ac571288f --- /dev/null +++ b/service/damagePattern.py @@ -0,0 +1,46 @@ +#=============================================================================== +# 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 . +#=============================================================================== + +import eos.db +import eos.types + +class DamagePattern(): + instance = None + @classmethod + def getInstance(cls): + if cls.instance is None: + cls.instance = DamagePattern() + + return cls.instance + + def __init__(self): + self.getDamagePatternList() + + def getDamagePatternList(self): + patterns = eos.db.getDamagePatternList() + if len(patterns) == 0: + uniform = eos.types.DamagePattern(25, 25, 25, 25) + uniform.name = "Uniform" + eos.db.save(uniform) + patterns.append(uniform) + + return patterns + + def getDamagePattern(self, name): + return eos.db.getDamagePattern(name) \ No newline at end of file diff --git a/service/fit.py b/service/fit.py index e6532f8df..fe186890b 100644 --- a/service/fit.py +++ b/service/fit.py @@ -21,6 +21,7 @@ import eos.db import eos.types from eos.types import State import copy +from service.damagePattern import DamagePattern class Fit(object): instance = None @@ -44,6 +45,7 @@ class Fit(object): fit = eos.types.Fit() fit.ship = eos.types.Ship(eos.db.getItem(shipID)) fit.name = name + fit.damagePattern = DamagePattern.getInstance().getDamagePattern("Uniform") eos.db.save(fit) fit.calculateModifiedAttributes() return fit.ID