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

Timestamp:

May 1, 2018 11:51:06 AM (6 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:

72ecbdf2

Parents:

6bd0d81

Message:

Responding to P(r) code review.

File:

• src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py (modified) (6 diffs)

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

@@ -8 +8 @@
 
 # global
-import sys
-import os
 import logging
 import numpy as np
@@ -51 +49 @@
 
         self.plot = PlotterWidget(self, self)
-        self.hasPlot = None
+        self.hasPlot = False
         self.verticalLayout.insertWidget(0, self.plot)
 
         # Let's choose the Standard Item Model.
         self.model = QtGui.QStandardItemModel(self)
-        self.mapper = None
+        self.mapper = QtWidgets.QDataWidgetMapper(self)
 
         # Add validators on line edits
         self.setupValidators()
 
-        # # Connect buttons to slots.
-        # # Needs to be done early so default values propagate properly.
+        # Connect buttons to slots.
+        # Needs to be done early so default values propagate properly.
         self.setupSlots()
 
@@ -89 +87 @@
 
     def setupMapper(self):
-        self.mapper = QtWidgets.QDataWidgetMapper(self)
         self.mapper.setOrientation(QtCore.Qt.Vertical)
         self.mapper.setModel(self.model)
@@ -112 +109 @@
         chi2 = []
 
-        xs = np.linspace(float(self.model.item(W.DMIN).text()),
-                         float(self.model.item(W.DMAX).text()),
-                         float(self.model.item(W.NPTS).text()))
+        try:
+            dmin = float(self.model.item(W.DMIN).text())
+            dmax = float(self.model.item(W.DMAX).text())
+            npts = float(self.model.item(W.NPTS).text())
+            xs = np.linspace(dmin, dmax, npts)
+        except ValueError as e:
+            msg = ("An input value is not correctly formatted. Please check {}"
+                   .format(e.message))
+            logger.error(msg)
 
         original = self.pr_state.d_max
@@ -133 +136 @@
                 msg = "ExploreDialog: inversion failed "
                 msg += "for D_max=%s\n%s" % (str(x), ex)
-                print(msg)
                 logger.error(msg)
 
@@ -143 +145 @@
             msg = "ExploreDialog: inversion failed "
             msg += "for D_max=%s\n%s" % (str(x), ex)
-            print(msg)
             logger.error(msg)