Changeset 76567bb in sasview for src/sas/qtgui/Perspectives

Timestamp:

Apr 13, 2018 4:00:37 PM (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:

b9e89d5

Parents:

effdd98

Message:

Improvements to batch P(r).

File:

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

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

@@ -34 +34 @@
 
 
+# TODO: Use communicator to catch data deletions
 # TODO: Update help with batch capabilities
-# TODO: Method to export results in some meaningful way
 class InversionWindow(QtWidgets.QDialog, Ui_PrInversion):
     """
@@ -381 +381 @@
 
     def showBatchOutput(self, output_data):
+        """
+        Display the batch output in tabular form
+        :param output_data: Dictionary mapping filename -> P(r) instance
+        """
         if self.grid_window is None:
             self.grid_window = BatchInversionOutputPanel(
                 parent=self, output_data=output_data)
+        else:
+            self.grid_window.setupTable(output_data)
         self.grid_window.show()
 
@@ -499 +505 @@
             self.dmaxWindow.close()
             self.dmaxWindow = None
-        current_data = self._data
+        self._data_list.pop(self._data)
+        self._data = None
         self.dataList.removeItem(self.dataList.currentIndex())
-        self._data_list.pop(current_data)
         # Last file removed
         if len(self._data_list) == 0:
@@ -527 +533 @@
         for data_ref in self._data_list.keys():
             self.setCurrentData(data_ref)
+            self.performEstimate()
+            self.performEstimateNT()
+            self.acceptAlpha()
+            self.acceptNoTerms()
             self.startThread()
             output[self.logic.data.filename] = self._calculator
@@ -581 +591 @@
         self.estimation_thread_nt.queue()
         self.estimation_thread_nt.ready(2.5)
+        if self.waitForEach:
+            if self.estimation_thread_nt.isrunning():
+                self.estimation_thread_nt.update()
 
     def performEstimate(self):
@@ -599 +612 @@
         self.estimation_thread.queue()
         self.estimation_thread.ready(2.5)
+        if self.waitForEach:
+            if self.estimation_thread.isrunning():
+                self.estimation_thread.update()
 
     ######################################################################
@@ -618 +634 @@
         if message:
             logging.info(message)
-        self.performEstimateNT()
+        if not self.waitForEach:
+            self.performEstimateNT()
 
     def _estimateNTCompleted(self, nterms, alpha, message, elapsed):