DOC: add components section

kcjengr · Feb 23, 2019 · 1d478e7 · 1d478e7
1 parent 9cc1f8c
commit 1d478e7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/docs/source/tutorials/action_buttons.rst → docs/source/components/action_buttons.rst b/docs/source/tutorials/action_buttons.rst → docs/source/components/action_buttons.rst
diff --git a/docs/source/tutorials/status_labels.rst → docs/source/components/status_labels.rst b/docs/source/tutorials/status_labels.rst → docs/source/components/status_labels.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -23,6 +23,15 @@ building complex VCPs.
 
    showcase/index
 
+.. toctree::
+   :maxdepth: 1
+   :caption: Tutorials
+
+   tutorials/basic_vcp
+   tutorials/getting_started
+   tutorials/widget_rules
+   tutorials/components
+
 .. toctree::
    :maxdepth: 1
    :caption: Configuration
@@ -32,14 +41,10 @@ building complex VCPs.
 
 .. toctree::
    :maxdepth: 1
-   :caption: Tutorials
+   :caption: Components
 
-   tutorials/basic_vcp
-   tutorials/getting_started
-   tutorials/widget_rules
-   tutorials/components
-   tutorials/action_buttons
-   tutorials/status_labels
+   components/action_buttons
+   components/status_labels
 
 .. toctree::
    :maxdepth: 1

diff --git a/docs/source/tutorials/basic_vcp_04.rst b/docs/source/tutorials/basic_vcp_04.rst
@@ -128,10 +128,6 @@ Now we can see the slider in action.
 
 **DRO**
 
-.. Note::
-    At this time the `DROWidget` is being reworked so it does not work.
-
-
 Add a `DROWidget` between the jog buttons and the axis labels and set the axis
 and the reference_type to `Relative` and select the correct axis for each one.
 
@@ -145,14 +141,10 @@ Now when we run the VCP we can see the DRO's change when we jog an axis.
    :align: center
    :scale: 60 %
 
-For now we can use a `StatusLabel` to display the positions. Drag three status
-labels between the jog buttons and the labels and create a rule for each one.
-
-The channels for each one are from the positions status so type in `p` and pick
-position:rel and add the rest like this. The expression is ``ch[0]``.
+You can also use a `StatusLabel` to display position. Create a rule for the
+`StatusLabel` and add a channel from the position plugin and the expression is
+``ch[0]``. The following example is for relative position and the X axis.
 ::
 
     position:rel?string&axis=x
-    position:rel?string&axis=y
-    position:rel?string&axis=z