Skip to content

Commit e56656f

Browse files
Merge pull request #980 from TheDeanLab/cleanup-docs
Clean up Docs
2 parents 9b5645e + b54c930 commit e56656f

26 files changed

+221
-236
lines changed

docs/source/add_new_device.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Startup and Configuration
126126
--------------
127127

128128
Integration with Microscope Object Configurations
129-
------------------------------------------------
129+
-------------------------------------------------
130130

131131
- Each microscope configuration in **navigate** that uses the new device should
132132
receive a reference to the established communication object.

docs/source/advanced.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ hardware.
158158
**navigate** establishes communication with each device independently, and passes the
159159
instance of that device to class that controls it (e.g., in this case, the
160160
`CustomDevice` class). This allows **navigate** to be initialized with multiple
161-
microscope :ref:`configurations <user_guide/software_configuration:configuration file>`,
162-
some of which may share devices.
161+
microscope :ref:`configurations <multiple_microscopes>`, some of which may share devices.
162+
163163

164164
.. code-block:: python
165165
@@ -470,7 +470,7 @@ Install the plugin using one of two methods:
470470
* Install a plugin by putting the whole plugin folder directly into
471471
``navigate/plugins/``. In this example, put ``custom_device`` folder
472472
and all its contents into ``navigate/plugins``.
473-
* Alernatively, install this plugin through the menu
473+
* Alternatively, install this plugin through the menu
474474
:menuselection:`Plugins --> Install Plugin` by selecting the plugin folder.
475475

476476
The plugin is ready to use. For this plugin, you can now specify a CustomDevice in the

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
# List of patterns, relative to source directory, that match files and
9090
# directories to ignore when looking for source files.
9191
# This pattern also affects html_static_path and html_extra_path.
92-
exclude_patterns = []
92+
exclude_patterns = ["**/configurations_archive/*", "*archive*", "**/*_archive.rst"]
9393

9494

9595
# -- Options for HTML output -------------------------------------------------

docs/source/contributing/contributing_guidelines.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.. _contributing_guidelines:
12
=======================
23
Contributing Guidelines
34
=======================

docs/source/contributing/feature_container.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Once a feature is executed, any features dependent on this feature's execution
1414
will execute (for example, move the stage, then snap a picture). Following
1515
this, the next set of features in sequence will be executed.
1616

17-
Examples of some existing features include ``navigate.model.features.common_features.ZStackAcquisition``,
18-
which acquires a z-stack, and ``navigate.model.features.autofocus.Autofocus``,
17+
Examples of some existing features include ``navigate.model.features.common_features.ZStackAcquisition``,
18+
which acquires a z-stack, and ``navigate.model.features.autofocus.Autofocus``,
1919
which finds the ideal plane of focus of a sample using a discrete cosine transform.
2020

2121
-----------------
@@ -30,7 +30,6 @@ Currently Implemented Features
3030
../_autosummary/navigate.model.features.auto_tile_scan
3131
../_autosummary/navigate.model.features.autofocus
3232
../_autosummary/navigate.model.features.common_features
33-
../_autosummary/navigate.model.features.cva_conpro
3433
../_autosummary/navigate.model.features.image_writer
3534
../_autosummary/navigate.model.features.remove_empty_tiles
3635
../_autosummary/navigate.model.features.restful_features

docs/source/implementations/implementations.rst

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _implemented_microscopes:
2+
13
===========================================
24
Implemented Microscopes
35
===========================================
@@ -58,10 +60,10 @@ The University of Texas Southwestern Medical Center, Dallas, TX
5860
**Relevant Publications**:
5961

6062
* `Deconvolution-free subcellular imaging with axially swept light sheet microscopy
61-
<https://www.cell.com/biophysj/pdf/S0006-3495(15)00498-1.pdf>`_
63+
<https://pubmed.ncbi.nlm.nih.gov/26083920/>`_
6264
* `Diagonally scanned light-sheet microscopy for fast volumetric imaging of adherent cells
63-
<https://www.cell.com/biophysj/pdf/S0006-3495(16)00139-9.pdf>`_
64-
* `u-track3D: Measuring, navigating, and validating dense particle trajectories in three dimensions <https://www.cell.com/cell-reports-methods/pdf/S2667-2375(23)00326-0.pdf>`_
65+
<https://pubmed.ncbi.nlm.nih.gov/27028654/>`_
66+
* `u-track3D: Measuring, navigating, and validating dense particle trajectories in three dimensions <https://pubmed.ncbi.nlm.nih.gov/38042149/>`_
6567
* `Robust and automated detection of subcellular morphological motifs in 3D microscopy images <https://www.nature.com/articles/s41592-019-0539-z>`_
6668

