Changeset a86e69b in sasview for fittingview/src/sans/perspectives

Timestamp:

Sep 30, 2011 8:59:08 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:

d682c92

Parents:

b7c6a4a

Message:

improved the paramval copy behavior on changing models

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (2 diffs)

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

@@ -1192 +1192 @@
             self.model.name = "M" + str(self.index_model)
     
+
     def _on_select_model(self, event=None): 
         """
         call back for model selection
         """  
-        
         self.Show(False) 
+        copy_flag = '' 
+        is_poly_enabled = None 
         if event != None:
-            copy_flag = self.get_copy_params()
-            is_poly_enabled = self.enable_disp.GetValue() 
-        else:
-            copy_flag = '' 
-            is_poly_enabled = None 
+            if (event.GetEventObject() == self.formfactorbox\
+                        and self.structurebox.GetLabel() != 'None')\
+                        or event.GetEventObject() == self.structurebox\
+                        or event.GetEventObject() == self.multifactorbox:
+                copy_flag = self.get_copy_params()
+                is_poly_enabled = self.enable_disp.GetValue() 
+
         self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)                   
@@ -1294 +1298 @@
 
             # Keep the previous param values
-            if copy_flag:
+            if copy_flag  and self.structurebox.GetLabel() != 'None':
                 self.get_paste_params(copy_flag)
             self._onDraw(event=None)