Changeset c0a3b22e in sasview for src/sas/qtgui/Perspectives

Timestamp:

Sep 3, 2018 1:42:34 PM (6 years ago)

Author:

piotr

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

0d72cac, 1f646618

Parents:

d686ff1

Message:

Guard against improper types of Data - SASVIEW-1012

File:

• src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py

@@ -127 +127 @@
         Callback for running the mask editor
         """
-        self.parent.communicate.maskEditorSignal.emit(self.logic.data)
-        pass
+        if isinstance(self.logic.data, Data2D):
+            self.parent.communicate.maskEditorSignal.emit(self.logic.data)
 
     def onRangeReset(self):
@@ -157 +157 @@
         Enable/disable various UI elements based on data loaded
         """
+        is2Ddata = isinstance(self.logic.data, Data2D)
         self.boxWeighting.setEnabled(True)
-        self.cmdMaskEdit.setEnabled(True)
+        self.cmdMaskEdit.setEnabled(is2Ddata)
         # Switch off txtNpts related controls
         self.txtNpts.setEnabled(False)