6769
.. collapse:: Technical Information
@@ -142,7 +144,7 @@ The University of Texas Southwestern Medical Center, Dallas, TX
142144
**Relevant Publications**:
143145

144146
* `Increasing the field-of-view in oblique plane microscopy via optical tiling
145-
<https://opg.optica.org/abstract.cfm?uri=boe-13-11-5616>`_
147+
<https://pubmed.ncbi.nlm.nih.gov/36733723/>`_
146148
* `A versatile oblique plane microscope for large-scale and high-resolution imaging of subcellular dynamics
147149
<https://elifesciences.org/articles/57681>`_
148150

@@ -215,8 +217,8 @@ The University of Texas Southwestern Medical Center, Dallas, TX
215217

216218
**Relevant Publications**:
217219

218-
* `Adaptive optics in an oblique plane microscope <https://www.biorxiv.org/content/10.1101/2024.03.21.586191v1>`_
219-
* `Increasing the field-of-view in oblique plane microscopy via optical tiling <https://opg.optica.org/abstract.cfm?uri=boe-13-11-5616>`_
220+
* `Adaptive optics in an oblique plane microscope <https://pubmed.ncbi.nlm.nih.gov/38562744/>`_
221+
* `Increasing the field-of-view in oblique plane microscopy via optical tiling <https://pubmed.ncbi.nlm.nih.gov/36733723/>`_
220222
* `A versatile oblique plane microscope for large-scale and high-resolution imaging of subcellular dynamics <https://elifesciences.org/articles/57681>`_
221223

222224
.. collapse:: Technical Information
@@ -428,7 +430,7 @@ The University of Texas Southwestern Medical Center, Dallas, TX
428430

429431
**Relevant Publications**:
430432

431-
* `Mechanically sheared Axially Swept Light-Sheet Microscopy <https://www.biorxiv.org/content/10.1101/2024.04.10.588892>`_
433+
* `Mechanically sheared Axially Swept Light-Sheet Microscopy <https://pubmed.ncbi.nlm.nih.gov/38645073/>`_
432434
* `The mesoSPIM initiative: open-source light-sheet microscopes for imaging cleared tissue <https://www.nature.com/articles/s41592-019-0554-0>`_.
433435
* `Isotropic imaging across spatial scales with axially swept light-sheet microscopy <https://www.nature.com/articles/s41596-022-00706-6>`_
434436
* `Light-sheet microscopy of cleared tissues with isotropic, subcellular resolution <https://www.nature.com/articles/s41592-019-0615-4>`_.
@@ -591,8 +593,8 @@ The University of Texas Southwestern Medical Center, Dallas, TX
591593

592594
**Relevant Publications**:
593595

594-
* `Effective elimination of laser interference fringing in fluorescence microscopy by Spinning azimuthal incidence angle <https://analyticalsciencejournals.onlinelibrary.wiley.com/doi/10.1002/jemt.20334>`_.
595-
* `Spinning-spot shadowless TIRF microscopy <https://journals.plos.org/plosone/article?id=10.1371/journal.pone.0136055>`_
596+
* `Effective elimination of laser interference fringing in fluorescence microscopy by Spinning azimuthal incidence angle <https://pubmed.ncbi.nlm.nih.gov/16770769/>`_.
597+
* `Spinning-spot shadowless TIRF microscopy <https://pubmed.ncbi.nlm.nih.gov/26308212/>`_
596598

597599
.. collapse:: Technical Information
598600

@@ -824,7 +826,7 @@ Arizona State University, Tempe, AZ
824826
**Relevant Publications**:
825827

826828
* `Increasing the field-of-view in oblique plane microscopy via optical tiling
827-
<https://opg.optica.org/abstract.cfm?uri=boe-13-11-5616>`_
829+
<https://pubmed.ncbi.nlm.nih.gov/36733723/>`_
828830
* `A versatile oblique plane microscope for large-scale and high-resolution imaging of subcellular dynamics
829831
<https://elifesciences.org/articles/57681>`_
830832

