Changeset b0c5e8c in sasview for src/sas/qtgui/Calculators

Timestamp:

Jun 15, 2017 6: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

Location:

src/sas/qtgui/Calculators

Files:

• DensityPanel.py (modified) (2 diffs)
• GenericScatteringCalculator.py (modified) (1 diff)
• KiessigPanel.py (modified) (2 diffs)
• SldPanel.py (modified) (3 diffs)
• SlitSizeCalculator.py (modified) (2 diffs)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -8 +8 @@
 from sas.qtgui.Utilities.GuiUtils import FormulaValidator
 from sas.qtgui.UI import main_resources_rc
+from sas.qtgui.Utilities.GuiUtils import HELP_DIRECTORY_LOCATION
 
 # Local UI
@@ -148 +149 @@
     def displayHelp(self):
         try:
-            location = self.manager.HELP_DIRECTORY_LOCATION + \
+            location = HELP_DIRECTORY_LOCATION + \
                 "/user/sasgui/perspectives/calculator/density_calculator_help.html"
 

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -378 +378 @@
         """
         try:
-            location = self.manager.HELP_DIRECTORY_LOCATION + \
+            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
                        "/user/sasgui/perspectives/calculator/sas_calculator_help.html"
             self.manager._helpView.load(QtCore.QUrl(location))

src/sas/qtgui/Calculators/KiessigPanel.py

@@ -4 +4 @@
 from sas.qtgui.UI import main_resources_rc
 from UI.KiessigPanel import Ui_KiessigPanel
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # sas-global
@@ -37 +38 @@
         """
         try:
-            location = self.manager.HELP_DIRECTORY_LOCATION + \
+            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
                 "/user/sasgui/perspectives/calculator/kiessig_calculator_help.html"
 

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))

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -9 +9 @@
 
 from sas.qtgui.UI import main_resources_rc
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 from UI.SlitSizeCalculator import Ui_SlitSizeCalculator
@@ -45 +46 @@
         """
         try:
-            location = self._parent.HELP_DIRECTORY_LOCATION + \
+            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
                 "/user/sasgui/perspectives/calculator/slit_calculator_help.html"