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

When mass-changing charges, take not only items with the same typeID but all items from the same market group

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-19 01:02:44 +03:00
parent 21f095250d
commit 2fb9d3479f
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
gui/builtinContextMenus/moduleAmmoChange.py
View File

@@ -225,29 +225,49 @@ class ChangeModuleAmmo(ContextMenu):
# Switch in selection or all modules, depending on ctrl key state and settings
if switchAll:
fit = sFit.getFit(fitID)
selectedModule = self.modules[0]
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.modules if m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
command = cmd.GuiChangeLocalModuleChargesCommand
modContainer = fit.modules
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.projectedModules if
m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
command = cmd.GuiChangeProjectedModuleChargesCommand
modContainer = fit.projectedModules
else:
return
sMkt = Market.getInstance()
selectedModule = self.modules[0]
mainMktGroupID = getattr(sMkt.getMarketGroupByItem(selectedModule.item), 'ID', None)
mods = []
for mod in modContainer:
# Always include selected module itself
if mod is selectedModule:
mods.append(mod)
continue
if mod.itemID is None:
continue
# Modules which have the same item ID
if mod.itemID == selectedModule.itemID:
mods.append(mod)
continue
# And modules from the same market group too
modMktGroupID = getattr(sMkt.getMarketGroupByItem(mod.item), 'ID', None)
if modMktGroupID is not None and modMktGroupID == mainMktGroupID:
mods.append(mod)
continue
self.mainFrame.command.Submit(command(
fitID=fitID,
modules=mods,
chargeItemID=charge.ID if charge is not None else None))
else:
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID,
modules=self.modules,
chargeItemID=charge.ID if charge is not None else None))
command = cmd.GuiChangeLocalModuleChargesCommand
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID,
modules=self.modules,
chargeItemID=charge.ID if charge is not None else None))
command = cmd.GuiChangeProjectedModuleChargesCommand
else:
return
self.mainFrame.command.Submit(command(
fitID=fitID,
modules=self.modules,
chargeItemID=charge.ID if charge is not None else None))
ChangeModuleAmmo.register()

2
gui/builtinContextMenus/shipJump.py
View File

@@ -26,7 +26,7 @@ class JumpToShip(ContextMenu):
groupID = stuff.item.group.ID
self.mainFrame.notebookBrowsers.SetSelection(1)
wx.PostEvent(self.mainFrame.shipBrowser, Stage3Selected(shipID=stuff.item.ID, back=groupID))
wx.PostEvent(self.mainFrame.shipBrowser, Stage3Selected(shipID=stuff.item.ID, back=True))
JumpToShip.register()