Changes in / [f07b2e9:5265420] in sasview

Files:

• docs/pre-sphinx-docs/fitting_help_v0.html (deleted)
• src/sas/guiframe/media/data_explorer_help.rst (modified) (10 diffs)

src/sas/guiframe/media/data_explorer_help.rst

@@ -17 +17 @@
 Remove_Data_
 
+Append_Plot_to_Graph_
+
 Create_New_Plot_
-
-Append_Plot_to_Graph_
 
 Freeze_Theory_
@@ -40 +40 @@
 
 *NOTE! When* Data Explorer *is hidden, all data loaded will be sent directly 
-to the current active analysis perspective, if possible. When* Data Explorer *is
+to the current active application, if possible. When* Data Explorer *is 
 shown, data go first to the* Data Explorer.
 
@@ -50 +50 @@
 ---------
 
-To load data, do one of the following:
+To load data, click the button *Load Data*, then select one or more (by holding 
+the Ctrl key) files to load into the application. The name of each selected 
+file will be listed.
 
-Select File -> Load Data File(s), and navigate to your data;
-
-Select File -> Load Data Folder, which will attempt to load all the data in the
-specified folder;
-
-Or, in the *Data Explorer* click the button *Load Data*, then select one or more
-(by holding down the Ctrl key) files to load into SasView.
-
-The name of each loaded file will be listed in the *Data Explorer*. Clicking the
-*+*  symbol alongside will display any available metadata read from the file.
+Clicking the *+*  symbol will display any available metadata.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -71 +64 @@
 
 Right-clicking on a loaded dataset (or model calculation, what SasView calls a 
-'theory') brings up a *Handy Menu* from which it is possible to access *Data Info*,
-*Save* the data/theory, or *Plot* the data/theory.
+theory) brings up a *Handy Menu* from which it is possible to access Datainfo, 
+Save the data/theory, or Plot the data/theory.
 
 .. image:: hand_menu.png
@@ -84 +77 @@
 
 To interact with data it must be activated. This is accomplished by checking 
-the box next to the file name in the *Data Explorer*. A green tick will appear.
+the box next to the data label. A green tick will appear.
 
-Unchecking/unticking a box deactivates that data set.
+Unchecking/unticking the box deactivates a data set.
 
 There is also a combo box labeled *Selection Options* from which you can 
-activate or deactivate multiple data sets in one go.
+activate or deactivate multiple data sets.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -101 +94 @@
 selected data sets.*
 
-*Remove Data* removes all references to selected data from SasView.
+*Remove Data* removes all reference to selected data from the application.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. _Append_Plot_to_Graph:
+
+Append Plot to Graph
+--------------------
+
+This operation can only be performed on 1D data and plot panels currently 
+containing 1D data.
+
+Click on the button *Append To* to add selected data to a plot panel. Next to 
+the button is a combo box containing the names of available plot panels. 
+Selecting a name from this combo box will move that plot into focus.
+ 
+If a plot panel is not available, the combo box and button will be 
+disabled.
+
+2D Data cannot be appended to any plot panels.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -110 +122 @@
 ---------------
 
-Click on the *New Plot* button to create a new plot panel where the currently
+Click on the *New Plot* button to create a new plot panel where the currently 
 selected data will be plotted.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. _Append_Plot_to_Graph:
-
-Append Plot to Graph
---------------------
-
-This operation can currently only be performed on 1D data and plot panels
-containing 1D data.
-
-Click on the button *Append Plot To* to add selected data to a plot panel. Next
-to the button is a combo box containing the names of available plot panels.
-Selecting a name from this combo box will move that plot into focus.
- 
-If a plot panel is not available, the combo box and button will be 
-disabled.
-
-2D Data cannot be appended to any plot panels.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -141 +134 @@
 The *Freeze Theory* button generates data from the selected theory.
 
-*NOTE! This operation can only be performed when theory labels are selected in*
-*the Data panel.*
+*NOTE! This operation can only be performed when theory labels are selected.*
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -151 +143 @@
 -------------------
 
-Click on the *Send To* button to send the currently selected data to one of the
-perspectives (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation).
+Click on the button *Send To* button to send the currently selected data to 
+a perspective (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation).
  
 The *Single*/*Batch* mode radio buttons only apply to the *Fitting* perspective.
@@ -163 +155 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 26Apr2015
+.. note::  This help document was last changed by Steve King, 18Feb2015