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

Avoid doing unnecessary recalcs

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-12 04:08:54 +03:00
parent f8062ba39f
commit 8a4caeaa2d
31 changed files with 233 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gui/fitCommands/calc/module/changeCharges.py
View File

@@ -11,12 +11,13 @@ pyfalog = Logger(__name__)
class CalcChangeModuleChargesCommand(wx.Command):
def __init__(self, fitID, projected, chargeMap, ignoreRestriction=False):
def __init__(self, fitID, projected, chargeMap, ignoreRestrictions=False, recalc=True):
wx.Command.__init__(self, True, 'Change Module Charges')
self.fitID = fitID
self.projected = projected
self.chargeMap = chargeMap
self.ignoreRestriction = ignoreRestriction
self.ignoreRestriction = ignoreRestrictions
self.recalc = recalc
self.savedChargeMap = None
self.savedStateCheckChanges = None
@@ -48,8 +49,9 @@ class CalcChangeModuleChargesCommand(wx.Command):
mod.charge = chargeItem
if not changes:
return False
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
if self.recalc:
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
return True
def Undo(self):
@@ -58,8 +60,18 @@ class CalcChangeModuleChargesCommand(wx.Command):
fitID=self.fitID,
projected=self.projected,
chargeMap=self.savedChargeMap,
ignoreRestriction=True)
ignoreRestrictions=True,
recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

27
gui/fitCommands/calc/module/localAdd.py
View File

@@ -39,14 +39,7 @@ class CalcAddLocalModuleCommand(wx.Command):
fitID=self.fitID,
position=fit.modules.index(oldMod),
newModInfo=self.newModInfo)
if not self.subsystemCmd.Do():
return False
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, newMod)
return True
return self.subsystemCmd.Do()
if not newMod.fits(fit):
pyfalog.warning('Module does not fit')
return False
@@ -66,15 +59,23 @@ class CalcAddLocalModuleCommand(wx.Command):
pyfalog.debug('Undoing addition of local module {} to fit {}'.format(self.newModInfo, self.fitID))
# We added a subsystem module, which actually ran the replace command. Run the undo for that guy instead
if self.subsystemCmd is not None:
if not self.subsystemCmd.Undo():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
return self.subsystemCmd.Undo()
if self.savedPosition is None:
return False
from .localRemove import CalcRemoveLocalModulesCommand
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.savedPosition])
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.savedPosition], recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.subsystemCmd is not None:
return self.subsystemCmd.needsGuiRecalc
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

2
gui/fitCommands/calc/module/localChangeStates.py
View File

@@ -63,7 +63,7 @@ class CalcChangeLocalModuleStatesCommand(wx.Command):
return True
@property
def recalcNeeded(self):
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:

11
gui/fitCommands/calc/module/localClone.py
View File

@@ -44,8 +44,17 @@ class CalcCloneLocalModuleCommand(wx.Command):
def Undo(self):
pyfalog.debug('Undoing cloning of local module from position {} to position {} for fit ID {}'.format(self.srcPosition, self.dstPosition, self.fitID))
from .localRemove import CalcRemoveLocalModulesCommand
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.dstPosition])
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.dstPosition], recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

30
gui/fitCommands/calc/module/localRemove.py
View File

