Changeset e4676c8 in sasview

Timestamp:

Nov 3, 2016 6:07:10 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:

ca8b853

Parents:

f140169

Message:

Added SLDCalculator unit tests. Refactored things a bit.

Location:

src/sas/qtgui

Files:

• DensityPanel.py (modified) (2 diffs)
• GuiUtils.py (modified) (2 diffs, 1 prop)
• SldPanel.py (modified) (2 diffs)
• UnitTesting/DensityCalculatorTest.py (modified) (2 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (1 diff)
• UnitTesting/SLDCalculatorTest.py (added)

src/sas/qtgui/DensityPanel.py

@@ -2 +2 @@
 import logging
 import functools
+from PyQt4 import QtGui, QtCore
 
 from periodictable import formula as Formula
 
-from PyQt4 import QtGui, QtCore
+from GuiUtils import FormulaValidator
 
 # Local UI
@@ -34 +35 @@
     except:
         return ""
-
-
-class FormulaValidator(QtGui.QValidator):
-    def __init__(self, parent=None):
-        super(FormulaValidator, self).__init__(parent)
-  
-    def validate(self, input, pos):
-        try:
-            Formula(str(input))
-            self._setStyleSheet("")
-            return QtGui.QValidator.Acceptable, pos
-
-        except Exception as e:
-            self._setStyleSheet("background-color:pink;")
-            return QtGui.QValidator.Intermediate, pos
-
-    def _setStyleSheet(self, value):
-        try:
-            if self.parent():
-                self.parent().setStyleSheet(value)
-        except:
-            pass
 
 

src/sas/qtgui/GuiUtils.py

@@ -25 +25 @@
 #from sas.sasgui.guiframe.events import StatusEvent
 #from sas.sasgui.guiframe.events import NewPlotEvent
+
+from periodictable import formula as Formula
 
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -535 +537 @@
     if os.path.splitext(filename)[1].lower() == ext_format:
         loader.save(filename, data, ext_format)
+
+class FormulaValidator(QtGui.QValidator):
+    def __init__(self, parent=None):
+        super(FormulaValidator, self).__init__(parent)
+  
+    def validate(self, input, pos):
+        try:
+            Formula(str(input))
+            self._setStyleSheet("")
+            return QtGui.QValidator.Acceptable, pos
+
+        except Exception as e:
+            self._setStyleSheet("background-color:pink;")
+            return QtGui.QValidator.Intermediate, pos
+
+    def _setStyleSheet(self, value):
+        try:
+            if self.parent():
+                self.parent().setStyleSheet(value)
+        except:
+            pass

src/sas/qtgui/SldPanel.py

@@ -1 +1 @@
 # global
 import logging
+from PyQt4 import QtGui, QtCore
+
 from periodictable import formula as Formula
 from periodictable.xsf import xray_energy, xray_sld_from_atoms
 from periodictable.nsf import neutron_scattering
 
-from PyQt4 import QtGui, QtCore
+from GuiUtils import FormulaValidator
 
 # Local UI
@@ -93 +95 @@
 
 
-class FormulaValidator(QtGui.QValidator):
-    def __init__(self, parent=None):
-        super(FormulaValidator, self).__init__(parent)
-  
-    def validate(self, input, pos):
-        try:
-            Formula(str(input))
-            self._setStyleSheet("")
-            return QtGui.QValidator.Acceptable, pos
-
-        except Exception as e:
-            self._setStyleSheet("background-color:pink;")
-            return QtGui.QValidator.Intermediate, pos
-
-    def _setStyleSheet(self, value):
-        try:
-            if self.parent():
-                self.parent().setStyleSheet(value)
-        except:
-            pass
-
-
 class SldPanel(QtGui.QDialog):
 

src/sas/qtgui/UnitTesting/DensityCalculatorTest.py

@@ -15 +15 @@
 from DensityPanel import DensityPanel
 from DensityPanel import toMolarMass
-from DensityPanel import FormulaValidator
+from GuiUtils import FormulaValidator
 
 import LocalConfig
@@ -37 +37 @@
     def testBadInputStr(self):
         self.assertEqual(toMolarMass("Im a bad string"), "")
-
-class FormulaValidatorTest(unittest.TestCase):
-    """ Test the formula validator """
-    def setUp(self):
-        '''Create the validator'''
-        self.validator = FormulaValidator()
-
-    def tearDown(self):
-        '''Destroy the validator'''
-        self.validator = None
-
-    def testValidateGood(self):
-        """Test a valid Formula """
-        formula_good = "H24O12C4C6N2Pu"
-        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
-
-        formula_good = "(H2O)0.5(D2O)0.5"
-        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
-
-    def testValidateBad(self):
-        """Test a valid Formula """
-        formula_bad = "H24 %%%O12C4C6N2Pu"
-        self.assertRaises(self.validator.validate(formula_bad, 1)[0])
-        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
-
-        formula_bad = [1]
-        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
 
 class DensityCalculatorTest(unittest.TestCase):

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -324 +324 @@
         self.assertFalse(os.path.isfile(file_name))
 
+class FormulaValidatorTest(unittest.TestCase):
+    """ Test the formula validator """
+    def setUp(self):
+        '''Create the validator'''
+        self.validator = FormulaValidator()
+
+    def tearDown(self):
+        '''Destroy the validator'''
+        self.validator = None
+
+    def testValidateGood(self):
+        """Test a valid Formula """
+        formula_good = "H24O12C4C6N2Pu"
+        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
+
+        formula_good = "(H2O)0.5(D2O)0.5"
+        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
+
+    def testValidateBad(self):
+        """Test a valid Formula """
+        formula_bad = "H24 %%%O12C4C6N2Pu"
+        self.assertRaises(self.validator.validate(formula_bad, 1)[0])
+        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
+
+        formula_bad = [1]
+        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
+
 
 if __name__ == "__main__":