Revert "Don't reclear and repopulate the whole fitting view whenever anything"
This reverts commit 35d9a42d70.
This commit is contained in:
@@ -85,7 +85,7 @@ class Display(wx.ListCtrl):
|
||||
selection = []
|
||||
|
||||
self.Freeze()
|
||||
|
||||
|
||||
sel = self.GetFirstSelected()
|
||||
while sel != -1:
|
||||
selection.append(sel)
|
||||
@@ -113,17 +113,6 @@ class Display(wx.ListCtrl):
|
||||
|
||||
self.Thaw()
|
||||
|
||||
def refresh(self, stuff):
|
||||
self.Freeze()
|
||||
item = -1
|
||||
for id, st in enumerate(stuff):
|
||||
item = self.GetNextItem(item)
|
||||
for i, col in enumerate(self.activeColumns):
|
||||
self.SetStringItem(item, i, col.getText(st), col.getImageId(st))
|
||||
self.SetItemData(item, id)
|
||||
|
||||
self.Thaw()
|
||||
|
||||
def getColumn(self, point):
|
||||
x = point[0]
|
||||
total = 0
|
||||
|
||||
@@ -42,7 +42,6 @@ class FittingView(d.Display):
|
||||
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
|
||||
self.Hide() #Don't show ourselves at start
|
||||
self.activeFitID = None
|
||||
self.ignore = False
|
||||
|
||||
#Gets called from the fitMultiSwitch when it decides its time
|
||||
def changeFit(self, fitID):
|
||||
@@ -52,20 +51,14 @@ class FittingView(d.Display):
|
||||
else:
|
||||
self.Show()
|
||||
|
||||
self.ignore = True
|
||||
wx.PostEvent(self.mainFrame, FitChanged(fitID=fitID))
|
||||
self.ignore = False
|
||||
self.slotsChanged()
|
||||
|
||||
def appendItem(self, itemID):
|
||||
fitID = self.activeFitID
|
||||
if fitID != None:
|
||||
cFit = controller.Fit.getInstance()
|
||||
cFit.appendModule(fitID, itemID)
|
||||
self.ignore = True
|
||||
wx.PostEvent(self.mainFrame, FitChanged(fitID=fitID))
|
||||
self.ignore = False
|
||||
self.slotsChanged()
|
||||
|
||||
def removeItem(self, event):
|
||||
row, _ = self.HitTest(event.Position)
|
||||
@@ -74,14 +67,11 @@ class FittingView(d.Display):
|
||||
trigger = cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position)
|
||||
|
||||
if trigger:
|
||||
self.ignore = True
|
||||
wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID))
|
||||
self.ignore = False
|
||||
self.slotsChanged()
|
||||
|
||||
def generateMods(self):
|
||||
def fitChanged(self, event):
|
||||
cFit = controller.Fit.getInstance()
|
||||
fit = cFit.getFit(self.activeFitID)
|
||||
fit = cFit.getFit(event.fitID)
|
||||
|
||||
slotOrder = [Slot.SUBSYSTEM, Slot.HIGH, Slot.MED, Slot.LOW, Slot.RIG]
|
||||
|
||||
@@ -91,14 +81,6 @@ class FittingView(d.Display):
|
||||
else:
|
||||
self.mods = None
|
||||
|
||||
def slotsChanged(self):
|
||||
self.generateMods()
|
||||
self.populate(self.mods)
|
||||
|
||||
def fitChanged(self, event):
|
||||
if self.ignore:
|
||||
return
|
||||
|
||||
self.generateMods()
|
||||
self.refresh(self.mods)
|
||||
event.Skip()
|
||||
|
||||
Reference in New Issue
Block a user