Changeset d132f33 in sasview

Timestamp:

Oct 28, 2017 10:44:29 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:

fca1f50, 26f42b1

Parents:

57ad773

Message:

Start of P(r) batch capability work.

File:

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

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

@@ -64 +64 @@
         self._data_index = 0
         # list mapping data to p(r) calculation
-        self._data_list = []
+        self._data_list = {}
         if not isinstance(data, list):
-            data = [data]
-        for datum in data:
-            self._data_list.append({datum: self._calculator.clone()})
+            data_list = [data]
+        if data is not None:
+            for datum in data_list:
+                self._data_list[datum] = self._calculator.clone()
 
         # plots
@@ -90 +91 @@
 
     def allowBatch(self):
-        return False
+        return True
 
     def setClosable(self, value=True):
@@ -118 +119 @@
         """Connect the use controls to their appropriate methods"""
         self.enableButtons()
-        # TODO: enable the drop down box once batch is working
-        self.dataList.setEnabled(False)
-        # TODO: enable displayChange once batch is working
-        # self.dataList.currentIndexChanged.connect(self.displayChange)
+        self.dataList.currentIndexChanged.connect(self.displayChange)
         self.calculateButton.clicked.connect(self._calculation)
         self.helpButton.clicked.connect(self.help)
@@ -272 +270 @@
             self.regConstantSuggestionButton.text()))
 
+    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
+
     ######################################################################
     # GUI Interaction Events
@@ -285 +288 @@
         Calculate the P(r) for every data set in the data list
         """
-        # Set data before running the calculations
-        self.update_calculator()
-        # Run
-        self.startThread()
+        for data_ref, pr in self._data_list.items():
+            self._data_set = GuiUtils.dataFromItem(data_ref)
+            self._calculator = pr
+            # Set data before running the calculations
+            self.update_calculator()
+            # Run
+            self.startThread()
 
     def model_changed(self):
@@ -355 +361 @@
 
         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
@@ -363 +371 @@
             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)))
@@ -371 +379 @@
 
             self.enableButtons()
-
-            # TODO: Only load 1st data until batch mode working. Thus, break
-            break
 
     ######################################################################
@@ -527 +532 @@
         self._calculator = pr
         # Append data to data list
-        self._data_list.append({self._data: pr})
+        self._data_list[self._data] = self._calculator.clone()
 
         if self.pr_plot is None: