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

Rework FitChanged command to avoid refreshing graph multiple times in certain cases

Browse Source
This commit is contained in:
DarkPhoenix
2019-07-07 14:25:27 +03:00
parent 64bc2c34c2
commit 3a09f4b45c
98 changed files with 254 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/builtinAdditionPanes/boosterView.py
View File

@@ -101,16 +101,16 @@ class BoosterView(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
@@ -120,8 +120,8 @@ class BoosterView(d.Display):
if self.boosters is not None:
self.boosters.sort(key=lambda booster: booster.slot or 0)
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

10
gui/builtinAdditionPanes/cargoView.py
View File

@@ -137,16 +137,16 @@ class CargoView(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
# self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
@@ -156,8 +156,8 @@ class CargoView(d.Display):
if self.cargo is not None:
self.cargo.sort(key=lambda c: (c.item.group.category.name, c.item.group.name, c.item.name))
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

10
gui/builtinAdditionPanes/commandView.py
View File

@@ -126,24 +126,24 @@ class CommandView(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
AddCommandFit.populateFits(event)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

10
gui/builtinAdditionPanes/droneView.py
View File

@@ -201,16 +201,16 @@ class DroneView(Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
@@ -221,8 +221,8 @@ class DroneView(Display):
if self.drones is not None:
self.drones.sort(key=self.droneKey)
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

12
gui/builtinAdditionPanes/fighterView.py
View File

@@ -90,7 +90,7 @@ class FighterView(wx.Panel):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
@@ -246,16 +246,16 @@ class FighterDisplay(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
self.Parent.Parent.Parent.DisablePage(self.Parent, not fit)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
@@ -266,8 +266,8 @@ class FighterDisplay(d.Display):
if self.fighters is not None:
self.fighters.sort(key=self.fighterKey)
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

12
gui/builtinAdditionPanes/implantView.py
View File

@@ -80,7 +80,7 @@ class ImplantView(wx.Panel):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
@@ -156,16 +156,16 @@ class ImplantDisplay(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
self.Parent.Parent.Parent.DisablePage(self.Parent, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
@@ -175,8 +175,8 @@ class ImplantDisplay(d.Display):
if self.implants is not None:
self.implants.sort(key=lambda implant: implant.slot or 0)
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

10
gui/builtinAdditionPanes/notesView.py
View File

@@ -32,11 +32,11 @@ class NotesView(wx.Panel):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
self.saveTimer.Stop() # cancel any pending timers
@@ -46,11 +46,11 @@ class NotesView(wx.Panel):
if self.lastFitId is not None:
sFit.editNotes(self.lastFitId, self.editNotes.GetValue())
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.lastFitId = None
return
elif event.fitID != self.lastFitId:
self.lastFitId = event.fitID
elif activeFitID != self.lastFitId:
self.lastFitId = activeFitID
self.editNotes.SetValue(fit.notes or "")
def onText(self, event):

10
gui/builtinAdditionPanes/projectedView.py
View File

@@ -170,25 +170,25 @@ class ProjectedView(d.Display):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
# pyfalog.debug('ProjectedView::fitChanged: {}', repr(fit))
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None:
if activeFitID is None and self.lastFitId is not None:
self.DeleteAllItems()
self.lastFitId = None
return
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
if activeFitID != self.lastFitId:
self.lastFitId = activeFitID
item = self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_DONTCARE)

2
gui/builtinContextMenus/ammoToDmgPattern.py
View File

@@ -36,7 +36,7 @@ class AmmoToDmgPattern(ContextMenuSingle):
def activate(self, fullContext, mainItem, i):
fitID = self.mainFrame.getActiveFit()
Fit.getInstance().setAsPattern(fitID, mainItem)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def getBitmap(self, context, mainItem):
return None

2
gui/builtinContextMenus/damagePatternChange.py
View File

@@ -108,7 +108,7 @@ class ChangeDamagePattern(ContextMenuUnconditional):
fitID = self.mainFrame.getActiveFit()
sFit.setDamagePattern(fitID, pattern)
setattr(self.mainFrame, "_activeDmgPattern", pattern)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
ChangeDamagePattern.register()

3
gui/builtinContextMenus/factorReload.py
View File

@@ -24,8 +24,7 @@ class FactorReload(ContextMenuUnconditional):
def activate(self, fullContext, i):
fitIDs = Fit.getInstance().toggleFactorReload()
for fitID in fitIDs:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=tuple(fitIDs)))
@property
def checked(self):

3
gui/builtinContextMenus/priceOptions.py
View File

@@ -32,7 +32,8 @@ class ItemGroupPrice(ContextMenuUnconditional, metaclass=ABCMeta):
def activate(self, fullContext, i):
self.settings.set(self.optionName, not self.settings.get(self.optionName))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
fitID = self.mainFrame.getActiveFit()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
@property
def checked(self):

2
gui/builtinContextMenus/skillAffectors.py
View File

@@ -116,7 +116,7 @@ class ChangeAffectingSkills(ContextMenuSingle):
self.sFit.changeChar(fitID, self.charID)
wx.PostEvent(self.mainFrame, GE.CharListUpdated())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
ChangeAffectingSkills.register()

2
gui/builtinContextMenus/targetResists.py
View File

@@ -38,7 +38,7 @@ class TargetResists(ContextMenuUnconditional):
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
sFit.setTargetResists(fitID, pattern)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def addPattern(self, rootMenu, pattern):
id = ContextMenuUnconditional.nextID()

2
gui/builtinItemStatsViews/itemMutator.py
View File

@@ -240,4 +240,4 @@ class ItemMutatorList(wx.ScrolledWindow):
sFit.switchFit(activeFit)
# Send signal to GUI to update stats with current active fit
wx.PostEvent(mainFrame, GE.FitChanged(fitID=activeFit))
wx.PostEvent(mainFrame, GE.FitChanged(fitIDs=(activeFit,)))

3
gui/builtinPreferenceViews/pyfaEnginePreferences.py
View File

@@ -124,8 +124,7 @@ class PFFittingEnginePref(PreferenceView):
def OnCBGlobalForceReloadStateChange(self, event):
fitIDs = self.sFit.toggleFactorReload(value=bool(self.cbGlobalForceReload.GetValue()))
for fitID in fitIDs:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=tuple(fitIDs)))
def OnCBStrictSkillLevelsChange(self, event):
self.engine_settings.set("strictSkillLevels", self.cbStrictSkillLevels.GetValue())

8
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
View File

@@ -132,7 +132,7 @@ class PFGeneralPref(PreferenceView):
if iView.active:
iView.update(iView.active)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
def onCBGlobalRackSlots(self, event):
@@ -140,14 +140,14 @@ class PFGeneralPref(PreferenceView):
self.cbRackLabels.Enable(self.cbRackSlots.GetValue())
fitID = self.mainFrame.getActiveFit()
self.sFit.refreshFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
def onCBGlobalRackLabels(self, event):
self.sFit.serviceFittingOptions["rackLabels"] = self.cbRackLabels.GetValue()
fitID = self.mainFrame.getActiveFit()
self.sFit.refreshFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
def OnCBGlobalCharStateChange(self, event):
@@ -166,7 +166,7 @@ class PFGeneralPref(PreferenceView):
self.sFit.serviceFittingOptions["compactSkills"] = self.cbCompactSkills.GetValue()
fitID = self.mainFrame.getActiveFit()
self.sFit.refreshFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
def onCBReopenFits(self, event):

11
gui/builtinPreferenceViews/pyfaMarketPreferences.py
View File

@@ -126,7 +126,7 @@ class PFMarketPref(PreferenceView):
fitID = self.mainFrame.getActiveFit()
self.sFit.refreshFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
def onPricesSourceSelection(self, event):
@@ -135,15 +135,18 @@ class PFMarketPref(PreferenceView):
def OnTotalPriceDroneChange(self, event):
self.priceSettings.set('drones', event.GetInt())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
fitID = self.mainFrame.getActiveFit()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def OnTotalPriceCargoChange(self, event):
self.priceSettings.set('cargo', event.GetInt())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
fitID = self.mainFrame.getActiveFit()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def OnTotalPriceCharacterChange(self, event):
self.priceSettings.set('character', event.GetInt())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
fitID = self.mainFrame.getActiveFit()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def OnMarketJumpChange(self, event):
self.priceSettings.set('marketMGJumpMode', event.GetInt())

3
gui/builtinStatsViews/resistancesViewFull.py
View File

@@ -165,7 +165,8 @@ class ResistancesViewFull(StatsView):
def ehpSwitch(self, event):
self.showEffective = event.effective
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
fitID = self.mainFrame.getActiveFit()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def refreshPanel(self, fit):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here

4
gui/builtinViews/emptyView.py
View File

@@ -15,7 +15,7 @@ class BlankPage(wx.Panel):
self.parent.Bind(EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=None))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=()))
def Destroy(self):
# todo: This unbind caused fits to not recalc when switching to their tabs; find out why
@@ -27,6 +27,6 @@ class BlankPage(wx.Panel):
fitID = None
# sFit = Fit.getInstance()
# sFit.switchFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()

