Changeset 87dfca4 in sasview

Timestamp:

May 23, 2018 3:40:53 AM (7 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

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingLogic.py (modified) (2 diffs)
• FittingWidget.py (modified) (1 diff)
• OptionsWidget.py (modified) (1 diff)

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):

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

@@ -177 +177 @@
 
         # Create logics with data items
-        self._logic=[]
         # Logics.data contains only a single Data1D/Data2D object
-        for data_item in value:
-            self._logic.append(FittingLogic())
-            self._logic[-1].data = GuiUtils.dataFromItem(data_item)
+        if len(value) == 1:
+            # single data logic is already defined, update data on it
+            self._logic[0].data = GuiUtils.dataFromItem(value[0])
+        else:
+            # batch datasets
+            for data_item in value:
+                logic = FittingLogic(data=GuiUtils.dataFromItem(data_item))
+                self._logic.append(logic)
 
         # Overwrite data type descriptor

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):