Changeset effdd98 in sasview for src/sas

Timestamp:

Apr 10, 2018 1:53:59 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:

76567bb

Parents:

bb6b037

Message:

First vestiges of the batch inversion results panel built off of the batch fit panel.

Location:

src/sas/qtgui

Files:

• Perspectives/Inversion/InversionPerspective.py (modified) (7 diffs)
• Utilities/GridPanel.py (modified) (1 diff)

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

@@ -16 +16 @@
 # pr inversion calculation elements
 from sas.sascalc.pr.invertor import Invertor
+
+# Batch calculation display
+from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel
 
 def is_float(value):
@@ -73 +76 @@
 
         # Calculation threads used by all data items
+        self.waitForEach = False
         self.calc_thread = None
         self.estimation_thread = None
@@ -90 +94 @@
         self.model = QtGui.QStandardItemModel(self)
         self.mapper = QtWidgets.QDataWidgetMapper(self)
+
+        self.grid_window = None
 
         # Add validators
@@ -374 +380 @@
         self.dmaxWindow.show()
 
+    def showBatchOutput(self, output_data):
+        if self.grid_window is None:
+            self.grid_window = BatchInversionOutputPanel(
+                parent=self, output_data=output_data)
+        self.grid_window.show()
+
     ######################################################################
     # Response Actions
@@ -451 +463 @@
                            QtGui.QStandardItem("{:.4g}".format(pr.get_qmax())))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT,
-                           QtGui.QStandardItem("{:.3f}".format(pr.background)))
+                           QtGui.QStandardItem("{:.3g}".format(pr.background)))
         self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT,
                            QtGui.QStandardItem("{:.3g}".format(pr.background)))
@@ -511 +523 @@
     # Thread Creators
     def startThreadAll(self):
+        self.waitForEach = True
+        output = {}
         for data_ref in self._data_list.keys():
             self.setCurrentData(data_ref)
             self.startThread()
+            output[self.logic.data.filename] = self._calculator
+        self.waitForEach = False
+        self.showBatchOutput(output)
 
     def startThread(self):
@@ -535 +552 @@
         self.calc_thread.queue()
         self.calc_thread.ready(2.5)
+        if self.waitForEach:
+            if self.calc_thread.isrunning():
+                self.calc_thread.update()
 
     def performEstimateNT(self):

src/sas/qtgui/Utilities/GridPanel.py

@@ -280 +280 @@
             index += 1
 
+
+class BatchInversionOutputPanel(BatchOutputPanel):
+    """
+        Class for stateless grid-like printout of P(r) parameters for any number
+        of data sets
+    """
+    def __init__(self, parent = None, output_data=None):
+
+        super(BatchInversionOutputPanel, self).__init__(parent, output_data)
+
+    def setupTable(self, data):
+        """
+        Create tablewidget items and show them, based on params
+        """
+        # headers
+        param_list = ['Filename', 'Rg', 'Chi^2/dof', 'I(Q=0)', 'Oscillations',
+                      'Background', 'P+ Fraction', 'P+1-theta Fraction',
+                      'Calculation Time']
+        # P(r) keys
+        pr_keys = ['background', ]
+
+        keys = data.keys()
+        rows = len(keys)
+        columns = len(param_list)
+        self.tblParams.setColumnCount(columns)
+        self.tblParams.setRowCount(rows)
+
+        for i, param in enumerate(param_list):
+            self.tblParams.setHorizontalHeaderItem(i, QtWidgets.QTableWidgetItem(param))
+
+        # first - Chi2 and data filename
+        for i_row, (filename, pr) in enumerate(data.items()):
+            out = pr.out
+            cov = pr.cov
+            self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem(
+                GuiUtils.formatNumber(filename, high=True)))
+            self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem(
+                "{:.3g}".format(pr.chi2[0])))
+            self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem(
+                "{:.3g}".format(pr.background)))
+            self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(
+                "{:.2g}".format(pr.elapsed)))
+            if out is not None:
+                self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
+                    "{:.3g}".format(pr.rg(out))))
+                self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem(
+                    "{:.3g}".format(pr.iq0(out))))
+                self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem(
+                    "{:.3g}".format(pr.oscillations(out))))
+                self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem(
+                    "{:.3g}".format(pr.get_positive(out))))
+                self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem(
+                    "{:.3g}".format(pr.get_pos_err(out, cov))))
+            else:
+                self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
+                    "NaN"))
+                self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem(
+                    "NaN"))
+                self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem(
+                    "NaN"))
+                self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem(
+                    "NaN"))
+                self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem(
+                    "NaN"))
+
+        self.tblParams.resizeColumnsToContents()