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

Timestamp:

May 23, 2018 3: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/FittingLogic.py (modified) (2 diffs)

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

@@ -16 +16 @@
         self._data = data
         self.data_is_loaded = False
+        #dq data presence in the dataset
+        self.dq_flag = False
+        #di data presence in the dataset
+        self.di_flag = False
         if data is not None:
             self.data_is_loaded = True
+            self.setDataProperties()
 
     @property
@@ -28 +33 @@
         self._data = value
         self.data_is_loaded = True
+        self.setDataProperties()
 
     def isLoadedData(self):
         """ accessor """
         return self.data_is_loaded
+
+    def setDataProperties(self):
+        """
+        Analyze data and set up some properties important for
+        the Presentation layer
+        """
+        if self._data.__class__.__name__ == "Data2D":
+            if self._data.err_data is not None and np.any(self._data.err_data):
+                self.di_flag = True
+            if self._data.dqx_data is not None and np.any(self._data.dqx_data):
+                self.dq_flag = True
+        else:
+            if self._data.dy is not None and np.any(self._data.dy):
+                self.di_flag = True
+            if self._data.dx is not None and np.any(self._data.dx):
+                self.dq_flag = True
+            elif self._data.dxl is not None and np.any(self._data.dxl):
+                self.dq_flag = True
 
     def createDefault1dData(self, interval, tab_id=0):