Changeset 14ec7dfd in sasview

Timestamp:

Sep 14, 2018 8:39:20 AM (6 years ago)

Author:

wojciech

Branches:

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

Children:

4fbf0db

Parents:

e2451f2

Message:

Fix to disable 2D data in P(r) calculations

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -459 +459 @@
             # Create initial internal mappings
             self.logic.data = GuiUtils.dataFromItem(data)
+            if not isinstance(self.logic.data, Data1D):
+                msg = "P(r) perspective works for 1D data only"
+                logger.warning(msg)
+                continue
             # Estimate q range
             qmin, qmax = self.logic.computeDataRange()
@@ -468 +472 @@
             self.populateDataComboBox(self.logic.data.filename, data)
         self.dataList.setCurrentIndex(len(self.dataList) - 1)
-        self.setCurrentData(data)
+        #Checking for 1D again to mitigate the case when 2D data is last on the data list
+        if isinstance(self.logic.data, Data1D):
+            self.setCurrentData(data)
 
     def updateDataList(self, dataRef):