Changeset 10c43a5 in sasview for sansview

Timestamp:

Feb 6, 2009 12:30:42 AM (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:

216efab

Parents:

4af20b4

Message:

fixing close button errors

Location:

sansview/perspectives/fitting

Files:

• AnnulusSlicer.py (deleted)
• fitpage1D.py (modified) (1 diff)
• fitpanel.py (modified) (7 diffs)
• modelpage.py (modified) (1 diff)
• scroll_fitpage1D.py (deleted)

sansview/perspectives/fitting/fitpage1D.py

@@ -26 +26 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page"
-    
+    name=None
     
     def __init__(self, parent,data, *args, **kwargs):

sansview/perspectives/fitting/fitpanel.py

@@ -43 +43 @@
         self.AddPage(self.sim_page,"Simultaneous Fit")
         
-        
+        self._mgr = wx.aui.AuiManager(self)
 
         
@@ -53 +53 @@
         #model page info
         self.model_page_number=None
-        self.page_name=None
+       
         self.model_page=None
         # increment number for model name
@@ -115 +115 @@
             from fitpage1D import FitPage1D
             panel = FitPage1D(self,data, -1)
+            panel.name=name
             m_name= "M"+str(self.count)  
             panel.set_manager(self.manager)
@@ -139 +140 @@
         self.AddPage(page=panel,caption="Model",select=True)
         panel.populate_box( self.model_list_box)
+        panel.name=page_title
         self.draw_model_name=page_title
         self.model_page_number=self.GetSelection()
@@ -166 +168 @@
             @param npts: number of Q points
         """
+        print "self.draw_model_name none",self.draw_model_name
         if  self.draw_model_name ==None:
+            print "self.draw_model_name none"
             self._help_add_model_page(model,description,page_title, qmin=qmin, qmax=qmax, npts=npts)
         elif topmenu==True:
             self.model_page.select_model(model, page_title)
-           
+          
     def get_current_page(self):
         """
@@ -179 +183 @@
   
     
-    def old_onClose(self, page=None,page_number=None):
+    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)
         """
-        #print "model page", page_number, page
+        print "model page", page_number, page, self.draw_model_name
         if page!=None and page_number!=None:
-            
-            self.nb.RemovePage(page_number)
-            page.Destroy()
+            i=self.DeletePage(page_number)
+            #self.nb.RemovePage(page_number)
+            #page.Destroy()
             self.model_page_number=None
             self.model_page=None
             self.draw_model_name=None
+            print"self.draw_model_name",self.draw_model_name
             return 
         try:
-            sim_page = self.nb.GetPage(0)
-            selected_page = self.nb.GetPage(self.nb.GetSelection())
-            
+            sim_page = self.GetPage(1)
+            selected_page = self.GetPage(self.GetSelection())
+            print "sim_page ",sim_page ,selected_page
             if sim_page != selected_page:
+                print "sim_page ",sim_page ,selected_page
                 # remove the check box link to the model name of this page (selected_page)
                 sim_page.remove_model(selected_page)
@@ -207 +213 @@
                         break
                 #Delete the page from notebook
-                page_number = self.nb.GetSelection()
-                if self.nb.GetPageText(page_number)== self.page_name:
+                page_number = self.GetSelection()
+                print selected_page.name,self.GetPageText(page_number),self.draw_model_name
+                if selected_page.name== self.draw_model_name:
+                    print "went here"
                     self.draw_model_name=None
+                    self.model_page=None
                 if  page_number == 1:
                     self.model_page=None
                     self.draw_model_name=None
-                selected_page.Destroy()
-                self.nb.RemovePage(page_number)
+                #selected_page.Destroy()
+                #self.RemovePage(page_number)
+                i=self.DeletePage(page_number)
                 #self.count =self.count -1 
                 self.fit_page_name=None

sansview/perspectives/fitting/modelpage.py

@@ -26 +26 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page"
-    
-    
+    name=""
     def __init__(self, parent,model,name, *args, **kwargs):
         wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)