Changeset d8c54ead in sasview for sansview/perspectives

Timestamp:

Jun 28, 2011 2:07:18 PM (14 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:

2d603a2

Parents:

2c6b224

Message:

fixes of paste on combobox parameters for multifunctional model

File:

• sansview/perspectives/fitting/basepage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -2793 +2793 @@
                     if name in content.keys():
                         # Avoid changing combox content which needs special care
-                        if item[2].__class__.__name__ != "ComboBox":
-                            item[2].SetValue(content[name])
-                            
+                        value = content[name]
+                        item[2].SetValue(value)
+                        if item[2].__class__.__name__ == "ComboBox":
+                            if self.model.fun_list.has_key(value):
+                                fun_val = self.model.fun_list[value]
+                                self.model.setParam(name,fun_val)
+                                # save state
+                                #self._copy_parameters_state(self.str_parameters, 
+                                #    self.state.str_parameters)