Changeset 0f8f831 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 14, 2011 2:10:04 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:

e9875db

Parents:

0cf97c5

Message:

smearer option disabled before set_data

File:

• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -305 +305 @@
                 self.slit_smearer.Disable()   
                 #self.enable_smearer.Disable() 
+            if self.data == None:
+                self.slit_smearer.Disable() 
+                self.pinhole_smearer.Disable() 
+                self.enable_smearer.Disable() 
         else: self._show_smear_sizer()
         boxsizer_range.Add(self.sizer_set_masking)
@@ -1570 +1574 @@
             self._set_smear(data)
             # more disables for 2D
-            if self.data.__class__.__name__ =="Data2D":
+            if self.data.__class__.__name__ =="Data2D":   
                 self.slit_smearer.Disable()
                 self.default_mask = copy.deepcopy(self.data.mask)
-                
+            else:
+                self.slit_smearer.Enable(True) 
+                self.pinhole_smearer.Enable(True)      
                 
             self.formfactorbox.Enable()