Changes in / [acdf0d1:9c7e2b8] in sasview

Files:

• LICENSE.TXT (modified) (1 diff)
• docs/sphinx-docs/source/index.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/RELEASE.rst (deleted)
• docs/sphinx-docs/source/user/tutorial.rst (modified) (1 diff)
• installers/README-ABOUT-RELEASE-NOTES.txt (deleted)
• installers/README-next-release.txt (added)
• installers/README.txt (added)
• src/sas/sascalc/corfunc/LICENSE.TXT (deleted)
• src/sas/sasgui/guiframe/config.py (modified) (3 diffs)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (4 diffs)
• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (1 diff)
• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) (1 diff)
• src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) (1 diff)
• src/sas/sasview/local_config.py (modified) (3 diffs)
• src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (deleted)
• src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified) (previous)

LICENSE.TXT

@@ -11 +11 @@
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Also see https://github.com/SasView/sasview/blob/master/installers/license.txt

docs/sphinx-docs/source/index.rst

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

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

@@ -21 +21 @@
 
 :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>`

src/sas/sasgui/guiframe/config.py

@@ -33 +33 @@
 _do_aboutbox = True
 _do_acknowledge = True
-_do_release = True
 _do_tutorial = True
 _acknowledgement_preamble =\
@@ -50 +49 @@
 _acknowledgement_citation = \
 '''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
+
 _acknowledgement =  \
 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
@@ -94 +94 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
+_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
 marketplace_url = "http://marketplace.sasview.org/"
 

src/sas/sasgui/guiframe/gui_manager.py

@@ -1276 +1276 @@
 
         wx_id = wx.NewId()
-        self._help_menu.Append(wx_id, '&Documentation', 'Help documentation for SasView')
+        self._help_menu.Append(wx_id, '&Documentation', '')
         wx.EVT_MENU(self, wx_id, self._onSphinxDocs)
 
@@ -1283 +1283 @@
             # Pluralised both occurences of 'Tutorial' in the line below
             # S King, Sep 2018
-            self._help_menu.Append(wx_id, '&Tutorials', 'Tutorials on how to use SasView')
+            self._help_menu.Append(wx_id, '&Tutorials', 'Software tutorials')
             wx.EVT_MENU(self, wx_id, self._onTutorial)
-
-        if config.marketplace_url:
-            wx_id = wx.NewId()
-            self._help_menu.Append(wx_id, '&Model marketplace', 'Plug-in fitting models for SasView')
-            wx.EVT_MENU(self, wx_id, self._on_marketplace_click)
-
-        if config._do_release:
-            wx_id = wx.NewId()
-            self._help_menu.Append(wx_id, '&Release notes',
-                                   'SasView release notes and known issues')
-            wx.EVT_MENU(self, wx_id, self._onRelease)
 
         if config._do_acknowledge:
@@ -1306 +1295 @@
             logger.info("Doing help menu")
             wx_id = wx.NewId()
-            self._help_menu.Append(wx_id, '&About', 'Information about SasView')
+            self._help_menu.Append(wx_id, '&About', 'Software information')
             wx.EVT_MENU(self, wx_id, self._onAbout)
+
+        if config.marketplace_url:
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&Model marketplace', '')
+            wx.EVT_MENU(self, wx_id, self._on_marketplace_click)
 
         # Checking for updates
@@ -2144 +2138 @@
             dialog = AboutBox.DialogAbout(None, -1, "")
             dialog.ShowModal()
-
-    def _onRelease(self, evt):
-        """
-        Pop up the release notes
-
-        :param evt: menu event
-
-        """
-        # S King, Sep 2018
-
-        from documentation_window import DocumentationWindow
-        _TreeLocation = "user/release.html"
-        DocumentationWindow(self, -1, _TreeLocation, "",
-                            "SasView Documentation")
 
     def _onTutorial(self, evt):

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -20 +20 @@
 
 OUTPUT_STRINGS = {
-    'max': "Long Period (A): ",
+    'max': "Long Period / 2 (A): ",
     'Lc': "Average Hard Block Thickness (A): ",
     'dtr': "Average Interface Thickness (A): ",

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -28 +28 @@
 # List of output parameters, used by __str__
 output_list = [
-    ['max', "Long Period (A): "],
+    ['max', "Long Period / 2 (A): "],
     ['Lc', "Average Hard Block Thickness (A): "],
     ['dtr', "Average Interface Thickness (A): "],

src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst

@@ -7 +7 @@
 
 :download:`Fibre_Diffraction_Review_1994_3_25-29.pdf <Fibre_Diffraction_Review_1994_3_25-29.pdf>`
-
 :download:`Fibre_Diffraction_Review_2004_12_24.pdf <Fibre_Diffraction_Review_2004_12_24.pdf>`
-
 :download:`Fibre_Diffraction_Review_2005_13_19-22.pdf <Fibre_Diffraction_Review_2005_13_19-22.pdf>`

src/sas/sasview/local_config.py

@@ -33 +33 @@
 _do_aboutbox = True
 _do_acknowledge = True
-_do_release = True
 _do_tutorial = True
 _acknowledgement_preamble =\
@@ -50 +49 @@
 _acknowledgement_citation = \
 '''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041'''
+
 _acknowledgement =  \
 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
@@ -94 +94 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
+_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
 marketplace_url = "http://marketplace.sasview.org/"