@@ -12,10 +12,11 @@ pyfalog = Logger(__name__)
class CalcRemoveLocalModulesCommand(wx.Command):
def __init__(self, fitID, positions):
def __init__(self, fitID, positions, recalc=True):
wx.Command.__init__(self, True, 'Remove Module')
self.fitID = fitID
self.positions = positions
self.recalc = recalc
self.savedSubInfos = None
self.savedModInfos = None
self.savedStateCheckChanges = None
@@ -39,12 +40,12 @@ class CalcRemoveLocalModulesCommand(wx.Command):
if len(self.savedSubInfos) == 0 and len(self.savedModInfos) == 0:
return False
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
# If no modules were removed, report that command was not completed
if self.recalc:
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
return True
def Undo(self):
@@ -60,7 +61,8 @@ class CalcRemoveLocalModulesCommand(wx.Command):
fitID=self.fitID,
position=position,
newModInfo=modInfo,
ignoreRestrictions=True)
ignoreRestrictions=True,
recalc=False)
results.append(cmd.Do())
sFit.recalc(fit)
for position, modInfo in self.savedModInfos.items():
@@ -68,9 +70,19 @@ class CalcRemoveLocalModulesCommand(wx.Command):
fitID=self.fitID,
position=position,
newModInfo=modInfo,
ignoreRestrictions=True)
ignoreRestrictions=True,
recalc=False)
results.append(cmd.Do())
if not any(results):
return False
restoreCheckedStates(fit, self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

25
gui/fitCommands/calc/module/localReplace.py
View File

@@ -11,7 +11,7 @@ pyfalog = Logger(__name__)
class CalcReplaceLocalModuleCommand(wx.Command):
def __init__(self, fitID, position, newModInfo, unloadInvalidCharges=False, ignoreRestrictions=False):
def __init__(self, fitID, position, newModInfo, unloadInvalidCharges=False, ignoreRestrictions=False, recalc=True):
wx.Command.__init__(self, True, 'Replace Module')
self.fitID = fitID
self.position = position
@@ -19,6 +19,7 @@ class CalcReplaceLocalModuleCommand(wx.Command):
self.oldModInfo = None
self.unloadInvalidCharges = unloadInvalidCharges
self.ignoreRestrictions = ignoreRestrictions
self.recalc = recalc
self.savedStateCheckChanges = None
self.unloadedCharge = None
@@ -56,11 +57,12 @@ class CalcReplaceLocalModuleCommand(wx.Command):
pyfalog.warning('Failed to replace in list')
self.Undo()
return False
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, newMod)
if self.recalc:
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, newMod)
return True
def Undo(self):
@@ -70,7 +72,7 @@ class CalcReplaceLocalModuleCommand(wx.Command):
# Remove if there was no module
if self.oldModInfo is None:
from .localRemove import CalcRemoveLocalModulesCommand
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.position])
cmd = CalcRemoveLocalModulesCommand(fitID=self.fitID, positions=[self.position], recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(fit, self.savedStateCheckChanges)
@@ -87,3 +89,12 @@ class CalcReplaceLocalModuleCommand(wx.Command):
return False
restoreCheckedStates(fit, self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

29
gui/fitCommands/calc/module/projectedAdd.py
View File

@@ -12,12 +12,13 @@ pyfalog = Logger(__name__)
class CalcAddProjectedModuleCommand(wx.Command):
def __init__(self, fitID, modInfo, position=None, ignoreRestrictions=False):
def __init__(self, fitID, modInfo, position=None, ignoreRestrictions=False, recalc=True):
wx.Command.__init__(self, True)
self.fitID = fitID
self.newModInfo = modInfo
self.newPosition = position
self.ignoreRestrictions = ignoreRestrictions
self.recalc = recalc
self.oldModInfo = None
self.oldPosition = None
self.savedStateCheckChanges = None
@@ -46,11 +47,12 @@ class CalcAddProjectedModuleCommand(wx.Command):
return False
self.newPosition = fit.projectedModules.index(newMod)
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, newMod)
if self.recalc:
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, newMod)
return True
def Undo(self):
@@ -60,7 +62,8 @@ class CalcAddProjectedModuleCommand(wx.Command):
fitID=self.fitID,
modInfo=self.oldModInfo,
position=self.oldPosition,
ignoreRestrictions=True)
ignoreRestrictions=True,
recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
@@ -68,8 +71,18 @@ class CalcAddProjectedModuleCommand(wx.Command):
from .projectedRemove import CalcRemoveProjectedModuleCommand
cmd = CalcRemoveProjectedModuleCommand(
fitID=self.fitID,
position=self.newPosition)
position=self.newPosition,
recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

9
gui/fitCommands/calc/module/projectedChangeStates.py
View File

