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

Fixed bugs introduced from code consistency fix

Browse Source
This commit is contained in:
blitzmann
2014-08-18 01:10:49 -04:00
parent 11891340af
commit 84ac71f528
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinContextMenus/droneRemoveStack.py
View File

@@ -18,10 +18,10 @@ class ItemRemove(ContextMenu):
srcContext = fullContext[0] srcContext = fullContext[0]
sFit = service.Fit.getInstance() sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit() fitID = self.mainFrame.getActiveFit()
sFit = sFit.getFit(fitID) fit = sFit.getFit(fitID)
idx = sFit.drones.index(selection[0]) idx = fit.drones.index(selection[0])
sFit.removeDrone(fitID, idx, numDronesToRemove=sFit.drones[idx].amount) sFit.removeDrone(fitID, idx, numDronesToRemove=fit.drones[idx].amount)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

10
gui/builtinContextMenus/itemRemove.py
View File

@@ -19,20 +19,20 @@ class ItemRemove(ContextMenu):
srcContext = fullContext[0] srcContext = fullContext[0]
sFit = service.Fit.getInstance() sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit() fitID = self.mainFrame.getActiveFit()
sFit = sFit.getFit(fitID) fit = sFit.getFit(fitID)
if srcContext == "fittingModule": if srcContext == "fittingModule":
for module in selection: for module in selection:
if module is not None: if module is not None:
sFit.removeModule(fitID,sFit.modules.index(module)) sFit.removeModule(fitID,fit.modules.index(module))
elif srcContext in ("fittingCharge" , "projectedCharge"): elif srcContext in ("fittingCharge" , "projectedCharge"):
sFit.setAmmo(fitID, None, selection) sFit.setAmmo(fitID, None, selection)
elif srcContext == "droneItem": elif srcContext == "droneItem":
sFit.removeDrone(fitID, sFit.drones.index(selection[0])) sFit.removeDrone(fitID, fit.drones.index(selection[0]))
elif srcContext == "implantItem": elif srcContext == "implantItem":
sFit.removeImplant(fitID, sFit.implants.index(selection[0])) sFit.removeImplant(fitID, fit.implants.index(selection[0]))
elif srcContext == "boosterItem": elif srcContext == "boosterItem":
sFit.removeBooster(fitID, sFit.boosters.index(selection[0])) sFit.removeBooster(fitID, fit.boosters.index(selection[0]))
else: else:
sFit.removeProjected(fitID, selection[0]) sFit.removeProjected(fitID, selection[0])