Changeset ace0e33 in sasview

Timestamp:

Oct 6, 2011 7:40:56 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:

01642fec

Parents:

92b2fd8

Message:

almost to copy array disp too: but still many to go

File:

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

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

@@ -2488 +2488 @@
                         item[0].Disable()
                         item[2].Disable()
+                        item[3].Show(False)
+                        item[4].Show(False)
                         item[5].Disable()
                         item[6].Disable()
@@ -2904 +2906 @@
                 disfunc = ',' + disfunc
             # TODO: to support array func for copy/paste
-            if disfunc.count('array') == 0:
-                content += name + ',' + value + disfunc + ':'
+            try:
+                if disfunc.count('array') > 0:
+                    disfunc += ','
+                    for val in self.values[name]:
+                        disfunc += ' ' + str(val)
+                    disfunc += ','
+                    for weight in self.weights[name]:
+                        disfunc += ' ' + str(weight)
+            except:
+                pass
+            #if disfunc.count('array') == 0:
+            content += name + ',' + value + disfunc + ':'
 
         return content
@@ -2956 +2968 @@
             try:
                 poly_func = item[2]
+                context[name].append(poly_func)
+                try:
+                    # take the vals and weights for  array 
+                    array_values = item[3].split(' ')
+                    array_weights = item[4].split(' ')
+                    val = [float(a_val) for a_val in array_values[1:]]
+                    weit = [float(a_weit) for a_weit in array_weights[1:]]
+                    
+                    context[name].append(val)
+                    context[name].append(weit)
+                except:
+                    raise
             except:
-                poly_func = None
-            context[name].append(poly_func)
+                poly_func = ''
+                context[name].append(poly_func)
 
         # Do it if params exist        
@@ -2995 +3019 @@
                 name = item[1]
                 if name in content.keys():
-                    
+                    pd = content[name][0]
                     if name.count('.') > 0:
                         try:
-                            float(content[name][0])
+                            float(pd)
                         except:
                             continue
-                    item[2].SetValue(content[name][0])
+                            #if not pd and pd != '':
+                            #    continue
+                    item[2].SetValue(str(pd))
+                    
                     if item[2].__class__.__name__ == "ComboBox":
                         if self.model.fun_list.has_key(content[name][0]):
@@ -3007 +3034 @@
                             self.model.setParam(name,fun_val)
                     
-                    poly_func = content[name][1]
-                    if poly_func:
-                        try:
-                            item[7].SetValue(poly_func)
-                            selection = item[7].GetCurrentSelection()
-                            param_name = item[7].Name.split('.')[0]
-                            disp_name = item[7].GetValue()
-                            dispersity= item[7].GetClientData(selection)
-                            disp_model = dispersity()
-                            #disp_model = self._disp_obj_dict[name]
-                            self.model.set_dispersion(param_name, disp_model)
-                            self.state._disp_obj_dict[param_name]= disp_model
-                        except:
-                            pass           
+                    value = content[name]
+                    self._paste_poly_help(item, value)
         # 1D
             else:
@@ -3029 +3044 @@
                         # Avoid changing combox content which needs special care
                         value = content[name]
+                        pd = value[0]
                         if name.count('.') > 0:
                             try:
-                                float(value[0])
+                                pd = float(pd)
                             except:
                                 continue
-                        item[2].SetValue(value[0])
+                                #if not pd and pd != '':
+                                #    continue
+                        item[2].SetValue(str(pd))
+                        if item in self.fixed_param and pd == '':
+                            # Only array func has pd == '' case.
+                            item[2].Enable(False)
                         if item[2].__class__.__name__ == "ComboBox":
                             if self.model.fun_list.has_key(value[0]):
@@ -3042 +3063 @@
                                 #self._copy_parameters_state(self.str_parameters, 
                                 #    self.state.str_parameters)
-                        if value[1]:
-                            try:
-                                item[7].SetValue(value[1])
-                                selection = item[7].GetCurrentSelection()
-                                param_name = item[7].Name.split('.')[0]
-                                disp_name = item[7].GetValue()
-                                dispersity= item[7].GetClientData(selection)
-                                disp_model = dispersity()
-                                self.model.set_dispersion(param_name, disp_model)
-                                self.state._disp_obj_dict[param_name]= disp_model
-                            except:
-                                pass
+                        self._paste_poly_help(item, value)
+                        
+    def _paste_poly_help(self, item, value):
+        """
+        Helps get paste for poly function
+        
+        :param item: Gui param items
+        :param value: the values for parameter ctrols
+        """
+        if len(value[1]) > 0:
+            # Only for dispersion func.s
+            try:
+                item[7].SetValue(value[1])
+                selection = item[7].GetCurrentSelection()
+                param_name = item[7].Name.split('.')[0]
+                disp_name = item[7].GetValue()
+                dispersity= item[7].GetClientData(selection)
+                disp_model = dispersity()
+                # Only for array disp
+                try:
+                    pd_vals = numpy.array(value[2])
+                    pd_weights = numpy.array(value[3])
+                    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[param_name] = pd_vals
+                            self.weights[param_name] = pd_weights
+                            # disable the fixed items for array
+                            item[0].SetValue(False)
+                            item[0].Enable(False)
+                            item[2].Enable(False)
+                            item[4].Show(False)
+                            item[5].SetValue('')
+                            item[5].Enable(False)
+                            item[6].SetValue('')
+                            item[6].Enable(False)
+                except:
+                    pass 
+                self._disp_obj_dict[param_name] = disp_model
+                self.model.set_dispersion(param_name, 
+                                          disp_model)
+                self.state._disp_obj_dict[param_name] = \
+                                          disp_model
+                    
+            except:
+                pass