Changeset 2439c4c in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 20, 2011 12:26:59 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:

ee19117

Parents:

cc694d0

Message:

fixing smearer sizer problem on model

File:

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

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

@@ -2572 +2572 @@
             self.smear_description_smear_type.SetValue(str(self.smear_type))
             self.smear_data_left.SetValue(str(self.dq_l))   
-            self.smear_data_right.SetValue(str(self.dq_r))       
+            self.smear_data_right.SetValue(str(self.dq_r)) 
 
         self._hide_all_smear_info()
@@ -2578 +2578 @@
         data = copy.deepcopy(self.data)
         # make sure once more if it is smearer
-        self.current_smearer = smear_selection(data, self.model)
-        
+        temp_smearer = smear_selection(data, self.model)
+        if self.current_smearer != temp_smearer:
+            self.current_smearer = temp_smearer
         if self.enable_smearer.GetValue():
             if hasattr(self.data,"dxl"):
@@ -2599 +2600 @@
         elif self.disable_smearer.GetValue():
             self.smear_description_none.Show(True)
+        elif self.pinhole_smearer.GetValue():
+            self.onPinholeSmear(None)
+        elif self.slit_smearer.GetValue():
+            self.onSlitSmear(None)
             
         self._show_smear_sizer()