Changeset d2d0cfdf in sasview for sansview/perspectives

Timestamp:

Apr 21, 2009 3:34:06 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:

a7fe3e3

Parents:

7268dcc

Message:

save gaussian dispersity

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -343 +343 @@
         self.state.model = self.model.clone()
         new_state = self.state.clone()
+        ## save checkbutton state and txtcrtl values
+        self._copy_parameters_state(self.orientation_params,
+                                     self.state.orientation_params)
+        self._copy_parameters_state(self.orientation_params_disp,
+                                     self.state.orientation_params_disp)
+        self._copy_parameters_state(self.parameters, self.state.parameters)
+       
+        self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
+        self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
         
         ##Add model state on context menu
@@ -459 +468 @@
             self.state.disp_box = self.disp_box.GetCurrentSelection()
         self._save_plotting_range()
-      
+        
+        self.state.orientation_params =[]
+        self.state.orientation_params_disp =[]
+        self.state.parameters =[]
+        self.state.fittable_param =[]
+        self.state.fixed_param =[]
+        
         ## save checkbutton state and txtcrtl values
-       
-        self._copy_parameters_state(self.parameters, self.state.parameters)
-        self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
-        self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
         self._copy_parameters_state(self.orientation_params,
                                      self.state.orientation_params)
         self._copy_parameters_state(self.orientation_params_disp,
                                      self.state.orientation_params_disp)
-        
+        self._copy_parameters_state(self.parameters, self.state.parameters)
+       
+        self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
+        self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
         
         ## post state to fit panel
@@ -506 +520 @@
             self.compute_chisqr(smearer= self.smearer)  
             
-        ## reset context menu items
-        self._reset_context_menu()
+       
         ## reset state of checkbox,textcrtl  and parameters value
-        self._reset_parameters_state(self.parameters,state.parameters)
-        self._reset_parameters_state(self.fittable_param,state.fittable_param)
-        self._reset_parameters_state(self.fixed_param,state.fixed_param)
         self._reset_parameters_state(self.orientation_params_disp,
                                      state.orientation_params_disp)
         self._reset_parameters_state(self.orientation_params,
                                      state.orientation_params)
-        
+        self._reset_parameters_state(self.parameters,state.parameters)
+        self._reset_parameters_state(self.fittable_param,state.fittable_param)
+        self._reset_parameters_state(self.fixed_param,state.fixed_param)
+     
+        ## reset context menu items
+        self._reset_context_menu()
         ## draw the model with previous parameters value
         self._draw_model()
@@ -591 +606 @@
             is_modified =self._check_value_enter( self.parameters ,is_modified)        
            
-            
             self.Layout()
             # Here we should check whether the boundaries have been modified.
@@ -676 +690 @@
             @param statelist: list of state object to store the current state
         """
+        
         if len(listtocopy)==0:
             return

sansview/perspectives/fitting/fitpage.py

@@ -197 +197 @@
             radius_max = math.sqrt(x*x + y*y)
             
-            #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
+            #For qmin and qmax, do not use format_number
+            #.(If do, qmin and max could be different from what is in the data.)
             # Minimum value of data   
-            #data_min = str(format_number(radius_min))
             data_min = str((radius_min))
             # Maximum value of data  
-            #data_max = str(format_number(radius_max))
             data_max = str((radius_max))
             text4_3 = wx.StaticText(self, -1, "Total Q Range (1/A)",
@@ -436 +435 @@
                             self.orientation_params_disp.append([None,name3, Tctl
                                                      ,None,None, None, None,None])
-        self._copy_parameters_state(self.orientation_params_disp,
-                                     self.state.orientation_params_disp) 
+   
                                   
         wx.PostEvent(self.parent, StatusEvent(status=\