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

Fix command code

Browse Source
This commit is contained in:
DarkPhoenix
2018-11-20 13:48:54 +03:00
parent 59d9d47a56
commit 60ecc95049
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/fitCommands/calc/fitImportMutatedModule.py
View File

@@ -30,19 +30,22 @@ class FitImportMutatedCommand(wx.Command):
pyfalog.warning("Unable to build non-mutated module: no base item to build from")
return False
mutaplasmid = getDynamicItem(self.mutaItem.ID)
mutaplasmid = getDynamicItem(getattr(self.mutaItem, 'ID'))
# Try to build simple item even though no mutaplasmid found
if mutaplasmid is None:
try:
module = Module(self.baseItem)
except ValueError:
pyfalog.warning("Unable to build non-mutated module: typeID {}", self.baseItem.id)
pyfalog.warning("Unable to build non-mutated module: {}", self.baseItem)
return False
# Build mutated module otherwise
else:
try:
module = Module(mutaplasmid.resultingItem, self.baseItem, mutaplasmid)
except ValueError:
pass
pyfalog.warning("Unable to build mutated module: {} {}", self.baseItem, self.mutaItem)
return False
else:
for attrID, mutator in module.mutators.items():
if attrID in self.attrMap:

2
gui/fitCommands/guiImportMutatedModule.py
View File

@@ -11,7 +11,7 @@ pyfalog = Logger(__name__)
class GuiImportMutatedModuleCommand(wx.Command):
def __init__(self, fitID, baseItem, mutaItem, attrMap):
wx.Command.__init__(self, True, "Mutated Module Import: {} {} {}".format(baseItem.id, mutaItem.id, attrMap))
wx.Command.__init__(self, True, "Mutated Module Import: {} {} {}".format(baseItem, mutaItem, attrMap))
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.sFit = Fit.getInstance()
self.fitID = fitID