June 2009 - Olena-patches

4183: 6Update Scribo.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

* extract/lines_discontinued.hh: remove. Useless. * extract/primitive/lines_discontinued.hh: enlarge the window used to dilate. * extract/primitive/lines_h_pattern.hh, * extract/primitive/lines_pattern.hh, * extract/primitive/lines_v_pattern.hh: new line extraction algorithm. * headers.mk: remove lines_discontinued.hh from this list. * preprocessing/unskew.hh: fix wrong angle computation. * src/extract/primitive/find_discontinued_lines.cc, * table/extract.hh: use the new line extraction algorithm. * src/preprocess.cc: call scribo::preprocess. --- scribo/ChangeLog | 22 +++ scribo/extract/lines_discontinued.hh | 194 -------------------- scribo/extract/primitive/lines_discontinued.hh | 7 +- scribo/extract/primitive/lines_h_pattern.hh | 99 ++++++++++ scribo/extract/primitive/lines_pattern.hh | 122 ++++++++++++ scribo/extract/primitive/lines_v_pattern.hh | 94 ++++++++++ scribo/headers.mk | 1 - scribo/preprocessing/unskew.hh | 4 +- .../extract/primitive/find_discontinued_lines.cc | 24 +-- scribo/src/preprocess.cc | 4 +- scribo/table/extract.hh | 20 ++- 11 files changed, 366 insertions(+), 225 deletions(-) delete mode 100644 scribo/extract/lines_discontinued.hh create mode 100644 scribo/extract/primitive/lines_h_pattern.hh create mode 100644 scribo/extract/primitive/lines_pattern.hh create mode 100644 scribo/extract/primitive/lines_v_pattern.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 306a272..39c6c72 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,25 @@ +2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Update Scribo. + + * extract/lines_discontinued.hh: remove. Useless. + + * extract/primitive/lines_discontinued.hh: enlarge the window used to + dilate. + + * extract/primitive/lines_h_pattern.hh, + * extract/primitive/lines_pattern.hh, + * extract/primitive/lines_v_pattern.hh: new line extraction algorithm. + + * headers.mk: remove lines_discontinued.hh from this list. + + * preprocessing/unskew.hh: fix wrong angle computation. + + * src/extract/primitive/find_discontinued_lines.cc, + * table/extract.hh: use the new line extraction algorithm. + + * src/preprocess.cc: call scribo::preprocess. + 2009-06-19 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Use scripts located in build-aux in Scribo. diff --git a/scribo/extract/lines_discontinued.hh b/scribo/extract/lines_discontinued.hh deleted file mode 100644 index f966f69..0000000 --- a/scribo/extract/lines_discontinued.hh +++ /dev/null @@ -1,194 +0,0 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project 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. - -#ifndef SCRIBO_EXTRACT_PRIMITIVE_LINES_DISCONTINUED_HH -# define SCRIBO_EXTRACT_PRIMITIVE_LINES_DISCONTINUED_HH - -/// \file -/// -/// Extract discontinued lines in a binary image. - - -# include <mln/core/concept/image.hh> -# include <mln/core/concept/window.hh> -# include <mln/core/concept/neighborhood.hh> -# include <mln/core/site_set/box.hh> - -# include <mln/labeling/blobs.hh> -# include <mln/labeling/compute.hh> - -# include <mln/morpho/rank_filter.hh> -# include <mln/morpho/dilation.hh> - -# include <mln/accu/shape/bbox.hh> - -# include <mln/util/array.hh> -# include <mln/util/couple.hh> - -# include <scribo/core/macros.hh> - -namespace scribo -{ - - namespace extract - { - - namespace primitive - { - - using namespace mln; - - - /// Extract discontinued lines in a binary image. - /*! - * Based on a rank filter. - * - * \param[in] input_ A binary image. - * \param[in] nbh_ The neighborhood used for labeling image - * components. - * \param[in,out] nlines The label type used for labeling. - * \param[in] win_ A Window used to extract lines. - * \param[in] rank_k Rank used for filtering. - * \param[in,out] line_bboxes line bounding boxes. - * - * \return An image in which lines are labeled. - */ - template <typename I, typename N, typename V, typename W> - mln_ch_value(I,V) - lines_discontinued(const Image& input_, - const Neighborhood<N>& nbh_, V& nlines, - const Window<W>& win_, unsigned rank_k, - util::array<box<mln_site(I)> >& line_bboxes); - - - /// \overload - template <typename I, typename N, typename V, typename W> - mln_ch_value(I,V) - lines_discontinued(const Image& input_, - const Neighborhood<N>& nbh_, V& nlines, - const Window<W>& win_, unsigned rank_k); - - - - -# ifndef MLN_INCLUDE_ONLY - - - namespace internal - { - - template <typename I, typename N, typename V, typename W> - void - lines_discontinued_tests(const Image& input, - const Neighborhood<N>& nbh, V& nlines, - const Window<W>& win, unsigned rank_k) - { - mlc_equal(mln_value(I),bool)::check(); - mlc_bool(mln_site_(I)::dim == 2)::check(); - mlc_is_a(V, mln::value::Symbolic)::check(); - - mln_precondition(exact(input).is_valid()); - mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); - - (void) nlines; - (void) rank_k; - } - - } // end of namespace scribo::primitive::internal - - - - template <typename I, typename N, typename V, typename W> - inline - mln_ch_value(I,V) - lines_discontinued(const Image& input_, - const Neighborhood<N>& nbh_, V& nlines, - const Window<W>& win_, unsigned rank_k) - { - trace::entering("scribo::primitive::lines_discontinued"); - - internal::lines_discontinued_tests(input_, nbh_, nlines, win_, rank_k); - - const I& input = exact(input_); - const N& nbh = exact(nbh_); - const W& win = exact(win_); - - mln_ch_value(I,bool) filter = morpho::rank_filter(input, win, rank_k); - mln_ch_value(I,V) output = labeling::blobs(filter, nbh, nlines); - - //FIXME: we would like to enlarge the component in the right direction, - // in order to avoid rank filter side effects (smaller components). - - trace::exiting("scribo::primitive::lines_discontinued"); - return output; - } - - - - - template <typename I, typename N, typename V, typename W> - inline - mln_ch_value(I,V) - lines_discontinued(const Image& input_, - const Neighborhood<N>& nbh_, V& nlines, - const Window<W>& win_, unsigned rank_k, - util::array<box<mln_site(I)> >& line_bboxes) - { - trace::entering("scribo::primitive::lines_discontinued"); - - internal::lines_discontinued_tests(input_, nbh_, nlines, win_, rank_k); - - const I& input = exact(input_); - const N& nbh = exact(nbh_); - const W& win = exact(win_); - - mln_ch_value(I,V) - output = lines_discontinued(input, nbh, nlines, win, rank_k); - - line_bboxes = labeling::compute(accu::meta::shape::bbox(), output, nlines); - mln_postcondition(line_bboxes.nelements() == nlines.next()); - - //FIXME: is it correct? - for_all_components(i, line_bboxes) - { - line_bboxes[i].enlarge(W::dir, win.delta_() - rank_k); - line_bboxes[i].crop_wrt(input.domain()); - } - - trace::exiting("scribo::primitive::lines_discontinued"); - return output; - } - -# endif // ! MLN_INCLUDE_ONLY - - - } // end of namespace scribo::extract::primitive - - } // end of namespace scribo::extract - -} // end of namespace scribo - -#endif // ! SCRIBO_EXTRACT_PRIMITIVE_LINES_DISCONTINUED_HH diff --git a/scribo/extract/primitive/lines_discontinued.hh b/scribo/extract/primitive/lines_discontinued.hh index 0e87efd..97d08f8 100644 --- a/scribo/extract/primitive/lines_discontinued.hh +++ b/scribo/extract/primitive/lines_discontinued.hh @@ -123,18 +123,15 @@ namespace scribo int dil; if (!(rank_k % 2)) - dil = win.length() / 2 + rank_k; + dil = win.length() / 2 + 2 * rank_k + 2; else - dil = win.length() / 2 + rank_k + 1; + dil = win.length() / 2 + 2 * rank_k + 3; mln_ch_value(I,bool) filter = morpho::dilation(morpho::rank_filter(input, win, rank_k), W(dil)); object_image(mln_ch_value(I,V)) output = extract::primitive::objects(filter, nbh, nlines); - //FIXME: we would like to enlarge the component in the right direction, - // in order to avoid rank filter side effects (smaller components). - trace::exiting("scribo::primitive::lines_discontinued"); return output; } diff --git a/scribo/extract/primitive/lines_h_pattern.hh b/scribo/extract/primitive/lines_h_pattern.hh new file mode 100644 index 0000000..10dcfe5 --- /dev/null +++ b/scribo/extract/primitive/lines_h_pattern.hh @@ -0,0 +1,99 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#ifndef SCRIBO_EXTRACT_PRIMITIVE_LINES_H_PATTERN_HH +# define SCRIBO_EXTRACT_PRIMITIVE_LINES_H_PATTERN_HH + +/// \file +/// +/// Extract horizontal lines matching a specific pattern. + +#include <mln/core/concept/image.hh> +#include <mln/core/alias/window2d.hh> + +# include <mln/win/hline2d.hh> + +# include <mln/morpho/dilation.hh> + +# include <scribo/extract/primitive/lines_pattern.hh> + +namespace scribo +{ + + namespace extract + { + + namespace primitive + { + using namespace mln; + + /// Extract horizontal lines matching a specific pattern. + /// + /// \param[in] input A binary image. + /// \param[in] length The minimum line length. + /// + /// \result An image of horizontal lines. + // + template <typename I> + mln_concrete(I) + lines_h_pattern(const Image& input, unsigned length); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + mln_concrete(I) + lines_h_pattern(const Image& input, unsigned length) + { + mlc_is(mln_value(I), bool)::check(); + mln_precondition(exact(input).is_valid()); + mln_precondition(length % 2 == 1); + + bool win_def[7][1] = { {1}, + {0}, + {0}, + {0}, + {0}, + {0}, + {1} }; + + window2d win; + convert::from_to(win_def, win); + + win::hline2d hwin(length/2 + 2); + return morpho::dilation(lines_pattern(input, length, 1, win), hwin); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::impl::generic + + } // end of namespace mln::impl + +} // end of namespace mln + + +#endif // ! SCRIBO_EXTRACT_PRIMITIVE_LINES_H_PATTERN_HH + diff --git a/scribo/extract/primitive/lines_pattern.hh b/scribo/extract/primitive/lines_pattern.hh new file mode 100644 index 0000000..45bc487 --- /dev/null +++ b/scribo/extract/primitive/lines_pattern.hh @@ -0,0 +1,122 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#ifndef SCRIBO_EXTRACT_PRIMITIVE_LINES_PATTERN_HH +# define SCRIBO_EXTRACT_PRIMITIVE_LINES_PATTERN_HH + +/// \file +/// +/// Extract lines matching a specific pattern. + +# include <mln/core/concept/image.hh> +# include <mln/core/alias/window2d.hh> +# include <mln/core/routine/duplicate.hh> + +# include <mln/accu/transform_line.hh> +# include <mln/accu/count_value.hh> + +# include <mln/data/paste.hh> + + +namespace scribo +{ + + namespace extract + { + + namespace primitive + { + + using namespace mln; + + + /// Extract lines with a specific pattern + /// + /// \param[in] input_ A binary image. + /// \param[in] length The minimum line length. + /// \param[in] dir The direction of the lines. + /// \param[in] win_ A window corresponding to the line pattern. + /// + /// \return A image with lines of direction \p dir. + // + template <typename I, typename W> + mln_concrete(I) + lines_pattern(const Image& input_, unsigned length, + unsigned dir, const Window<W>& win_); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename W> + mln_concrete(I) + lines_pattern(const Image& input_, unsigned length, + unsigned dir, const Window<W>& win_) + { + trace::entering("mln::lines_pattern"); + + const I& input = exact(input_); + const W& win = exact(win_); + mlc_is(mln_value(I), bool)::check(); + mln_precondition(input.is_valid()); + + accu::count_value<bool> accu(true); + mln_ch_value(I,unsigned) + tmp = accu::transform_line(accu, input, length, dir); + + mln_concrete(I) output; + initialize(output, input); + + mln_piter(I) p(input.domain()); + mln_qiter(window2d) q(win, p); + for_all(p) + { + if (length - tmp(p) > (0.2f * length)) + { + output(p) = false; + continue; + } + + unsigned bg_count = 0; + for_all(q) + bg_count += tmp(q); + + output(p) = (2 * length - bg_count) > (2 * length * 0.90f); + } + + + trace::exiting("mln::lines_pattern"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::impl::generic + + } // end of namespace mln::impl + +} // end of namespace mln + + +#endif // ! SCRIBO_EXTRACT_PRIMITIVE_LINES_PATTERN_HH diff --git a/scribo/extract/primitive/lines_v_pattern.hh b/scribo/extract/primitive/lines_v_pattern.hh new file mode 100644 index 0000000..43727d1 --- /dev/null +++ b/scribo/extract/primitive/lines_v_pattern.hh @@ -0,0 +1,94 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#ifndef SCRIBO_EXTRACT_PRIMITIVE_LINES_V_PATTERN_HH +# define SCRIBO_EXTRACT_PRIMITIVE_LINES_V_PATTERN_HH + +/// \file +/// +/// Extract vertical lines matching a specific pattern. + +#include <mln/core/concept/image.hh> +#include <mln/core/alias/window2d.hh> + +# include <mln/win/hline2d.hh> + +# include <mln/morpho/dilation.hh> + +# include <scribo/extract/primitive/lines_pattern.hh> + +namespace scribo +{ + + namespace extract + { + + namespace primitive + { + using namespace mln; + + + /// Extract vertical lines matching a specific pattern. + /// + /// \param[in] input A binary image. + /// \param[in] length The minimum line length. + /// + /// \result An image of vertical lines. + // + template <typename I> + mln_concrete(I) + lines_v_pattern(const Image& input, unsigned length); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_concrete(I) + lines_v_pattern(const Image& input, unsigned length) + { + mln_precondition(length % 2 == 1); + + bool win_def[1][7] = { { 1, 0, 0, 0, 0, 0, 1 } }; + + window2d win; + convert::from_to(win_def, win); + + win::vline2d vwin(length/2 + 2); + return morpho::dilation(lines_pattern(input, length, 0, win), vwin); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::impl::generic + + } // end of namespace mln::impl + +} // end of namespace mln + + +#endif // ! SCRIBO_EXTRACT_PRIMITIVE_LINES_V_PATTERN_HH + diff --git a/scribo/headers.mk b/scribo/headers.mk index 4846d70..ad834f7 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -18,7 +18,6 @@ nobase_include_HEADERS = \ ./draw/all.hh \ ./draw/bounding_box_links.hh \ ./draw/bounding_boxes.hh \ -./extract/lines_discontinued.hh \ ./extract/primitive/canvas.hh \ ./extract/primitive/cells.hh \ ./extract/primitive/lines_discontinued.hh \ diff --git a/scribo/preprocessing/unskew.hh b/scribo/preprocessing/unskew.hh index 2563c25..aa82f44 100644 --- a/scribo/preprocessing/unskew.hh +++ b/scribo/preprocessing/unskew.hh @@ -80,11 +80,12 @@ namespace scribo double angle = 0; int max_angle = max_p.col(); + std::cout << "max_angle = " << max_angle << std::endl; if (max_angle > 180) max_angle = - max_angle % 180; if (max_angle < 90 && max_angle > 0) - angle = - max_angle; + angle = 90 - max_angle; else if (max_angle < 0 && max_angle > -90) angle = max_angle; else if (max_angle < 180 && max_angle > 90) @@ -92,6 +93,7 @@ namespace scribo else if (max_angle < -90 && max_angle > -180) angle = 180 + max_angle; + std::cout << "effective angle = " << angle << std::endl; mln_concrete(I) output = transformation::rotate(input, angle); trace::exiting("scribo::preprocessing::unskew"); diff --git a/scribo/src/extract/primitive/find_discontinued_lines.cc b/scribo/src/extract/primitive/find_discontinued_lines.cc index 8f81770..4fc76f6 100644 --- a/scribo/src/extract/primitive/find_discontinued_lines.cc +++ b/scribo/src/extract/primitive/find_discontinued_lines.cc @@ -32,15 +32,15 @@ #include <mln/data/convert.hh> #include <mln/debug/superpose.hh> -#include <scribo/extract/primitive/lines_h_discontinued.hh> -#include <scribo/extract/primitive/lines_v_discontinued.hh> #include <scribo/debug/usage.hh> +#include <scribo/extract/primitive/lines_h_pattern.hh> +#include <scribo/extract/primitive/lines_v_pattern.hh> + const char *args_desc[][2] = { { "input.pbm", "A binary image." }, { "length", " Minimum line length." }, - { "rank", " Filter rank." }, {0, 0} }; @@ -49,10 +49,10 @@ int main(int argc, char *argv[]) { using namespace mln; - if (argc != 5) + if (argc != 4) return scribo::debug::usage(argv, "Extract discontinued horizontal and vertical lines", - "input.pbm length rank output.pbm", + "input.pbm length output.pbm", args_desc, "A binary image of horizontal and vertical lines."); @@ -64,23 +64,15 @@ int main(int argc, char *argv[]) value::label_16 nhlines; image2d<bool> hlines = data::convert(bool(), - scribo::extract::primitive::lines_h_discontinued(input, - c8(), - nhlines, - atoi(argv[2]), - atoi(argv[3]))); + scribo::extract::primitive::lines_h_pattern(input, atoi(argv[2]))); value::label_16 nvlines; image2d<bool> vlines = data::convert(bool(), - scribo::extract::primitive::lines_v_discontinued(input, - c8(), - nvlines, - atoi(argv[2]), - atoi(argv[3]))); + scribo::extract::primitive::lines_v_pattern(input, atoi(argv[2]))); data::fill((hlines | pw::value(vlines)).rw(), true); image2d<value::rgb8> out = debug::superpose(input, hlines); - io::ppm::save(out, argv[4]); + io::ppm::save(out, argv[3]); trace::exiting("main"); } diff --git a/scribo/src/preprocess.cc b/scribo/src/preprocess.cc index bc1a1c7..c9f74c7 100644 --- a/scribo/src/preprocess.cc +++ b/scribo/src/preprocess.cc @@ -65,11 +65,11 @@ int main(int argc, char *argv[]) image2d<bool> input_bw = scribo::binarization::simple(input); logical::not_inplace(input_bw); - input_bw = scribo::preprocessing::unskew(input_bw); - input_bw = scribo::filter::small_objects(input_bw, c8(), value::label_16(), 3); input_bw = scribo::filter::thin_objects(input_bw, c8(), value::label_16(), 1); + input_bw = scribo::preprocessing::unskew(input_bw); + logical::not_inplace(input_bw); io::pbm::save(input_bw, argv[2]); diff --git a/scribo/table/extract.hh b/scribo/table/extract.hh index 026343d..a553ccc 100644 --- a/scribo/table/extract.hh +++ b/scribo/table/extract.hh @@ -35,18 +35,24 @@ # include <mln/util/couple.hh> # include <mln/util/array.hh> +# include <mln/io/ppm/all.hh> +# include <mln/labeling/colorize.hh> + # include <scribo/core/object_image.hh> # include <scribo/table/rebuild.hh> # include <scribo/table/erase.hh> -# include <scribo/extract/primitive/lines_h_discontinued.hh> -# include <scribo/extract/primitive/lines_v_discontinued.hh> +# include <scribo/extract/primitive/lines_h_pattern.hh> +# include <scribo/extract/primitive/lines_v_pattern.hh> +# include <scribo/extract/primitive/objects.hh> +# include <scribo/debug/save_bboxes_image.hh> namespace scribo { namespace table { + using namespace mln; /// Extract tables from a binary image. /// Use arbitrary criterions. @@ -80,12 +86,14 @@ namespace scribo mln_precondition(input.is_valid()); mlc_equal(mln_value(I), bool)::check(); + image2d<bool> + bhlines = scribo::extract::primitive::lines_h_pattern(input, 51), + bvlines = scribo::extract::primitive::lines_v_pattern(input, 51); + V nhlines, nvlines; object_image(mln_ch_value(I,V)) - hlines = scribo::extract::primitive::lines_h_discontinued(input, c8(), - nhlines, 51, 6), - vlines = scribo::extract::primitive::lines_v_discontinued(input, c8(), - nvlines, 51, 6); + hlines = scribo::extract::primitive::objects(bhlines, c8(), nhlines), + vlines = scribo::extract::primitive::objects(bvlines, c8(), nvlines); typedef mln::util::couple<mln_ch_value(I,V), mln::util::couple<mln::util::array<box<mln_site(I)> >, -- 1.5.6.5