16
gui/builtinViews/fittingView.py
View File

@@ -64,7 +64,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
if page.activeFitID == event.fitID:
count += 1
self.multiSwitch.SetSelection(index)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=event.fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(event.fitID,)))
break
except Exception as e:
pyfalog.critical("Caught exception in fitSelected")
@@ -94,7 +94,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
if isinstance(page, FittingView) and page.activeFitID == fitID:
index = self.multiSwitch.GetPageIndex(page)
self.multiSwitch.SetSelection(index)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
return
elif isinstance(page, gui.builtinViews.emptyView.BlankPage):
view = FittingView(self.multiSwitch)
@@ -229,7 +229,7 @@ class FittingView(d.Display):
fitID = self.getActiveFit()
sFit = Fit.getInstance()
sFit.switchFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
@@ -313,7 +313,7 @@ class FittingView(d.Display):
fit = sFit.getFit(self.getActiveFit())
if fit:
sFit.refreshFit(self.getActiveFit())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(self.activeFitID,)))
except RuntimeError:
pyfalog.warning("Caught dead object")
pass
@@ -344,7 +344,7 @@ class FittingView(d.Display):
self.slotsChanged()
sFit.switchFit(fitID)
# @todo pheonix: had to disable this as it was causing a crash at the wxWidgets level. Dunno why, investigate
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
event.Skip()
@@ -608,10 +608,10 @@ class FittingView(d.Display):
if not self:
return
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
try:
if self.activeFitID is not None and self.activeFitID == event.fitID:
if self.activeFitID is not None and self.activeFitID == activeFitID:
self.generateMods()
if self.GetItemCount() != len(self.mods):
# This only happens when turning on/off slot divisions
@@ -619,7 +619,7 @@ class FittingView(d.Display):
self.refresh(self.mods)
self.Refresh()
self.Show(self.activeFitID is not None and self.activeFitID == event.fitID)
self.Show(self.activeFitID is not None and self.activeFitID == activeFitID)
except RuntimeError:
pyfalog.error("Caught dead object")

