Changeset 2387abc in sasview for src/sas/sasgui/perspectives

Timestamp:

Aug 19, 2016 11:02:55 AM (8 years ago)

Author:

lewis

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6f343e3

Parents:

32c5983 (diff), 45d7662 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into corfunc

Location:

src/sas/sasgui/perspectives

Files:

• fitting/basepage.py (modified) (1 diff)
• fitting/media/fitting_help.rst (modified) (3 diffs)
• fitting/media/pd_help.rst (modified) (2 diffs)
• invariant/media/invariant_help.rst (modified) (4 diffs)
• pr/media/pr_help.rst (modified) (2 diffs)
• corfunc/__init__.py (added)
• corfunc/corfunc.py (added)
• corfunc/corfunc_panel.py (added)
• corfunc/corfunc_state.py (added)
• corfunc/media/corfunc_help.rst (added)
• corfunc/media/fig1.gif (added)
• corfunc/media/fig2.gif (added)
• corfunc/media/tutorial1.png (added)
• corfunc/media/tutorial2.png (added)
• corfunc/media/tutorial3.png (added)
• corfunc/plot_labels.py (added)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2942 +2942 @@
         """
 
-        _TreeLocation = "user/sasgui/perspectives/fitting/mag_help.html"
+        _TreeLocation = "user/magnetism.html"
         _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "",
                                           "Polarized Beam/Magnetc Help")

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -15 +15 @@
 
 
-Fitting Perspective
-===================
+Fitting
+=======
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -24 +24 @@
 
 To fit some data you must first load some data, activate one or more data sets,
-send those data sets to the fitting perspective, and select a model to fit to
-each data set.
+send those data sets to fitting, and select a model to fit to each data set.
 
 Instructions on how to load and activate data are in the section :ref:`Loading_data`.
@@ -331 +330 @@
 This mode fits one data set.
 
-When data is sent to the fitting perspective it is plotted in a graph window as
-markers.
+When data is sent to the fitting it is plotted in a graph window as markers.
 
 If a graph does not appear, or a graph window appears but is empty, then the data

src/sas/sasgui/perspectives/fitting/media/pd_help.rst

@@ -105 +105 @@
 
 The median value for the distribution will be the value given for the respective
-size parameter in the *Fitting Perspective*, for example, radius = 60.
+size parameter in the *FitPage*, for example, radius = 60.
 
 The polydispersity is given by |sigma|
@@ -172 +172 @@
 
 SasView only uses these array values during the computation, therefore any mean
-value of the parameter represented by *x* present in the *Fitting Perspective*
+value of the parameter represented by *x* present in the *FitPage*
 will be ignored.
 

src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-Invariant Calculation Perspective
-=================================
+Invariant Calculation
+=====================
 
 Description
@@ -45 +45 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-Using the perspective
----------------------
+Using invariant analysis
+------------------------
 
 1) Select *Invariant* from the *Analysis* menu on the SasView toolbar.
@@ -53 +53 @@
 
 3) Select a dataset and use the *Send To* button on the *Data Explorer* to load 
-   the dataset into the *Invariant* perspective.
+   the dataset into the *Invariant* panel.
 
-4) Use the *Customised Input* boxes on the *Invariant* perspective to subtract 
+4) Use the *Customised Input* boxes on the *Invariant* panel to subtract 
    any background, specify the contrast (i.e. difference in SLDs - this must be 
    specified for the eventual value of Q*\  to be on an absolute scale), or to 
@@ -73 +73 @@
 
 8) If the value of Q*\  calculated with the extrapolated regions is invalid, a 
-   red warning will appear at the top of the *Invariant* perspective panel.
+   red warning will appear at the top of the *Invariant* panel.
 
    The details of the calculation are available by clicking the *Details* 

src/sas/sasgui/perspectives/pr/media/pr_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-P(r) Inversion Perspective
-==========================
+P(r) Calculation
+================
 
 Description
@@ -32 +32 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-Using the perspective
----------------------
+Using P(r) inversion
+--------------------
 
 The user must enter