1 0

4182: Fix compilation warnings.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

* mln/core/image/vmorph/fun_image.hh: move inline keyword before return type. * mln/fun/v2v/hsl_to_rgb.hh: pass float arguments to sqrt. * tests/core/routine/exact.cc: avoid a warning. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/vmorph/fun_image.hh | 6 +++--- milena/mln/fun/v2v/hsl_to_rgb.hh | 9 +++++---- milena/tests/core/routine/exact.cc | 5 ++++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d12ed5c..289810b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix compilation warnings. + + * mln/core/image/vmorph/fun_image.hh: move inline keyword before + return type. + + * mln/fun/v2v/hsl_to_rgb.hh: pass float arguments to sqrt. + + * tests/core/routine/exact.cc: avoid a warning. + +2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Update list of non distributed files. * mln/accu/math/all.hh: strip inclusion of non distributed files. diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 27c85f3..3934725 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -84,7 +84,7 @@ namespace mln trait::image::quant::high, // Else undef) - ) + ) quant; }; @@ -142,14 +142,14 @@ namespace mln fun_image<F, I> operator << (const Function_v2v<F>& f, const Image& ima); - + # ifndef MLN_INCLUDE_ONLY template <typename F, typename I> - fun_image<F, I> inline + fun_image<F, I> operator << (const Function_v2v<F>& f, const Image& ima) { fun_image<F, I> tmp(exact(f), exact(ima)); diff --git a/milena/mln/fun/v2v/hsl_to_rgb.hh b/milena/mln/fun/v2v/hsl_to_rgb.hh index 2fd5fb8..ebc33d5 100644 --- a/milena/mln/fun/v2v/hsl_to_rgb.hh +++ b/milena/mln/fun/v2v/hsl_to_rgb.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -106,9 +107,9 @@ namespace mln static math::round<blue_t> to_b; static const float - sqrt3_3 = std::sqrt(3) / 3, - inv_sqrt6 = 1 / std::sqrt(6), - inv_sqrt2 = 1 / std::sqrt(2); + sqrt3_3 = std::sqrt(3.0f) / 3.0f, + inv_sqrt6 = 1 / std::sqrt(6.0f), + inv_sqrt2 = 1 / std::sqrt(2.0f); float h = hsl.hue() / 180.0 * 3.1415, diff --git a/milena/tests/core/routine/exact.cc b/milena/tests/core/routine/exact.cc index d26bfcf..fd95929 100644 --- a/milena/tests/core/routine/exact.cc +++ b/milena/tests/core/routine/exact.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,10 +43,12 @@ namespace mln void m() { int** i = exact(this)->m_impl(); + (void) i; } void m() const { int* i = exact(this)->m_impl(); + (void) i; } }; -- 1.5.6.5

