[Olena-patches] 3246: Fix step2 in tutorial.

* doc/tutorial/figures/tuto1_first_image-1.pbm, * doc/tutorial/outputs/tuto1_first_image.txt: remove. Not needed anymore. * doc/tutorial/samples/tuto2_first_image.cc: update image saving. * doc/tutorial/tutorial.tex: include the right files. --- milena/ChangeLog | 12 ++++++++++++ .../doc/tutorial/figures/tuto1_first_image-1.pbm | 5 ----- milena/doc/tutorial/outputs/tuto1_first_image.txt | 14 -------------- milena/doc/tutorial/samples/tuto2_first_image.cc | 3 ++- milena/doc/tutorial/tutorial.tex | 12 ++++++------ 5 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 milena/doc/tutorial/figures/tuto1_first_image-1.pbm delete mode 100644 milena/doc/tutorial/outputs/tuto1_first_image.txt diff --git a/milena/ChangeLog b/milena/ChangeLog index 39ac7d6..f846446 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2009-02-03 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix step2 in tutorial. + + * doc/tutorial/figures/tuto1_first_image-1.pbm, + * doc/tutorial/outputs/tuto1_first_image.txt: remove. Not needed + anymore. + + * doc/tutorial/samples/tuto2_first_image.cc: update image saving. + + * doc/tutorial/tutorial.tex: include the right files. + 2009-02-02 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Introduce subject_point_impl. diff --git a/milena/doc/tutorial/figures/tuto1_first_image-1.pbm b/milena/doc/tutorial/figures/tuto1_first_image-1.pbm deleted file mode 100644 index 03baef0..0000000 --- a/milena/doc/tutorial/figures/tuto1_first_image-1.pbm +++ /dev/null @@ -1,5 +0,0 @@ -P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr -# EPITA Research and Development Laboratory (LRDE) -21 13 -ÿÿøš»Ø«»šˆ»š«»ššˆØÿÿø­›˜ª«šª›šŠ«š­š˜ÿÿø \ No newline at end of file diff --git a/milena/doc/tutorial/outputs/tuto1_first_image.txt b/milena/doc/tutorial/outputs/tuto1_first_image.txt deleted file mode 100644 index 42a59f9..0000000 --- a/milena/doc/tutorial/outputs/tuto1_first_image.txt +++ /dev/null @@ -1,14 +0,0 @@ -- - - - - - - - - - - - - - - - - - - - - -- | - | - | | | - | - - - | - - - - | - - -- | - | - | - - - | - - - | - - - | - | - -- | | | - | | | - | - - - | - - - | - | - -- | - | - | - - - | - - - | - - - | - | - -- | - | - | | | - | | | - | | | - - | - - -- - - - - - - - - - - - - - - - - - - - - -- | - | - - | - - | | - - | - - - | | - - -- | - | - | - | - | - | - | - - - | - | - -- | - | - | - | - | | - - | - - - | - | - -- | | | - | - | - | - | - | - - - | - | - -- | - | - - | - - | - | - | | | - | | - - -- - - - - - - - - - - - - - - - - - - - - - diff --git a/milena/doc/tutorial/samples/tuto2_first_image.cc b/milena/doc/tutorial/samples/tuto2_first_image.cc index ecc995f..c9ef0fd 100644 --- a/milena/doc/tutorial/samples/tuto2_first_image.cc +++ b/milena/doc/tutorial/samples/tuto2_first_image.cc @@ -1,4 +1,5 @@ #include <mln/essential/2d.hh> +#include <doc/tutorial/tools/sample_utils.hh> int main() { using namespace mln; @@ -30,6 +31,6 @@ int main() // \} // \{ - io::pbm::save(ima, "../figures/tuto1_first_image-1.pbm"); + doc::pbmsave(ima, "tuto2_first_image"); // \} } diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index ffe6ca5..83219ee 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -420,27 +420,27 @@ After this step you should know how to: First, declare an array of bool which will represent the image grid. Each each cell in this grid is a site and each cell contains a value, \val{true} or \val{false}. -\doxycode[1]{tuto1_first_image} +\doxycode[1]{tuto2_first_image} From that grid, simply call make::image to get an image initialized with that data. -\doxycode[2]{tuto1_first_image} +\doxycode[2]{tuto2_first_image} This way of initializing an image is the most common one. However, there are several other ways described in section \doxyref{imacreate}. To be sure that the data is correctly initialized, it is possible to display the image in the standard output using debug::println. -\doxycode[3]{tuto1_first_image} +\doxycode[3]{tuto2_first_image} Output: -\doxyoutput{tuto1_first_image} +\doxyoutput{tuto2_first_image} Finally, you may want to save the image. Since we use bool as image value, the PBM format is the best choice. Therefore, we use io::pbm::save. -\doxycode[4]{tuto1_first_image} +\doxycode[4]{tuto2_first_image} The output image looks like the following: -\doxyfigure{tuto1_first_image}{3cm} +\doxyfigure{tuto2_first_image}{3cm} In this first step we used a boolean image. Many other value types are available though. A more detailed description can be found in section -- 1.5.6.5