@@ -57,3 +57,12 @@ class CalcChangeProjectedModuleStatesCommand(wx.Command):
mod.state = state
restoreCheckedStates(fit, self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

26
gui/fitCommands/calc/module/projectedRemove.py
View File

@@ -11,10 +11,11 @@ pyfalog = Logger(__name__)
class CalcRemoveProjectedModuleCommand(wx.Command):
def __init__(self, fitID, position):
def __init__(self, fitID, position, recalc=True):
wx.Command.__init__(self, True)
self.fitID = fitID
self.position = position
self.recalc = recalc
self.savedModInfo = None
self.savedStateCheckChanges = None
@@ -26,11 +27,12 @@ class CalcRemoveProjectedModuleCommand(wx.Command):
self.savedModInfo = ModuleInfo.fromModule(mod)
del fit.projectedModules[self.position]
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
if self.recalc:
# Need to flush because checkStates sometimes relies on module->fit
# relationship via .owner attribute, which is handled by SQLAlchemy
eos.db.flush()
sFit.recalc(fit)
self.savedStateCheckChanges = sFit.checkStates(fit, None)
return True
def Undo(self):
@@ -40,8 +42,18 @@ class CalcRemoveProjectedModuleCommand(wx.Command):
fitID=self.fitID,
modInfo=self.savedModInfo,
position=self.position,
ignoreRestrictions=True)
ignoreRestrictions=True,
recalc=False)
if not cmd.Do():
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

9
gui/fitCommands/calc/projectedFit/add.py
View File

@@ -88,3 +88,12 @@ class CalcAddProjectedFitCommand(wx.Command):
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

9
gui/fitCommands/calc/projectedFit/changeState.py
View File

@@ -54,3 +54,12 @@ class CalcChangeProjectedFitStateCommand(wx.Command):
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

9
gui/fitCommands/calc/projectedFit/remove.py
View File

@@ -79,3 +79,12 @@ class CalcRemoveProjectedFitCommand(wx.Command):
return False
restoreCheckedStates(Fit.getInstance().getFit(self.fitID), self.savedStateCheckChanges)
return True
@property
def needsGuiRecalc(self):
if self.savedStateCheckChanges is None:
return True
for container in self.savedStateCheckChanges:
if len(container) > 0:
return True
return False

4
gui/fitCommands/gui/itemsRebase.py
View File

@@ -22,6 +22,7 @@ class GuiRebaseItemsCommand(wx.Command):
def Do(self):
sFit = Fit.getInstance()
fit = sFit.getFit(self.fitID)
# Here we assume that item attribs do not change and item state will not change
for mod in fit.modules:
if mod.itemID in self.rebaseMap:
cmd = CalcRebaseItemCommand(
@@ -34,7 +35,8 @@ class GuiRebaseItemsCommand(wx.Command):
cmd = CalcChangeModuleChargesCommand(
fitID=self.fitID,
projected=False,
chargeMap={fit.modules.index(mod): self.rebaseMap[mod.chargeID]})
chargeMap={fit.modules.index(mod): self.rebaseMap[mod.chargeID]},
recalc=False)
self.internalHistory.submit(cmd)
for containerName in ('drones', 'fighters', 'implants', 'boosters'):
container = getattr(fit, containerName)

5
gui/fitCommands/gui/localModule/add.py
View File

@@ -22,9 +22,10 @@ class GuiAddLocalModuleCommand(wx.Command):
cmd = CalcAddLocalModuleCommand(fitID=self.fitID, newModInfo=ModuleInfo(itemID=self.itemID))
success = self.internalHistory.submit(cmd)
Market.getInstance().storeRecentlyUsed(self.itemID)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(

5
gui/fitCommands/gui/localModule/changeCharges.py
View File

@@ -20,9 +20,10 @@ class GuiChangeLocalModuleChargesCommand(wx.Command):
def Do(self):
cmd = CalcChangeModuleChargesCommand(fitID=self.fitID, projected=False, chargeMap={p: self.chargeItemID for p in self.positions})
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

5
gui/fitCommands/gui/localModule/changeMetas.py
View File

@@ -42,8 +42,9 @@ class GuiChangeLocalModuleMetasCommand(wx.Command):
if not commands:
return False
success = self.internalHistory.submitBatch(*commands)
eos.db.flush()
sFit.recalc(self.fitID)
if commands[-1].needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
events = []

4
gui/fitCommands/gui/localModule/changeStates.py
View File

@@ -26,9 +26,9 @@ class GuiChangeLocalModuleStatesCommand(wx.Command):
positions=self.positions,
click=self.click)
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit = Fit.getInstance()
if cmd.recalcNeeded:
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()

5
gui/fitCommands/gui/localModule/clone.py
View File

