Changeset 87dfca4 in sasview for src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py

Timestamp:

May 23, 2018 1:40:53 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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

Children:

c03692f

Parents:

db7d2c7

Message:

Fixed a bug where weighting options would not correctly update on data load

File:

• src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (modified) (1 diff)

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

@@ -163 +163 @@
         self.chkLogData.setEnabled(False)
         # Weighting controls
-        if isinstance(self.logic.data, Data2D):
-            if self.logic.data.err_data is None or\
-                    np.all(err == 1 for err in self.logic.data.err_data) or \
-                    not np.any(self.logic.data.err_data):
-                self.rbWeighting2.setEnabled(False)
-                self.rbWeighting1.setChecked(True)
-            else:
-                self.rbWeighting2.setEnabled(True)
-                self.rbWeighting2.setChecked(True)
+        if self.logic.di_flag:
+            self.rbWeighting2.setEnabled(True)
+            self.rbWeighting2.setChecked(True)
         else:
-            if self.logic.data.dy is None or\
-                    np.all(self.logic.data.dy == 1) or\
-                    not np.any(self.logic.data.dy):
-                self.rbWeighting2.setEnabled(False)
-                self.rbWeighting1.setChecked(True)
-            else:
-                self.rbWeighting2.setEnabled(True)
-                self.rbWeighting2.setChecked(True)
+            self.rbWeighting2.setEnabled(False)
+            self.rbWeighting1.setChecked(True)
 
     def updateQRange(self, q_range_min, q_range_max, npts):