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

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/Utilities/GridPanel.py (modified) (3 diffs)

src/sas/qtgui/Utilities/GridPanel.py

@@ -295 +295 @@
         """
         # 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', ]
+        param_list = ['Filename', 'Rg [Ã
+]', 'χ^2/dof', 'I(Q=0)', 'Oscillations',
+                      'Background [Ã
+^-1]', 'P+ Fraction', 'P+1-σ Fraction',
+                      'Calc. Time [sec]']
 
         keys = data.keys()
@@ -314 +314 @@
             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(
-                GuiUtils.formatNumber(filename, high=True)))
+                "{}".format(filename)))
             self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.chi2[0])))
@@ -322 +325 @@
             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.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))))
 
         self.tblParams.resizeColumnsToContents()
+
+    @classmethod
+    def onHelp(cls):
+        """
+        Open a local url in the default browser
+        """
+        # TODO: Add anchor to batch fitting help when written
+        location = GuiUtils.HELP_DIRECTORY_LOCATION
+        url = "/user/sasgui/perspectives/pr/pr_help.html"
+        try:
+            webbrowser.open('file://' + os.path.realpath(location + url))
+        except webbrowser.Error as ex:
+            logging.warning("Cannot display help. %s" % ex)