Changeset 3b9e023 in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Jun 22, 2009 4:52:42 PM (15 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:

8a48713

Parents:

75925e0

Message:

working on save dispersity

File:

• sansview/perspectives/fitting/basepage.py (modified) (9 diffs)

sansview/perspectives/fitting/basepage.py

@@ -302 +302 @@
         # Go through the list of dispersion check boxes to identify which one has changed 
         for p in self.disp_cb_dict:
+            self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
             # Catch which one of the box was just checked or unchecked.
             if event.GetEventObject() == self.disp_cb_dict[p]:              
@@ -349 +350 @@
                     self.state.values=[]
                     self.state.weights=[]
-                    self.state.values = self.values
-                    self.state.weights = self.weights
+                    self.state.values = copy.deepcopy(self.values)
+                    self.state.weights = copy.deepcopy(self.weights)
                     # Set the new model as the dispersion object for the selected parameter
                     self.model.set_dispersion(p, disp_model)
@@ -366 +367 @@
               
                 ## Redraw the model
-               
                 self._draw_model()
-                ## post state to fit panel
-                
-                self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
-                #event = PageInfoEvent(page = self)
-                #wx.PostEvent(self.parent, event)
-        return
-    
+        
+        ## post state to fit panel
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event)
+       
     
     def onResetModel(self, event):
@@ -621 +619 @@
         
         if hasattr(self, "disp_box"):
-            self.disp_box.SetSelection(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_box.SetSelection(state.disp_box) 
+            n= self.disp_box.GetCurrentSelection()
+            dispersity= self.disp_box.GetClientData(n)
+            name= dispersity.__name__      
+            self._set_dipers_Param(event=None)
+            
+            #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)
+            if name=="ArrayDispersion":
+                for item in self.disp_cb_dict.keys():
+                    print "array dispersion",state.values, state.weights
+                    self.disp_cb_dict[item].SetValue(state.disp_cb_dict[item])
+                    # Create the dispersion objects
+                    from sans.models.dispersion_models import ArrayDispersion
+                    disp_model = ArrayDispersion()
+                    disp_model.set_weights(state.values, state.weights)
+                   
+                    self._disp_obj_dict[item] = disp_model
+                    # Set the new model as the dispersion object for the selected parameter
+                    self.model.set_dispersion(item, disp_model)
+                   
+                    #self.model._persistency_dict = {}
+                    #self.model._persistency_dict[item] = [state.values, state.weights]
+                    
+            else:
+                self._disp_obj_dict={}
+                for k , v in self.state._disp_obj_dict.iteritems():
+                    self._disp_obj_dict[k]=v
+    
         ##plotting range restore    
         self._reset_plotting_range(state)
@@ -649 +667 @@
         self._reset_parameters_state(self.fittable_param,state.fittable_param)
         self._reset_parameters_state(self.fixed_param,state.fixed_param)
-        
-        
+    
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
@@ -1187 +1204 @@
         self.state.model =self.model
         self.disp_list =self.model.getDispParamList()
-        self.state.disp_list = self.disp_list
-        self.state.structurecombobox =self.structurebox.GetCurrentSelection()
-        self.state.formfactorcombobox = self.formfactorbox.GetCurrentSelection()
+        self.state.disp_list = self.disp_list,
         self.sizer4_4.Layout()
         self.sizer4.Layout()
@@ -1409 +1424 @@
             self._set_sizer_arraydispersion()
             
+            
         self.state.disp_box= n
+        
+        self._undo.Enable(True)
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event)
         
         self.sizer4_4.Layout()
@@ -1447 +1467 @@
             ix+=1 
             self.disp_cb_dict[p] = wx.CheckBox(self, -1, p, (10, 10))
-            
+            self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
+            print "went here======>",self.disp_cb_dict
             wx.EVT_CHECKBOX(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
             self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -1462 +1483 @@
         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
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event)
+        
 
     def _set_range_sizer(self, title, object1=None,object=None):