Changeset 706667b in sasview

Timestamp:

Oct 4, 2011 9:42:17 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:

31469d50

Parents:

1cff677

Message:

copy/paste remembers now poly func too except array function

File:

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

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

@@ -2884 +2884 @@
             try:
                 if item[7].__class__.__name__ == 'ComboBox':
-                    disfunc = item[7].GetLabel()
+                    disfunc = str(item[7].GetValue())
             except:
-                disfunc = ''
                 pass
+            
             # 2D
             if self.data.__class__.__name__== "Data2D":
@@ -2898 +2898 @@
                     name = item[1]
                     value = item[2].GetValue()
-                else:
-                    disfunc = ''
+
             # add to the content
             if disfunc != '':
+                
                 disfunc = ',' + disfunc
-            content += name + ',' + value + disfunc + ':'
+            # TODO: to support array func for copy/paste
+            if disfunc.count('array') == 0:
+                content += name + ',' + value + disfunc + ':'
 
         return content
@@ -2950 +2952 @@
                 value = item[1]
                 # Transfer the text to content[dictionary]
-                context[name] = value
+                context[name] = [value]
             # ToDo: PlugIn this poly disp function for pasting
-            if len(line) == 3:
+            try:
                 poly_func = item[2]
-            else:
+            except:
                 poly_func = None
+            context[name].append(poly_func)
+
         # Do it if params exist        
         if  self.parameters != []:
@@ -2964 +2968 @@
             # go through the fittables
             self._get_paste_helper(self.fittable_param, 
-                                   self.orientation_params_disp, context)
+                                   self.orientation_params_disp, 
+                                   context)
 
             # go through the fixed params
@@ -2990 +2995 @@
                 name = item[1]
                 if name in content.keys():
-                    item[2].SetValue(content[name])
-            # 1D
+                    
+                    if name.count('.') > 0:
+                        try:
+                            float(content[name][0])
+                        except:
+                            continue
+                    item[2].SetValue(content[name][0])
+                    if item[2].__class__.__name__ == "ComboBox":
+                        if self.model.fun_list.has_key(content[name][0]):
+                            fun_val = self.model.fun_list[content[name][0]]
+                            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           
+        # 1D
             else:
                 ## for 1D all parameters except orientation
@@ -2999 +3029 @@
                         # Avoid changing combox content which needs special care
                         value = content[name]
-                        item[2].SetValue(value)
+                        if name.count('.') > 0:
+                            try:
+                                float(value[0])
+                            except:
+                                continue
+                        item[2].SetValue(value[0])
                         if item[2].__class__.__name__ == "ComboBox":
-                            if self.model.fun_list.has_key(value):
-                                fun_val = self.model.fun_list[value]
+                            if self.model.fun_list.has_key(value[0]):
+                                fun_val = self.model.fun_list[value[0]]
                                 self.model.setParam(name,fun_val)
                                 # save state
                                 #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