Skip to content

Commit

Permalink
Revert "Don't reclear and repopulate the whole fitting view whenever …
Browse files Browse the repository at this point in the history
…anything"

This reverts commit 35d9a42.
  • Loading branch information
hwdro committed Sep 15, 2010
1 parent 35d9a42 commit 2fe3b82
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 32 deletions.
13 changes: 1 addition & 12 deletions gui/builtinViewColumns/display.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def populate(self, stuff):
selection = []

self.Freeze()

sel = self.GetFirstSelected()
while sel != -1:
selection.append(sel)
Expand Down Expand Up @@ -113,17 +113,6 @@ def populate(self, stuff):

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
Expand Down
22 changes: 2 additions & 20 deletions gui/fittingView.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def __init__(self, parent):
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):
Expand All @@ -52,20 +51,14 @@ def changeFit(self, fitID):
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)
Expand All @@ -74,14 +67,11 @@ def removeItem(self, event):
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]

Expand All @@ -91,14 +81,6 @@ def generateMods(self):
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()

0 comments on commit 2fe3b82

Please sign in to comment.