1 0

4181: Makefile.am: add accu/math/all.hh as stripped file.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

--- ChangeLog | 4 ++++ Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fd1f1b..8d05e22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * Makefile.am: add accu/math/all.hh as stripped file. + 2009-06-22 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * bootstrap: fix generation of header.mk in scribo. diff --git a/Makefile.am b/Makefile.am index 3657461..6039908 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ REGEN_SUBDIRS += milena scribo LRDE_STRIPPED_DIST_FILES = \ $(distdir)/Makefile.am \ $(distdir)/configure.ac \ + $(distdir)/milena/mln/accu/math/all.hh \ $(distdir)/milena/mln/all.hh \ $(distdir)/milena/mln/core/image/vmorph/all.hh \ $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \ -- 1.5.6.5

1 0

4180: Update list of non distributed files.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

* mln/accu/math/all.hh: strip inclusion of non distributed files. * nodist-headers: add new files. --- milena/ChangeLog | 8 ++++++++ milena/mln/accu/math/all.hh | 3 +++ milena/nodist-headers | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5f7b445..d12ed5c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Update list of non distributed files. + + * mln/accu/math/all.hh: strip inclusion of non distributed files. + + * nodist-headers: add new files. + 2009-06-22 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> * doc/Makefile.am: Fix id extraction during refman compilation. diff --git a/milena/mln/accu/math/all.hh b/milena/mln/accu/math/all.hh index b4f77a3..2e94362 100644 --- a/milena/mln/accu/math/all.hh +++ b/milena/mln/accu/math/all.hh @@ -54,7 +54,10 @@ namespace mln # include <mln/accu/math/sum.hh> # include <mln/accu/math/count.hh> + +//<<lrde # include <mln/accu/math/inf.hh> # include <mln/accu/math/sup.hh> +//>> #endif // ! MLN_ACCU_MATH_ALL_HH diff --git a/milena/nodist-headers b/milena/nodist-headers index 12a0c5e..ceba967 100644 --- a/milena/nodist-headers +++ b/milena/nodist-headers @@ -11,13 +11,26 @@ mln/extract/hue.hh mln/extract/lum.hh mln/extract/red.hh mln/extract/sat.hh +mln/fun/access/all.hh +mln/fun/access/mean.hh +mln/fun/accu_result.hh mln/fun/binary.hh mln/fun/binary_param.hh +mln/fun/component/red.hh +mln/fun/component/comp_count.hh +mln/fun/component/scomp.hh +mln/fun/component/green.hh mln/fun/component/comp.hh +mln/fun/component/blue.hh +mln/fun/component/rgb.hh +mln/fun/component/ithcomp.hh mln/fun/compose.hh mln/fun/composition.hh mln/fun/from_accu.hh +mln/fun/math/abs.hh +mln/fun/math/cos.hh mln/fun/math/inf.hh +mln/fun/math/norm.hh mln/fun/math/sup.hh mln/fun/meta/all.hh mln/fun/meta/blue.hh @@ -32,6 +45,9 @@ mln/fun/meta/sat.hh mln/fun/meta/second.hh mln/fun/meta/to_enc.hh mln/fun/param.hh +mln/fun/point/col.hh +mln/fun/point/row.hh +mln/fun/point/sli.hh mln/fun/spe/binary.hh mln/fun/spe/unary.hh mln/fun/unary.hh -- 1.5.6.5

