Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add accu::rank. * mln/accu/rank.hh: New, accumulator for the rank filters. * mln/accu/rank_bool.hh: New. Specialisation of accu::rank<bool>. * tests/accu/rank.cc: New. --- mln/accu/rank.hh | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++ mln/accu/rank_bool.hh | 133 +++++++++++++++++++++++++++++++++++++ tests/accu/rank.cc | 55 +++++++++++++++ 3 files changed, 364 insertions(+) Index: trunk/milena/tests/accu/rank.cc =================================================================== --- trunk/milena/tests/accu/rank.cc (revision 0) +++ trunk/milena/tests/accu/rank.cc (revision 1675) @@ -0,0 +1,55 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +/*! \file tests/accu/rank.cc + * + * \brief Tests on mln::accu::rank. + */ + +#include <mln/accu/rank.hh> + +int main() +{ + using namespace mln; + + accu::rank_<int> accu(3, 5); + + accu.take(3); + accu.take(1); + accu.take(4); + accu.take(5); + accu.take(2); + mln_assertion(accu.to_result() == 4); + + accu::rank_<bool> accu_bool(1, 5); + accu_bool.take(true); + accu_bool.take(true); + accu_bool.take(true); + accu_bool.take(true); + accu_bool.take(false); + mln_assertion(accu_bool == true); +} Index: trunk/milena/mln/accu/rank.hh =================================================================== --- trunk/milena/mln/accu/rank.hh (revision 0) +++ trunk/milena/mln/accu/rank.hh (revision 1675) @@ -0,0 +1,176 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +#ifndef MLN_ACCU_RANK_HH +# define MLN_ACCU_RANK_HH + +/*! \file mln/accu/rank.hh + * + * \brief Define an rank accumulator. + */ + +# include <vector> +# include <mln/accu/internal/base.hh> +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/trait/value_.hh> +# include <mln/util/pix.hh> +# include <mln/core/inplace.hh> + +namespace mln +{ + + namespace accu + { + + + /*! \brief Generic rank accumulator class. + * + * The parameter \c T is the type of values. + */ + template <typename T> + struct rank_ : public mln::accu::internal::base_< T, rank_<T> > + { + typedef T argument; + typedef T result; + + rank_(unsigned k, unsigned n); + + void init(); + void take_as_init(const argument& t); + void take(const argument& t); + void take(const rank_<T>& other); + void sort(); + + T to_result() const; + + protected: + + std::vector<T> elts_; + bool is_sorted_; + unsigned k_; // 0 <= k_ < n + unsigned n_; + }; + + + template <typename I> struct rank_< util::pix >; + + + /*! + * \brief Meta accumulator for rank. + */ + struct rank : public Meta_Accumulator< rank > + { + template <typename T> + struct with + { + typedef rank_<T> ret; + }; + }; + + + + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + rank_<T>::rank_(unsigned k, unsigned n) + : k_(k), + n_(n), + is_sorted_(false) + { + mln_assertion(k_ < n_); + init(); + } + + template <typename T> + inline + void + rank_<T>::init() + { + } + + template <typename T> + inline + void rank_<T>::take_as_init(const argument& t) + { + elts_.push_back(t); + is_sorted_ = false; + } + + template <typename T> + inline + void rank_<T>::take(const argument& t) + { + elts_.push_back(t); + is_sorted_ = false; + } + + template <typename T> + inline + void + rank_<T>::take(const rank_<T>& other) + { + elts_.insert(elts_.end(), + other.elts_.begin(), + other.elts_.end()); + is_sorted_ = false; + } + + template <typename T> + inline + T + rank_<T>::to_result() const + { + mln_assertion(n_ == elts_.size()); + inplace(*this).sort(); + return elts_[k_]; + } + + template <typename T> + inline + void + rank_<T>::sort() + { + if (!is_sorted_) + { + is_sorted_ = true; + std::sort(elts_.begin(), elts_.end()); + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu + +} // end of namespace mln + +#include <mln/accu/rank_bool.hh> + +#endif // ! MLN_ACCU_RANK_HH Index: trunk/milena/mln/accu/rank_bool.hh =================================================================== --- trunk/milena/mln/accu/rank_bool.hh (revision 0) +++ trunk/milena/mln/accu/rank_bool.hh (revision 1675) @@ -0,0 +1,133 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +#ifndef MLN_ACCU_RANK_BOOL_HH +# define MLN_ACCU_RANK_BOOL_HH + +/*! \file mln/accu/rank_bool.hh + * + * \brief Define an rank accumulator. + */ + +# include <vector> +# include <mln/accu/internal/base.hh> +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/trait/value_.hh> +# include <mln/util/pix.hh> +# include <mln/core/inplace.hh> + +namespace mln +{ + + namespace accu + { + + // Fwd declaration. + template <typename T> struct rank_; + + /*! \brief rank accumulator class for boolean. + * + */ + template <> + struct rank_<bool> : public mln::accu::internal::base_< bool, rank_<bool> > + { + typedef bool argument; + typedef bool result; + + rank_(unsigned k, unsigned n); + + void init(); + void take_as_init(const argument& t); + void take(const argument& t); + void take(const rank_<bool>& other); + + bool to_result() const; + + protected: + unsigned nfalse_; + unsigned k_; // 0 <= k_ < n + unsigned n_; + }; + +# ifndef MLN_INCLUDE_ONLY + + inline + rank_<bool>::rank_(unsigned k, unsigned n) + : k_(k), + n_(n), + nfalse_(0) + { + mln_assertion(k_ < n_); + init(); + } + + + inline + void + rank_<bool>::init() + { + } + + + inline + void rank_<bool>::take_as_init(const argument& t) + { + nfalse_ += !t; + } + + + inline + void rank_<bool>::take(const argument& t) + { + nfalse_ += !t; + } + + + inline + void + rank_<bool>::take(const rank_<bool>& other) + { + nfalse_ += other.nfalse_; + } + + + inline + bool + rank_<bool>::to_result() const + { + mln_assertion(nfalse_ <= n_); + return k_ >= nfalse_; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_RANK_BOOL_HH

