Changeset 1fc7411 in sasview

Timestamp:

Feb 24, 2009 3:54:48 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:

fe3aba9

Parents:

3e1a859

Message:

error handling for selected data to fit

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -49 +49 @@
         self.model_list_box={}
         # save the title of the last page tab added
-        self.fit_page_name=None
+        self.fit_page_name=[]
         self.draw_model_name=None
         #model page info
@@ -105 +105 @@
             name = 'Fit'
         flag2=self.draw_model_name !=name
-        flag= ((self.draw_model_name ==name) and (data.__class__.__name__ is "Data2D"))
+        flag= ((self.draw_model_name ==name) and (data.__class__.__name__ is "Data2D"))or\
+        (self.draw_model_name !=name)
         #if self.fit_page_name != name and self.draw_model_name !=name:
-        if self.fit_page_name != name and flag :
+        if not name in self.fit_page_name  and flag :
             #self.about_page.Disable()
             from fitpage1D import FitPage1D
@@ -118 +119 @@
             self.AddPage(page=panel,caption=name,select=True)
             panel.populate_box( self.model_list_box)
-            self.fit_page_name = name
-            EVT_FIT_PAGE
+            self.fit_page_name.append(name)
+    
             return panel #,m_name
         else:
@@ -205 +206 @@
             sim_page = self.GetPage(1)
             selected_page = self.GetPage(self.GetSelection())
-            print "sim_page ",sim_page ,selected_page
+            #print "sim_page ",sim_page ,selected_page
             if sim_page != selected_page:
-                print "sim_page ",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)
@@ -218 +219 @@
                 #Delete the page from notebook
                 page_number = self.GetSelection()
-                print "on close",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 in self.fit_page_name:
+                    self.fit_page_name.remove(selected_page.name)
+                    
                 if selected_page.name== self.draw_model_name:
-                    print "went here"
+                    #print "went here"
                     self.draw_model_name=None
                     self.model_page=None
@@ -230 +235 @@
                 i=self.DeletePage(page_number)
                 #self.count =self.count -1 
-                self.fit_page_name=None
+                
         except:
             raise