Changeset 6b39d58 in sasview

Timestamp:

Oct 19, 2011 7:58:14 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:

5cf5f51

Parents:

3912db5

Message:

fixed paste array disp problem

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (5 diffs)

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

@@ -2593 +2593 @@
         msg = "Applying loaded %s distribution: %s" % (name, path)
         wx.PostEvent(self.parent.parent, StatusEvent(status=msg))  
-
+        self._set_array_disp_model(name=name, disp=disp,
+                                    values=values, weights=weights)
+        return basename
+    
+    def _set_array_disp_model(self, name=None, disp=None, 
+                              values=[], weights=[]):
+        """
+        Set array dispersion model
+        
+        :param name: name of the parameter for the dispersion to be set
+        :param disp: the polydisperion object
+        """
         disp.set_weights(values, weights)
         self._disp_obj_dict[name] = disp
@@ -2620 +2631 @@
         self.state.model._persistency_dict[name.split('.')[0]] = \
                                         [values,weights]
-        return basename
-    
+                                        
+
     def _del_array_values(self, name=None):  
         """
@@ -3034 +3045 @@
             self._get_paste_helper(self.str_parameters, 
                                    self.orientation_params, context)
+                
             return True
         return None
@@ -3124 +3136 @@
         :param value: the values for parameter ctrols
         """
+        is_array = False
         if len(value[1]) > 0:
             # Only for dispersion func.s
@@ -3140 +3153 @@
                     if len(pd_vals) > 0 and len(pd_vals) > 0:
                         if len(pd_vals) == len(pd_weights):
-                            disp_model.set_weights(pd_vals, 
-                                                   pd_weights)
-                            self.values[name] = pd_vals
-                            self.weights[name] = pd_weights
-                            # disable the fixed items for array
-                            item[0].SetValue(False)
-                            item[0].Enable(False)
-                            item[2].Enable(False)
-                            item[3].Show(False)
-                            item[4].Show(False)
-                            item[5].SetValue('')
-                            item[5].Enable(False)
-                            item[6].SetValue('')
-                            item[6].Enable(False)
+                            self._set_disp_array_cb(item=item)
+                            self._set_array_disp_model(name=name, 
+                                                       disp=disp_model,
+                                                       values=pd_vals, 
+                                                       weights=pd_weights)
+                            is_array = True
                 except:
                     pass 
-                self._disp_obj_dict[name] = disp_model
-                self.model.set_dispersion(name, 
-                                          disp_model)
-                self.state._disp_obj_dict[name] = \
-                                          disp_model
-                self.model.set_dispersion(param_name, disp_model)
-                state.values = self.values
-                state.weights = self.weights    
-                self.model._persistency_dict[param_name] = \
-                                        [state.values, state.weights]
-                    
-                    
+                if not is_array:
+                    self._disp_obj_dict[name] = disp_model
+                    self.model.set_dispersion(name, 
+                                              disp_model)
+                    self.state._disp_obj_dict[name] = \
+                                              disp_model
+                    self.model.set_dispersion(param_name, disp_model)
+                    self.state.values = self.values
+                    self.state.weights = self.weights    
+                    self.model._persistency_dict[param_name] = \
+                                            [state.values, state.weights]
+                         
             except:
                 pass 
+    
+    def _set_disp_array_cb(self, item):
+        """
+        Set cb for array disp
+        """
+        item[0].SetValue(False)
+        item[0].Enable(False)
+        item[2].Enable(False)
+        item[3].Show(False)
+        item[4].Show(False)
+        item[5].SetValue('')
+        item[5].Enable(False)
+        item[6].SetValue('')
+        item[6].Enable(False)
+
+