Changeset 6a3e1fe in sasview for src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py

Timestamp:

Nov 17, 2017 8:59:52 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

0261bc1

Parents:

84df556

Message:

Implemented hash method for certain QStandardItem objects, allowing them to be used as dict keys. SASVIEW-806
Minor inversion perspective fixes. SASVIEW-338

File:

• src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py (modified) (3 diffs, 1 prop)

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

@@ -24 +24 @@
 
 # local
-from .UI.dmax import Ui_DmaxExplorer
-# from InvariantDetails import DetailsDialog
-# from InvariantUtils import WIDGETS
+from .UI.DMaxExplorer import Ui_DmaxExplorer
 
 logger = logging.getLogger(__name__)
@@ -78 +76 @@
     def setupModel(self):
         self.model.setItem(W.NPTS, QtGui.QStandardItem(str(self.nfunc)))
-        self.model.setItem(W.DMIN,
-                           QtGui.QStandardItem(
-                               str(0.9*self.pr_state.d_max)))
-        self.model.setItem(W.DMAX,
-                           QtGui.QStandardItem(
-                               str(1.1*self.pr_state.d_max)))
-        self.model.setItem(W.VARIABLE,
-                           QtGui.QStandardItem( "χ²/dof"))
+        self.model.setItem(W.DMIN, QtGui.QStandardItem(str(0.9*self.pr_state.d_max)))
+        self.model.setItem(W.DMAX, QtGui.QStandardItem(str(1.1*self.pr_state.d_max)))
+        self.model.setItem(W.VARIABLE, QtGui.QStandardItem( "χ²/dof"))
 
     def setupMapper(self):
@@ -133 +126 @@
                 msg += "for D_max=%s\n%s" % (str(x), sys.exc_info()[1])
                 print(msg)
-                # logger.error(msg)
+                logger.error(msg)
 
         #Return the invertor to its original state
         self.pr_state.d_max = original
-        self.pr_state.invert(self.nfunc)
+        try:
+            self.pr_state.invert(self.nfunc)
+        except RuntimeError as ex:
+            msg = "ExploreDialog: inversion failed "
+            msg += "for D_max=%s\n%s" % (str(x), sys.exc_info()[1])
+            print(msg)
+            logger.error(msg)
 
         plotter = str(self.model.item(W.VARIABLE).text())