* camille/: New directory. * camille/graph-line-gradient-closing.cc, * camille/graph-wst.cc: New. * camille/Makefile: New. * camille/.gitignore: New. --- milena/sandbox/ChangeLog | 10 + milena/sandbox/camille/.gitignore | 4 + milena/sandbox/camille/Makefile | 9 + .../sandbox/camille/graph-line-gradient-closing.cc | 149 +++++++++++++ milena/sandbox/camille/graph-wst.cc | 219 ++++++++++++++++++++ 5 files changed, 391 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/camille/.gitignore create mode 100644 milena/sandbox/camille/Makefile create mode 100644 milena/sandbox/camille/graph-line-gradient-closing.cc create mode 100644 milena/sandbox/camille/graph-wst.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 6fca8e7..448a251 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2009-02-10 Roland Levillain <roland@lrde.epita.fr> + + Add programs for Camille Couprie. + + * camille/: New directory. + * camille/graph-line-gradient-closing.cc, + * camille/graph-wst.cc: New. + * camille/Makefile: New. + * camille/.gitignore: New. + 2009-02-10 Frederic Bour <bour@lrde.epita.fr> [sandbox][bour] Leveling filter with test. diff --git a/milena/sandbox/camille/.gitignore b/milena/sandbox/camille/.gitignore new file mode 100644 index 0000000..299cd39 --- /dev/null +++ b/milena/sandbox/camille/.gitignore @@ -0,0 +1,4 @@ +/graph-line-gradient-closing +/graph-wst +/out.pgm +/out.ppm diff --git a/milena/sandbox/camille/Makefile b/milena/sandbox/camille/Makefile new file mode 100644 index 0000000..a95fb63 --- /dev/null +++ b/milena/sandbox/camille/Makefile @@ -0,0 +1,9 @@ +CXXFLAGS = -ggdb -DNDEBUG -O2 -I../.. + +all: graph-line-gradient-closing graph-wst + +test-graph-wst: graph-wst + ./graph-wst ../../img/small.pgm 20 out.ppm + +test-graph-line-gradient-closing: graph-line-gradient-closing + ./graph-line-gradient-closing ../../img/small.pgm 20 out.pgm diff --git a/milena/sandbox/camille/graph-line-gradient-closing.cc b/milena/sandbox/camille/graph-line-gradient-closing.cc new file mode 100644 index 0000000..a9eaa4e --- /dev/null +++ b/milena/sandbox/camille/graph-line-gradient-closing.cc @@ -0,0 +1,149 @@ +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +// FIXME: Update. +/** \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> +#include <mln/core/alias/neighb2d.hh> + +/// Required for line graph images. +#include <mln/core/site_set/p_edges.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/var.hh> +#include <mln/pw/all.hh> +#include <mln/fun/i2v/array.hh> +#include <mln/util/graph.hh> + +#include <mln/morpho/line_gradient.hh> +#include <mln/morpho/closing_area_on_vertices.hh> +#include <mln/morpho/meyer_wst.hh> +#include <mln/level/stretch.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/rgb8.hh> +#include <mln/literal/black.hh> +#include <mln/literal/colors.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/math/max.hh> +#include <mln/math/abs.hh> + + +int main(int argc, char* argv[]) +{ + if (argc != 4) + { + std::cerr << "usage: " << argv[0] << " input.pgm lambda output.pgm" + << std::endl; + std::exit(1); + } + std::string input_filename = argv[1]; + unsigned lambda = atoi(argv[2]); + std::string output_filename = argv[3]; + + + using namespace mln; + using value::int_u8; + using value::int_u16; + using value::rgb8; + + /*--------. + | Input. | + `--------*/ + + typedef int_u8 input_val_t; + image2d<input_val_t> input; + io::pgm::load(input, input_filename); + + /*----------------. + | Line gradient. | + `----------------*/ + + // Line graph image. + mln_VAR(lg_ima, morpho::line_gradient(input)); + + /*-----------------. + | Simplification. | + `-----------------*/ + + typedef line_graph_elt_neighborhood<util::graph, lg_ima_t::pset::fun_t> nbh_t; + nbh_t nbh; + + mln_VAR(closed_lg_ima, morpho::closing_area_on_vertices(lg_ima, nbh, lambda)); + + /*---------. + | Output. | + `---------*/ + + // FIXME: Inlined conversion, to be reifed into a routine. + + // Data. + typedef int_u8 output_val_t; + typedef image2d<output_val_t> output_t; + point2d output_pmin = input.domain().pmin(); + point2d output_pmax(input.domain().pmax()[0] * 2, + input.domain().pmax()[1] * 2); + output_t output(box2d(output_pmin, output_pmax)); + data::fill(output, 0); + // Draw the filtered gradient. + mln_piter_(closed_lg_ima_t) p(closed_lg_ima.domain()); + for_all(p) + { + mln_psite_(lg_ima_t) pp(p); + // Equivalent of the line (edge) PP in OUTPUT. + int row1 = pp.first()[0] * 2; + int col1 = pp.first()[1] * 2; + int row2 = pp.second()[0] * 2; + int col2 = pp.second()[1] * 2; + point2d q((row1 + row2) / 2, (col1 + col2) / 2); + // Print the watershed in red. + output(q) = closed_lg_ima(p); + } + io::pgm::save(output, output_filename); +} diff --git a/milena/sandbox/camille/graph-wst.cc b/milena/sandbox/camille/graph-wst.cc new file mode 100644 index 0000000..aafdc85 --- /dev/null +++ b/milena/sandbox/camille/graph-wst.cc @@ -0,0 +1,219 @@ +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +// FIXME: Update. +/** \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> +#include <mln/core/alias/neighb2d.hh> + +/// Required for line graph images. +#include <mln/core/site_set/p_edges.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/var.hh> +#include <mln/pw/all.hh> +#include <mln/fun/i2v/array.hh> +#include <mln/util/graph.hh> + +#include <mln/morpho/line_gradient.hh> +#include <mln/morpho/closing_area_on_vertices.hh> +#include <mln/morpho/meyer_wst.hh> +#include <mln/level/stretch.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/rgb8.hh> +#include <mln/literal/black.hh> +#include <mln/literal/colors.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/math/max.hh> +#include <mln/math/abs.hh> + + +int main(int argc, char* argv[]) +{ + if (argc != 4) + { + std::cerr << "usage: " << argv[0] << " input.pgm lambda output.ppm" + << std::endl; + std::exit(1); + } + std::string input_filename = argv[1]; + unsigned lambda = atoi(argv[2]); + std::string output_filename = argv[3]; + + + using namespace mln; + using value::int_u8; + using value::int_u16; + using value::rgb8; + + /*--------. + | Input. | + `--------*/ + + typedef int_u8 input_val_t; + image2d<input_val_t> input; + io::pgm::load(input, input_filename); + + /*----------------. + | Line gradient. | + `----------------*/ + + // Line graph image. + mln_VAR(lg_ima, morpho::line_gradient(input)); + + /*-----------------. + | Simplification. | + `-----------------*/ + + typedef line_graph_elt_neighborhood<util::graph, lg_ima_t::pset::fun_t> nbh_t; + nbh_t nbh; + + mln_VAR(closed_lg_ima, morpho::closing_area_on_vertices(lg_ima, nbh, lambda)); + + /*------. + | WST. | + `------*/ + + // Perform a Watershed Transform. + unsigned nbasins; + mln_VAR(wshed, morpho::meyer_wst(closed_lg_ima, nbh, nbasins)); + std::cout << "nbasins = " << nbasins << std::endl; + + /*---------. + | Output. | + `---------*/ + + // FIXME: Inlined conversion, to be reifed into a routine. + + // Save the result in gray levels (data) + color (wshed). + + // Data. + typedef rgb8 output_val_t; + typedef image2d<output_val_t> output_t; + point2d output_pmin = input.domain().pmin(); + point2d output_pmax(input.domain().pmax()[0] * 2, + input.domain().pmax()[1] * 2); + output_t output(box2d(output_pmin, output_pmax)); + data::fill(output, literal::black); + mln_fwd_piter_(image2d<input_val_t>) p(input.domain()); + for_all(p) + { + // Equivalent of P in OUTPUT. + point2d q(p[0] * 2, p[1] * 2); + input_val_t v = input(p); + /* FIXME: Use a conversion function from input_val_t to + output_val_t instead of an explicit construction. */ + output(q) = output_val_t(v, v, v); + } + // Interpolate missing points in OUTPUT. + mln_piter_(output_t) p_out(output.domain()); + for_all(p_out) + { + // Process points on even rows and odd columns + if (p_out[0] % 2 == 0 && p_out[1] % 2 == 1) + output(p_out) = (output(p_out + left) + output(p_out + right)) / 2; + // Process points on odd rows and even columns + if (p_out[0] % 2 == 1 && p_out[1] % 2 == 0) + output(p_out) = (output(p_out + up) + output(p_out + down)) / 2; + // Process points on odd rows and odd columns + if (p_out[0] % 2 == 1 && p_out[1] % 2 == 1) + output(p_out) = + (output(p_out + dpoint2d(-1, -1)) + + output(p_out + dpoint2d(-1, +1)) + + output(p_out + dpoint2d(+1, -1)) + + output(p_out + dpoint2d(+1, +1))) / 4; + } + // Draw the watershed. + /* FIXME: We should draw the watershed on another image and + superimpose it on OUTPUT instead of drawing it directly into + OUTPUT. */ + mln_piter_(wshed_t) pw(wshed.domain()); + for_all(pw) + { + if (wshed(pw) == 0) + { + mln_psite_(lg_ima_t) pp(pw); + // Equivalent of the line (edge) PP in OUTPUT. + int row1 = pp.first()[0] * 2; + int col1 = pp.first()[1] * 2; + int row2 = pp.second()[0] * 2; + int col2 = pp.second()[1] * 2; + point2d q((row1 + row2) / 2, (col1 + col2) / 2); + // Print the watershed in red. + output(q) = literal::red; + } + } + // Fill the holes, so that the watershed looks connected. + /* FIXME: This approach is bad: it creates thick lines of watershed. + We should probably solve this when we ``paint'' the watershed + over the ``doubled'' image. + + A better approach is probably to iterate over the set of vertices, + and ``connect'' edges according to patterns (vertically or + horizontally connected egdes member of the watershed, etc.). */ + // Reuse the piter on OUTPUT. + for_all (p_out) + // Only handle points on odd rows and columns. + if (p_out[0] % 2 == 1 && p_out[1] % 2 == 1) + { + // Count the number of adjacent watershed points. If there are + // two or more, consider, create a watershed point. + /* FIXME: Iterating over a c4 window would be more elegant, of + course. */ + unsigned nwsheds = + (output.has(p_out + up ) && output(p_out + up ) == literal::red) + + (output.has(p_out + down ) && output(p_out + down ) == literal::red) + + (output.has(p_out + left ) && output(p_out + right) == literal::red) + + (output.has(p_out + right) && output(p_out + left ) == literal::red); + if (nwsheds >= 2) + output(p_out) = literal::red; + } + io::ppm::save(output, output_filename); +} -- 1.6.1.2