Changeset 26bf293 in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Feb 2, 2009 5:28:06 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ca88b2e

Parents:

2cf2b87

Message:

redesign the model1D and madel page

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -1 +1 @@
 import wx
+import wx.aui
 import wx.lib
 import numpy
@@ -7 +8 @@
 
 
-    
-class FitPanel(wx.Panel):
+class FitPanel(wx.aui.AuiNotebook):    
+#class FitPanel(wx.aui.AuiNotebook,wx.panel):
     """
         FitPanel class contains fields allowing to fit  models and  data
@@ -20 +21 @@
     window_caption = "Fit Panel "
     CENTER_PANE = True
-   
-    
     def __init__(self, parent, *args, **kwargs):
-        wx.Panel.__init__(self, parent, *args, **kwargs)
+        
+        wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_SCROLL_BUTTONS )
+        
         self.manager=None
         self.parent=parent
         self.event_owner=None
-        #self.menu_mng = models.ModelManager()
-        self.nb = wx.Notebook(self)
-        self.sizer = wx.BoxSizer()
-        self.sizer.Add(self.nb, 1, wx.EXPAND)
+        
+        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.onClosePage)
+
         #Creating an initial page for simultaneous fitting
         from simfitpage import SimultaneousFitPage
-        self.sim_page = SimultaneousFitPage(self.nb, -1)
-        
-        #self.fit_panel.add_page(self.sim_page,"Simultaneous Fit")
-        self.nb.AddPage(self.sim_page,"Simultaneous Fit")
+        self.sim_page = SimultaneousFitPage(self, -1)
+        self.AddPage(self.sim_page,"Simultaneous Fit")
+        
+
         
         #dictionary of miodel {model class name, model class}
@@ -50 +51 @@
         self.count=0
         #updating the panel
-        self.nb.Update()
-        self.SetSizer(self.sizer)
-        self.sizer.Fit(self)
+        self.Update()
         self.Center()
-        
+    def onClosePage(self, event):
+        self.ToggleWindowStyle(wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
+        print "went here",self.get_current_page(), self.GetPage(0)
+        #event.Skip()
+        if self.GetPageCount() <= 2:
+            print "wente here"
+            
+            # Prevent last tab from being closed
+            self.ToggleWindowStyle(~wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
+            
+
+   
+
 
         
@@ -86 +97 @@
         if self.fit_page_name != name:
             self.count +=1
+            
             if data.__class__.__name__=='Data2D':
                  from fitpage2D import FitPage2D
-                 panel = FitPage2D(self.nb,data, -1)
+                 panel = FitPage2D(self,data, -1)
                  
             else:
-                
+           
                 from fitpage1D import FitPage1D
-                panel = FitPage1D(self.nb,data, -1)
+                panel = FitPage1D(self,data, -1)
             m_name= "M"+str(self.count)  
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
             
-            self.nb.AddPage(page=panel,text=name,select=True)
+            self.AddPage(page=panel,caption=name,select=True)
             panel.populate_box( self.model_list_box)
             self.fit_page_name = name
@@ -112 +124 @@
         """
         from modelpage import ModelPage
-        panel = ModelPage(self.nb,model,page_title, -1)
+        print "fitpanel model", model
+        panel = ModelPage(self,model,page_title, -1)
         panel.set_manager(self.manager)
         panel.set_owner(self.event_owner)
-        #self.nb.AddPage(page=panel,text=page_title,select=True)
-        self.nb.AddPage(page=panel,text="Model",select=True)
+        self.AddPage(page=panel,caption="Model",select=True)
         panel.populate_box( self.model_list_box)
         self.draw_model_name=page_title
-        self.model_page_number=self.nb.GetSelection()
-        self.model_page=self.nb.GetPage(self.nb.GetSelection())
+        self.model_page_number=self.GetSelection()
+        self.model_page=self.GetPage(self.GetSelection())
         
         
@@ -150 +162 @@
             self.model_page.select_model(model, page_title)
            
-    def get_notebook(self):
-        """
-            @return self.nb: return its own notebook mostly used by fitting module 
-        """
-        return self.nb
+    def get_current_page(self):
+        """
+            @return the current page selected
+        """
+        #return self.nb.GetCurrentPage()
+        return self.GetPage(self.GetSelection() )
+  
     
-    def get_page(self, n):
-        """
-            @return page at position n
-            @param n: page number
-        """
-        return self.nb.GetPage(n)
-    
-    
-    def get_page_count(self):
-        """ @return  number total of pages contained in notebook"""
-        return self.nb.GetPageCount()
-        
-        
-    def get_current_page(self):
-        """
-            @return the current page selected
-        """
-        return self.nb.GetCurrentPage()
-    
-    
-    def get_selected_page(self):
-        """ @return the page just selected by the user """
-        return self.nb.GetPage(self.nb.GetSelection())
-    
-    
-    def get_page_number(self):
-        return self.nb.GetSelection()
-    
-    def onClose(self, page=None,page_number=None):
+    def old_onClose(self, page=None,page_number=None):
         """
              close the current page except the simpage. remove each check box link to the model