16 years, 12 months

milena r1674: Add tools for display in random color a labeled image

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-18 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add tools for display in random color a labeled image. * mln/draw/label.hh: New function which creates a color image from a labeled image. * tests/draw/label.cc: New test for that. --- mln/draw/label.hh | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/draw/label.cc | 59 +++++++++++++++++++++++++ 2 files changed, 180 insertions(+) Index: trunk/milena/tests/draw/label.cc =================================================================== --- trunk/milena/tests/draw/label.cc (revision 0) +++ trunk/milena/tests/draw/label.cc (revision 1674) @@ -0,0 +1,59 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +/*! \file tests/draw/label.cc + * + * \brief Tests on mln::draw::label. + */ + + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/save.hh> +#include <mln/draw/label.hh> +#include <mln/literal/all.hh> + +#include <mln/core/image2d.hh> +#include <mln/io/pbm/load.hh> +#include <mln/core/neighb2d.hh> +#include <mln/labeling/blobs.hh> +#include <mln/display/save_and_show.hh> + +#include "tests/data.hh" + + +int +main() +{ + using namespace mln; + image2d<bool> input = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); + unsigned n; + image2d<unsigned> ima = labeling::blobs(input, c4(), n); + image2d<value::rgb8> out = draw::label (ima, literal::black); + display::save_and_show(out, "display", 1); +} Index: trunk/milena/mln/draw/label.hh =================================================================== --- trunk/milena/mln/draw/label.hh (revision 0) +++ trunk/milena/mln/draw/label.hh (revision 1674) @@ -0,0 +1,121 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +#ifndef MLN_DRAW_LABEL_HH +# define MLN_DRAW_LABEL_HH + +/*! \file mln/draw/label.hh + * + * \brief Draw a random color image from a label image. + */ + +# include <mln/core/clone.hh> +# include <mln/core/concept/image.hh> +# include <mln/pw/image.hh> +# include <mln/pw/cst.hh> + +# include <mln/trait/image_from_mesh.hh> +# include <mln/core/image_if_value.hh> +# include <mln/value/rgb8.hh> +# include <mln/level/fill.hh> +# include <mln/level/paste.hh> +# include <mln/core/p_set.hh> +# include <mln/metal/is_not.hh> +# include <mln/core/image_if_value.hh> +# include <mln/debug/println.hh> + +namespace mln +{ + + namespace draw + { + + /*! Draw a new image from a data (int, unsigned, int_u8, etc...) label image. + * + * \param[in] input The input image. + * \param[in] background The value to fill background output. + * + * \return A rgb8 image. + * + * \pre \p input has to be initialized. + * + */ + template <typename I> + typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + label(Image& input, const value::rgb8& background); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + label(Image& input, const value::rgb8& background) + { + typedef mln_value(I) V; + typedef mln_ch_value(I, value::rgb8) O; + typedef const mln::pset_if<mln_pset(I), mln::fun::eq_p2b_expr_<mln::pw::value_, mln::pw::cst_<V> > > F; + + I in = exact(input); + mln_precondition(in.has_data()); + I ref = clone(in); + O out (in.domain ()); + + level::fill(out, background); + mln_piter(I) p (out.domain()); + for_all (p) + { + if (ref(p) == 0) + continue; + value::rgb8 color; + while (1) + { + int r = rand() % 256; + int g = rand() % 256; + int b = rand() % 256; + if (r + g + b < 50) + continue; + color = value::rgb8(r, g, b); + break; + } + V val = ref(p); + image_if_value ima_if = ref | val; + mln_piter(F) l (ima_if.domain()); + for_all (l) + out(l) = color; + level::fill(ima_if, 0); + } + return out; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::draw + +} // end of namespace mln + + +#endif // ! MLN_DRAW_LINE_HH

16 years, 12 months

milena r1673: Modify lemmings utilisation

