Changeset c477b31 in sasview for sansview/perspectives

Timestamp:

Apr 21, 2009 5:11:00 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:

29953e2

Parents:

eba0cb5f

Message:

saving option for dispersity

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (2 diffs)
• modelpage.py (modified) (3 diffs)
• pagestate.py (modified) (4 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)
-        
+        new_state.enable2D = copy.deepcopy(self.enable2D)
         ##Add model state on context menu
         self.number_saved_state += 1
@@ -451 +442 @@
             self.state.model = self.model.clone()
         self.state.save_data(self.data)
-    
+        
+        self.state.enable2D = copy.deepcopy(self.enable2D)
+        
         if hasattr(self,"cb1"):
             self.state.cb1= self.cb1.GetValue()
@@ -467 +460 @@
         if hasattr(self,"disp_box"):
             self.state.disp_box = self.disp_box.GetCurrentSelection()
+            if len(self.disp_cb_dict)>0:
+                for k , v in self.disp_cb_dict.iteritems():
+                    if v ==None :
+                        self.state.disp_cb_dict[k]= v
+                    else:
+                        try:
+                            self.state.disp_cb_dict[k]=v.GetValue()
+                        except:
+                            self.state.disp_cb_dict[k]= None
+           
+            if len(self._disp_obj_dict)>0:
+                for k , v in self._disp_obj_dict.iteritems():
+                    self.state._disp_obj_dict[k]= v
+           
         self._save_plotting_range()
         
@@ -503 +510 @@
         self._set_model_sizer_selection( self.model )
         self.set_model_param_sizer(self.model)
+      
+        self.enable2D= state.enable2D
+        self.state.enable2D= state.enable2D
+       
+        if hasattr(self,"model_view"):
+            if not self.enable2D:
+                self.model_view.Enable()
+            else:
+                self.model_view.Disable()
+            
         if hasattr(self, "cb1"):   
             self.cb1.SetValue(self.state.cb1)
@@ -510 +527 @@
         if hasattr(self, "disp_box"):
             self.disp_box.SetSelection(self.state.disp_box)  
+            
+            self.disp_cb_dict = {}
+            for k,v in self.state.disp_cb_dict.iteritems():
+                self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
+                self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
+                
+            self._disp_obj_dict={}
+            for k , v in self.state._disp_obj_dict.iteritems():
+                self._disp_obj_dict[k]=v
+      
         self._set_dipers_Param(event=None)
         ##plotting range restore    
@@ -529 +556 @@
         self._reset_parameters_state(self.fittable_param,state.fittable_param)
         self._reset_parameters_state(self.fixed_param,state.fixed_param)
-     
+        self._onparamEnter_helper()
         ## reset context menu items
         self._reset_context_menu()
         ## draw the model with previous parameters value
-        self._draw_model()
+        #self._draw_model()
         
    
@@ -634 +661 @@
             if is_modified:
                 self._draw_model() 
+                self.save_current_state()
                 
                 

sansview/perspectives/fitting/fitpage.py

@@ -250 +250 @@
             self._disp_obj_dict[item] = disp_model
             self.model.set_dispersion(item, disp_model)
+            self.state._disp_obj_dict[item]= disp_model
 
         ix=0
@@ -436 +437 @@
                                                      ,None,None, None, None,None])
    
-                                  
+        self.state.disp_cb_dict = copy.deepcopy(self.disp_cb_dict)                         
         wx.PostEvent(self.parent, StatusEvent(status=\
                         " Selected Distribution: Gaussian"))   

sansview/perspectives/fitting/modelpage.py

@@ -137 +137 @@
             self._disp_obj_dict[item] = disp_model
             self.model.set_dispersion(item, disp_model)
+            self.state._disp_obj_dict[item]= disp_model
+            
+            
         ix=0
         iy=1
@@ -309 +312 @@
                     if item[2]!=None:
                         item[2].Enable()
-                
+        self.state.enable2D =  copy.deepcopy(self.enable2D)
     
                 
@@ -546 +549 @@
             else:
                 self.text2_4.Hide()
-    
+        self.state.disp_cb_dict = copy.deepcopy(self.disp_cb_dict) 
         boxsizer1.Add(sizer)
         self.sizer3.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)

sansview/perspectives/fitting/pagestate.py

@@ -48 +48 @@
         #list of dispersion paramaters
         self.disp_list =[]
+        self._disp_obj_dict={}
+        self.disp_cb_dict={}
         #contains link between a model and selected parameters to fit 
         self.param_toFit =[]
@@ -70 +72 @@
         self.enable_disp= False
         self.disable_disp= True
+        ## plot 2D data
+        self.enable2D= False
         ## state of selected all check button
         self.cb1 = False
@@ -92 +96 @@
         obj.event_owner = self.event_owner
         
+        obj.enable2D = copy.deepcopy(self.enable2D)
         obj.parameters = copy.deepcopy(self.parameters)
         obj.fixed_param = copy.deepcopy(self.fixed_param)
@@ -101 +106 @@
         obj.disable_disp = copy.deepcopy(self.disable_disp)
         
+        if len(self._disp_obj_dict)>0:
+            for k , v in self._disp_obj_dict.iteritems():
+                obj._disp_obj_dict[k]= v
+        obj.disp_cb_dict = copy.deepcopy(self.disp_cb_dict)
         obj.enable_smearer = copy.deepcopy(self.enable_smearer)
         obj.disable_smearer = copy.deepcopy(self.disable_smearer)