Changeset 287d356 in sasview for src

Timestamp:

Sep 4, 2018 10:58:12 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

d738feb

Parents:

e3df84e

Message:

Don't wantonly cast parameter names into lower case. SASVIEW-1016

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Utilities/AddMultEditor.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -1136 +1136 @@
         model_row = item.row()
         name_index = self._poly_model.index(model_row, 0)
-        parameter_name = str(name_index.data()).lower() # "distribution of sld" etc.
-        if "distribution of" in parameter_name:
+        parameter_name = str(name_index.data()) # "distribution of sld" etc.
+        if "istribution of" in parameter_name:
             # just the last word
             parameter_name = parameter_name.rsplit()[-1]

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: