[Olena-patches] [PATCH 6/8] WIP: Restore comments dropped by the tool that update copyright notices.

--- .../morpho/artificial_line_graph_image_wst.cc | 22 ++++++++++++++++++ milena/tests/morpho/complex_image_morpho.cc | 4 +++ milena/tests/morpho/complex_image_wst.cc | 5 ++++ milena/tests/morpho/graph_image_morpho.cc | 4 +++ milena/tests/morpho/graph_image_wst.cc | 3 ++ milena/tests/morpho/lena_line_graph_image_wst1.cc | 21 +++++++++++++++++ milena/tests/morpho/lena_line_graph_image_wst2.cc | 24 ++++++++++++++++++++ milena/tests/morpho/line_graph_image_morpho.cc | 4 +++ milena/tests/morpho/line_graph_image_wst.cc | 4 +++ 9 files changed, 91 insertions(+), 0 deletions(-) diff --git a/milena/tests/morpho/artificial_line_graph_image_wst.cc b/milena/tests/morpho/artificial_line_graph_image_wst.cc index 9d09ab5..3b019ba 100644 --- a/milena/tests/morpho/artificial_line_graph_image_wst.cc +++ b/milena/tests/morpho/artificial_line_graph_image_wst.cc @@ -23,6 +23,28 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/* FIXME: We should factor as much things as possible between + tests/morpho/lena_line_graph_image_wst1.cc, + tests/morpho/lena_line_graph_image_wst2.cc and this file, starting + with conversion routines. */ + +/** \file + \brief Tests on the Watershed Transform (WST) on an artificial + mln::line_graph_image. + + The scenario is as follows: + \li create an artificial (checkboard) 2-D image ; + \li convert this 2-D image into a line graph-based one, where values + on edges are computed as the absolute value of the difference + between the values on the vertices adjacent to the edge, so as to + create a (norm of the) gradient ``between the pixels'' of the + input image; + \li perform a WST on this line graph image; + \li create a 2-D, color output image with height and width double + the size the original one, and copy the data of the input image + in it, interpolating inter-pixel points; + \li print the watershed on lines into that same image, and save it. */ + #include <mln/core/image/image2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index 31e202d..601b7a9 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -23,6 +23,10 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// Test of mln::complex_image with morphological filters. + #include <iostream> #include <mln/value/int_u8.hh> diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc index 239630b..ef7adea 100644 --- a/milena/tests/morpho/complex_image_wst.cc +++ b/milena/tests/morpho/complex_image_wst.cc @@ -23,6 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Testing the Watershed Transform by flooding an +/// mln::complex_image. + #include <iostream> #include <fstream> #include <sstream> diff --git a/milena/tests/morpho/graph_image_morpho.cc b/milena/tests/morpho/graph_image_morpho.cc index 0a78462..bfa16c6 100644 --- a/milena/tests/morpho/graph_image_morpho.cc +++ b/milena/tests/morpho/graph_image_morpho.cc @@ -23,6 +23,10 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Tests on a graph-based image with morphological filters. + #include <mln/accu/shape/bbox.hh> #include <mln/core/alias/box2d.hh> #include <mln/core/alias/point2d.hh> diff --git a/milena/tests/morpho/graph_image_wst.cc b/milena/tests/morpho/graph_image_wst.cc index bbc9e74..735b648 100644 --- a/milena/tests/morpho/graph_image_wst.cc +++ b/milena/tests/morpho/graph_image_wst.cc @@ -23,6 +23,9 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// \brief Tests on the Watershed Transform on a graph-based image. + #include <vector> #include <mln/core/alias/point2d.hh> diff --git a/milena/tests/morpho/lena_line_graph_image_wst1.cc b/milena/tests/morpho/lena_line_graph_image_wst1.cc index 98d20d8..aef5cc3 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst1.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst1.cc @@ -23,6 +23,27 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/* FIXME: We should factor as much things as possible between + tests/morpho/lena_line_graph_image_wst1.cc and + tests/morpho/lena_line_graph_image_wst2.cc, starting from conversion + routines. */ + +/** \file + \brief Tests on the Watershed Transform (WST) on a mln::line_graph_image. + + The scenario is as follows: + \li load a 2-D, gray-level image from a PGM file; + \li compute a morphological gradient of this image; + \li simplify the image to reduce the number of local minima; + \li convert this 2-D image into a line graph-based one, where values + on edges are computed as the maxmimum of the values on the vertices + adjacent to the edge; + \li perform a WST on the line graph image; + \li create an 2-D, color output image with height and width double + the size the original one, and copy the data of the input image + in it, interpolating inter-pixel points; + \li print the watershed on lines into that same image, and save it. */ + #include <map> #include <vector> diff --git a/milena/tests/morpho/lena_line_graph_image_wst2.cc b/milena/tests/morpho/lena_line_graph_image_wst2.cc index 697bbfe..ab650b6 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst2.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst2.cc @@ -23,6 +23,30 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/* FIXME: We should factor as much things as possible between + tests/morpho/lena_line_graph_image_wst1.cc and + tests/morpho/lena_line_graph_image_wst2.cc, starting from conversion + routines. */ + +/** \file + \brief More tests on the Watershed Transform (WST) on a + mln::line_graph_image. + + The scenario is as follows: + \li load a 2-D, gray-level image from a PGM file; + \li convert this 2-D image into a line graph-based one, where values + on edges are computed as the absolute value of the difference + between the values on the vertices adjacent to the edge, so as to + create a (norm of the) gradient ``between the pixels'' of the + input image; + \li reduce the number of minima using an area opening (counting the + vertices to compute the area, not the edges); + \li perform a WST on this simplified line graph image; + \li create a 2-D, color output image with height and width double + the size the original one, and copy the data of the input image + in it, interpolating inter-pixel points; + \li print the watershed on lines into that same image, and save it. */ + #include <mln/core/image/image2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/tests/morpho/line_graph_image_morpho.cc b/milena/tests/morpho/line_graph_image_morpho.cc index 945a47c..21ce087 100644 --- a/milena/tests/morpho/line_graph_image_morpho.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -23,6 +23,10 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// Tests on line a graph-based image with morphological filters. + #include <mln/core/alias/point2d.hh> /// Required for line graph images. diff --git a/milena/tests/morpho/line_graph_image_wst.cc b/milena/tests/morpho/line_graph_image_wst.cc index 2d10779..2ce2cb6 100644 --- a/milena/tests/morpho/line_graph_image_wst.cc +++ b/milena/tests/morpho/line_graph_image_wst.cc @@ -23,6 +23,10 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file tests/morpho/line_graph_image_wst.cc +/// +/// Tests on the Watershed Transform on a line graph-based image. + #include <mln/core/alias/point2d.hh> /// Required for line graph images. -- 1.6.4.2