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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
HomeWorld
2010-11-17 15:55:51 +02:00
parent 112226e8d2 5f2d1a4f5c
commit da7bcd82b7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/chromeTabs.py
View File

@@ -102,7 +102,7 @@ class PFNotebook(wx.Panel):
return self.pages[i] return self.pages[i]
def SetPage(self, i, page): def SetPage(self, i, page):
if i >= len(self.pages): if i >= len(self.pages) or i is None or page is None:
return return
oldPage = self.pages[i] oldPage = self.pages[i]
@@ -123,7 +123,7 @@ class PFNotebook(wx.Panel):
return self.activePage return self.activePage
def GetPageIndex(self, page): def GetPageIndex(self, page):
return self.pages.index(page) return self.pages.index(page) if page in self.pages else None
def GetSelection(self): def GetSelection(self):
return self.GetPageIndex(self.activePage) return self.GetPageIndex(self.activePage)

3
gui/fittingView.py
View File

@@ -100,6 +100,9 @@ class FittingView(d.Display):
self.Bind(wx.EVT_RIGHT_DOWN, self.click) self.Bind(wx.EVT_RIGHT_DOWN, self.click)
self.parent.Bind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged) self.parent.Bind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
def Destroy(self):
self.parent.Unbind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged)
def pageChanged(self, event): def pageChanged(self, event):
if self.parent.IsActive(self): if self.parent.IsActive(self):
fitID = self.getActiveFit() fitID = self.getActiveFit()