Skip to content

Commit

Permalink
Few doc improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
paugier committed Feb 24, 2024
1 parent 36bfbfb commit 4a0a36a
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 12 deletions.
8 changes: 7 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@ This will be a big breaking release.
{func}`fluidimage.works.BaseWorkFromSerie.process_1_serie` (see the examples on
[preprocessing](./examples/preproc.md) and [PIV](./examples/piv_try_params.md)).

- The work classes {class}`fluidimage.works.image2image.WorkImage2Image` and
- The work classes {class}`fluidimage.image2image.Work` and
{class}`fluidimage.works.bos.WorkBOS`
now have a parameters in `params.images` and a method
{func}`fluidimage.works.BaseWorkFromImage.process_1_image`.

- The work class {class}`fluidimage.image2image.Work` has a new method
{func}`fluidimage.works.image2image.WorkImage2Image.display`.

- The work class {class}`fluidimage.preproc.Work` has a new method
{func}`fluidimage.works.preproc.WorkPreproc.display`.

## [0.2.0] (2024-02-19)

- Python >=3.9,<3.12
Expand Down
1 change: 1 addition & 0 deletions doc/autosum.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ API reference
fluidimage.calcul
fluidimage.piv
fluidimage.preproc
fluidimage.image2image
fluidimage.calibration
fluidimage.reconstruct
fluidimage.postproc
Expand Down
5 changes: 5 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"sphinx.ext.mathjax",
"sphinx.ext.viewcode",
"sphinx.ext.autosummary",
"sphinx.ext.intersphinx",
"numpydoc",
"fluiddoc.mathmacro",
"sphinx.ext.inheritance_diagram", # requires Graphviz
Expand Down Expand Up @@ -325,3 +326,7 @@
]

suppress_warnings = ["mystnb.unknown_mime_type"]

intersphinx_mapping = {
"fluiddyn": ("https://fluiddyn.readthedocs.io/en/latest", None)
}
3 changes: 2 additions & 1 deletion doc/examples/optflow_try_params.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ this example:
```{literalinclude} optflow_try_params.py
```

The parameters in `params.series` are used to define an object `SeriesOfArrays`
The parameters in `params.series` are used to define an object
{class}`fluiddyn.util.serieofarrays.SeriesOfArrays`
and to select one serie (which represents here a couple of images). It is also
what is done internally in the topology. Have a look at
[our tutorial](https://fluiddyn.readthedocs.io/en/latest/ipynb/tuto_serieofarrays.html)
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/piv_try_params.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ look for the best parameters for a PIV computation. It is better to use the PIV
```{literalinclude} piv_try_params.py
```

The parameters in `params.series` are used to define an object `SeriesOfArrays`
The parameters in `params.series` are used to define a
{class}`fluiddyn.util.serieofarrays.SeriesOfArrays`
and to select one serie (which represents here a couple of images). It is also
what is done internally in the PIV topology. Have a look at
[our tutorial](https://fluiddyn.readthedocs.io/en/latest/ipynb/tuto_serieofarrays.html)
Expand Down
6 changes: 3 additions & 3 deletions doc/examples/piv_try_params.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""To be run in IPython to find a good set of parameters"""

from fluidimage.piv import WorkPIV
from fluidimage.piv import Work

params = WorkPIV.create_default_params()
params = Work.create_default_params()

params.multipass.number = 2
params.multipass.use_tps = True
Expand All @@ -19,7 +19,7 @@
params.series.path = path
params.series.str_subset = "i+1:i+3"

work = WorkPIV(params=params)
work = Work(params=params)

piv = work.process_1_serie()

Expand Down
6 changes: 3 additions & 3 deletions doc/examples/preproc.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ to first investigate which are the better parameters for your case:
```

and then process a large serie of images in parallel with the class
{class}`fluidimage.topologies.image2image.TopologyImage2Image`.
{class}`fluidimage.image2image.Topology`.

```{literalinclude} im2im_parallel.py
```
Expand All @@ -32,7 +32,7 @@ standard preprocessing to images.
### Preprocessing one serie

To find the good parameter, you can use the class
{class}`fluidimage.work.preproc.Work` (see also
{class}`fluidimage.preproc.Work` (see also
{mod}`fluidimage.preproc`).

```{literalinclude} preproc_try_params.py
Expand All @@ -41,7 +41,7 @@ To find the good parameter, you can use the class
### Preprocessing large series of images

To apply the preprocessing to a large serie of images in parallel, use
{class}`fluidimage.topologies.preproc.TopologyPreproc`.
{class}`fluidimage.preproc.Topology`.

```{literalinclude} preproc_parallel.py
```
6 changes: 3 additions & 3 deletions src/fluidimage/topologies/preproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ def create_default_params(cls, backend="python"):
ind_start : int
Start index for the whole series of images being loaded.
For more details: see `class SeriesOfArrays`.
For more details: see {class}`fluiddyn.util.serieofarrays.SeriesOfArrays`.
ind_stop : int
Stop index for the whole series of images being loaded.
For more details: see `class SeriesOfArrays`.
For more details: see {class}`fluiddyn.util.serieofarrays.SeriesOfArrays`.
ind_step : int
Step index for the whole series of images being loaded.
For more details: see `class SeriesOfArrays`.
For more details: see {class}`fluiddyn.util.serieofarrays.SeriesOfArrays`.
"""
)
Expand Down

0 comments on commit 4a0a36a

Please sign in to comment.