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

Reuse selected module getter in fitting panel code

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-22 13:20:10 +03:00
parent a15fdc3b23
commit 71d5b28b75
1 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
gui/builtinViews/fittingView.py
View File

@@ -285,17 +285,8 @@ class FittingView(d.Display):
def kbEvent(self, event): def kbEvent(self, event):
keycode = event.GetKeyCode() keycode = event.GetKeyCode()
if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE: if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
row = self.GetFirstSelected() modules = [m for m in self.getSelectedMods() if not m.isEmpty]
modules = []
while row != -1:
if row not in self.blanks:
mod = self.mods[row]
if isinstance(mod, Module) and not mod.isEmpty:
modules.append(self.mods[row])
row = self.GetNextSelected(row)
self.removeModule(modules) self.removeModule(modules)
event.Skip() event.Skip()
def fitRemoved(self, event): def fitRemoved(self, event):
@@ -392,17 +383,10 @@ class FittingView(d.Display):
if isinstance(mod, Module) and not mod.isEmpty: if isinstance(mod, Module) and not mod.isEmpty:
positions.append(position) positions.append(position)
else: else:
sel = self.GetFirstSelected() for mod in self.getSelectedMods():
while sel != -1 and sel not in self.blanks: if mod.isEmpty or mod not in fit.modules:
try:
mod = self.mods[self.GetItemData(sel)]
except IndexError:
sel = self.GetNextSelected(sel)
continue continue
if isinstance(mod, Module) and not mod.isEmpty and mod in fit.modules: positions.append(fit.modules.index(mod))
positions.append(fit.modules.index(mod))
sel = self.GetNextSelected(sel)
if len(positions) > 0: if len(positions) > 0:
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand( self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID, positions=positions, chargeItemID=itemID)) fitID=fitID, positions=positions, chargeItemID=itemID))
@@ -643,38 +627,29 @@ class FittingView(d.Display):
sel = self.GetFirstSelected() sel = self.GetFirstSelected()
contexts = [] contexts = []
while sel != -1: for mod in self.getSelectedMods():
# Test if this is a mode, which is a special snowflake of a Module
if isinstance(mod, Mode):
srcContext = "fittingMode"
itemContext = "Tactical Mode"
fullContext = (srcContext, itemContext)
if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
contexts.append(fullContext)
selection.append(mod)
elif not mod.isEmpty:
srcContext = "fittingModule"
itemContext = sMkt.getCategoryByItem(mod.item).name
fullContext = (srcContext, itemContext)
if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
contexts.append(fullContext)
if sel not in self.blanks: if mod.charge is not None:
try: srcContext = "fittingCharge"
mod = self.mods[self.GetItemData(sel)] itemContext = sMkt.getCategoryByItem(mod.charge).name
except IndexError:
sel = self.GetNextSelected(sel)
continue
# Test if this is a mode, which is a special snowflake of a Module
if isinstance(mod, Mode):
srcContext = "fittingMode"
itemContext = "Tactical Mode"
fullContext = (srcContext, itemContext) fullContext = (srcContext, itemContext)
if srcContext not in tuple(fCtxt[0] for fCtxt in contexts): if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
contexts.append(fullContext) contexts.append(fullContext)
selection.append(mod) selection.append(mod)
elif not mod.isEmpty:
srcContext = "fittingModule"
itemContext = sMkt.getCategoryByItem(mod.item).name
fullContext = (srcContext, itemContext)
if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
contexts.append(fullContext)
if mod.charge is not None:
srcContext = "fittingCharge"
itemContext = sMkt.getCategoryByItem(mod.charge).name
fullContext = (srcContext, itemContext)
if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
contexts.append(fullContext)
selection.append(mod)
sel = self.GetNextSelected(sel)
sFit = Fit.getInstance() sFit = Fit.getInstance()
fit = sFit.getFit(self.activeFitID) fit = sFit.getFit(self.activeFitID)