Changeset 6da3e3d in sasview for src/sas/qtgui/Utilities

Timestamp:

Sep 6, 2018 3:27:00 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f84d793, 47471ec

Parents:

0eff615 (diff), 605d944 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/Utilities

Files:

• AddMultEditor.py (modified) (2 diffs)
• GuiUtils.py (modified) (2 diffs)
• LocalConfig.py (modified) (1 diff)
• ReportDialog.py (modified) (2 diffs)
• UnitTesting/ReportDialogTest.py (modified) (1 diff)

src/sas/qtgui/Utilities/AddMultEditor.py

@@ -15 +15 @@
 import re
 import logging
+import traceback
+
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sasmodels.sasview_model import load_standard_models
@@ -202 +204 @@
                                      self.cbOperator.currentText())
 
-        success = GuiUtils.checkModel(self.plugin_filename)
+        try:
+            success = GuiUtils.checkModel(self.plugin_filename)
+        except Exception as ex:
+            # broad exception from sasmodels
+            msg = "Error building model: "+ str(ex)
+            logging.error(msg)
+            #print three last lines of the stack trace
+            # this will point out the exact line failing
+            last_lines = traceback.format_exc().split('\n')[-4:]
+            traceback_to_show = '\n'.join(last_lines)
+            logging.error(traceback_to_show)
+
+            # Set the status bar message
+            self.parent.communicate.statusBarUpdateSignal.emit("Model check failed")
+            return
 
         if not success:

src/sas/qtgui/Utilities/GuiUtils.py

@@ -35 +35 @@
         HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
 IMAGES_DIRECTORY_LOCATION = HELP_DIRECTORY_LOCATION + "/_images"
+
+# This matches the ID of a plot created using FittingLogic._create1DPlot, e.g.
+# "5 [P(Q)] modelname"
+# or
+# "4 modelname".
+# Useful for determining whether the plot in question is for an intermediate result, such as P(Q) or S(Q) in the
+# case of a product model; the identifier for this is held in square brackets, as in the example above.
+theory_plot_ID_pattern = re.compile(r"^([0-9]+)\s+(\[(.*)\]\s+)?(.*)$")
 
 def get_app_dir():
@@ -211 +219 @@
     # New theory data in current perspective
     updateTheoryFromPerspectiveSignal = QtCore.pyqtSignal(QtGui.QStandardItem)
+
+    # Request to delete plots (in the theory view) related to a given model ID
+    deleteIntermediateTheoryPlotsSignal = QtCore.pyqtSignal(str)
 
     # New plot requested from the GUI manager

src/sas/qtgui/Utilities/LocalConfig.py

@@ -134 +134 @@
 
 # Default threading model
-USING_TWISTED = True
+USING_TWISTED = False
 
 # Time out for updating sasview

src/sas/qtgui/Utilities/ReportDialog.py

@@ -73 +73 @@
         # Use a sensible filename default
         default_name = os.path.join(location, 'fit_report.pdf')
+
         kwargs = {
             'parent'   : self,
             'caption'  : 'Save Report',
-            'directory': default_name,
+            # don't use 'directory' in order to remember the previous user choice
+            #'directory': default_name,
             'filter'   : 'PDF file (*.pdf);;HTML file (*.html);;Text file (*.txt)',
             'options'  : QtWidgets.QFileDialog.DontUseNativeDialog}
@@ -99 +101 @@
 
         # Create files with charts
-        pictures = self.getPictures(basename)
+        pictures = []
+        if self.data_images is not None:
+            pictures = self.getPictures(basename)
 
         # self.data_html contains all images at the end of the report, in base64 form;

src/sas/qtgui/Utilities/UnitTesting/ReportDialogTest.py

@@ -158 +158 @@
 
         self.assertTrue(logging.error.called)
-        logging.error.assert_called_with("Error creating pdf: Failed")
+        #logging.error.assert_called_with("Error creating pdf")