by nivaul_s＠lrde.epita.fr

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-18 Simon Nivault <simon.nivault(a)lrde.epita.fr> Modify lemmings utilisation. * mln/util/lemmings.hh: The lemmings use the image domain and don't ask another domain definition. * tests/util/lemmings.cc: Update tests. --- mln/util/lemmings.hh | 27 ++++++++++----------------- tests/util/lemmings.cc | 10 +++++----- 2 files changed, 15 insertions(+), 22 deletions(-) Index: trunk/milena/tests/util/lemmings.cc =================================================================== --- trunk/milena/tests/util/lemmings.cc (revision 1672) +++ trunk/milena/tests/util/lemmings.cc (revision 1673) @@ -60,11 +60,11 @@ mln_value_(I) vl4 = ima(pt4); mln_value_(I) vl5 = ima(pt5); - mln_point_(I) ptl1 = util::lemmings(ima, ima.domain(), pt1, right, vl1); - mln_point_(I) ptl2 = util::lemmings(ima, ima.domain(), pt2, down, vl2); - mln_point_(I) ptl3 = util::lemmings(ima, ima.domain(), pt3, left, vl3); - mln_point_(I) ptl4 = util::lemmings(ima, ima.domain(), pt4, up, vl4); - mln_point_(I) ptl5 = util::lemmings(ima, ima.domain(), pt5, up, vl5); + mln_point_(I) ptl1 = util::lemmings(ima, pt1, right, vl1); + mln_point_(I) ptl2 = util::lemmings(ima, pt2, down, vl2); + mln_point_(I) ptl3 = util::lemmings(ima, pt3, left, vl3); + mln_point_(I) ptl4 = util::lemmings(ima, pt4, up, vl4); + mln_point_(I) ptl5 = util::lemmings(ima, pt5, up, vl5); mln_assertion(ptl1 == point2d(1, 2)); mln_assertion(ptl2 == point2d(2, 2)); Index: trunk/milena/mln/util/lemmings.hh =================================================================== --- trunk/milena/mln/util/lemmings.hh (revision 1672) +++ trunk/milena/mln/util/lemmings.hh (revision 1673) @@ -49,14 +49,12 @@ template <typename I> struct lemmings_ : public Object< lemmings_ > { - lemmings_(const Image& ima, const mln_pset(I)& domain, - const mln_point(I)& pt, const mln_dpoint(I)& dpt, - const mln_value(I)& val); + lemmings_(const Image& ima, const mln_point(I)& pt, + const mln_dpoint(I)& dpt, const mln_value(I)& val); mln_point(I) operator()(); const I& ima_; - const mln_pset(I)& domain_; mln_point(I) pt_; const mln_dpoint(I)& dpt_; const mln_value(I)& val_; @@ -77,9 +75,8 @@ */ template <typename I> mln_point(I) - lemmings(const Image& ima, const mln_pset(I)& domain, - const mln_point(I)& pt, const mln_dpoint(I)& dpt, - const mln_value(I)& val); + lemmings(const Image& ima, const mln_point(I)& pt, + const mln_dpoint(I)& dpt, const mln_value(I)& val); # ifndef MLN_INCLUDE_ONLY @@ -87,34 +84,30 @@ template <typename I> inline - lemmings_::lemmings_(const Image& ima, const mln_pset(I)& domain, - const mln_point(I)& pt, const mln_dpoint(I)& dpt, - const mln_value(I)& val) + lemmings_::lemmings_(const Image& ima, const mln_point(I)& pt, + const mln_dpoint(I)& dpt, const mln_value(I)& val) : ima_(exact(ima)), - domain_(domain), pt_(pt), dpt_(dpt), val_(val) { - mln_precondition(set::is_subset_of(domain, ima_.domain())); } template <typename I> mln_point(I) lemmings_::operator()() { - while (domain_.has(pt_) && ima_(pt_) == val_) + while (ima_.domain().has(pt_) && ima_(pt_) == val_) pt_ += dpt_; return pt_; } template <typename I> mln_point(I) - lemmings(const Image& ima, const mln_pset(I)& domain, - const mln_point(I)& pt, const mln_dpoint(I)& dpt, - const mln_value(I)& val) + lemmings(const Image& ima, const mln_point(I)& pt, + const mln_dpoint(I)& dpt, const mln_value(I)& val) { - lemmings_ lm(ima, domain, pt, dpt, val); + lemmings_ lm(ima, pt, dpt, val); return lm(); }

16 years, 12 months

milena r1672: Update processing of scores

by nivaul_s＠lrde.epita.fr

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-18 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update processing of scores. * sandbox/nivault/extract_score.cc: Update, processing and labelling of big connected components, closing for highlight notes and getting of an horizontal projection of image for highlight lines. --- extract_score.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 5 deletions(-) Index: trunk/milena/sandbox/nivault/extract_score.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_score.cc (revision 1671) +++ trunk/milena/sandbox/nivault/extract_score.cc (revision 1672) @@ -63,6 +63,7 @@ # include <mln/draw/mesh.hh> # include <mln/level/stretch.hh> +# include <mln/linear/gaussian.hh> # include <mln/core/image_if_value.hh> # include <mln/core/sub_image.hh> @@ -78,7 +79,8 @@ typedef point2d P; typedef image2d<bool> IB; -typedef image2d<int_u8> IU; +typedef image2d<int_u8> IU8; +typedef image2d<unsigned int> IU; typedef image2d<value::rgb8> O; template <typename I> @@ -99,7 +101,7 @@ draw::line (image, p3, p1, val); } -IB to_binary(IU in, mln_value_(IU) val) +IB to_binary(IU8 in, mln_value_(IU8) val) { // Divise L'image en deux : // box2d gb = score_u.domain(); @@ -108,7 +110,7 @@ // image2d< accu::mean_<int_u8> > ima_mean(sb); // { -// mln_piter_(IU) p(gb); +// mln_piter_( IU8) p(gb); // for_all(p) // ima_mean(point2d(p[0] / 2, p[1] / 2)).take(score_u(p)); @@ -117,7 +119,7 @@ IB score_b(in.domain()); { - mln_piter_(IU) p(in.domain()); + mln_piter_( IU8) p(in.domain()); for_all(p) score_b(p) = in(p) < val; @@ -126,6 +128,30 @@ return score_b; } +IU8 projection(IB ima, int coord) +{ + box2d smb = ima.domain(); + + point2d& pt = smb.pmax(); + pt[coord] = 0; + + IU projected(smb); + IU8 projected_stretched(smb); + level::fill(projected, literal::zero); + + mln_piter_(IB) p(ima.domain()); + + point2d pt2; + for_all(p) + { + pt2 = p; + pt2[coord] = 0; + projected(pt2) += ima(p); + } + level::stretch(projected, projected_stretched); + return projected_stretched; +} + int main(int argc, char** argv) { @@ -137,12 +163,49 @@ exit(1); } - IU score_u; + IU8 score_u; io::pgm::load(score_u, argv[1]); IB score_b = to_binary(score_u, 175); io::pbm::save(score_b, argv[2]); + + +// { // Obtenir un histogramme vertical pour reperer les lignes de portée. +// IU8 histo_col = projection(score_b, 1); + +// IU8 histo_col_blur(histo_col.domain()); +// linear::gaussian(histo_col, 5, histo_col_blur); +// level::stretch(histo_col_blur, histo_col_blur); + +// io::pgm::save(histo_col, "histo_col.pgm"); +// io::pgm::save(histo_col_blur, "histo_col_blur.pgm"); +// } + +// { // Labelling des grosses composant connexes pour étiqueter les differentes portées. +// IB only_big(score_b.domain()); +// morpho::opening_area(score_b, c4(), 5000, only_big); + +// unsigned nlabels; +// IU inter_labeled = labeling::blobs(only_big, c4(), nlabels); // labelling blobs don't use algo(input, output) formalism +// IU8 labeled(inter_labeled.domain()); // and it should return int_u8 ? +// level::stretch(inter_labeled, labeled); +// io::pgm::save(labeled, "labeled.pgm"); +// } + +// { // fermeture avec un disk et un element vertial pour reperer les notes. +// IB closed1 = morpho::closing(score_b, win::vline2d(5)); +// IB closed2 = morpho::closing(score_b, win::disk2d(5)); +// morpho::opening_area(closed1, c4(), 20, closed1); +// morpho::opening_area(closed2, c4(), 15, closed2); +// io::pbm::save(closed1, "closed1.pbm"); +// io::pbm::save(closed2, "closed2.pbm"); +// } + + { // Fermeture avec un element struturant en horizontale pour obtenir les lignes de portée. + IB hclosed = morpho::closing(score_b, win::hline2d(73)); + io::pbm::save(hclosed, "hclosed.pbm"); + } }

