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

Timestamp:

Feb 12, 2009 2:11:08 PM (15 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:

7983c731

Parents:

3b909b7

Message:

dispersity not work well. closing button fixed

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -102 +102 @@
         except:
             name = 'Fit'
+        
         if self.fit_page_name != name:
-            print"went here"
-            #self.count +=1
-         
             #self.about_page.Disable()
             from fitpage1D import FitPage1D
             panel = FitPage1D(self,data, -1)
             panel.name=name
-            m_name= "M"+str(self.count)  
+            #m_name= "M"+str(self.count)  
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
@@ -118 +116 @@
             self.fit_page_name = name
             EVT_FIT_PAGE
-            return panel,m_name
+            return panel #,m_name
         else:
-            return None, None
+            return None #, None
         
     def _help_add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50):
@@ -137 +135 @@
         self.AddPage(page=panel,caption="Model",select=True)
         panel.populate_box( self.model_list_box)
-        panel.name=page_title
+        panel.name = page_title
         self.draw_model_name=page_title
         self.model_page_number=self.GetSelection()
@@ -166 +164 @@
         """
         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)
+        if topmenu==True:
+            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)
+            else:
+                #self.model_page.name=page_title
+                #self.draw_model_name=page_title
+                #print "wnent here self.draw_model_name ",self.draw_model_name,self.model_page.name,self.model_page
+                
+                self.model_page.select_model(model, page_title)
           
     def get_current_page(self):
@@ -211 +214 @@
                 #Delete the page from notebook
                 page_number = self.GetSelection()
-                print selected_page.name,self.GetPageText(page_number),self.draw_model_name
+                print "on close",selected_page.name,self.GetPageText(page_number),self.draw_model_name
                 if selected_page.name== self.draw_model_name:
                     print "went here"