docs/source/index.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ technology developers.
7979
:maxdepth: 1
8080

8181
navigate Plugin Template <https://github.com/TheDeanLab/navigate-plugin-template>
82-
navigate Confocal Projection Plugin <https://github.com/TheDeanLab/navigate-confocal-projection>
82+
navigate Confocal Projection <https://github.com/TheDeanLab/navigate-confocal-projection>
8383
navigate at Scale <https://github.com/TheDeanLab/navigate-at-scale>
84-
navigate MMCore Plugin <https://github.com/TheDeanLab/navigate-mmcore-plugin>
84+
navigate Constant Velocity Acquisition <https://github.com/TheDeanLab/navigate-constant-velocity-acquisition>
85+
navigate MMCore <https://github.com/TheDeanLab/navigate-mmcore-plugin>
8586
navigate ilastik Server <https://github.com/TheDeanLab/navigate-ilastik-server>
87+
navigate Photoactivation <https://github.com/TheDeanLab/navigate-photoactivation>
8688

8789
.. toctree::
8890
:caption: Reference
@@ -96,7 +98,7 @@ technology developers.
9698
============
9799
**navigate** includes key contributions from numerous individuals, both past and
98100
present, in `The Dean Lab <https://www.dean-lab.org>`_. Please see the accompanying manuscript
99-
for a full list of contributors. :ref:`Outside contributors <contributing/contributing_guidelines>` are welcome.
101+
for a full list of contributors. :ref:`Outside contributors <contributing_guidelines>` are welcome.
100102

101103
**Funding**
102104
============

docs/source/plugin/plugin_home.rst

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ Plugin Structure:
9999
│ └── features/
100100
│ ├── plugin_feature.py
101101
│ ├── ...
102-
102+
103103
├── view/
104104
| ├── plugin_name_frame.py
105105
| ├── ...
106106
107107
├── feature_list.py
108108
├── plugin_acquisition_mode.py
109-
└── plugin_config.yml
109+
└── plugin_config.yml
110110
111111
112112
.. note::
@@ -127,7 +127,7 @@ is:
127127
128128
name: Plugin Name
129129
view: Popup # or Tab
130-
acquisition_modes:
130+
acquisition_modes:
131131
- name: Plugin Acquisition
132132
file_name: plugin_acquisition_mode.py
133133
@@ -137,8 +137,8 @@ Plugin GUI Elements
137137
--------------------
138138

139139
**navigate** supports plugins with their own GUIs. A custom plugin GUI can be integrated as a tab or a popup.
140-
Users should specify a view option in ``plugin_config.yml``. If it is a popup, users can find the plugin under
141-
the :guilabel:`Plugins` menu in the **navigate** window. If it is a tab, it will appear next to the
140+
Users should specify a view option in ``plugin_config.yml``. If it is a popup, users can find the plugin under
141+
the :guilabel:`Plugins` menu in the **navigate** window. If it is a tab, it will appear next to the
142142
:ref:`Settings Notebooks <user_guide/gui_walkthrough:settings notebooks>`.
143143

144144

@@ -155,7 +155,7 @@ should be named: ``my_plugin_frame.py`` and ``my_plugin_controller.py``.
155155
Plugin Devices
156156
------------------
157157

158-
The **navigate** plugin architecture allows you to integrate new hardware device. There can be more than one
158+
The **navigate** plugin architecture allows you to integrate new hardware device. There can be more than one
159159
device inside a plugin. If they are different kinds of device, please put them into different folders. For each
160160
kind of device, there should be a ``device_startup_functions.py`` telling **navigate** how to start the device
161161
and indicating the reference name of the device to be used in ``configuration.yaml``.
@@ -186,16 +186,16 @@ A function to start the device should be given,
186186
return device_object
187187
188188
189-
The template for ``device_startup_functions.py`` can be found in the `plugin template <https://github.com/TheDeanLab/navigate-plugin-template/blob/main/src/plugins-template/model/devices/plugin_device/device_startup_functions.py>`_.
190-
189+
The template for ``device_startup_functions.py`` can be found in the
190+
`plugin template <https://github.com/TheDeanLab/navigate-plugin-template/blob/main/plugins_template/model/devices/plugin_device/device_startup_functions.py>`_.
191191
-------------------------------------
192192

