Changeset f39511b in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Dec 12, 2008 5:13:10 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:

3aae6b6

Parents:

2d107b8

Message:

scroll bars and model2d view added—bug?

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -43 +43 @@
         self.fit_page_name=None
         self.draw_model_name=None
-        self.page_name="Model View"
+        #model page info
+        self.model_page_number=None
+        self.page_name=None
+        self.model_page=None
+        #updating the panel
         self.nb.Update()
         self.SetSizer(self.sizer)
@@ -95 +99 @@
             return panel
         
+    def _help_add_model_page(self,model,description,page_title):
+        from modelpage import ModelPage
+        panel = ModelPage(self.nb,model, -1)
+        panel.set_manager(self.manager)
+        panel.set_owner(self.event_owner)
+        self.nb.AddPage(page=panel,text=page_title,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())
+        
         
     def add_model_page(self,model,description,page_title):
@@ -103 +118 @@
             @param page_title: the name of the page
         """
-        if  page_title !=self.draw_model_name or self.draw_model_name ==None: 
-            self.onClose()
+        if  self.draw_model_name ==None:
+            # or  self.draw_model_name !=page_title: 
+            #print "removing the prevois model page ",self.model_page, self.model_page_number
+            #self.onClose(self.model_page, self.model_page_number)
+            self._help_add_model_page(model,description,page_title)
+        else:
+            if  self.draw_model_name !=page_title: 
+                self.onClose(self.model_page, self.model_page_number)
+                #print "removing the prevois model page ",self.model_page, self.model_page_number
+                self._help_add_model_page(model,description,page_title)
+        """
+        if  self.draw_model_name ==None : 
+            
             from modelpage import ModelPage
             panel = ModelPage(self.nb,model, -1)
@@ -112 +138 @@
             panel.populate_box( self.model_list_box)
             self.draw_model_name=page_title
+            self.model_page_number = self.nb.GetPage(self.nb.GetSelection())
+            print "model page",self.model_page_number,self.nb.GetSelection()
         else:
             for i in range(self.nb.GetPageCount()):
@@ -118 +146 @@
                     page.set_page(model,description)
                     break
+        """
                 
            
@@ -150 +179 @@
         return self.nb.GetPage(self.nb.GetSelection())
     
-    def onClose(self):
+    def onClose(self, page=None,page_number=None):
         """
              close the current page except the simpage. remove each check box link to the model
              selected on that page. remove its reference into page_finder (fitting module)
         """
+        if page!=None and page_number!=None:
+            page.Destroy()
+            self.nb.RemovePage(page_number)
+            self.model_page_number=None
+            self.model_page=None
+            return 
         try:
             sim_page = self.nb.GetPage(0)
@@ -179 +214 @@
         except:
             raise
-        print "fitpanel", self.draw_model_name 
+        #print "fitpanel", self.draw_model_name 
         
     def set_model_list(self,dict):