Changes in src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py [f4480f0:b0ba43e] in sasview

File:

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

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

@@ -8 +8 @@
 
 # global
-import sys
-import os
 import logging
 import numpy as np
@@ -42 +40 @@
         super(DmaxWindow, self).__init__()
         self.setupUi(self)
+        self.parent = parent
 
         self.setWindowTitle("Dₐₓ Explorer")
@@ -50 +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()
 
@@ -82 +81 @@
 
     def setupModel(self):
+        self.model.blockSignals(True)
         self.model.setItem(W.NPTS, QtGui.QStandardItem(str(self.nfunc)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.DMIN, QtGui.QStandardItem("{:.1f}".format(0.9*self.pr_state.d_max)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.DMAX, QtGui.QStandardItem("{:.1f}".format(1.1*self.pr_state.d_max)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.VARIABLE, QtGui.QStandardItem( "χ²/dof"))
+        self.model.blockSignals(False)
 
     def setupMapper(self):
-        self.mapper = QtWidgets.QDataWidgetMapper(self)
         self.mapper.setOrientation(QtCore.Qt.Vertical)
         self.mapper.setModel(self.model)
@@ -111 +117 @@
         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
@@ -132 +144 @@
                 msg = "ExploreDialog: inversion failed "
                 msg += "for D_max=%s\n%s" % (str(x), ex)
-                print(msg)
                 logger.error(msg)
 
@@ -142 +153 @@
             msg = "ExploreDialog: inversion failed "
             msg += "for D_max=%s\n%s" % (str(x), ex)
-            print(msg)
             logger.error(msg)
 
@@ -151 +161 @@
         if plotter == "χ²/dof":
             ys = chi2
-            y_label = "\chi^2/dof"
+            y_label = "\\chi^2/dof"
             y_unit = "a.u."
         elif plotter == "I(Q=0)":
             ys = iq0
             y_label = "I(q=0)"
-            y_unit = "\AA^{-1}"
+            y_unit = "\\AA^{-1}"
         elif plotter == "Rg":
             ys = rg
             y_label = "R_g"
-            y_unit = "\AA"
+            y_unit = "\\AA"
         elif plotter == "Oscillation parameter":
             ys = osc
@@ -168 +178 @@
             ys = bck
             y_label = "Bckg"
-            y_unit = "\AA^{-1}"
+            y_unit = "\\AA^{-1}"
         elif plotter == "Positive Fraction":
             ys = pos
@@ -175 +185 @@
         else:
             ys = pos_err
-            y_label = "P^{+}_{1\sigma}"
+            y_label = "P^{+}_{1\\sigma}"
             y_unit = "a.u."
 
@@ -188 +198 @@
         data._yunit = y_unit
         self.plot.plot(data=data, marker="-")
+
+    def closeEvent(self, event):
+        """Override close event"""
+        self.parent.dmaxWindow = None
+        event.accept()