Changeset ee22241 in sasview for src/sas

Timestamp:

Sep 24, 2018 9:15:49 AM (6 years ago)

Author:

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:

2dce1d8

Parents:

712db9e

Message:

Refactored onHelp a bit to allow more encapsulation. SASVIEW-1112

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (1 diff)
• Plotting/SlicerParameters.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -202 +202 @@
         Open a local url in the default browser
         """
-        location = GuiUtils.HELP_DIRECTORY_LOCATION + url
-        #WP: Added to handle OSX bundle docs
-        if os.path.isdir(location) == False:
-            sas_path = os.path.abspath(os.path.dirname(sys.argv[0]))
-            location = sas_path+"/"+location
-        try:
-            webbrowser.open('file://' + os.path.realpath(location))
-        except webbrowser.Error as ex:
-            logging.warning("Cannot display help. %s" % ex)
+        GuiUtils.showHelp(url)
 
     def workspace(self):

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -4 +4 @@
 import numpy
 import functools
+
 from PyQt5 import QtCore
 from PyQt5 import QtGui
@@ -86 +87 @@
         Display generic data averaging help
         """
-        location = "/user/qtgui/MainWindow/graph_help.html#d-data-averaging"
-        self.parent.showHelp(location)
-
+        url = "/user/qtgui/MainWindow/graph_help.html#d-data-averaging"
+        GuiUtils.showHelp(url)
 
 class ProxyModel(QtCore.QIdentityProxyModel):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -584 +584 @@
         msg = "Attempt at opening an invalid URL"
         raise AttributeError(msg)
+
+def showHelp(url):
+    """
+    Open a local url in the default browser
+    """
+    location = HELP_DIRECTORY_LOCATION + url
+    #WP: Added to handle OSX bundle docs
+    if os.path.isdir(location) == False:
+        sas_path = os.path.abspath(os.path.dirname(sys.argv[0]))
+        location = sas_path+"/"+location
+    try:
+        webbrowser.open('file://' + os.path.realpath(location))
+    except webbrowser.Error as ex:
+        logging.warning("Cannot display help. %s" % ex)
 
 def retrieveData1d(data):