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

Raise exceptions on failures to add module to module list

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-12 10:47:14 +03:00
parent ad03f907fa
commit 1d98f889fd
5 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/fitCommands/calc/fitRemoveModule.py
View File

@@ -25,7 +25,7 @@ class FitRemoveModuleCommand(wx.Command):
mod = fit.modules[position]
if not mod.isEmpty:
self.oldModInfos[position] = ModuleInfo.fromModule(mod)
fit.modules.toDummy(position)
fit.modules.free(position)
# If no modules were removed, report that command was not completed
if not len(self.oldModInfos) > 0:

8
gui/fitCommands/calc/fitReplaceModule.py
View File

@@ -29,13 +29,13 @@ class FitReplaceModuleCommand(wx.Command):
if newMod is None:
return False
# Dummy it out in case the next bit fails
fit.modules.toDummy(self.position)
fit.modules.free(self.position)
if not newMod.fits(fit):
pyfalog.warning('Module does not fit')
self.Undo()
return False
newMod.owner = fit
fit.modules.toModule(self.position, newMod)
fit.modules.replace(self.position, newMod)
sFit.checkStates(fit, newMod)
eos.db.commit()
return True
@@ -53,13 +53,13 @@ class FitReplaceModuleCommand(wx.Command):
oldMod = self.oldModInfo.toModule()
if oldMod is None:
return False
fit.modules.toDummy(self.position)
fit.modules.free(self.position)
if not oldMod.fits(fit):
pyfalog.warning('Module does not fit')
self.Do()
return False
oldMod.owner = fit
fit.modules.toModule(self.position, oldMod)
fit.modules.replace(self.position, oldMod)
sFit.checkStates(fit, oldMod)
eos.db.commit()
return True