Changeset b0c5e8c in sasview for src/sas/qtgui/Calculators/SldPanel.py

Timestamp:

Jun 15, 2017 8:24:49 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:

72f4834

Parents:

144ec831

Message:

Unit tests for fitting options dialog SASVIEW-514

File:

• src/sas/qtgui/Calculators/SldPanel.py (modified) (3 diffs)

src/sas/qtgui/Calculators/SldPanel.py

@@ -7 +7 @@
 from periodictable.nsf import neutron_scattering
 
-from sas.qtgui.Utilities.GuiUtils import FormulaValidator
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
+
 from sas.qtgui.UI import main_resources_rc
 
@@ -125 +126 @@
 
         # set validators
-        self.ui.editMolecularFormula.setValidator(FormulaValidator(self.ui.editMolecularFormula))
+        self.ui.editMolecularFormula.setValidator(GuiUtils.FormulaValidator(self.ui.editMolecularFormula))
 
         rx = QtCore.QRegExp("[+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?")
@@ -216 +217 @@
     def displayHelp(self):
         try:
-            location = self.manager.HELP_DIRECTORY_LOCATION + \
+            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
                 "/user/sasgui/perspectives/calculator/sld_calculator_help.html"
             self.manager._helpView.load(QtCore.QUrl(location))