@@ -25,9 +25,10 @@ class GuiCloneLocalModuleCommand(wx.Command):
sFit = Fit.getInstance()
cmd = CalcCloneLocalModuleCommand(fitID=self.fitID, srcPosition=self.srcPosition, dstPosition=self.dstPosition)
success = self.internalHistory.submit(cmd)
eos.db.flush()
fit = sFit.getFit(self.fitID)
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
self.savedItemID = fit.modules[self.srcPosition].itemID

6
gui/fitCommands/gui/localModule/fillAdd.py
View File

@@ -27,9 +27,11 @@ class GuiFillWithNewLocalModulesCommand(wx.Command):
break
added_modules += 1
Market.getInstance().storeRecentlyUsed(self.itemID)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
# Only last command decides if we need to recalc here or not
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
success = added_modules > 0

5
gui/fitCommands/gui/localModule/fillClone.py
View File

@@ -30,8 +30,9 @@ class GuiFillWithClonedLocalModulesCommand(wx.Command):
if not self.internalHistory.submit(cmd):
break
added_modules += 1
eos.db.flush()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
success = added_modules > 0

5
gui/fitCommands/gui/localModule/mutatedConvert.py
View File

@@ -39,8 +39,9 @@ class GuiConvertMutatedLocalModuleCommand(wx.Command):
spoolType=mod.spoolType,
spoolAmount=mod.spoolAmount))
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

5
gui/fitCommands/gui/localModule/mutatedImport.py
View File

@@ -24,9 +24,10 @@ class GuiImportLocalMutatedModuleCommand(wx.Command):
def Do(self):
cmd = CalcAddLocalModuleCommand(fitID=self.fitID, newModInfo=self.newModInfo)
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(

5
gui/fitCommands/gui/localModule/mutatedRevert.py
View File

@@ -34,8 +34,9 @@ class GuiRevertMutatedLocalModuleCommand(wx.Command):
spoolType=mod.spoolType,
spoolAmount=mod.spoolAmount))
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

5
gui/fitCommands/gui/localModule/remove.py
View File

