Changeset 3e314e6 in sasview

Timestamp:

Sep 27, 2018 7:57:05 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

bd39d6c

Parents:

b6f47be

Message:

Minor fixes to the Kiessig calculator. SASVIEW-1161

Location:

src/sas/qtgui/Calculators

Files:

• KiessigPanel.py (modified) (1 diff)
• UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff)
• UnitTesting/KiessigCalculatorTest.py (modified) (2 diffs)

src/sas/qtgui/Calculators/KiessigPanel.py

@@ -21 +21 @@
         self.thickness = KiessigThicknessCalculator()
 
-        self.deltaq_in.setText("0.05")
+        rx = QtCore.QRegExp("[+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?")
+        self.deltaq_in.setValidator(QtGui.QRegExpValidator(rx, self.deltaq_in))
 
         # signals
         self.helpButton.clicked.connect(self.onHelp)
-        self.computeButton.clicked.connect(self.onCompute)
+        self.computeButton.setVisible(False)
         self.closeButton.clicked.connect(self.onClose)
+        self.deltaq_in.textChanged.connect(self.onCompute)
+        self.deltaq_in.setText("0.05")
 
         # no reason to have this widget resizable

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -253 +253 @@
         # TODO to be changed
         self.assertEqual(self.widget.txtData.text(), 'diamdsml.pdb')
-        self.assertEqual(self.widget.txtTotalVolume.text(), '170.950584161')
+        self.assertAlmostEqual(float(self.widget.txtTotalVolume.text()), 170.95058, 5)
         self.assertEqual(self.widget.txtNoPixels.text(), '18')
 

src/sas/qtgui/Calculators/UnitTesting/KiessigCalculatorTest.py

@@ -75 +75 @@
     def testComplexEntryLetters(self):
         """ User entered compound calculations and subsequent reset"""
-
+        self.widget.deltaq_in.clear()
         self.widget.deltaq_in.insert("xyz")
 
@@ -81 +81 @@
         computeButton = self.widget.computeButton
         QTest.mouseClick(computeButton, Qt.LeftButton)
+        self.assertEqual(self.widget.deltaq_in.text(), '')
         self.assertEqual(self.widget.lengthscale_out.text(), '')