Changeset 26f42b1 in sasview

Timestamp:

Oct 28, 2017 11:15:26 AM (7 years ago)

Author:

krzywon

Branches:

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

dfd8233

Parents:

d132f33

Message:

Multiple data sets loading into P(r) and able to calculate them all, but not cleanly.

File:

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

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

@@ -252 +252 @@
             self.explorerButton.setEnabled(False)
 
-    def populateDataComboBox(self, filename):
+    def populateDataComboBox(self, filename, data_ref):
         """
         Append a new file name to the data combobox
@@ -258 +258 @@
         """
         qt_item = QtCore.QString.fromUtf8(filename)
-        self.dataList.addItem(qt_item)
+        ref = QtCore.QVariant(data_ref)
+        self.dataList.addItem(qt_item, ref)
 
     def acceptNoTerms(self):
@@ -271 +272 @@
 
     def displayChange(self):
-        data_name = str(self.dataList.currentText())
-        # TODO: Find data ref based on file name
-        # TODO: Find way to link standardmodelitem with combobox entry
+        variant_ref = self.currentWidget()
+        self.setCurrentData(variant_ref.toPyObject()[0])
 
     ######################################################################
@@ -356 +356 @@
             raise AttributeError, msg
 
-        if not isinstance(data_item[0], QtGui.QStandardItem):
+        for data in data_item:
+            self.setCurrentData(data)
+
+    def setCurrentData(self, data_ref):
+        """Set an individual data set to the current data"""
+
+        if not isinstance(data_ref, QtGui.QStandardItem):
             msg = "Incorrect type passed to the P(r) Perspective"
             raise AttributeError, msg
 
-        for data in data_item:
-            # Data references
-            self._data = data
-            self._data_set = GuiUtils.dataFromItem(data)
-            self.populateDataComboBox(self._data_set.filename)
-            self._data_list[self._data] = self._calculator
-
-            # Estimate initial values from data
-            self.performEstimate()
-            self.logic = InversionLogic(self._data_set)
-
-            # Estimate q range
-            qmin, qmax = self.logic.computeDataRange()
-            self.model.setItem(WIDGETS.W_QMIN, QtGui.QStandardItem(
-                "{:.4g}".format(qmin)))
-            self.model.setItem(WIDGETS.W_QMAX, QtGui.QStandardItem(
-                "{:.4g}".format(qmax)))
-
-            self.enableButtons()
+        # Data references
+        self._data = data_ref
+        self._data_set = GuiUtils.dataFromItem(data_ref)
+        ref = QtCore.QVariant(self._data)
+        self.populateDataComboBox(self._data_set.filename, ref)
+        self._data_list[self._data] = self._calculator
+
+        # Estimate initial values from data
+        self.performEstimate()
+        self.logic = InversionLogic(self._data_set)
+
+        # Estimate q range
+        qmin, qmax = self.logic.computeDataRange()
+        self.model.setItem(WIDGETS.W_QMIN, QtGui.QStandardItem(
+            "{:.4g}".format(qmin)))
+        self.model.setItem(WIDGETS.W_QMAX, QtGui.QStandardItem(
+            "{:.4g}".format(qmax)))
+
+        self.enableButtons()
 
     ######################################################################