Changeset fe76fba in sasview

Timestamp:

May 22, 2018 6:53:15 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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:

db7d2c7

Parents:

0459591

git-author:

Piotr Rozyczko <rozyczko@…> (05/22/18 06:52:37)

git-committer:

Piotr Rozyczko <rozyczko@…> (05/22/18 06:53:15)

Message:

Minor change to the python shell docs.
Fixed doc call from main menu

Location:

src/sas/qtgui

Files:

• Calculators/media/new_pycrust_example.png (modified) (previous)
• Calculators/media/old_pycrust_example.png (modified) (previous)
• Calculators/media/python_shell_help.rst (modified) (1 diff)
• MainWindow/GuiManager.py (modified) (3 diffs)

src/sas/qtgui/Calculators/media/python_shell_help.rst

@@ -13 +13 @@
 -----------
 
-This is a Python shell/editor provided with WxPython.
+This is a Jupyter Python QtConsole shell.
 
 For the help about Python, visit the website http://docs.python.org/tutorial/
 
-.. note:: This shell/editor has its own help, but the Help() and Credits() calls do not work on Macs.
+For the help about QtConsole, visit the website https://ipython.org/ipython-doc/3/interactive/qtconsole.html
 
-The NumPy, SciPy, and Matplotlib, etc, libraries are shipped with SasView and so functions from these can be imported into the shell/editor, however, some functionality may not work.
+The NumPy, SciPy, and Matplotlib, etc, libraries are shipped with SasView and so functions from these can be imported into the shell, however, some functionality may not work.
 
 .. image:: new_pycrust_example.png
    :align: center
 
-When a Python file, for example a fitting model, is created or loaded with the *New* or *Open* options from the menu, a new tab opens with an editing notebook.
+..
+    When a Python file, for example a fitting model, is created or loaded with the *New* or *Open* options from the menu, a new tab opens with an editing notebook.
 
-.. image:: new_pycrust_example_2.png
-   :align: center
+    .. image:: new_pycrust_example_2.png
+    :align: center
 
-If a Python (.py) model has a linked C (.c) subroutine *in the same folder* then the shell/editor will open both! However input focus is usually transferred to the tab with the .c file.
+    If a Python (.py) model has a linked C (.c) subroutine *in the same folder* then the shell/editor will open both! However input focus is usually transferred to the tab with the .c file.
 
-To compile a model, select *Run* > *Check Model* from the shell/editor menu. If the model contains a unit test (which it should!!!) then this will also run and a popup window will report the success/failure of the test.
+    To compile a model, select *Run* > *Check Model* from the shell/editor menu. If the model contains a unit test (which it should!!!) then this will also run and a popup window will report the success/failure of the test.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 10Oct2015
+.. note::  This help document was last changed by Piotr Rozyczko, 22 May 2018

src/sas/qtgui/MainWindow/GuiManager.py

@@ -94 +94 @@
         # Set up the status bar
         self.statusBarSetup()
-
-        # Needs URL like path, so no path.join() here
-        self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
 
         # Current tutorial location
@@ -191 +188 @@
         Open a local url in the default browser
         """
-        #location = os.path.join(GuiUtils.HELP_DIRECTORY_LOCATION, url)
         location = GuiUtils.HELP_DIRECTORY_LOCATION + url
         try:
@@ -814 +810 @@
         TODO: use QNetworkAccessManager to assure _helpLocation is valid
         """
-        helpfile = "index.html"
+        helpfile = "/index.html"
         self.showHelp(helpfile)