From d928df9c69b7ef57071546cda6118c04a904aa37 Mon Sep 17 00:00:00 2001 From: blitzman Date: Sun, 26 Mar 2017 14:28:13 -0400 Subject: [PATCH] Move `useStaticAdaptiveArmorHardener` to the EOSSettings. Not moving force reload for now --- eos/config.py | 2 +- eos/effects/adaptivearmorhardener.py | 5 ++--- eos/effects/tractorbeamcan.py | 1 - gui/builtinPreferenceViews/pyfaDatabasePreferences.py | 1 - gui/builtinPreferenceViews/pyfaEnginePreferences.py | 10 ++++++---- gui/builtinPreferenceViews/pyfaLoggingPreferences.py | 1 - service/fit.py | 1 - 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/eos/config.py b/eos/config.py index 9dc0eabbc..b8454b1f2 100644 --- a/eos/config.py +++ b/eos/config.py @@ -22,7 +22,7 @@ else: pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring) settings = { - "setting1": True + "useStaticAdaptiveArmorHardener": False } # Autodetect path, only change if the autodetection bugs out. diff --git a/eos/effects/adaptivearmorhardener.py b/eos/effects/adaptivearmorhardener.py index 42c50a610..246c67fcf 100644 --- a/eos/effects/adaptivearmorhardener.py +++ b/eos/effects/adaptivearmorhardener.py @@ -3,7 +3,7 @@ # Used by: # Module: Reactive Armor Hardener from logbook import Logger -from service.fit import Fit +import eos.config pyfalog = Logger(__name__) @@ -14,8 +14,7 @@ type = "active" def handler(fit, module, context): damagePattern = fit.damagePattern - sFit = Fit.getInstance() - static_adaptive_behavior = sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"] + static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener'] if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior: pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.") diff --git a/eos/effects/tractorbeamcan.py b/eos/effects/tractorbeamcan.py index 2c7f8eae3..3f0d21230 100644 --- a/eos/effects/tractorbeamcan.py +++ b/eos/effects/tractorbeamcan.py @@ -7,5 +7,4 @@ type = "active" def handler(fit, module, context): - print settings['setting1'] pass diff --git a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py index b8647ef2f..608dc0197 100644 --- a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py +++ b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py @@ -14,7 +14,6 @@ class PFGeneralPref(PreferenceView): def populatePanel(self, panel): self.dirtySettings = False - # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) mainSizer = wx.BoxSizer(wx.VERTICAL) diff --git a/gui/builtinPreferenceViews/pyfaEnginePreferences.py b/gui/builtinPreferenceViews/pyfaEnginePreferences.py index 415264436..e2c7ac3d5 100644 --- a/gui/builtinPreferenceViews/pyfaEnginePreferences.py +++ b/gui/builtinPreferenceViews/pyfaEnginePreferences.py @@ -5,6 +5,7 @@ import wx from service.fit import Fit from gui.bitmapLoader import BitmapLoader from gui.preferenceView import PreferenceView +from service.settings import EOSSettings logger = logging.getLogger(__name__) @@ -20,10 +21,11 @@ class PFFittingEnginePref(PreferenceView): # noinspection PyAttributeOutsideInit def populatePanel(self, panel): - # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) mainSizer = wx.BoxSizer(wx.VERTICAL) + self.engine_settings = EOSSettings.getInstance() + self.stTitle = wx.StaticText(panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0) self.stTitle.Wrap(-1) self.stTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString)) @@ -36,7 +38,7 @@ class PFFittingEnginePref(PreferenceView): wx.DefaultPosition, wx.DefaultSize, 0) mainSizer.Add(self.cbGlobalForceReload, 0, wx.ALL | wx.EXPAND, 5) - self.cbUniversalAdaptiveArmorHardener = wx.CheckBox(panel, wx.ID_ANY, u"When damage profile is even, set Reactive Armor Hardener to match (old behavior).", + self.cbUniversalAdaptiveArmorHardener = wx.CheckBox(panel, wx.ID_ANY, u"When damage profile is Uniform, set Reactive Armor Hardener to match (old behavior).", wx.DefaultPosition, wx.DefaultSize, 0) mainSizer.Add(self.cbUniversalAdaptiveArmorHardener, 0, wx.ALL | wx.EXPAND, 5) @@ -69,7 +71,7 @@ class PFFittingEnginePref(PreferenceView): self.cbGlobalForceReload.SetValue(self.sFit.serviceFittingOptions["useGlobalForceReload"]) self.cbGlobalForceReload.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalForceReloadStateChange) - self.cbUniversalAdaptiveArmorHardener.SetValue(self.sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"]) + self.cbUniversalAdaptiveArmorHardener.SetValue(self.engine_settings.get("useStaticAdaptiveArmorHardener")) self.cbUniversalAdaptiveArmorHardener.Bind(wx.EVT_CHECKBOX, self.OnCBUniversalAdaptiveArmorHardenerChange) panel.SetSizer(mainSizer) @@ -79,7 +81,7 @@ class PFFittingEnginePref(PreferenceView): self.sFit.serviceFittingOptions["useGlobalForceReload"] = self.cbGlobalForceReload.GetValue() def OnCBUniversalAdaptiveArmorHardenerChange(self, event): - self.sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"] = self.cbUniversalAdaptiveArmorHardener.GetValue() + self.engine_settings.set("useStaticAdaptiveArmorHardener", self.cbUniversalAdaptiveArmorHardener.GetValue()) def getImage(self): return BitmapLoader.getBitmap("settings_fitting", "gui") diff --git a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py index 8aa140f97..5a7ffccc1 100644 --- a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py +++ b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py @@ -17,7 +17,6 @@ class PFGeneralPref(PreferenceView): def populatePanel(self, panel): self.dirtySettings = False - # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) mainSizer = wx.BoxSizer(wx.VERTICAL) diff --git a/service/fit.py b/service/fit.py index c1ce66f45..cbcbd7e4c 100644 --- a/service/fit.py +++ b/service/fit.py @@ -73,7 +73,6 @@ class Fit(object): "exportCharges": True, "openFitInNew": False, "priceSystem": "Jita", - "useStaticAdaptiveArmorHardener": False, "showShipBrowserTooltip": True, }