1 0

Revision 3996
by Roland Levillain 23 Jun '09

23 Jun '09

| 2009-06-05 Etienne FOLIO <folio(a)lrde.epita.fr> | | Tests around projected histograms for the report. | * folio/test/histo/classify_with_histo_rgb.cc: . | * folio/test/histo/project_histo_add.cc: New. | * folio/test/histo/project_screen.cc: New. | * folio/test/histo/projected3d.cc: . | * folio/test/value/comp.cc: New. This is not cool. You should refrain from committing dirty ChangeLog entries. Please fix it. (Re)read the LRDE Guidelines. And why can't I see you patch in the olena-patches mailing list? https://www.lrde.epita.fr/pipermail/olena-patches/2009-June/thread.html

2 2

4179: doc/Makefile.am: Fix id extraction during refman compilation.
by Guillaume Lazzara 22 Jun '09

22 Jun '09

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2e96e5f..5f7b445 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-22 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * doc/Makefile.am: Fix id extraction during refman compilation. + 2009-06-19 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add a demo for inter_pixel algorithms. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index cf7b3e3..5c9a626 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -218,7 +218,7 @@ Doxyfile_user_pdf: Doxyfile_user $(edit_pdf) $< >$@ Doxyfile_devel: $(srcdir)/Doxyfile.in - Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog | sed -e 's/\$$//g'`; \ + Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ Doxyfile_devel_pdf: $Doxyfile_devel -- 1.5.6.5

1 0

r4177: Add tools for histogram projections and visualization
by Etienne FOLIO 19 Jun '09

19 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-19 Etienne FOLIO <folio(a)lrde.epita.fr> Add tools for histogram projections and visualization. * folio/tools/histo/classify_with_histo.cc: Move file. * folio/tools/histo/classify_with_histo_gs.cc: Moved file updated. * folio/tools/histo/projected_histo_classified_color_maj.cc: New tool (still buggy). * folio/tools/histo/projected_histo_classified_gs.cc: New tool (still buggy). * folio/tools/histo/projected_histo_gs.cc: New tool. --- classify_with_histo_gs.cc | 110 +++++++++++++++++++++ projected_histo_classified_color_maj.cc | 116 +++++++++++++++++++++++ projected_histo_classified_gs.cc | 116 +++++++++++++++++++++++ projected_histo_gs.cc | 161 +++++++++++--------------------- 4 files changed, 398 insertions(+), 105 deletions(-) Index: trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc (deleted) =================================================================== Index: trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc (revision 4176) +++ trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc (revision 4177) @@ -1,51 +1,44 @@ -#include <mln/core/var.hh> +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. -#include <mln/core/image/image1d.hh> -#include <mln/core/image/image2d.hh> -#include <mln/core/image/dmorph/unproject_image.hh> -#include <mln/fun/v2v/projection.hh> - -#include <mln/core/image/dmorph/image_if.hh> -#include <mln/pw/value.hh> -#include <mln/data/transform.hh> -#include <mln/data/stretch.hh> - -#include <mln/arith/revert.hh> -#include <mln/core/alias/neighb3d.hh> -#include <mln/value/label_8.hh> - -#include <mln/morpho/closing/volume.hh> -#include <mln/morpho/watershed/flooding.hh> -#include <mln/morpho/elementary/dilation.hh> -#include "../../mln/histo/compute_histo_rgb.hh" -#include "../../mln/histo/classify_with_histo_rgb.hh" - -#include <mln/accu/math/count.hh> -#include <mln/accu/stat/mean.hh> #include <mln/accu/math/sum.hh> -#include <mln/accu/image/init.hh> -#include <mln/accu/image/take.hh> -#include <mln/accu/image/to_result.hh> - -#include <mln/io/ppm/load.hh> -#include <mln/io/ppm/save.hh> +#include <mln/data/stretch.hh> #include <mln/io/pgm/save.hh> -#include <mln/debug/println.hh> +#include <mln/io/ppm/load.hh> +#include <mln/value/rgb8.hh> +#include "../../mln/histo/compute_histo_3d.hh" +#include "../../mln/histo/project_histo_3d.hh" -namespace mln -{ +using namespace mln; +using namespace mln::value; - struct rgb8to6 : Function_v2v< rgb8to6 > - { - typedef value::rgb<6> result; - value::rgb<6> operator()(const value::rgb<8>& c) const + +namespace mln { - value::rgb<6> res(c.red() / 4, c.green() / 4, c.blue() / 4); - return res; - } - }; struct take_log : Function_v2v< take_log > { @@ -57,82 +50,40 @@ } }; - template <typename A, unsigned direction, typename V> - image2d<mln_result(A)> - project_histo(const image3d<V>& h) - { - image2d<A> h_2d_a(h.nrows(), h.ncols()); - accu::image::init(h_2d_a); - - accu::image::take( unproject( h_2d_a, - h.domain(), - fun::v2v::projection<point3d, direction>() ).rw(), - h ); - - return accu::image::to_result(h_2d_a); - } - } -int main(int argc, char* argv[]) +int +main(int argc, char** argv) { - if (argc != 3) + // check arguments + if (argc != 4) { - std::cout << "Usage:" << std::endl - << "./a.out <ima_in> <ima_out>" << std::endl; + std::cerr << "Usage:" << std::endl + << " ./a.out ../../../../img/lena.ppm 51 out.pgm" << std::endl + << std::endl + << "BTW, the number is the closure's lambda." << std::endl; + exit(1); } - using namespace mln; - - using value::int_u8; - typedef value::rgb<6> rgb6; - typedef value::int_u<6> int_u6; - + // build test image std::cout << " => loading " << argv[1] << "..." << std::endl; - image2d<value::rgb8> ima; - io::ppm::load(ima, argv[1]); -// image2d<rgb6> ima6 = data::transform(ima, rgb8to6()); + image2d<value::rgb8> ima8; + io::ppm::load(ima8, argv[1]); + // build histo std::cout << " => computing histogram..." << std::endl; - image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima); + image3d<unsigned> histo = histo::compute_histo_3d(ima8); - image2d<unsigned> proj = project_histo<accu::math::sum<unsigned, unsigned>, 2>(histo); - image2d<value::int_u8> proj_int = data::stretch( value::int_u8(), + // project it + image2d<unsigned> proj = + histo::project_histo<accu::math::sum<unsigned, unsigned>, 2>(histo); + + // compute output image + image2d<value::int_u8> out = data::stretch( value::int_u8(), data::transform( proj, take_log() ) ); - io::pgm::save(proj_int, argv[2]); - -// std::cout << " => computing reverted histogram..." << std::endl; -// image3d<unsigned> reverted = arith::revert(histo); - -// std::cout << " => computing closure..." << std::endl; -// image3d<unsigned> closed = -// morpho::closing::volume(reverted, c6(), atoi(argv[2])); - -// std::cout << " => computing watershed..." << std::endl; -// value::label_8 nbasin; -// image3d<value::label_8> labels = -// morpho::watershed::flooding(closed, c6(), nbasin); -// std::cout << "found " << nbasin << " labels" << std::endl; - -// labels = morpho::elementary::dilation(labels, c18()); - -// std::cout << " => computing output labelized image..." << std::endl; -// image2d<value::label_8> lab = histo::classify_with_histo_rgb(ima, labels); - -// std::cout << " => computing projection..." << std::endl; - -// typedef accu::stat::mean<int_u8, unsigned, int_u8> A; -// image2d<A> vmean(lab.nrows(), lab.ncols()); -// accu::image::init(vmean); -// { -// fun::v2v::projection<point3d, 0> vproj; -// mln_VAR( vmean_, unproject(vmean, lab.domain(), vproj) ); -// accu::image::take(vmean_, lab); -// } - -// std::cout << " => saving " << argv[2] << "..." << std::endl; -// io::ppm::save(vmean, argv[2]); - + // save output image + std::cout << " => saving " << argv[3] << "..." << std::endl; + io::pgm::save(out, argv[3]); } Index: trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_color_maj.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_color_maj.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_color_maj.cc (revision 4177) @@ -0,0 +1,116 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +#include <mln/accu/math/sum.hh> +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/data/stretch.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/load.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/value/label_8.hh> + +#include "../../mln/histo/compute_histo_3d.hh" +#include "../../mln/histo/project_histo_3d.hh" + +using namespace mln; +using namespace mln::value; + + +namespace mln +{ + + struct take_log : Function_v2v< take_log > + { + typedef float result; + float operator()(float f) const + { + mln_precondition(f > 0); + return std::log(f + 1); + } + }; + +} + + +int +main(int argc, char** argv) +{ + // check arguments + if (argc != 4) + { + std::cerr << "Usage:" << std::endl + << " ./a.out ../../../../img/lena.ppm 51 out.pgm" << std::endl + << std::endl + << "BTW, the number is the closure's lambda." << std::endl; + exit(1); + } + + // build test image + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima8; + io::ppm::load(ima8, argv[1]); + + // build histo + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_3d(ima8); + + // build reverted histo + std::cout << " => computing reverted histogram..." << std::endl; + image3d<unsigned> reverted = arith::revert(histo); + + // compute morpho closure + std::cout << " => computing closure..." << std::endl; + image3d<unsigned> closed = morpho::closing::volume(reverted, c6(), atoi(argv[2])); + + // compute watershed transform + std::cout << " => computing watershed..." << std::endl; + value::label_8 nbasin; + image3d<value::label_8> labels = morpho::watershed::flooding(closed, c6(), nbasin); + std::cout << "found " << nbasin << " labels" << std::endl; + + // close maximas + labels = morpho::elementary::dilation(labels, c18()); + + // FIXME + // { + + // project it + image2d<rgb8> proj = + histo::project_histo<accu::maj<rgb8>, 2>(labels); + + // compute output image + image2d<value::int_u8> out = data::stretch( value::int_u8(), + data::transform( proj, + take_log() ) ); + // save output image + std::cout << " => saving " << argv[3] << "..." << std::endl; + io::pgm::save(out, argv[3]); + + // } +} Index: trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_gs.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_gs.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/projected_histo_classified_gs.cc (revision 4177) @@ -0,0 +1,116 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +#include <mln/accu/math/sum.hh> +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/data/stretch.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/load.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/value/label_8.hh> + +#include "../../mln/histo/compute_histo_3d.hh" +#include "../../mln/histo/project_histo_3d.hh" + +using namespace mln; +using namespace mln::value; + + +namespace mln +{ + + struct take_log : Function_v2v< take_log > + { + typedef float result; + float operator()(float f) const + { + mln_precondition(f > 0); + return std::log(f + 1); + } + }; + +} + + +int +main(int argc, char** argv) +{ + // check arguments + if (argc != 4) + { + std::cerr << "Usage:" << std::endl + << " ./a.out ../../../../img/lena.ppm 51 out.pgm" << std::endl + << std::endl + << "BTW, the number is the closure's lambda." << std::endl; + exit(1); + } + + // build test image + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima8; + io::ppm::load(ima8, argv[1]); + + // build histo + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_3d(ima8); + + // build reverted histo + std::cout << " => computing reverted histogram..." << std::endl; + image3d<unsigned> reverted = arith::revert(histo); + + // compute morpho closure + std::cout << " => computing closure..." << std::endl; + image3d<unsigned> closed = morpho::closing::volume(reverted, c6(), atoi(argv[2])); + + // compute watershed transform + std::cout << " => computing watershed..." << std::endl; + value::label_8 nbasin; + image3d<value::label_8> labels = morpho::watershed::flooding(closed, c6(), nbasin); + std::cout << "found " << nbasin << " labels" << std::endl; + + // close maximas + labels = morpho::elementary::dilation(labels, c18()); + + // FIXME + // { + + // project it + image2d<unsigned> proj = + histo::project_histo<accu::math::sum<unsigned, unsigned>, 2>(labels); + + // compute output image + image2d<int_u8> out = data::stretch( int_u8(), + data::transform( proj, + take_log() ) ); + // } + + // save output image + std::cout << " => saving " << argv[3] << "..." << std::endl; + io::pgm::save(out, argv[3]); +} Index: trunk/milena/sandbox/folio/tools/histo/classify_with_histo_gs.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/classify_with_histo_gs.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/classify_with_histo_gs.cc (revision 4177) @@ -0,0 +1,110 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/data/stretch.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/load.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/value/label_8.hh> + +#include "../../mln/histo/compute_histo_3d.hh" +#include "../../mln/histo/classify_with_histo_3d.hh" + +using namespace mln; +using namespace mln::value; + + +namespace mln +{ + + struct rgb8to6 : Function_v2v< rgb8to6 > + { + typedef value::rgb<6> result; + value::rgb<6> operator()(const value::rgb<8>& c) const + { + value::rgb<6> res(c.red() / 4, c.green() / 4, c.blue() / 4); + return res; + } + }; + +} + + +int +main(int argc, char** argv) +{ + // check arguments + if (argc != 4) + { + std::cerr << "Usage:" << std::endl + << " ./a.out ../../../../img/lena.ppm 51 out.pgm" << std::endl + << std::endl + << "BTW, the number is the closure's lambda." << std::endl; + exit(1); + } + + typedef value::rgb<6> rgb6; + typedef value::int_u<6> int_u6; + + // build test image + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima8; + io::ppm::load(ima8, argv[1]); + image2d<rgb6> ima6 = data::transform(ima8, rgb8to6()); + + // build histo + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_3d(ima6); + + // build reverted histo + std::cout << " => computing reverted histogram..." << std::endl; + image3d<unsigned> reverted = arith::revert(histo); + + // compute morpho closure + std::cout << " => computing closure..." << std::endl; + image3d<unsigned> closed = morpho::closing::volume(reverted, c6(), atoi(argv[2])); + + // compute watershed transform + std::cout << " => computing watershed..." << std::endl; + value::label_8 nbasin; + image3d<value::label_8> labels = morpho::watershed::flooding(closed, c6(), nbasin); + std::cout << "found " << nbasin << " labels" << std::endl; + + // close maximas + labels = morpho::elementary::dilation(labels, c18()); + + // compute output image + std::cout << " => computing output labelized image..." << std::endl; + image2d<label_8> out = histo::classify_with_histo_3d(ima6, labels); + + // save output image + std::cout << " => saving " << argv[3] << "..." << std::endl; + io::pgm::save(data::stretch(int_u8(), out), argv[3]); +}

1 0

r4176: Stretch result of classification
by Etienne FOLIO 19 Jun '09

19 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-19 Etienne FOLIO <folio(a)lrde.epita.fr> Stretch result of classification. * folio/tools/histo/classify_with_histo.cc: Stretch result in the output image. --- classify_with_histo.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc (revision 4175) +++ trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc (revision 4176) @@ -26,6 +26,7 @@ #include <mln/arith/revert.hh> #include <mln/core/alias/neighb3d.hh> +#include <mln/data/stretch.hh> #include <mln/io/pgm/save.hh> #include <mln/io/ppm/load.hh> #include <mln/morpho/closing/volume.hh> @@ -105,5 +106,5 @@ // save output image std::cout << " => saving " << argv[3] << "..." << std::endl; - io::pgm::save(out, argv[3]); + io::pgm::save(data::stretch(int_u8(), out), argv[3]); }

1 0

r4175: Clean up
by Etienne FOLIO 19 Jun '09

19 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-19 Etienne FOLIO <folio(a)lrde.epita.fr> Clean up. * folio/mln/histo/classify_with_histo_3d.hh: New algorithm more generalist than the rgb version. * folio/mln/histo/compute_histo_3d.hh: Add macros. * folio/mln/histo/project_histo_3d.hh: Add macros. * folio/test/histo/classify_with_histo_rgb.cc: Move file. * folio/test/histo/project_histo_3d_add.cc: Update definitions. * folio/test/histo/project_histo_3d_mean.cc: Update definitions. * folio/tools/histo/classify_with_histo.cc: Moved file cleaned up. * folio/tools/histo/project_histo_add.cc: Move file. * folio/tools/histo/projected_histo_gs.cc: Moved file. --- mln/histo/classify_with_histo_3d.hh | 59 +++++++++++++++ mln/histo/compute_histo_3d.hh | 5 + mln/histo/project_histo_3d.hh | 5 + test/histo/project_histo_3d_add.cc | 2 test/histo/project_histo_3d_mean.cc | 2 tools/histo/classify_with_histo.cc | 109 ++++++++++++++++++++++++++++ tools/histo/projected_histo_gs.cc | 138 ++++++++++++++++++++++++++++++++++++ 7 files changed, 318 insertions(+), 2 deletions(-) Index: trunk/milena/sandbox/folio/test/histo/classify_with_histo_rgb.cc (deleted) =================================================================== Index: trunk/milena/sandbox/folio/test/histo/project_histo_3d_mean.cc =================================================================== --- trunk/milena/sandbox/folio/test/histo/project_histo_3d_mean.cc (revision 4174) +++ trunk/milena/sandbox/folio/test/histo/project_histo_3d_mean.cc (revision 4175) @@ -32,7 +32,7 @@ #include "../../mln/histo/project_histo_3d.hh" using namespace mln; -using namespace value; +using namespace mln::value; inline Index: trunk/milena/sandbox/folio/test/histo/project_histo_3d_add.cc =================================================================== --- trunk/milena/sandbox/folio/test/histo/project_histo_3d_add.cc (revision 4174) +++ trunk/milena/sandbox/folio/test/histo/project_histo_3d_add.cc (revision 4175) @@ -32,7 +32,7 @@ #include "../../mln/histo/project_histo_3d.hh" using namespace mln; -using namespace value; +using namespace mln::value; inline Index: trunk/milena/sandbox/folio/tools/histo/project_histo_add.cc (deleted) =================================================================== Index: trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/classify_with_histo.cc (revision 4175) @@ -0,0 +1,109 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + + +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/load.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/value/label_8.hh> + +#include "../../mln/histo/compute_histo_3d.hh" +#include "../../mln/histo/classify_with_histo_3d.hh" + +using namespace mln; +using namespace mln::value; + + +namespace mln +{ + + struct rgb8to6 : Function_v2v< rgb8to6 > + { + typedef value::rgb<6> result; + value::rgb<6> operator()(const value::rgb<8>& c) const + { + value::rgb<6> res(c.red() / 4, c.green() / 4, c.blue() / 4); + return res; + } + }; + +} + + +int +main(int argc, char** argv) +{ + // check arguments + if (argc != 4) + { + std::cerr << "Usage:" << std::endl + << " ./a.out ../../../../img/lena.ppm 51 out.pgm" << std::endl + << std::endl + << "BTW, the number is the closure's lambda." << std::endl; + exit(1); + } + + typedef value::rgb<6> rgb6; + typedef value::int_u<6> int_u6; + + // build test image + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima8; + io::ppm::load(ima8, argv[1]); + image2d<rgb6> ima6 = data::transform(ima8, rgb8to6()); + + // build histo + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_3d(ima6); + + // build reverted histo + std::cout << " => computing reverted histogram..." << std::endl; + image3d<unsigned> reverted = arith::revert(histo); + + // compute morpho closure + std::cout << " => computing closure..." << std::endl; + image3d<unsigned> closed = morpho::closing::volume(reverted, c6(), atoi(argv[2])); + + // compute watershed transform + std::cout << " => computing watershed..." << std::endl; + value::label_8 nbasin; + image3d<value::label_8> labels = morpho::watershed::flooding(closed, c6(), nbasin); + std::cout << "found " << nbasin << " labels" << std::endl; + + // close maximas + labels = morpho::elementary::dilation(labels, c18()); + + // compute output image + std::cout << " => computing output labelized image..." << std::endl; + image2d<label_8> out = histo::classify_with_histo_3d(ima6, labels); + + // save output image + std::cout << " => saving " << argv[3] << "..." << std::endl; + io::pgm::save(out, argv[3]); +} Index: trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/projected_histo_gs.cc (revision 4175) @@ -0,0 +1,138 @@ +#include <mln/core/var.hh> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/unproject_image.hh> +#include <mln/fun/v2v/projection.hh> + +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/pw/value.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> + +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/value/label_8.hh> + +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/elementary/dilation.hh> + +#include "../../mln/histo/compute_histo_rgb.hh" +#include "../../mln/histo/classify_with_histo_rgb.hh" + +#include <mln/accu/math/count.hh> +#include <mln/accu/stat/mean.hh> +#include <mln/accu/math/sum.hh> +#include <mln/accu/image/init.hh> +#include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/debug/println.hh> + + +namespace mln +{ + + struct rgb8to6 : Function_v2v< rgb8to6 > + { + typedef value::rgb<6> result; + value::rgb<6> operator()(const value::rgb<8>& c) const + { + value::rgb<6> res(c.red() / 4, c.green() / 4, c.blue() / 4); + return res; + } + }; + + struct take_log : Function_v2v< take_log > + { + typedef float result; + float operator()(float f) const + { + mln_precondition(f > 0); + return std::log(f + 1); + } + }; + + template <typename A, unsigned direction, typename V> + image2d<mln_result(A)> + project_histo(const image3d<V>& h) + { + image2d<A> h_2d_a(h.nrows(), h.ncols()); + accu::image::init(h_2d_a); + + accu::image::take( unproject( h_2d_a, + h.domain(), + fun::v2v::projection<point3d, direction>() ).rw(), + h ); + + return accu::image::to_result(h_2d_a); + } + +} + + +int main(int argc, char* argv[]) +{ + if (argc != 3) + { + std::cout << "Usage:" << std::endl + << "./a.out <ima_in> <ima_out>" << std::endl; + } + + using namespace mln; + + using value::int_u8; + typedef value::rgb<6> rgb6; + typedef value::int_u<6> int_u6; + + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima; + io::ppm::load(ima, argv[1]); +// image2d<rgb6> ima6 = data::transform(ima, rgb8to6()); + + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima); + + image2d<unsigned> proj = project_histo<accu::math::sum<unsigned, unsigned>, 2>(histo); + image2d<value::int_u8> proj_int = data::stretch( value::int_u8(), + data::transform( proj, + take_log() ) ); + io::pgm::save(proj_int, argv[2]); + +// std::cout << " => computing reverted histogram..." << std::endl; +// image3d<unsigned> reverted = arith::revert(histo); + +// std::cout << " => computing closure..." << std::endl; +// image3d<unsigned> closed = +// morpho::closing::volume(reverted, c6(), atoi(argv[2])); + +// std::cout << " => computing watershed..." << std::endl; +// value::label_8 nbasin; +// image3d<value::label_8> labels = +// morpho::watershed::flooding(closed, c6(), nbasin); +// std::cout << "found " << nbasin << " labels" << std::endl; + +// labels = morpho::elementary::dilation(labels, c18()); + +// std::cout << " => computing output labelized image..." << std::endl; +// image2d<value::label_8> lab = histo::classify_with_histo_rgb(ima, labels); + +// std::cout << " => computing projection..." << std::endl; + +// typedef accu::stat::mean<int_u8, unsigned, int_u8> A; +// image2d<A> vmean(lab.nrows(), lab.ncols()); +// accu::image::init(vmean); +// { +// fun::v2v::projection<point3d, 0> vproj; +// mln_VAR( vmean_, unproject(vmean, lab.domain(), vproj) ); +// accu::image::take(vmean_, lab); +// } + +// std::cout << " => saving " << argv[2] << "..." << std::endl; +// io::ppm::save(vmean, argv[2]); + +} Index: trunk/milena/sandbox/folio/mln/histo/project_histo_3d.hh =================================================================== --- trunk/milena/sandbox/folio/mln/histo/project_histo_3d.hh (revision 4174) +++ trunk/milena/sandbox/folio/mln/histo/project_histo_3d.hh (revision 4175) @@ -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. +#ifndef PROJECT_HISTO_3D_HH_ +# define PROJECT_HISTO_3D_HH_ + #include <mln/accu/image/init.hh> #include <mln/accu/image/take.hh> @@ -54,3 +57,5 @@ } } + +#endif /* !PROJECT_HISTO_3D_HH_ */ Index: trunk/milena/sandbox/folio/mln/histo/classify_with_histo_3d.hh =================================================================== --- trunk/milena/sandbox/folio/mln/histo/classify_with_histo_3d.hh (revision 0) +++ trunk/milena/sandbox/folio/mln/histo/classify_with_histo_3d.hh (revision 4175) @@ -0,0 +1,59 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#ifndef CLASSIFY_WITH_HISTO_3D_HH_ +# define CLASSIFY_WITH_HISTO_3D_HH_ + + +namespace mln +{ + + namespace histo + { + + template <typename T, typename C> + image2d<C> + classify_with_histo_3d(image2d<T>& ref, + image3d<C>& regions) + { + image2d<C> out; + initialize(out, ref); + + mln_fwd_piter(image2d<T>) p(ref.domain()); + for_all(p) + { + // get 3d point in regions image. + point3d p3 = point3d(ref(p).comp(0), ref(p).comp(1), ref(p).comp(2)); + out(p) = regions(p3); // copy the label in out's pixel. + } + + return out; + } + + } // end of namespace mln::histo + +} // end of namespace mln + +#endif /* !CLASSIFY_WITH_HISTO_3D_HH_ */ Index: trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh =================================================================== --- trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh (revision 4174) +++ trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh (revision 4175) @@ -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. +#ifndef COMPUTE_HISTO_3D_HH_ +# define COMPUTE_HISTO_3D_HH_ + #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> @@ -60,3 +63,5 @@ } } + +#endif /* !COMPUTE_HISTO_3D_HH_ */

1 0

r4174: Clean up sandbox
by Etienne FOLIO 19 Jun '09

19 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-19 Etienne FOLIO <folio(a)lrde.epita.fr> Clean up sandbox. * folio/test/histo/project_histo_add.cc: Move old file. * folio/tools/histo/project_histo_add.cc: Moved file. * folio/tools/histo: New folder for histo tools. * folio/tools: New folder for tools. --- project_histo_add.cc | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) Index: trunk/milena/sandbox/folio/test/histo/project_histo_add.cc (deleted) =================================================================== Index: trunk/milena/sandbox/folio/tools/histo/project_histo_add.cc =================================================================== --- trunk/milena/sandbox/folio/tools/histo/project_histo_add.cc (revision 0) +++ trunk/milena/sandbox/folio/tools/histo/project_histo_add.cc (revision 4174) @@ -0,0 +1,138 @@ +#include <mln/core/var.hh> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/unproject_image.hh> +#include <mln/fun/v2v/projection.hh> + +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/pw/value.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> + +#include <mln/arith/revert.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/value/label_8.hh> + +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/elementary/dilation.hh> + +#include "../../mln/histo/compute_histo_rgb.hh" +#include "../../mln/histo/classify_with_histo_rgb.hh" + +#include <mln/accu/math/count.hh> +#include <mln/accu/stat/mean.hh> +#include <mln/accu/math/sum.hh> +#include <mln/accu/image/init.hh> +#include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/debug/println.hh> + + +namespace mln +{ + + struct rgb8to6 : Function_v2v< rgb8to6 > + { + typedef value::rgb<6> result; + value::rgb<6> operator()(const value::rgb<8>& c) const + { + value::rgb<6> res(c.red() / 4, c.green() / 4, c.blue() / 4); + return res; + } + }; + + struct take_log : Function_v2v< take_log > + { + typedef float result; + float operator()(float f) const + { + mln_precondition(f > 0); + return std::log(f + 1); + } + }; + + template <typename A, unsigned direction, typename V> + image2d<mln_result(A)> + project_histo(const image3d<V>& h) + { + image2d<A> h_2d_a(h.nrows(), h.ncols()); + accu::image::init(h_2d_a); + + accu::image::take( unproject( h_2d_a, + h.domain(), + fun::v2v::projection<point3d, direction>() ).rw(), + h ); + + return accu::image::to_result(h_2d_a); + } + +} + + +int main(int argc, char* argv[]) +{ + if (argc != 3) + { + std::cout << "Usage:" << std::endl + << "./a.out <ima_in> <ima_out>" << std::endl; + } + + using namespace mln; + + using value::int_u8; + typedef value::rgb<6> rgb6; + typedef value::int_u<6> int_u6; + + std::cout << " => loading " << argv[1] << "..." << std::endl; + image2d<value::rgb8> ima; + io::ppm::load(ima, argv[1]); +// image2d<rgb6> ima6 = data::transform(ima, rgb8to6()); + + std::cout << " => computing histogram..." << std::endl; + image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima); + + image2d<unsigned> proj = project_histo<accu::math::sum<unsigned, unsigned>, 2>(histo); + image2d<value::int_u8> proj_int = data::stretch( value::int_u8(), + data::transform( proj, + take_log() ) ); + io::pgm::save(proj_int, argv[2]); + +// std::cout << " => computing reverted histogram..." << std::endl; +// image3d<unsigned> reverted = arith::revert(histo); + +// std::cout << " => computing closure..." << std::endl; +// image3d<unsigned> closed = +// morpho::closing::volume(reverted, c6(), atoi(argv[2])); + +// std::cout << " => computing watershed..." << std::endl; +// value::label_8 nbasin; +// image3d<value::label_8> labels = +// morpho::watershed::flooding(closed, c6(), nbasin); +// std::cout << "found " << nbasin << " labels" << std::endl; + +// labels = morpho::elementary::dilation(labels, c18()); + +// std::cout << " => computing output labelized image..." << std::endl; +// image2d<value::label_8> lab = histo::classify_with_histo_rgb(ima, labels); + +// std::cout << " => computing projection..." << std::endl; + +// typedef accu::stat::mean<int_u8, unsigned, int_u8> A; +// image2d<A> vmean(lab.nrows(), lab.ncols()); +// accu::image::init(vmean); +// { +// fun::v2v::projection<point3d, 0> vproj; +// mln_VAR( vmean_, unproject(vmean, lab.domain(), vproj) ); +// accu::image::take(vmean_, lab); +// } + +// std::cout << " => saving " << argv[2] << "..." << std::endl; +// io::ppm::save(vmean, argv[2]); + +}

1 0