Changeset 72f4834 in sasview

Timestamp:

Jun 16, 2017 4:22:23 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:

85487ebd

Parents:

b0c5e8c

Message:

Code review changes SASVIEW-597

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• Perspectives/Fitting/FittingOptions.py (modified) (4 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Perspectives/Fitting/UI/FittingOptionsUI.ui (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingOptionsTest.py (modified) (1 diff)

src/sas/qtgui/GUITests.py

@@ -45 +45 @@
 from Perspectives.Fitting.UnitTesting import FittingUtilitiesTest
 from Perspectives.Fitting.UnitTesting import FitPageTest
+from Perspectives.Fitting.UnitTesting import FittingOptionsTest
 
 
@@ -90 +91 @@
         unittest.makeSuite(FittingUtilitiesTest.FittingUtilitiesTest,     'test'),
         unittest.makeSuite(FitPageTest.FitPageTest,                       'test'),
+        unittest.makeSuite(FittingOptionsTest.FittingOptionsTest,         'test'),
     )
     return unittest.TestSuite(suites)

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

@@ -19 +19 @@
 # Set the default optimizer
 fitters.FIT_DEFAULT_ID = 'lm'
+
 
 class FittingOptions(QtGui.QDialog, Ui_FittingOptions):
@@ -66 +67 @@
         self.assignValidators()
 
+        # Set defaults
         self.current_fitter_id = fitters.FIT_DEFAULT_ID
+
+        # OK has to be initialized to True, after initial validator setup
+        self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True)
 
         # Display HTML content
@@ -80 +85 @@
             if type(f_type) == types.FunctionType:
                 validator = QtGui.QIntValidator()
+                validator.setBottom(0)
             elif f_type == types.FloatType:
                 validator = QtGui.QDoubleValidator()
+                validator.setBottom(0)
             else:
                 continue
@@ -88 +95 @@
                 if hasattr(line_edit, 'setValidator') and validator is not None:
                     line_edit.setValidator(validator)
+                    line_edit.textChanged.connect(self.check_state)
+                    line_edit.textChanged.emit(line_edit.text())
+
+    def check_state(self, *args, **kwargs):
+        sender = self.sender()
+        validator = sender.validator()
+        state = validator.validate(sender.text(), 0)[0]
+        if state == QtGui.QValidator.Acceptable:
+            color = '' # default
+            self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True)
+        else:
+            color = '#fff79a' # yellow
+            self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(False)
+
+        sender.setStyleSheet('QLineEdit { background-color: %s }' % color)
 
     def onAlgorithmChange(self, index):

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

@@ -1363 +1363 @@
         """
         datafile = QtGui.QFileDialog.getOpenFileName(
-            self, "Choose a weight file", "", "All files (*.*)")
-        if not datafile:
+            self, "Choose a weight file", "", "All files (*.*)",
+            None, QtGui.QFileDialog.DontUseNativeDialog)
+
+        if datafile is None:
             logging.info("No weight data chosen.")
             raise IOError
+
         values = []
         weights = []

src/sas/qtgui/Perspectives/Fitting/UI/FittingOptionsUI.ui

@@ -116 +116 @@
                <item>
                 <property name="text">
-                 <string>radom</string>
+                 <string>random</string>
                 </property>
                </item>

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -61 +61 @@
         self.assertIsInstance(self.widget.ftol_de.validator(), QtGui.QDoubleValidator)
         self.assertIsInstance(self.widget.xtol_de.validator(), QtGui.QDoubleValidator)
+
+        # bottom value for floats and ints
+        self.assertEqual(self.widget.steps_de.validator().bottom(), 0)
+        self.assertEqual(self.widget.CR_de.validator().bottom(), 0)
+
+        # Behaviour on empty cell
+        self.widget.onAlgorithmChange(3)
+        self.widget.steps_de.setText("")
+        # This should disable the OK button
+        self.assertFalse(self.widget.buttonBox.button(QtGui.QDialogButtonBox.Ok).isEnabled())
+        # Let's put some valid value in lineedit
+        self.widget.steps_de.setText("1")
+        # This should enable the OK button
+        self.assertTrue(self.widget.buttonBox.button(QtGui.QDialogButtonBox.Ok).isEnabled())
 
     def testOnAlgorithmChange(self):