2
gui/characterEditor.py
View File

@@ -296,7 +296,7 @@ class CharacterEditor(wx.Frame):
fitID = self.mainFrame.getActiveFit()
if fitID is not None:
sFit.clearFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
wx.Frame.Destroy(self)

10
gui/characterSelection.py
View File

@@ -188,7 +188,7 @@ class CharacterSelection(wx.Panel):
sFit = Fit.getInstance()
sFit.changeChar(fitID, charID)
self.charCache = self.charChoice.GetCurrentSelection()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def toggleRefreshButton(self):
charID = self.getActiveCharacter()
@@ -216,16 +216,16 @@ class CharacterSelection(wx.Panel):
"""
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
self.charChoice.Enable(event.fitID is not None)
self.charChoice.Enable(activeFitID is not None)
choice = self.charChoice
sFit = Fit.getInstance()
currCharID = choice.GetClientData(choice.GetCurrentSelection())
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
newCharID = fit.character.ID if fit is not None else None
if event.fitID is None:
if activeFitID is None:
self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)
self.skillReqsStaticBitmap.SetToolTip("No active fit")
else:

4
gui/fitCommands/gui/booster/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddBoosterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddBoosterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/booster/changeMeta.py
View File

@@ -31,7 +31,7 @@ class GuiChangeBoosterMetaCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeBoosterMetaCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/booster/remove.py
View File

@@ -27,7 +27,7 @@ class GuiRemoveBoostersCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -37,5 +37,5 @@ class GuiRemoveBoostersCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/booster/sideEffectToggleState.py
View File

@@ -25,7 +25,7 @@ class GuiToggleBoosterSideEffectStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiToggleBoosterSideEffectStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/booster/toggleStates.py
View File

@@ -25,7 +25,7 @@ class GuiToggleBoosterStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiToggleBoosterStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/cargo/add.py
View File

@@ -20,11 +20,11 @@ class GuiAddCargoCommand(wx.Command):
cmd = CalcAddCargoCommand(fitID=self.fitID, cargoInfo=CargoInfo(itemID=self.itemID, amount=self.amount))
success = self.internalHistory.submit(cmd)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
success = self.internalHistory.undoAll()
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/cargo/changeAmount.py
View File

@@ -26,11 +26,11 @@ class GuiChangeCargoAmountCommand(wx.Command):
cmd = CalcRemoveCargoCommand(fitID=self.fitID, cargoInfo=CargoInfo(itemID=self.itemID, amount=math.inf))
success = self.internalHistory.submit(cmd)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
success = self.internalHistory.undoAll()
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/cargo/changeMetas.py
View File

@@ -39,11 +39,11 @@ class GuiChangeCargoMetasCommand(wx.Command):
results.append(self.internalHistory.submitBatch(cmdRemove, cmdAdd))
success = any(results)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
success = self.internalHistory.undoAll()
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/cargo/remove.py
View File

@@ -26,11 +26,11 @@ class GuiRemoveCargosCommand(wx.Command):
results.append(self.internalHistory.submit(cmd))
success = any(results)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
success = self.internalHistory.undoAll()
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/commandFit/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddCommandFitCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddCommandFitCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/commandFit/remove.py
View File

@@ -27,7 +27,7 @@ class GuiRemoveCommandFitsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -37,5 +37,5 @@ class GuiRemoveCommandFitsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/commandFit/toggleStates.py
View File

@@ -28,7 +28,7 @@ class GuiToggleCommandFitStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -38,5 +38,5 @@ class GuiToggleCommandFitStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/fitRestrictionToggle.py
View File

@@ -34,7 +34,7 @@ class GuiToggleFittingRestrictionsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -46,5 +46,5 @@ class GuiToggleFittingRestrictionsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/fitSystemSecurity.py
View File

@@ -23,7 +23,7 @@ class GuiChangeFitSystemSecurityCommand(wx.Command):
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -32,5 +32,5 @@ class GuiChangeFitSystemSecurityCommand(wx.Command):
sFit = Fit.getInstance()
sFit.recalc(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/add.py
View File

@@ -36,7 +36,7 @@ class GuiAddImplantCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -46,5 +46,5 @@ class GuiAddImplantCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/changeLocation.py
View File

@@ -24,7 +24,7 @@ class GuiChangeImplantLocationCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiChangeImplantLocationCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/changeMeta.py
View File

@@ -31,7 +31,7 @@ class GuiChangeImplantMetaCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeImplantMetaCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/remove.py
View File

@@ -27,7 +27,7 @@ class GuiRemoveImplantsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -37,5 +37,5 @@ class GuiRemoveImplantsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/setAdd.py
View File

@@ -26,7 +26,7 @@ class GuiAddImplantSetCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
# Some might fail, as we already might have these implants
return any(results)
@@ -37,5 +37,5 @@ class GuiAddImplantSetCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/implant/toggleStates.py
View File

@@ -25,7 +25,7 @@ class GuiToggleImplantStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiToggleImplantStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/itemsRebase.py
View File

@@ -62,7 +62,7 @@ class GuiRebaseItemsCommand(wx.Command):
sFit.recalc(fit)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return len(self.internalHistory) > 0
def Undo(self):
@@ -72,5 +72,5 @@ class GuiRebaseItemsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/add.py
View File

@@ -25,7 +25,7 @@ class GuiAddLocalDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiAddLocalDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/changeAmount.py
View File

@@ -31,7 +31,7 @@ class GuiChangeLocalDroneAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeLocalDroneAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/changeMetas.py
View File

@@ -45,7 +45,7 @@ class GuiChangeLocalDroneMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -55,5 +55,5 @@ class GuiChangeLocalDroneMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/clone.py
View File

@@ -30,7 +30,7 @@ class GuiCloneLocalDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -40,5 +40,5 @@ class GuiCloneLocalDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/remove.py
View File

@@ -31,7 +31,7 @@ class GuiRemoveLocalDronesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiRemoveLocalDronesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/stackSplit.py
View File

@@ -42,7 +42,7 @@ class GuiSplitLocalDroneStackCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -52,5 +52,5 @@ class GuiSplitLocalDroneStackCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/stacksMerge.py
View File

@@ -42,7 +42,7 @@ class GuiMergeLocalDroneStacksCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -52,5 +52,5 @@ class GuiMergeLocalDroneStacksCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localDrone/toggleStates.py
View File

@@ -28,7 +28,7 @@ class GuiToggleLocalDroneStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -38,5 +38,5 @@ class GuiToggleLocalDroneStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/abilityToggleState.py
View File

@@ -31,7 +31,7 @@ class GuiToggleLocalFighterAbilityStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiToggleLocalFighterAbilityStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddLocalFighterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddLocalFighterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/changeAmount.py
View File

@@ -29,7 +29,7 @@ class GuiChangeLocalFighterAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -39,5 +39,5 @@ class GuiChangeLocalFighterAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/changeMetas.py
View File

@@ -41,7 +41,7 @@ class GuiChangeLocalFighterMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -51,5 +51,5 @@ class GuiChangeLocalFighterMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/remove.py
View File

@@ -27,7 +27,7 @@ class GuiRemoveLocalFightersCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -37,5 +37,5 @@ class GuiRemoveLocalFightersCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localFighter/toggleStates.py
View File

@@ -28,7 +28,7 @@ class GuiToggleLocalFighterStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -38,5 +38,5 @@ class GuiToggleLocalFighterStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

8
gui/fitCommands/gui/localModule/add.py
View File

@@ -27,9 +27,9 @@ class GuiAddLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -43,7 +43,7 @@ class GuiAddLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/changeCharges.py
View File

@@ -25,7 +25,7 @@ class GuiChangeLocalModuleChargesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiChangeLocalModuleChargesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

12
gui/fitCommands/gui/localModule/changeMetas.py
View File

@@ -48,11 +48,11 @@ class GuiChangeLocalModuleMetasCommand(wx.Command):
eos.db.commit()
events = []
if success and self.replacedItemIDs:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.replacedItemIDs))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.replacedItemIDs))
if success:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.newItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.newItemID))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success
@@ -68,11 +68,11 @@ class GuiChangeLocalModuleMetasCommand(wx.Command):
eos.db.commit()
events = []
if success:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.newItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.newItemID))
if success and self.replacedItemIDs:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.replacedItemIDs))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.replacedItemIDs))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success

4
gui/fitCommands/gui/localModule/changeMutation.py
View File

@@ -30,7 +30,7 @@ class GuiChangeLocalModuleMutationCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -40,5 +40,5 @@ class GuiChangeLocalModuleMutationCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/changeSpool.py
View File

@@ -31,7 +31,7 @@ class GuiChangeLocalModuleSpoolCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeLocalModuleSpoolCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/changeStates.py
View File

@@ -31,7 +31,7 @@ class GuiChangeLocalModuleStatesCommand(wx.Command):
sFit.recalc(self.fitID)
self.savedRemovedDummies = sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -43,5 +43,5 @@ class GuiChangeLocalModuleStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

8
gui/fitCommands/gui/localModule/clone.py
View File

@@ -32,9 +32,9 @@ class GuiCloneLocalModuleCommand(wx.Command):
eos.db.commit()
self.savedItemID = fit.modules[self.srcPosition].itemID
if success and self.savedItemID is not None:
event = GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.savedItemID)
event = GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.savedItemID)
else:
event = GE.FitChanged(fitID=self.fitID)
event = GE.FitChanged(fitIDs=(self.fitID,))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success
@@ -48,8 +48,8 @@ class GuiCloneLocalModuleCommand(wx.Command):
sFit.fill(self.fitID)
eos.db.commit()
if success and self.savedItemID is not None:
event = GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.savedItemID)
event = GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.savedItemID)
else:
event = GE.FitChanged(fitID=self.fitID)
event = GE.FitChanged(fitIDs=(self.fitID,))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success

8
gui/fitCommands/gui/localModule/fillAdd.py
View File

@@ -33,9 +33,9 @@ class GuiFillWithNewLocalModulesCommand(wx.Command):
success = added_modules > 0
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -49,7 +49,7 @@ class GuiFillWithNewLocalModulesCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success

8
gui/fitCommands/gui/localModule/fillClone.py
View File

@@ -37,9 +37,9 @@ class GuiFillWithClonedLocalModulesCommand(wx.Command):
success = added_modules > 0
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.savedItemID)
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.savedItemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -53,7 +53,7 @@ class GuiFillWithClonedLocalModulesCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.savedItemID)
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.savedItemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/mutatedConvert.py
View File

@@ -43,7 +43,7 @@ class GuiConvertMutatedLocalModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -53,5 +53,5 @@ class GuiConvertMutatedLocalModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/mutatedImport.py
View File

@@ -31,7 +31,7 @@ class GuiImportLocalMutatedModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.newModInfo.itemID))
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.newModInfo.itemID))
return success
def Undo(self):
@@ -45,5 +45,5 @@ class GuiImportLocalMutatedModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.newModInfo.itemID))
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.newModInfo.itemID))
return success

4
gui/fitCommands/gui/localModule/mutatedRevert.py
View File

@@ -38,7 +38,7 @@ class GuiRevertMutatedLocalModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -48,5 +48,5 @@ class GuiRevertMutatedLocalModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

8
gui/fitCommands/gui/localModule/remove.py
View File

@@ -30,9 +30,9 @@ class GuiRemoveLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.savedTypeIDs)
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.savedTypeIDs)
if success and self.savedTypeIDs else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -46,7 +46,7 @@ class GuiRemoveLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.savedTypeIDs)
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.savedTypeIDs)
if success and self.savedTypeIDs else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success

8
gui/fitCommands/gui/localModule/replace.py
View File

@@ -34,9 +34,9 @@ class GuiReplaceLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -50,7 +50,7 @@ class GuiReplaceLocalModuleCommand(wx.Command):
eos.db.commit()
wx.PostEvent(
gui.mainFrame.MainFrame.getInstance(),
GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.itemID)
GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.itemID)
if success else
GE.FitChanged(fitID=self.fitID))
GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/localModule/swap.py
View File

@@ -22,11 +22,11 @@ class GuiSwapLocalModulesCommand(wx.Command):
cmd = CalcSwapLocalModuleCommand(fitID=self.fitID, position1=self.position1, position2=self.position2)
success = self.internalHistory.submit(cmd)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
success = self.internalHistory.undoAll()
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

12
gui/fitCommands/gui/localModuleCargo/cargoToLocalModule.py
View File

@@ -135,11 +135,11 @@ class GuiCargoToLocalModuleCommand(wx.Command):
eos.db.commit()
events = []
if self.removedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.removedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.removedModItemID))
if self.addedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.addedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.addedModItemID))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success
@@ -155,11 +155,11 @@ class GuiCargoToLocalModuleCommand(wx.Command):
eos.db.commit()
events = []
if self.addedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.addedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.addedModItemID))
if self.removedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.removedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.removedModItemID))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success

12
gui/fitCommands/gui/localModuleCargo/localModuleToCargo.py
View File

@@ -114,11 +114,11 @@ class GuiLocalModuleToCargoCommand(wx.Command):
eos.db.commit()
events = []
if self.removedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.removedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.removedModItemID))
if self.addedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.addedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.addedModItemID))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success
@@ -134,11 +134,11 @@ class GuiLocalModuleToCargoCommand(wx.Command):
eos.db.commit()
events = []
if self.addedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='moddel', typeID=self.addedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='moddel', typeID=self.addedModItemID))
if self.removedModItemID is not None:
events.append(GE.FitChanged(fitID=self.fitID, action='modadd', typeID=self.removedModItemID))
events.append(GE.FitChanged(fitIDs=(self.fitID,), action='modadd', typeID=self.removedModItemID))
if not events:
events.append(GE.FitChanged(fitID=self.fitID))
events.append(GE.FitChanged(fitIDs=(self.fitID,)))
for event in events:
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
return success

4
gui/fitCommands/gui/projectedChangeStates.py
View File

@@ -88,7 +88,7 @@ class GuiChangeProjectedItemStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -98,5 +98,5 @@ class GuiChangeProjectedItemStatesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedDrone/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddProjectedDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddProjectedDroneCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedDrone/changeAmount.py
View File

@@ -31,7 +31,7 @@ class GuiChangeProjectedDroneAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeProjectedDroneAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedDrone/changeMetas.py
View File

@@ -40,7 +40,7 @@ class GuiChangeProjectedDroneMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -50,5 +50,5 @@ class GuiChangeProjectedDroneMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFighter/abilityToggleState.py
View File

@@ -31,7 +31,7 @@ class GuiToggleProjectedFighterAbilityStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiToggleProjectedFighterAbilityStateCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFighter/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddProjectedFighterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddProjectedFighterCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFighter/changeAmount.py
View File

@@ -29,7 +29,7 @@ class GuiChangeProjectedFighterAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -39,5 +39,5 @@ class GuiChangeProjectedFighterAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFighter/changeMetas.py
View File

@@ -36,7 +36,7 @@ class GuiChangeProjectedFighterMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -46,5 +46,5 @@ class GuiChangeProjectedFighterMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFit/add.py
View File

@@ -25,7 +25,7 @@ class GuiAddProjectedFitCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiAddProjectedFitCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedFit/changeAmount.py
View File

@@ -31,7 +31,7 @@ class GuiChangeProjectedFitAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeProjectedFitAmountCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedModule/add.py
View File

@@ -24,7 +24,7 @@ class GuiAddProjectedModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiAddProjectedModuleCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedModule/changeCharges.py
View File

@@ -25,7 +25,7 @@ class GuiChangeProjectedModuleChargesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -35,5 +35,5 @@ class GuiChangeProjectedModuleChargesCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedModule/changeMetas.py
View File

@@ -36,7 +36,7 @@ class GuiChangeProjectedModuleMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -46,5 +46,5 @@ class GuiChangeProjectedModuleMetasCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedModule/changeSpool.py
View File

@@ -31,7 +31,7 @@ class GuiChangeProjectedModuleSpoolCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -41,5 +41,5 @@ class GuiChangeProjectedModuleSpoolCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/projectedRemove.py
View File

@@ -59,7 +59,7 @@ class GuiRemoveProjectedItemsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -69,5 +69,5 @@ class GuiRemoveProjectedItemsCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

4
gui/fitCommands/gui/shipModeChange.py
View File

@@ -24,7 +24,7 @@ class GuiChangeShipModeCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success
def Undo(self):
@@ -34,5 +34,5 @@ class GuiChangeShipModeCommand(wx.Command):
sFit.recalc(self.fitID)
sFit.fill(self.fitID)
eos.db.commit()
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitID=self.fitID))
wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), GE.FitChanged(fitIDs=(self.fitID,)))
return success

3
gui/graphFrame/frame.py
View File

@@ -155,7 +155,8 @@ class GraphFrame(wx.Frame):
def OnFitChanged(self, event):
event.Skip()
self.clearCache(reason=GraphCacheCleanupReason.fitChanged, extraData=event.fitID)
for fitID in event.fitIDs:
self.clearCache(reason=GraphCacheCleanupReason.fitChanged, extraData=fitID)
self.draw()
def OnFitRenamed(self, event):

3
gui/graphFrame/lists.py
View File

@@ -94,7 +94,8 @@ class BaseList(gui.display.Display):
def OnFitChanged(self, event):
event.Skip()
self.update(self.fits)
if set(event.fitIDs).union(f.ID for f in self.fits):
self.update(self.fits)
def getSelectedFits(self):
fits = []

3
gui/mainFrame.py
View File

@@ -637,7 +637,8 @@ class MainFrame(wx.Frame):
def toggleOverrides(self, event):
ModifiedAttributeDict.overrides_enabled = not ModifiedAttributeDict.overrides_enabled
wx.PostEvent(self, GE.FitChanged(fitID=self.getActiveFit()))
wx.PostEvent(self, GE.FitChanged(fitIDs=(self.getActiveFit(),)))
menu = self.GetMenuBar()
menu.SetLabel(menu.toggleOverridesId,
"&Turn Overrides Off" if ModifiedAttributeDict.overrides_enabled else "&Turn Overrides On")

8
gui/mainMenuBar.py
View File

@@ -178,9 +178,9 @@ class MainMenuBar(wx.MenuBar):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
enable = event.fitID is not None
enable = activeFitID is not None
self.Enable(wx.ID_SAVEAS, enable)
self.Enable(wx.ID_COPY, enable)
self.Enable(self.exportSkillsNeededId, enable)
@@ -198,9 +198,9 @@ class MainMenuBar(wx.MenuBar):
self.Enable(self.toggleIgnoreRestrictionID, enable)
if event.fitID:
if activeFitID:
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
if fit.ignoreRestrictions:
self.ignoreRestrictionItem.SetItemLabel("Enable Fitting Re&strictions")

2
gui/propertyEditor.py
View File

@@ -106,7 +106,7 @@ class AttributeEditor(wx.Frame):
def closeWindow(self):
fitID = self.mainFrame.getActiveFit()
if fitID is not None:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
self.Destroy()
def OnImport(self, event):

2
gui/shipBrowser.py
View File

@@ -99,7 +99,7 @@ class ShipBrowser(wx.Panel):
def RefreshList(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
stage = self.GetActiveStage()

4
gui/statsPane.py
View File

@@ -71,10 +71,10 @@ class StatsPane(wx.Panel):
def fitChanged(self, event):
event.Skip()
activeFitID = self.mainFrame.getActiveFit()
if activeFitID is not None and event.fitID is not None and event.fitID != activeFitID:
if activeFitID is not None and activeFitID not in event.fitIDs:
return
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
fit = sFit.getFit(activeFitID)
for view in self.views:
view.refreshPanel(fit)