dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 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