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

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/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -138 +138 @@
         Show the "Loading data" section of help
         """
-        tree_location = self.parent.HELP_DIRECTORY_LOCATION +\
+        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION +\
             "/user/sasgui/guiframe/data_explorer_help.html"
         self._helpView.load(QtCore.QUrl(tree_location))

src/sas/qtgui/MainWindow/GuiManager.py

@@ -45 +45 @@
     Main SasView window functionality
     """
-    ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
-    HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
-
     def __init__(self, parent=None):
         """
@@ -99 +96 @@
         self._helpView = QtWebKit.QWebView()
         # Needs URL like path, so no path.join() here
-        self._helpLocation = self.HELP_DIRECTORY_LOCATION + "/index.html"
+        self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
 
         # Current tutorial location
-        self._tutorialLocation = os.path.abspath(os.path.join(self.HELP_DIRECTORY_LOCATION,
+        self._tutorialLocation = os.path.abspath(os.path.join(GuiUtils.HELP_DIRECTORY_LOCATION,
                                               "_downloads",
                                               "Tutorial.pdf"))