Changeset 81a7b6c in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 21, 2011 12:13:38 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

f6518f8

Parents:

e4d790f

Message:

simpage update on delete data

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpanel.py (modified) (2 diffs)
• simfitpage.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/fitpanel.py

@@ -592 +592 @@
                     break 
             del page_finder[selected_page]
-        ##remove the check box link to the model name of this page (selected_page)
-        try:
-            self.sim_page.draw_page()
-        except:
-            ## that page is already deleted no need to remove check box on
-            ##non existing page
-            pass
+
                 
         #Delete the name of the page into the list of open page
@@ -606 +600 @@
                 del self.opened_pages[selected_page.uid]
                 break 
-      
+        ##remove the check box link to the model name of this page (selected_page)
+        try:
+            self.sim_page.draw_page()
+        except:
+            ## that page is already deleted no need to remove check box on
+            ##non existing page
+            pass     

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -278 +278 @@
         self.constraint_dict={}
         self.nb_constraint= 0
+        self.model_cbox_left = None
+        self.model_cbox_right = None
         
         if len(self.model_list)>0:
@@ -562 +564 @@
         self._store_model()
         if self.model_cbox_left != None:
-            self.model_cbox_left.Clear()
+            try:
+                self.model_cbox_left.Clear()
+            except:
+                pass
             self.model_cbox_left = None
         if self.model_cbox_right != None:
-            self.model_cbox_right.Clear()
+            try:
+                self.model_cbox_right.Clear()
+            except:
+                pass
             self.model_cbox_right = None
         self.constraints_list = []