From 163207e2c953e4293bd53c8c91f9825023fa7181 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Thu, 1 Dec 2011 00:21:09 +0200 Subject: [PATCH] Added support for global(dmg/char) options in service.fit --- service/fit.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/service/fit.py b/service/fit.py index 2901362b5..c5fbb179e 100644 --- a/service/fit.py +++ b/service/fit.py @@ -33,6 +33,7 @@ from service.market import Market from service.damagePattern import DamagePattern from service.character import Character from service.fleet import Fleet +from service.settings import SettingsProvider class FitBackupThread(threading.Thread): def __init__(self, path, callback): @@ -80,6 +81,14 @@ class Fit(object): self.character = Character.getInstance().all0() self.dirtyFitIDs = set() + serviceFittingDefaultOptions = {"useGlobalCharacter": False, "useGlobalDamagePattern": False, "defaultCharacter": self.character.ID} + + self.serviceFittingOptions = SettingsProvider.getInstance().getSettings("pyfaServiceFittingOptions", serviceFittingDefaultOptions) + + self.useGlobalCharacter = self.serviceFittingOptions["useGlobalCharacter"] + self.useGlobalDamagePattern = self.serviceFittingOptions["useGlobalDamagePattern"] + + def getAllFits(self): fits = eos.db.getFitList() names = [] @@ -163,10 +172,13 @@ class Fit(object): fit = eos.db.getFit(fitID) -# if fit.character != self.character: -# fit.character = self.character -# if fit.damagePattern != self.pattern: -# fit.damagePattern = self.pattern + if self.useGlobalCharacter: + if fit.character != self.character: + fit.character = self.character + + if self.useGlobalDamagePattern: + if fit.damagePattern != self.pattern: + fit.damagePattern = self.pattern eos.db.commit() self.recalc(fit, withBoosters=True)