Changeset 091eee64 in sasview

Timestamp:

Feb 20, 2019 8:59:13 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

390494d

Parents:

d1b525b

Message:

Modified the open tutorial action - it now opens a webpage with tutorial
links. Just like in 4.2. SASVIEW-1255.
Also, modified copyright year in yet another place.

Files:

• docs/sphinx-docs/source/index.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/RELEASE.rst (added)
• docs/sphinx-docs/source/user/marketplace.rst (modified) (2 diffs)
• docs/sphinx-docs/source/user/tutorial.rst (modified) (1 diff)
• installers/license.txt (modified) (1 diff)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (1 diff)

docs/sphinx-docs/source/index.rst

@@ -10 +10 @@
    :maxdepth: 1
 
-   User Documentation <user/user>
+   USER DOCUMENTATION <user/user>
 
-   Developer Documentation <dev/dev>
+   DEVELOPER DOCUMENTATION <dev/dev>
+   
+   Release Notes <user/RELEASE>
+   

docs/sphinx-docs/source/user/marketplace.rst

@@ -6 +6 @@
 plug-in fitting models for *SasView* for all to use.
 
-.. note:: These plug-in models require SasView version 4.0 or later.
+.. note:: 
+    These plug-in models require SasView version 4.0 or later. However, 
+    not *all* models may work with *every* version of SasView because 
+    of changes to our API.
 
 Contributed models should be written in Python (only version 2.7.x is
@@ -12 +15 @@
 combination of Python and C. You only need to upload the .py/.c source
 code files to the Marketplace!
+
+Please put a comment in your code to indicate which version of SasView you 
+wrote the model for.
 
 For guidance on how to write a plugin model see :ref:`Writing_a_Plugin` . It

docs/sphinx-docs/source/user/tutorial.rst

@@ -8 +8 @@
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page
 
+The following tutorial was written for Version 2.x but is still a useful overview of 
+much of the analysis capability in SasView (but disregard Appendix XIII if using 
+Version 4.2 or later)
+
+:download:`Old Tutorial <sasview/Tutorial.pdf>`
+
+The following tutorials have been written for Version 4.x
+
 :download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>`
 
-:download:`Old Tutorial <sasview/Tutorial.pdf>`
+:download:`Basic 1D Fitting in Sasview <sasview/basic_1d_fitting_in_sasview_v3x_4x.pdf>`
+
+:download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>`
+
+:download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>`

installers/license.txt

@@ -19 +19 @@
 developed under NSF award DMR-0520547."*
 
-(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT
+(C) 2009-2019 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT

src/sas/qtgui/MainWindow/GuiManager.py

@@ -1019 +1019 @@
     def actionTutorial(self):
         """
-        Open the tutorial PDF file with default PDF renderer
-        """
-        # Not terribly safe here. Shell injection warning.
-        # isfile() helps but this probably needs a better solution.
-        if os.path.isfile(self._tutorialLocation):
-            result = subprocess.Popen([self._tutorialLocation], shell=True)
+        Open the page with tutorial PDF links
+        """
+        helpfile = "/user/tutorial.html"
+        self.showHelp(helpfile)
 
     def actionAcknowledge(self):