Changeset 1b1bbf9 in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Apr 6, 2011 8:42:32 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2ca51f44

Parents:

16865897

Message:

focus color (plots) and adjust panel sizes a bit

File:

• sansview/perspectives/fitting/fitpanel.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -3 +3 @@
 import string 
 import wx
-import wx.lib.flatnotebook as fnb
+#from wx.lib.flatnotebook import FlatNotebook as nb
+from wx.aui import AuiNotebook as nb
 
 from sans.guiframe.panel_base import PanelBase
@@ -14 +15 @@
 
 
-class FitPanel(fnb.FlatNotebook, PanelBase):    
+class FitPanel(nb, PanelBase):    
 
     """
@@ -32 +33 @@
         """
         """
-        fnb.FlatNotebook.__init__(self, parent, -1,
+        nb.__init__(self, parent, -1,
                     style= wx.aui.AUI_NB_WINDOWLIST_BUTTON|
                     wx.aui.AUI_NB_DEFAULT_STYLE|
                     wx.CLIP_CHILDREN)
         PanelBase.__init__(self, parent)
-        self.SetWindowStyleFlag(style=fnb.FNB_FANCY_TABS)
+        #self.SetWindowStyleFlag(style=nb.FNB_FANCY_TABS)
         self._manager = manager
         self.parent = parent
@@ -44 +45 @@
         self.menu_mng = models.ModelManager()
         self.model_list_box = self.menu_mng.get_model_list()
-        #pageClosedEvent = fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
-        self.Bind(fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING , self.on_close_page)
+        #pageClosedEvent = nb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
+        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        
+        self.Bind(pageClosedEvent, self.on_close_page)
          ## save the title of the last page tab added
         self.fit_page_name = {}
@@ -58 +61 @@
         self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.on_page_changing)
-      
+
         #add default pages
         self.add_default_pages()
@@ -375 +378 @@
         """
         #remove hint page
-        if selected_page == self.hint_page:
-            return
+        #if selected_page == self.hint_page:
+        #    return
         ## removing sim_page
         if selected_page == self.sim_page :