Changeset 998b6b8 in sasview

Timestamp:

Apr 15, 2009 2:07:46 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:

6063b16

Parents:

aa1e9a72

Message:

retrived status of checkbox fixed for selected all

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• fitpage.py (modified) (3 diffs)
• pagestate.py (modified) (1 diff)
• simfitpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -432 +432 @@
         if hasattr(self,"cb1"):
             self.state.cb1= self.cb1.GetValue()
-            
+            print "save current state ",self.state.cb1
         if hasattr(self,"enable_disp"):
             self.state.enable_disp= self.enable_disp.GetValue()
@@ -467 +467 @@
         self._set_model_sizer_selection( self.model )
         self.set_model_param_sizer(self.model)
-        
+        if hasattr(self, "cb1"):   
+            self.cb1.SetValue(self.state.cb1)
         ## display dispersion info layer
         self.enable_disp.SetValue(self.state.enable_disp)
@@ -477 +478 @@
         if hasattr(self,"enable_smearer"):
             self.enable_smearer.SetValue(state.enable_smearer)
-        
+         ## reset state of checkbox,textcrtl  and parameters value
+       
         ##plotting range restore    
         self._reset_plotting_range()
         ## reset context menu items
         self._reset_context_menu()
-        ## reset state of checkbox,textcrtl  and parameters value
-        if hasattr(self, "cb1"):    
-            self.cb1.SetValue(self.state.cb1)
+       
         self._reset_parameters_state(self.parameters,state.parameters)
         self._reset_parameters_state(self.fittable_param,state.fittable_param)

sansview/perspectives/fitting/fitpage.py

@@ -697 +697 @@
         
         if  self.parameters !=[]:
-            if  self.cb1.GetValue()==True:
+            if  self.cb1.GetValue():
                 for item in self.parameters:
                     item[0].SetValue(True)
@@ -723 +723 @@
         for item in self.parameters:
             #Select parameters to fit for list of primary parameters
-            if item[0].GetValue()==True:
+            if item[0].GetValue():
                 if not (item in self.param_toFit):
                     self.param_toFit.append(item )  
@@ -732 +732 @@
         #Select parameters to fit for list of fittable parameters with dispersion          
         for item in self.fittable_param:
-            if item[0].GetValue()==True:
+            if item[0].GetValue():
                 if not (item in self.param_toFit):
                     self.param_toFit.append(item)  

sansview/perspectives/fitting/pagestate.py

@@ -97 +97 @@
             copy_state = state.clone()
             obj.saved_states[copy_name]= copy_state
-                                           
-       
-        
         return obj
 

sansview/perspectives/fitting/simfitpage.py

@@ -105 +105 @@
                 sizer.Clear(True)
                 self.sizer_constraints.Remove(sizer)
-                #self.sizer_constraints.Layout()
+              
                 self.sizer2.Layout()
                 self.SetScrollbars(20,20,200,100)