Changeset aa9928e in sasview

Timestamp:

Jan 8, 2019 8:45:47 AM (6 years ago)

Author:

butler

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

f0c569d

Parents:

f632247

Message:

Fix behavior of smear buttons

Added check for self.model to _set_smear_buttons and more info logging.
Smear buttons should now be enabled depending on 2D vs 1D, model or not,
and resolution data available or not.

Addresses #1222

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -3237 +3237 @@
                     self.enable2D:
             self.slit_smearer.Disable()
-            self.pinhole_smearer.Enable(True)
             self.default_mask = copy.deepcopy(self.data.mask)
-        else:
-            self.slit_smearer.Enable(True)
-            self.pinhole_smearer.Enable(True)
+            if self.model is not None:
+                self.pinhole_smearer.Enable(True)
+
+        elif self.data.__class__.__name__ == "Data1D":
+            if self.model is not None:
+                self.slit_smearer.Enable(True)
+                self.pinhole_smearer.Enable(True)
+        else:
+            msg="data is not recognized as either 1D or 2D"
+            logger.info(msg)