Changeset 31c5b58 in sasview for src/sas/qtgui/GuiManager.py

Timestamp:

Nov 25, 2016 8:56:41 AM (8 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:

3968752

Parents:

14d9c7b

Message:

Refactored to allow running with run.py.
Minor fixes to plotting.

File:

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

src/sas/qtgui/GuiManager.py

@@ -11 +11 @@
 
 from twisted.internet import reactor
-
 # General SAS imports
+
 from sas.sasgui.guiframe.data_manager import DataManager
 from sas.sasgui.guiframe.proxy import Connection
-
-from SasviewLogger import XStream
-
-import LocalConfig
-import GuiUtils
-from UI.AcknowledgementsUI import Ui_Acknowledgements
-from AboutBox import AboutBox
-from IPythonWidget import IPythonWidget
-from WelcomePanel import WelcomePanel
-from SldPanel import SldPanel
-from DensityPanel import DensityPanel
+from sas.qtgui.SasviewLogger import XStream
+import sas.qtgui.LocalConfig as LocalConfig
+import sas.qtgui.GuiUtils as GuiUtils
+from sas.qtgui.UI.AcknowledgementsUI import Ui_Acknowledgements
+from sas.qtgui.AboutBox import AboutBox
+from sas.qtgui.IPythonWidget import IPythonWidget
+from sas.qtgui.WelcomePanel import WelcomePanel
+
+from sas.qtgui.SldPanel import SldPanel
+from sas.qtgui.DensityPanel import DensityPanel
 
 # Perspectives
-from Perspectives.Invariant.InvariantPerspective import InvariantWindow
-from DataExplorer import DataExplorerWindow
+from sas.qtgui.Perspectives.Invariant.InvariantPerspective import InvariantWindow
+from sas.qtgui.DataExplorer import DataExplorerWindow
 
 class Acknowledgements(QtGui.QDialog, Ui_Acknowledgements):
@@ -40 +39 @@
     Main SasView window functionality
     """
-    HELP_DIRECTORY_LOCATION = "html"
+    ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
+    HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
 
     def __init__(self, mainWindow=None, reactor=None, parent=None):
@@ -92 +92 @@
 
         # Current tutorial location
-        self._tutorialLocation = os.path.join(self.HELP_DIRECTORY_LOCATION,
+        self._tutorialLocation = os.path.abspath(os.path.join(self.HELP_DIRECTORY_LOCATION,
                                               "_downloads",
-                                              "Tutorial.pdf")
+                                              "Tutorial.pdf"))
 
         #==========================================================