193193
Plugin Features
194194
-------------------------
195195
**navigate** allows users to add new features. New feature objects and feature lists can each be a plugin or components
196196
of a plugin. Features and feature lists are automatically loaded into **navigate**.
197197

198-
Please visit `here <https://thedeanlab.github.io/**navigate**/feature_container/feature_container_home.html>`_ for details about how to build a new feature object and feature list.
198+
Please visit `here <https://thedeanlab.github.io/navigate/contributing/feature_container.html>`_ for details about how to build a new feature object and feature list.
199199

200200
-------------------------------------
201201

@@ -204,7 +204,7 @@ Custom Acquisition Modes
204204
Navigate offers seamless support for custom acquisition modes, and registering a new mode is straightforward.
205205

206206
1. Download the template for `plugin_acquisition_mode.py
207-
<https://github.com/TheDeanLab/navigate-plugin-template/blob/main/plugins-template/plugin_acquisition_mode.py>`_
207+
<https://github.com/TheDeanLab/navigate-plugin-template/blob/main/plugins_template/plugin_acquisition_mode.py>`_
208208

209209
2. Update the ``feature_list``.
210210

@@ -214,7 +214,7 @@ Navigate offers seamless support for custom acquisition modes, and registering a
214214
class PluginAcquisitionMode:
215215
def __init__(self, name):
216216
self.acquisition_mode = name
217-
217+
218218
self.feature_list = [
219219
# update here
220220
]
@@ -230,7 +230,7 @@ Users should tell **navigate** what to do before and after acquisition using the
230230
231231
def end_acquisition_controller(self, controller):
232232
# update here
233-
233+
234234
def prepare_acquisition_model(self, model):
235235
# update here
236236
@@ -241,11 +241,12 @@ Users should tell **navigate** what to do before and after acquisition using the
241241

242242
.. code-block:: none
243243
244-
acquisition_modes:
244+
acquisition_modes:
245245
- name: Custom Acquisition
246246
file_name: plugin_acquisition_mode.py
247247
248248
249249
-----------
250250

251-
For more plugin examples, please visit `navigate <https://github.com/TheDeanLab/navigate/tree/develop/src/navigate/plugins>`_ and `Navigate Plugins <https://github.com/TheDeanLab/navigate-plugins>`_.
251+
For more plugin examples, please visit the plugins in the table of contents menu on
252+
the left.

docs/source/quick_start.rst

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Installation
1111
------------
1212

1313
1. *Install Miniconda.*
14-
Download and install Miniconda from the `official website <https://docs.conda.io/en/latest/miniconda.html#latest-miniconda-installer-links>`_.
14+
Download and install Miniconda from the `official website <https://docs.conda.io/en/latest/miniconda.html>`_.
1515

1616
2. *Create and Activate a Conda Environment.*
1717
Launch a Miniconda Prompt (or a Terminal on MacOS) and enter the following.
@@ -41,53 +41,52 @@ To save an image to disk, follow these steps:
4141

4242
* Launch **navigate** in synthetic hardware mode as described above.
4343

44-
* Next to the the :guilabel:`Acquire` button on the upper left, make sure that the
44+
* Next to the the :guilabel:`Acquire` button on the upper left, make sure that the
4545
acquisition mode in the dropdown is set to "Continuous Scan".
4646

4747
* Press :guilabel:`Acquire` (:kbd:`ctrl + enter`) and confirm that a synthetic noise image is
4848
displayed in the :guilabel:`Camera View` window.
4949

