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

Code consistency

Browse Source
This commit is contained in:
blitzmann
2014-07-31 00:14:29 -04:00
parent dd27c3c805
commit c7042f314b
27 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/builtinContextMenus/droneRemoveStack.py
View File

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

14
gui/builtinContextMenus/itemRemove.py
View File

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

4
gui/builtinContextMenus/itemStats.py
View File

@@ -19,8 +19,8 @@ class ItemStats(ContextMenu):
srcContext = fullContext[0]
if srcContext == "fittingShip":
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
stuff = cFit.getFit(fitID).ship
sFit = service.Fit.getInstance()
stuff = sFit.getFit(fitID).ship
else:
stuff = selection[0]