16 years, 12 months

milena r1671: Add operator<< to Accumulators

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * mln/core/concept/accumulator.hh: (operator<<) New. * sandbox/garrigues/factures/array_global.cc: Remove. * sandbox/garrigues/factures/facture.pgm: Remove. --- trunk/milena/mln/core/concept/accumulator.hh | 11 +++++++++++ 1 file changed, 11 insertions(+) Index: trunk/milena/mln/core/concept/accumulator.hh =================================================================== --- trunk/milena/mln/core/concept/accumulator.hh (revision 1670) +++ trunk/milena/mln/core/concept/accumulator.hh (revision 1671) @@ -82,6 +82,9 @@ Accumulator(); }; + template <typename E> + std::ostream& + operator<<(std::ostream& ostr, const Accumulator<E>& accu); # ifndef MLN_INCLUDE_ONLY @@ -114,6 +117,14 @@ exact(this)->take(t); } + template <typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, const Accumulator<E>& accu) + { + return ostr << exact(accu).to_result(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: trunk/milena/sandbox/garrigues/factures/array_global.cc (deleted) =================================================================== Index: trunk/milena/sandbox/garrigues/factures/facture.pgm (deleted) ===================================================================

17 years

milena r1661: Begin a process to extract arrays

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-14 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Begin a process to extract arrays. * sandbox/garrigues/factures/array_global.cc: New. * sandbox/garrigues/factures/facture.pgm: An receipt image. * sandbox/garrigues/factures: New. --- array_global.cc | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) Index: trunk/milena/sandbox/garrigues/factures/array_global.cc =================================================================== --- trunk/milena/sandbox/garrigues/factures/array_global.cc (revision 0) +++ trunk/milena/sandbox/garrigues/factures/array_global.cc (revision 1661) @@ -0,0 +1,101 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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. + +#include <mln/core/image2d.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/geom/resize.hh> +#include <mln/display/all.hh> +#include <mln/value/int_u8.hh> +#include <mln/morpho/closing.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/pw/all.hh> +#include <mln/core/inplace.hh> +#include <mln/level/stretch.hh> +#include <mln/labeling/level.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/accu/all.hh> + +int main() +{ + using namespace mln; + using namespace mln; + + typedef image2d<bool> ima2d_bool; + typedef image2d<unsigned> ima2d_unsigned; + + image2d<value::int_u8> in; + + io::pgm::load(in , "facture.pgm"); + + // Resize 50%. + image2d<value::int_u8> small = in; //geom::resize(in, 0.5); + + // Binarisation. + ima2d_bool bin(small.domain()); + level::paste(inplace(pw::value(small) > pw::cst(50) | small.domain()), bin); + + // Labeling. + unsigned nlabels; + image2d<unsigned> labels = labeling::level(bin, true, c4(), nlabels); + + // Get the caracteristics of the connected components. + std::vector< accu::pair_< accu::bbox<point2d>, accu::count_<point2d> > > caracteristics(nlabels); + mln_fwd_piter_(ima2d_unsigned) p(labels.domain()); + for_all(p) + caracteristics[labels(p)].take(p); + + // Filter the connected components. + std::vector<bool> is_array(nlabels); + for (int i = 0; i < nlabels; i++) + { + box_<point2d> b = caracteristics[i].to_result().first; + unsigned n = caracteristics[i].to_result().second; + float ratio; + if (b.pmax() == b.pmin() || n < 10) + { + is_array[i] = false; + continue; + } + + if (0 != (b.pmax()[1] - b.pmin()[1])) + ratio = float(b.pmax()[0] - b.pmin()[0]) / (b.pmax()[1] - b.pmin()[1]); + else + ratio = float(b.pmax()[1] - b.pmin()[1]) / (b.pmax()[0] - b.pmin()[0]); + + int area = (b.pmax()[0] - b.pmin()[0]) * (b.pmax()[1] - b.pmin()[1]); + is_array[i] = ratio < 0.1 || ratio > 10 || (float(n) / area) < 0.2; + } + + // Clean the image. + for_all(p) + bin(p) = is_array[labels(p)]; + + io::pbm::save(bin, "array.pbm"); +} Index: trunk/milena/sandbox/garrigues/factures/facture.pgm =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/milena/sandbox/garrigues/factures/facture.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years