5050
.. Note::
51-
At least one channel must be selected (checkbox marked) in the
52-
:guilabel:`Channel Settings` window, and all of the parameters (e.g.,
51+
At least one channel must be selected (checkbox marked) in the
52+
:guilabel:`Channel Settings` window, and all of the parameters (e.g.,
5353
:guilabel:`Power`) in that row must be populated.
5454

55-
* Select the :guilabel:`Channels` tab. In the :guilabel:`Stack Acquisition Settings`
55+
* Select the :guilabel:`Channels` tab. In the :guilabel:`Stack Acquisition Settings`
5656
window in this tab, press the :guilabel:`Set Start Pos/Foc` button. This specifies
5757
the starting ``Z`` and ``F`` (e.g., Focus) positions for the stack acquisition.
5858

59-
* Select the :guilabel:`Stage Control` tab (:kbd:`ctrl + 3`), move the ``Z`` stage to
60-
the desired position (e.g., ``100`` μm), go back to the :guilabel:`Channels` tab
59+
* Select the :guilabel:`Stage Control` tab (:kbd:`ctrl + 3`), move the ``Z`` stage to
60+
the desired position (e.g., ``100`` μm), go back to the :guilabel:`Channels` tab
6161
(:kbd:`ctrl + 1`), and press the :guilabel:`Set End Pos/Foc` button. This specifies
6262
the ending ``Z`` and ``F`` positions for the stack acquisition.
6363

64-
* In the :guilabel:`Stack Acquisition Settings` frame, you can now adjust the step
64+
* In the :guilabel:`Stack Acquisition Settings` frame, you can now adjust the step
6565
size, which determines the number of slices in a z-stack.
6666

67-
* In the :guilabel:`Timepoint Settings` window, select :guilabel:`Save Data`
67+
* In the :guilabel:`Timepoint Settings` window, select :guilabel:`Save Data`
6868
by marking the checkbox. If the number of timepoints is set to ``1``, only a single
6969
stack will be acquired.
7070

7171
* Next to the the :guilabel:`Acquire` button on the upper left, change the acquisition
72-
mode in the dropdown to "Z-Stack", and press :guilabel:`Acquire`
72+
mode in the dropdown to "Z-Stack", and press :guilabel:`Acquire`
7373
(:kbd:`ctrl + enter`).
7474

7575
* A :guilabel:`File Saving Dialog` popup window will appear.
76-
* With the exception of :guilabel:`Notes`, all fields must be populated. Any
76+
* With the exception of :guilabel:`Notes`, all fields must be populated. Any
7777
spaces in the fields will be replaced with an underscore.
78-
* :guilabel:`Notes` is saved with the metadata, and can be useful for
78+
* :guilabel:`Notes` is saved with the metadata, and can be useful for
7979
describing the experiment.
8080
* :guilabel:`Solvent` is useful for tissue clearing experiments.
81-
* :guilabel:`File Type` can be set to :guilabel:`.TIFF`, :guilabel:`OME-TIFF`,
82-
:guilabel:`H5`, or :guilabel:`N5`. The latter two options are pyramidal file
83-
formats that are best used for large datasets and are immediately compatible
84-
with `BigDataViewer <https://imagej.net/plugins/bdv/>`_ and
81+
* :guilabel:`File Type` can be set to :guilabel:`.TIFF`, :guilabel:`OME-TIFF`,
82+
:guilabel:`H5`, or :guilabel:`N5`. The latter two options are pyramidal file
83+
formats that are best used for large datasets and are immediately compatible
84+
with `BigDataViewer <https://imagej.net/plugins/bdv/>`_ and
8585
`BigStitcher <https://imagej.net/plugins/bigstitcher/index>`_.
8686
* Press :guilabel:`Acquire` to begin the acquisition.
87-
* Once complete, the data can be opened using standard image processing
87+
* Once complete, the data can be opened using standard image processing
8888
software such as `Fiji <https://imagej.net/software/fiji/>`_.
8989

9090
.. image:: user_guide/images/save_dialog.png
9191
:align: center
9292
:alt: File Saving Dialog
93-

docs/source/software_installation.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ Operating System Compatibility
1212

1313
.. important::
1414
**navigate** is developed for use on Windows-based systems. This is due to the
15-
compatibility of :ref:`device drivers <firmware_overview>` for various microscope
16-
hardware components, such as
17-
cameras, stages, and data acquisition cards, which are predominantly designed for the
18-
Windows environment.
15+
compatibility of device drivers for various microscope hardware components, such
16+
as cameras, stages, and data acquisition cards, which are predominantly designed
17+
for the Windows environment.
1918

2019
While it is possible to launch the software on a Mac using synthetic hardware mode,
2120
users should be aware of known issues with the Tkinter interface. These issues
@@ -108,7 +107,7 @@ Quick install
108107

109108
**Setup your Python Environment**
110109

111-
Head over to the `miniconda website <https://docs.conda.io/en/latest/miniconda.html#latest-miniconda-installer-links>`_
110+
Head over to the `miniconda website <https://docs.conda.io/en/latest/miniconda.html>`_
112111
and install the appropriate version based on your operating system.
113112

114113
.. tip::

0 commit comments

Comments
 (0)