@@ -30,8 +30,9 @@ class GuiRemoveLocalModuleCommand(wx.Command):
for position in sorted(container, reverse=True):
modInfo = container[position]
sMkt.storeRecentlyUsed(modInfo.itemID)
eos.db.flush()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(

8
gui/fitCommands/gui/localModule/replace.py
View File

@@ -21,17 +21,21 @@ class GuiReplaceLocalModuleCommand(wx.Command):
def Do(self):
results = []
needRecalc = None
for position in self.positions:
cmd = CalcReplaceLocalModuleCommand(
fitID=self.fitID,
position=position,
newModInfo=ModuleInfo(itemID=self.itemID))
results.append(self.internalHistory.submit(cmd))
# Last command decides if we need it or not
needRecalc = cmd.needsGuiRecalc
success = any(results)
Market.getInstance().storeRecentlyUsed(self.itemID)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if needRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(

7
gui/fitCommands/gui/projectedChangeStates.py
View File

@@ -58,12 +58,14 @@ class GuiChangeProjectedItemStatesCommand(wx.Command):
if self.proposedState is None:
return False
results = []
needRecalc = True
if self.pModPositions:
cmd = CalcChangeProjectedModuleStatesCommand(
fitID=self.fitID,
positions=self.pModPositions,
proposedState=self.proposedState)
results.append(self.internalHistory.submit(cmd))
needRecalc = cmd.needsGuiRecalc
for pDroneItemID in self.pDroneItemIDs:
cmd = CalcChangeProjectedDroneStateCommand(
fitID=self.fitID,
@@ -83,9 +85,10 @@ class GuiChangeProjectedItemStatesCommand(wx.Command):
state=False if self.proposedState == 'inactive' else True)
results.append(self.internalHistory.submit(cmd))
success = any(results)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if needRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

5
gui/fitCommands/gui/projectedModule/add.py
View File

@@ -19,9 +19,10 @@ class GuiAddProjectedModuleCommand(wx.Command):
def Do(self):
cmd = CalcAddProjectedModuleCommand(fitID=self.fitID, modInfo=ModuleInfo(itemID=self.itemID))
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

5
gui/fitCommands/gui/projectedModule/changeCharges.py
View File

@@ -20,9 +20,10 @@ class GuiChangeProjectedModuleChargesCommand(wx.Command):
def Do(self):
cmd = CalcChangeModuleChargesCommand(fitID=self.fitID, projected=True, chargeMap={p: self.chargeItemID for p in self.positions})
success = self.internalHistory.submit(cmd)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if cmd.needsGuiRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

8
gui/fitCommands/gui/projectedModule/changeMetas.py
View File

@@ -22,6 +22,7 @@ class GuiChangeProjectedModuleMetasCommand(wx.Command):
sFit = Fit.getInstance()
fit = sFit.getFit(self.fitID)
results = []
needRecalc = None
for position in sorted(self.positions, reverse=True):
module = fit.projectedModules[position]
if module.itemID == self.newItemID:
@@ -31,9 +32,12 @@ class GuiChangeProjectedModuleMetasCommand(wx.Command):
cmdRemove = CalcRemoveProjectedModuleCommand(fitID=self.fitID, position=position)
cmdAdd = CalcAddProjectedModuleCommand(fitID=self.fitID, modInfo=info)
results.append(self.internalHistory.submitBatch(cmdRemove, cmdAdd))
# Only last add command counts
needRecalc = cmdAdd.needsGuiRecalc
success = any(results)
eos.db.flush()
sFit.recalc(self.fitID)
if needRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

7
gui/fitCommands/gui/projectedRemove.py
View File

@@ -41,9 +41,11 @@ class GuiRemoveProjectedItemsCommand(wx.Command):
def Do(self):
results = []
needRecalc = True
for pModPosition in sorted(self.pModPositions, reverse=True):
cmd = CalcRemoveProjectedModuleCommand(fitID=self.fitID, position=pModPosition)
results.append(self.internalHistory.submit(cmd))
needRecalc = cmd.needsGuiRecalc
for pDroneItemID in self.pDroneItemIDs:
cmd = CalcRemoveProjectedDroneCommand(fitID=self.fitID, itemID=pDroneItemID, amount=self.amount)
results.append(self.internalHistory.submit(cmd))
@@ -54,9 +56,10 @@ class GuiRemoveProjectedItemsCommand(wx.Command):
cmd = CalcRemoveProjectedFitCommand(fitID=self.fitID, projectedFitID=pFitID, amount=self.amount)
results.append(self.internalHistory.submit(cmd))
success = any(results)
eos.db.flush()
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
if needRecalc:
eos.db.flush()
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))

18
service/port/efs.py
View File

@@ -67,13 +67,17 @@ class EfsPort:
if propID is None:
return None
CalcAddLocalModuleCommand(fitID, ModuleInfo(itemID=propID)).Do()
sFit.recalc(fit)
cmd = CalcAddLocalModuleCommand(fitID, ModuleInfo(itemID=propID))
cmd.Do()
if cmd.needsGuiRecalc:
sFit.recalc(fit)
fit = eos.db.getFit(fitID)
mwdPropSpeed = fit.maxSpeed
mwdPosition = list(filter(lambda mod: mod.item and mod.item.ID == propID, fit.modules))[0].position
CalcRemoveLocalModulesCommand(fitID, [mwdPosition]).Do()
sFit.recalc(fit)
cmd = CalcRemoveLocalModulesCommand(fitID, [mwdPosition])
cmd.Do()
if cmd.needsGuiRecalc:
sFit.recalc(fit)
fit = eos.db.getFit(fitID)
return mwdPropSpeed
@@ -136,13 +140,15 @@ class EfsPort:
CalcChangeModuleChargesCommand(
fit.ID,
projected=False,
chargeMap={mod.position: None}).Do()
chargeMap={mod.position: None},
recalc=False).Do()
sFit.recalc(fit)
stats["unloadedCapacitorNeed"] = mod.getModifiedItemAttr("capacitorNeed")
CalcChangeModuleChargesCommand(
fit.ID,
projected=False,
chargeMap={mod.position: c.typeID}).Do()
chargeMap={mod.position: c.typeID},
recalc=False).Do()
sFit.recalc(fit)
elif mod.item.group.name == "Capacitor Booster":
# The capacitorNeed is negative, which provides the boost.