milena r1670: Update graph

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update graph. * mln/util/graph.hh: Fix : ordpair replace unsigned for edge. * mln/draw/mesh.hh: Apply this modification. * sandbox/nivault/extract_character.cc: Update. * mln/make/voronoi.hh: Fix comment. --- mln/draw/mesh.hh | 4 +- mln/make/voronoi.hh | 10 +++++++ mln/util/graph.hh | 49 +++++++++++++++++++++++++++++------ sandbox/nivault/extract_character.cc | 11 ++++--- 4 files changed, 59 insertions(+), 15 deletions(-) Index: trunk/milena/mln/draw/mesh.hh =================================================================== --- trunk/milena/mln/draw/mesh.hh (revision 1669) +++ trunk/milena/mln/draw/mesh.hh (revision 1670) @@ -98,8 +98,8 @@ for (unsigned i = 0; i < m.gr_.nb_link_; ++i) line (exact(ima), - m.loc_[m.gr_.links_[i]->node1], - m.loc_[m.gr_.links_[i]->node2], + m.loc_[m.gr_.links_[i]->pair_node_.first], + m.loc_[m.gr_.links_[i]->pair_node_.second], link_v); for (unsigned i = 0; i < m.gr_.nb_node_; ++i) Index: trunk/milena/mln/make/voronoi.hh =================================================================== --- trunk/milena/mln/make/voronoi.hh (revision 1669) +++ trunk/milena/mln/make/voronoi.hh (revision 1670) @@ -47,6 +47,16 @@ namespace make { + /*! + * \brief Apply Voronoi algorithm on \p ima_ with the original + * image \p orig_ for node computing with neighborhood \p nbh. + * + * \param[in] ima_ The labeling image. + * \param[in] orig_ The original image. + * \param[in] nbh The neighborhood for computing algorithm. + * + * \return The computed graph. + */ template <typename I, typename N> mesh_p<mln_psite(I)> voronoi (Image& ima_, Index: trunk/milena/mln/util/graph.hh =================================================================== --- trunk/milena/mln/util/graph.hh (revision 1669) +++ trunk/milena/mln/util/graph.hh (revision 1670) @@ -34,6 +34,7 @@ # include <vector> # include <list> # include <algorithm> +# include <mln/util/ordpair.hh> /*! \file mln/util/graph.hh * @@ -78,9 +79,10 @@ template<typename T> struct s_edge { + s_edge() : pair_node_ (0, 0) {} + T data; - unsigned node1; - unsigned node2; + ordpair_<unsigned> pair_node_; }; /*! \brief Structure of edge with void parameter. @@ -89,10 +91,14 @@ template<> struct s_edge <void> { - unsigned node1; - unsigned node2; + s_edge() : pair_node_ (0, 0) {} + ordpair_<unsigned> pair_node_; }; + bool operator==(const struct s_edge <void>& lhs, const struct s_edge <void>& rhs); + + bool operator< (const struct s_edge <void>& lhs, const struct s_edge <void>& rhs); + /// \brief Generic graph structure using s_node and s_edge. /* FIXME: We don't mention anywhere whether this graph structure handles directed or undirected graphs! */ @@ -104,8 +110,12 @@ /// The type of the set of edges. typedef std::vector< s_edge<E>* > edges; + /// Constructor. graph (); + /// Destructor. + ~graph(); + /*! \brief Add a void node. */ void add_node (); @@ -155,6 +165,18 @@ # ifndef MLN_INCLUDE_ONLY + bool + operator==(const struct s_edge <void>& lhs, const struct s_edge <void>& rhs) + { + return lhs.pair_node_ == rhs.pair_node_; + } + + bool + operator< (const struct s_edge <void>& lhs, const struct s_edge <void>& rhs) + { + return lhs.pair_node_ < rhs.pair_node_; + } + template<typename N, typename E> inline graph<N, E>::graph () @@ -167,6 +189,12 @@ template<typename N, typename E> inline + graph<N, E>::~graph () + { + } + + template<typename N, typename E> + inline void graph<N, E>::add_node () { @@ -187,12 +215,17 @@ struct s_edge<E>* edge; edge = new s_edge<E>; - edge->node1 = n1; - edge->node2 = n2; + edge->pair_node_.first = n1; + edge->pair_node_.second = n2; + if (links_.end () == std::find(links_.begin(), links_.end(), edge)) + delete edge; + else + { links_.push_back (edge); ++nb_link_; nodes_[n1]->links.push_back (n2); } + } template<typename N, typename E> inline @@ -212,8 +245,8 @@ typename std::vector<struct s_edge<E>*>::const_iterator it3 = links_.begin (); for (; it3 != links_.end (); ++it3) { - mln_precondition((*it3)->node1 < nb_node_); - mln_precondition((*it3)->node2 < nb_node_); + mln_precondition((*it3)->pair_node_.first < nb_node_); + mln_precondition((*it3)->pair_node_.second < nb_node_); } } Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1669) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1670) @@ -154,6 +154,7 @@ unsigned value = image(point2d(r, i)); if (value != 0) { + /// to_result ? draw::box (output, v_bbox[value].to_result(), literal::blue); typedef sub_image<I_LABEL, box2d> I_SUB; @@ -331,7 +332,7 @@ // for (unsigned i = 0; i <= nb_dilated_node_labels; ++i) // draw::box(output, vec_bbox2[i].to_result(), literal::red); -// image2d<int_u8> out (label_image.domain ()); + image2d<int_u8> out (label_image.domain ()); // // Save the influence area of the node of the graphe (seed2tiling result). // level::stretch (zi_image, out); @@ -343,10 +344,10 @@ // io::pgm::save(out, path_output + ".text_graph.pgm"); // std::cout << path_output + ".text_graph.pgm" << " generated" << std::endl; -// // Save the graph of the text. -// level::stretch (text_image, out); -// io::pgm::save(out, path_output + ".text.pgm"); -// std::cout << path_output + ".text.pgm" << " generated" << std::endl; + // Save the the text image. + level::stretch (text_image, out); + io::pgm::save(out, path_output + ".text.pgm"); + std::cout << path_output + ".text.pgm" << " generated" << std::endl; // Save the output image (input image + bounding box text in red). io::ppm::save(output, path_output + ".ppm");

17 years

milena r1669: Highlight hlives and vlines in extract_array

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Highlight hlives and vlines in extract_array. * sandbox/garrigues/factures/extract_array_highlight.cc: New. Highlight hlives and vlines in extract_array. * sandbox/garrigues/factures/array_global.cc: Rename as... * sandbox/garrigues/factures/extract_array.cc: this. * mln/geom/resize.hh: Use mln_sum type. --- mln/geom/resize.hh | 2 sandbox/garrigues/factures/extract_array.cc | 114 ++++++++++++ sandbox/garrigues/factures/extract_array_highlight.cc | 160 ++++++++++++++++++ 3 files changed, 275 insertions(+), 1 deletion(-) Index: trunk/milena/mln/geom/resize.hh =================================================================== --- trunk/milena/mln/geom/resize.hh (revision 1668) +++ trunk/milena/mln/geom/resize.hh (revision 1669) @@ -101,7 +101,7 @@ resize_2d_(const I& input, const float ratio) { trace::entering("mln::geom::impl::resize_2d_"); - typedef mln_value(I) V; + typedef mln_sum(mln_value(I)) V; std::size_t rows = input.bbox().len(0); std::size_t cols = input.bbox().len(1); Index: trunk/milena/sandbox/garrigues/factures/extract_array_highlight.cc =================================================================== --- trunk/milena/sandbox/garrigues/factures/extract_array_highlight.cc (revision 0) +++ trunk/milena/sandbox/garrigues/factures/extract_array_highlight.cc (revision 1669) @@ -0,0 +1,160 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +#include <mln/core/image2d.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/geom/resize.hh> +#include <mln/display/all.hh> +#include <mln/value/int_u8.hh> +#include <mln/morpho/opening.hh> +#include <mln/win/hline2d.hh> +#include <mln/win/vline2d.hh> +#include <mln/win/disk2d.hh> + +#include <mln/pw/all.hh> +#include <mln/core/inplace.hh> +#include <mln/level/stretch.hh> +#include <mln/level/median.hh> +#include <mln/morpho/gradient.hh> + +#include <mln/labeling/level.hh> +#include <mln/literal/all.hh> + +#include <mln/core/neighb2d.hh> + +#include <mln/accu/all.hh> + +#include <mln/draw/box.hh> + +using namespace mln; +typedef image2d<bool> ima2d_bool; +typedef image2d<unsigned> ima2d_unsigned; + +image2d<bool> +filter_arrays(image2d<bool> in) +{ + // Labeling. + unsigned nlabels; + image2d<unsigned> labels = labeling::level(in, true, c4(), nlabels); + + // Get the caracteristics of the connected components. + std::vector< accu::pair_< accu::bbox<point2d>, accu::count_<point2d> > > caracteristics(nlabels + 1); + mln_fwd_piter_(ima2d_unsigned) p(labels.domain()); + for_all(p) + caracteristics[labels(p)].take(p); + + // Filter each connected components. + std::vector<bool> is_array(nlabels); + for (int i = 0; i < nlabels; i++) + { + box_<point2d> b = caracteristics[i].to_result().first; + unsigned n = caracteristics[i].to_result().second; + float ratio; + if (b.pmax() == b.pmin() || n < 10) + { + is_array[i] = false; + continue; + } + + if (0 != (b.pmax()[1] - b.pmin()[1])) + ratio = float(b.pmax()[0] - b.pmin()[0]) / (b.pmax()[1] - b.pmin()[1]); + else + ratio = float(b.pmax()[1] - b.pmin()[1]) / (b.pmax()[0] - b.pmin()[0]); + + int area = (b.pmax()[0] - b.pmin()[0]) * (b.pmax()[1] - b.pmin()[1]); + is_array[i] = ratio < 0.1 || ratio > 10 || (float(n) / area) < 0.2; + } + + // Clean the image. + image2d<bool> output(in.domain()); + for_all(p) + output(p) = is_array[labels(p)]; + + return output; +} + +image2d<value::rgb8> +highlight_vlines(image2d<bool> in) +{ + + image2d<bool> tmp; + tmp = filter_arrays(in); + + // Opening. + tmp = morpho::opening(tmp, win::vline2d(5)); + + image2d<value::rgb8> output(tmp.domain()); + mln_fwd_piter_(ima2d_unsigned) p(tmp.domain()); + for_all(p) + if (tmp(p)) + output(p) = literal::red; + else + output(p) = literal::black; + + return output; +} + + +image2d<value::rgb8> +highlight_hlines(image2d<bool> in) +{ + + image2d<bool> tmp; + tmp = filter_arrays(in); + // Opening. + tmp = morpho::opening(tmp, win::hline2d(5)); + + image2d<value::rgb8> output(tmp.domain()); + mln_fwd_piter_(ima2d_unsigned) p(tmp.domain()); + for_all(p) + if (tmp(p)) + output(p) = literal::green; + else + output(p) = literal::black; + + return output; +} + + +int main() +{ + + image2d<value::int_u8> in; + + io::pgm::load(in , "facture.pgm"); + + // Binarisation. + ima2d_bool bin(in.domain()); + level::paste(inplace(pw::value(in) > pw::cst(50) | in.domain()), bin); + + image2d<value::rgb8> output_h = highlight_hlines(bin); + image2d<value::rgb8> output_v = highlight_vlines(bin); + + image2d<value::rgb8> sum = output_v + output_h; + io::ppm::save(sum, "array.ppm"); +} Index: trunk/milena/sandbox/garrigues/factures/extract_array.cc =================================================================== --- trunk/milena/sandbox/garrigues/factures/extract_array.cc (revision 0) +++ trunk/milena/sandbox/garrigues/factures/extract_array.cc (revision 1669) @@ -0,0 +1,114 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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. + +#include <mln/core/image2d.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/geom/resize.hh> +#include <mln/display/all.hh> +#include <mln/value/int_u8.hh> +#include <mln/morpho/closing.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/pw/all.hh> +#include <mln/core/inplace.hh> +#include <mln/level/stretch.hh> +#include <mln/labeling/level.hh> +#include <mln/literal/all.hh> + +#include <mln/core/neighb2d.hh> + +#include <mln/accu/all.hh> + +#include <mln/draw/box.hh> + +int main() +{ + using namespace mln; + using namespace mln; + + typedef image2d<bool> ima2d_bool; + typedef image2d<unsigned> ima2d_unsigned; + + image2d<value::int_u8> in; + + io::pgm::load(in , "facture.pgm"); + + // Resize 50%. + image2d<value::int_u8> small = in; //geom::resize(in, 0.5); + + // Binarisation. + ima2d_bool bin(small.domain()); + level::paste(inplace(pw::value(small) > pw::cst(50) | small.domain()), bin); + + // Labeling. + unsigned nlabels; + image2d<unsigned> labels = labeling::level(bin, true, c4(), nlabels); + + // Get the caracteristics of the connected components. + std::vector< accu::pair_< accu::bbox<point2d>, accu::count_<point2d> > > caracteristics(nlabels); + mln_fwd_piter_(ima2d_unsigned) p(labels.domain()); + for_all(p) + caracteristics[labels(p)].take(p); + + // Filter each connected components. + std::vector<bool> is_array(nlabels); + for (int i = 0; i < nlabels; i++) + { + box_<point2d> b = caracteristics[i].to_result().first; + unsigned n = caracteristics[i].to_result().second; + float ratio; + if (b.pmax() == b.pmin() || n < 10) + { + is_array[i] = false; + continue; + } + + if (0 != (b.pmax()[1] - b.pmin()[1])) + ratio = float(b.pmax()[0] - b.pmin()[0]) / (b.pmax()[1] - b.pmin()[1]); + else + ratio = float(b.pmax()[1] - b.pmin()[1]) / (b.pmax()[0] - b.pmin()[0]); + + int area = (b.pmax()[0] - b.pmin()[0]) * (b.pmax()[1] - b.pmin()[1]); + is_array[i] = ratio < 0.14 || ratio > 7 || (float(n) / area) < 0.2; + } + + // Clean the image. + image2d<value::rgb8> output(small.domain()); + for_all(p) + if (is_array[labels(p)]) + output(p) = literal::white; + else + output(p) = literal::black; + + // Draw the bounding boxes. + for (int i = 0; i < nlabels; i++) + if (is_array[i]) + draw::box(output, inplace(caracteristics[i].to_result().first), inplace(value::rgb8(literal::green))); + + io::ppm::save(output, "array.ppm"); +}

17 years

milena r1668: Update extract_character

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update extract_character. * sandbox/nivault/extract_character.cc: Update. --- extract_character.cc | 165 +++++++++++++++++++++------------------------------ 1 file changed, 68 insertions(+), 97 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1667) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1668) @@ -69,6 +69,7 @@ # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> # include <mln/morpho/opening_area.hh> +# include <mln/draw/box.hh> using namespace mln; @@ -80,10 +81,13 @@ unsigned size = rows * cols; // float ratio = (float) (rows * cols) / cardinality; - /// Remove noise. + // Remove noise. if ((rows < 5) && (cols < 5)) return true; + if (cardinality < 30) + return true; + // if (rows < cols) // ratio = cols / rows; // else @@ -106,9 +110,6 @@ // if (cols > 20) // return true; -// if (cols < 10) -// return true; - float min = 0.2; float max = 0.7; @@ -118,45 +119,25 @@ if (cardinality > size * max) return true; - return false; -} - -template <typename I> -void -draw_bbox(I& image, box2d box, value::rgb8 val) -{ - point2d pmin = box.pmin(); - point2d pmax = box.pmax(); + if (rows > 30) + return true; - point2d p1 (pmin[0], pmin[1]); - point2d p2 (pmax[0], pmin[1]); - point2d p3 (pmin[0], pmax[1]); - point2d p4 (pmax[0], pmax[1]); - - draw::line (image, p1, p2, val); - draw::line (image, p2, p4, val); - draw::line (image, p4, p3, val); - draw::line (image, p3, p1, val); + return false; } template <typename I, typename O> void extract_lines(I& text_image, O& output, - std::vector< accu::bbox <point2d> >& v_bbox) + std::vector< accu::bbox <point2d> >& v_bbox, + int limits) { typedef image2d<unsigned> I_LABEL; - - typedef std::list< accu::bbox <point2d> > L; - - L list_lines; - I image = clone(text_image); point2d start = text_image.domain().pmin (); point2d end = text_image.domain().pmax (); - int limits = 50; - for (int r = start[0]; r < end[0]; ++r) + for (int r = start[0]; r < end[0]; r += 10) { for (int c = start[1]; c < end[1]; ++c) { @@ -173,6 +154,8 @@ unsigned value = image(point2d(r, i)); if (value != 0) { + draw::box (output, v_bbox[value].to_result(), literal::blue); + typedef sub_image<I_LABEL, box2d> I_SUB; typedef image_if_value<I_SUB> I_VAL; @@ -194,16 +177,9 @@ } } if (ok) - list_lines.push_back(accu); + draw::box (output, accu.to_result(), literal::green); } } - - L::const_iterator it = list_lines.begin(); - for (; it != list_lines.end(); ++it) - { - box2d b = (*it).to_result (); - draw_bbox (output, b, literal::green); - } } @@ -248,6 +224,7 @@ int main(int argc, char** argv) { +// trace::quiet = false; using value::int_u8; using value::rgb8; @@ -269,24 +246,15 @@ I input = io::pbm::load (path_input); O output (input.domain ()); - /// Inversion video. + // Inversion video. morpho::complementation_inplace(input); - /// Clean input image (remove noise with area opening) - image2d<bool> input2 (input.domain()); - morpho::opening_area(input, c4(), 5, input2); - -// image2d<int_u8> process (input.domain ()); -// level::stretch (output_2, process); -// io::pgm::save(process, "process.pgm"); - - - /// Labeling the input image. + // Labeling the input image. unsigned nb_labels; - I_LABEL label_image = labeling::blobs(input2, c8(), nb_labels); + I_LABEL label_image = labeling::blobs(input, c8(), nb_labels); std::cout << "nb_labels = " << nb_labels << std::endl; - /// Extraction of informations in the image (BoundingBox, Cardinality, ... ). + // Extraction of informations in the image (BoundingBox, Cardinality, ... ). std::vector< accu::bbox <point2d> > vec_bbox (nb_labels + 1); std::vector< accu::count_<point2d> > vec_card (nb_labels + 1); @@ -299,15 +267,15 @@ vec_card[label_image(p)].take (p); } - /// Generation of the text image (text_image). + // Generation of the text image (text_image). I_LABEL text_image (label_image.domain()); for (unsigned i = 0; i <= nb_labels; ++i) { - /// Evaluation of kind of data (character or not). + // Evaluation of kind of data (character or not). if (is_character(vec_bbox[i].to_result(), vec_card[i].to_result())) continue; - /// Copy text in an image (text_image). + // Copy text in an image (text_image). { typedef sub_image<I_LABEL, box2d> I_SUB; typedef image_if_value<I_SUB> I_VAL; @@ -318,71 +286,74 @@ mln_piter_(I_VAL) p(val_image.domain()); - /// Hack : problem with traits in image_if. + // Hack : problem with traits in image_if. for_all (p) text_image(p) = val_image(p); - /// Here is the good way to do the previous action. -// level::paste (val_ima, text_image + // Here is the good way to do the previous action. +// level::paste (val_ima, text_image); } } - /// Extraction of lines. - extract_lines(text_image, output, vec_bbox); + // Extraction of lines. + extract_lines(text_image, output, vec_bbox, 50); - /// Generation of the graph from text image. - I_LABEL zi_image = geom::seeds2tiling(text_image, c4 ()); - mesh_p<point2d> m = make::voronoi(zi_image, text_image, c4()); - I_LABEL gr_image (label_image.domain ()); - I_LABEL gr_image2 (label_image.domain ()); - draw::mesh(gr_image, m, 255, 128); - draw::mesh(gr_image2, m, 255, 0); +// // Generation of the graph from text image. +// I_LABEL zi_image = geom::seeds2tiling(text_image, c4 ()); +// mesh_p<point2d> m = make::voronoi(zi_image, text_image, c4()); +// I_LABEL gr_image (label_image.domain ()); +// draw::mesh(gr_image, m, 255, 128); +// I_LABEL gr_image2 (label_image.domain ()); +// draw::mesh(gr_image2, m, 255, 0); - /// Dilation of node of the graph. - win::disk2d win (30); - I_LABEL pr = morpho::dilation(gr_image2, win); - I bool_ima (label_image.domain ()); - level::paste(pr, bool_ima); +// // Dilation of node of the graph. +// win::disk2d win (20); +// I_LABEL pr = morpho::dilation(gr_image2, win); +// I bool_ima (label_image.domain ()); +// level::paste(pr, bool_ima); - /// Labeling the dilated image. - unsigned nb_dilated_node_labels; - I_LABEL label_image2 = labeling::blobs(bool_ima, c8(), nb_dilated_node_labels); - std::cout << "nb_dilated_node_labels = " << nb_dilated_node_labels << std::endl; - std::vector< accu::bbox <point2d> > vec_bbox2 (nb_dilated_node_labels + 1); +// // Labeling the dilated image. +// unsigned nb_dilated_node_labels; +// I_LABEL label_image2 = labeling::blobs(bool_ima, c8(), nb_dilated_node_labels); +// std::cout << "nb_dilated_node_labels = " << nb_dilated_node_labels << std::endl; +// std::vector< accu::bbox <point2d> > vec_bbox2 (nb_dilated_node_labels + 1); - /// Extract area of text. - mln_piter_(I_LABEL) pl (label_image.domain ()); - for_all (pl) - vec_bbox2[label_image2(pl)].take (pl); +// // Extract area of text. +// mln_piter_(I_LABEL) pl (label_image.domain ()); +// for_all (pl) +// vec_bbox2[label_image2(pl)].take (pl); - /// Draw the bounding box of area of text in output. - for (unsigned i = 0; i <= nb_dilated_node_labels; ++i) - draw_bbox(output, vec_bbox2[i].to_result(), literal::red); +// // Draw the bounding box of area of text in output. +// for (unsigned i = 0; i <= nb_dilated_node_labels; ++i) +// draw::box(output, vec_bbox2[i].to_result(), literal::red); - image2d<int_u8> out (label_image.domain ()); +// image2d<int_u8> out (label_image.domain ()); - /// Save the influence area of the node of the graphe (seed2tiling result). - level::stretch (zi_image, out); - io::pgm::save(out, path_output + ".text_area.approx.pgm"); - std::cout << path_output + ".text_area.approx.pgm" << " generated" << std::endl; +// // Save the influence area of the node of the graphe (seed2tiling result). +// level::stretch (zi_image, out); +// io::pgm::save(out, path_output + ".text_area.approx.pgm"); +// std::cout << path_output + ".text_area.approx.pgm" << " generated" << std::endl; - /// Save the graph of the text. - level::stretch (gr_image, out); - io::pgm::save(out, path_output + ".text_graph.pgm"); - std::cout << path_output + ".text_graph.pgm" << " generated" << std::endl; +// // Save the graph of the text. +// level::stretch (gr_image, out); +// io::pgm::save(out, path_output + ".text_graph.pgm"); +// std::cout << path_output + ".text_graph.pgm" << " generated" << std::endl; - /// Save the graph of the text. - level::stretch (text_image, out); - io::pgm::save(out, path_output + ".text.pgm"); - std::cout << path_output + ".text.pgm" << " generated" << std::endl; +// // Save the graph of the text. +// level::stretch (text_image, out); +// io::pgm::save(out, path_output + ".text.pgm"); +// std::cout << path_output + ".text.pgm" << " generated" << std::endl; - /// Save the output image (input image + bounding box text in red). + // Save the output image (input image + bounding box text in red). io::ppm::save(output, path_output + ".ppm"); std::cout << path_output + ".ppm" << " generated" << std::endl; +// image2d<int_u8> process (input.domain ()); +// level::stretch (output_2, process); +// io::pgm::save(process, "process.pgm"); }

17 years

milena r1667: Fix bug in dilation

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix bug in dilation. * mln/morpho/dilation.hh: Fix bug for binary image. --- dilation.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: trunk/milena/mln/morpho/dilation.hh =================================================================== --- trunk/milena/mln/morpho/dilation.hh (revision 1666) +++ trunk/milena/mln/morpho/dilation.hh (revision 1667) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -125,9 +125,9 @@ return impl::dilation_on_set(exact(input), exact(win), output); } - template <typename K, typename I, typename W, typename O> + template <typename I, typename W, typename O> inline - void dilation_wrt_value(K, // otherwise => morphology on functions + void dilation_wrt_value(trait::image::kind::any, // otherwise => morphology on functions const Image& input, const Window<W>& win, Image<O>& output) { return impl::dilation_on_function(exact(input), exact(win), output);

17 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches