Changes in src/sas/qtgui/Utilities/GridPanel.py [4fbf0db:aed0532] in sasview

File:

• src/sas/qtgui/Utilities/GridPanel.py (modified) (2 diffs)

src/sas/qtgui/Utilities/GridPanel.py

@@ -54 +54 @@
         # Fill in the table from input data
         self.setupTable(widget=self.tblParams, data=output_data)
-        #TODO: This is not what was inteded to be.
         if output_data is not None:
             # Set a table tooltip describing the model
-            model_name = list(output_data.keys())[0]
+            model_name = output_data[0][0].model.id
             self.tabWidget.setTabToolTip(0, model_name)
 
@@ -411 +410 @@
             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._parent, output_data)
-        _translate = QtCore.QCoreApplication.translate
-        self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results"))
-
-    def setupTable(self, widget=None,  data=None):
-        """
-        Create tablewidget items and show them, based on params
-        """
-        # headers
-        param_list = ['Filename', 'Rg [Ã
-]', 'Chi^2/dof', 'I(Q=0)', 'Oscillations',
-                      'Background [Ã
-^-1]', 'P+ Fraction', 'P+1-theta Fraction',
-                      'Calc. Time [sec]']
-
-        if data is None:
-            return
-        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
-            if out is None:
-                logging.warning("P(r) for {} did not converge.".format(filename))
-                continue
-            self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem(
-                "{}".format(filename)))
-            self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
-                "{:.3g}".format(pr.rg(out))))
-            self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem(
-                "{:.3g}".format(pr.chi2[0])))
-            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, 5, QtWidgets.QTableWidgetItem(
-                "{:.3g}".format(pr.background)))
-            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))))
-            self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(
-                "{:.2g}".format(pr.elapsed)))
-
-        self.tblParams.resizeColumnsToContents()
-
-    @classmethod
-    def onHelp(cls):
-        """
-        Open a local url in the default browser
-        """
-        location = GuiUtils.HELP_DIRECTORY_LOCATION
-        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-pr-mode"
-        try:
-            webbrowser.open('file://' + os.path.realpath(location + url))
-        except webbrowser.Error as ex:
-            logging.warning("Cannot display help. %s" % ex)
-
-    def closeEvent(self, event):
-        """Tell the parent window the window closed"""
-        self.parent.batchResultsWindow = None
-        event.accept()