Olena-patches August 2009

olena-patches@lrde.epita.fr

6 participants
108 discussions

4397: tests/tools/pretty_check.sh: Change data base url.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/tests/tools/pretty_check.sh | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d9a3461..97a4b48 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * tests/tools/pretty_check.sh: Change data base url. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Introduce mixed windows and neighborhood for graph images. * mln/core/box_runstart_piter.hh, diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh index 9ba1635..febea51 100755 --- a/milena/tests/tools/pretty_check.sh +++ b/milena/tests/tools/pretty_check.sh @@ -77,6 +77,7 @@ output_directory=tmp output_file=tests.html check_log="$PWD/$output_directory/check.log" +base_url_data="http://www.lrde.epita.fr/~lazzara/uttk" base_make_path=$1 if [ -z "$base_make_path" ]; then @@ -111,9 +112,9 @@ begin_output_file() cat > $output_file << EOF <html> <head> - <script language="javascript" src="http://api.uttk.org/javascripts/uttk.js"></script> + <script language="javascript" src="$base_url_data/javascripts/uttk.js"></script> <style type="text/css"> - @import url('http://api.uttk.org/stylesheets/uttk.css'); + @import url('$base_url_data/stylesheets/uttk.css'); </style> </head> <body> @@ -171,7 +172,7 @@ open_dir() <div class="node"> <table class="title" id="FAIL"> <tr> - <td width="11px" <img src="http://api.uttk.org/images/triangle.gif"/></td> + <td width="11px" <img src="$base_url_data/images/triangle.gif"/></td> <td>$1</td> <td width="20px">$3</td> </tr> @@ -232,7 +233,7 @@ error_node() <div class="node"> <table class="title" id="$class_id"> <tr> - <td width="11px" <img src="http://api.uttk.org/images/triangle.gif"/></td> + <td width="11px" <img src="$base_url_data/images/triangle.gif"/></td> <td><a name="$name">$name</a></td> <td width="20px"><a href="#top">^ TOP</a></td> </tr> -- 1.5.6.5

14 years, 8 months

4395: configure.ac: Configure scribo/src/text/*.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79cb28f..0df5daa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: Configure scribo/src/text/*. + 2009-08-19 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * README: Be consistent with the documentation. diff --git a/configure.ac b/configure.ac index 782ddbd..75e34da 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,8 @@ AC_CONFIG_FILES([ scribo/src/filter/Makefile scribo/src/preprocessing/Makefile scribo/src/table/Makefile + scribo/src/text/Makefile + scribo/src/text/grouping/Makefile ]) AC_CONFIG_FILES([scribo/tests/data.hh]) -- 1.5.6.5

14 years, 8 months

4394: Small fixes in Milena.

by Guillaume Lazzara

* mln/canvas/labeling/blobs.hh, * mln/canvas/labeling/internal/tests.hh: Add missing includes. * mln/morpho/closing/algebraic.hh, * mln/test/predicate.hh, * mln/morpho/algebraic_filter.hh, * mln/labeling/relabel.hh, * mln/data/compare.hh, * mln/canvas/morpho/attribute_filter.hh: cosmetic changes. * mln/core/concept/image.hh: Remove data/compare.hh include. * mln/core/internal/site_relative_iterator_base.hh: Remove deprecated todo. * mln/data/compute.hh: Avoid a warning. * mln/labeling/blobs.hh: Remove useless headers. * mln/make/edge_image.hh: Fix a syntax error. --- milena/ChangeLog | 27 +++++++++++++++++++- milena/mln/canvas/labeling/blobs.hh | 4 +++ milena/mln/canvas/labeling/internal/tests.hh | 4 +++ milena/mln/canvas/morpho/attribute_filter.hh | 10 +++--- milena/mln/core/concept/image.hh | 1 - .../core/internal/site_relative_iterator_base.hh | 2 - milena/mln/data/compare.hh | 3 +- milena/mln/data/compute.hh | 1 + milena/mln/labeling/blobs.hh | 2 - milena/mln/labeling/relabel.hh | 3 +- milena/mln/make/edge_image.hh | 3 +- milena/mln/morpho/algebraic_filter.hh | 18 ++++++++++--- milena/mln/morpho/closing/algebraic.hh | 3 +- milena/mln/test/predicate.hh | 3 +- 14 files changed, 64 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6785877..c996afc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,28 @@ +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Small fixes in Milena. + + * mln/canvas/labeling/blobs.hh, + * mln/canvas/labeling/internal/tests.hh: Add missing includes. + + * mln/morpho/closing/algebraic.hh, + * mln/test/predicate.hh, + * mln/morpho/algebraic_filter.hh, + * mln/labeling/relabel.hh, + * mln/data/compare.hh, + * mln/canvas/morpho/attribute_filter.hh: cosmetic changes. + + * mln/core/concept/image.hh: Remove data/compare.hh include. + + * mln/core/internal/site_relative_iterator_base.hh: Remove + deprecated todo. + + * mln/data/compute.hh: Avoid a warning. + + * mln/labeling/blobs.hh: Remove useless headers. + + * mln/make/edge_image.hh: Fix a syntax error. + 2009-08-21 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * mln/debug/superpose.hh: Add support for more image types. @@ -61,7 +86,7 @@ 2009-08-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Remove extra ";" to compile. - + * mln/trait/functions.hh: Remove extra ";" l207 after "}" of compute. 2009-08-19 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/milena/mln/canvas/labeling/blobs.hh b/milena/mln/canvas/labeling/blobs.hh index 8f85541..bd6eeb5 100644 --- a/milena/mln/canvas/labeling/blobs.hh +++ b/milena/mln/canvas/labeling/blobs.hh @@ -31,6 +31,10 @@ /// Canvas for connected component labeling of the binary objects of a /// binary image using a queue-based algorithm. +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/data/fill.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <mln/util/pix.hh> diff --git a/milena/mln/canvas/labeling/internal/tests.hh b/milena/mln/canvas/labeling/internal/tests.hh index d1b9cf7..e91fcc9 100644 --- a/milena/mln/canvas/labeling/internal/tests.hh +++ b/milena/mln/canvas/labeling/internal/tests.hh @@ -30,6 +30,10 @@ /// /// Shared tests for labeling canvas arguments. +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> + + namespace mln { diff --git a/milena/mln/canvas/morpho/attribute_filter.hh b/milena/mln/canvas/morpho/attribute_filter.hh index 2e2d8cb..0e7cbb2 100644 --- a/milena/mln/canvas/morpho/attribute_filter.hh +++ b/milena/mln/canvas/morpho/attribute_filter.hh @@ -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. // @@ -44,7 +45,6 @@ # include <mln/extension/adjust_fill.hh> # include <mln/data/sort_psites.hh> - namespace mln { @@ -263,7 +263,7 @@ namespace mln //////////////////////// /// Fastest version. /// //////////////////////// - + template <typename I> inline unsigned @@ -385,8 +385,8 @@ namespace mln // Dispatch. - - + + namespace internal { diff --git a/milena/mln/core/concept/image.hh b/milena/mln/core/concept/image.hh index 6c0d860..8c620bc 100644 --- a/milena/mln/core/concept/image.hh +++ b/milena/mln/core/concept/image.hh @@ -47,7 +47,6 @@ # include <mln/tag/init.hh> -# include <mln/data/compare.hh> namespace mln { diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index de4e5aa..4d9567f 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -34,8 +34,6 @@ /// /// \todo Add a method to get the site set (if the center is defined) or /// the site set at a given center. -/// -/// \todo In start_ and next_, think about the commented code... # include <vector> diff --git a/milena/mln/data/compare.hh b/milena/mln/data/compare.hh index df1018d..30ea9ce 100644 --- a/milena/mln/data/compare.hh +++ b/milena/mln/data/compare.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 6a234a9..0ab146e 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -92,6 +92,7 @@ namespace mln mln_result(A) compute(const Accumulator<A>& a_, const Image<I>& input) { + (void) a_; A a; return compute(a, input); } diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index f63430f..d58ef5d 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -38,8 +38,6 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/data/fill.hh> -# include <mln/core/site_set/p_queue_fast.hh> # include <mln/canvas/labeling/blobs.hh> diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index 0e89e3c..b8ebc12 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.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. // diff --git a/milena/mln/make/edge_image.hh b/milena/mln/make/edge_image.hh index b0d0465..2a429cb 100644 --- a/milena/mln/make/edge_image.hh +++ b/milena/mln/make/edge_image.hh @@ -34,6 +34,7 @@ # include <mln/core/image/vertex_image.hh> # include <mln/core/concept/function.hh> # include <mln/util/internal/id2element.hh> +# include <mln/data/fill.hh> namespace mln @@ -91,7 +92,7 @@ namespace mln /// /// \return an edge image. // - template <typename P, typename V, typename G, typename FP, typename + template <typename P, typename V, typename G, typename FP, typename FV> mln::edge_image<mln_result(FP),mln_result(FV),G> edge_image(const mln::vertex_image<P,V,G>& v_ima_, const p_edges<G,FP> pe, diff --git a/milena/mln/morpho/algebraic_filter.hh b/milena/mln/morpho/algebraic_filter.hh index c6c0d9e..eca2cc3 100644 --- a/milena/mln/morpho/algebraic_filter.hh +++ b/milena/mln/morpho/algebraic_filter.hh @@ -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,8 +43,11 @@ # include <mln/canvas/morpho/attribute_filter.hh> -namespace mln { - namespace morpho { +namespace mln +{ + + namespace morpho + { template <typename I, typename N, typename A> mln_concrete(I) @@ -74,7 +78,11 @@ namespace mln { trait::accumulator::when_pix::use_p))::check(); mln_concrete(I) output; - output = canvas::morpho::internal::attribute_filter_dispatch(input, nbh, a, lambda, increasing); + output = canvas::morpho::internal::attribute_filter_dispatch(input, + nbh, + a, + lambda, + increasing); trace::exiting("morpho::opening::algebraic_filter"); @@ -82,7 +90,9 @@ namespace mln { } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho + } // end of namespace mln #endif // ! MLN_MORPHO_ALGEBRAIC_FILTER_HH diff --git a/milena/mln/morpho/closing/algebraic.hh b/milena/mln/morpho/closing/algebraic.hh index 6d68a11..f8c8184 100644 --- a/milena/mln/morpho/closing/algebraic.hh +++ b/milena/mln/morpho/closing/algebraic.hh @@ -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. // diff --git a/milena/mln/test/predicate.hh b/milena/mln/test/predicate.hh index de205cc..0cc587e 100644 --- a/milena/mln/test/predicate.hh +++ b/milena/mln/test/predicate.hh @@ -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. // -- 1.5.6.5

14 years, 8 months

4393: New object grouping routine based on a rag.

by Guillaume Lazzara

* text/grouping/group_with_rag.hh, * text/grouping/internal/have_link_valid.hh: New. * src/text/grouping/group_from_rag.cc: New related example. --- scribo/ChangeLog | 9 + scribo/src/text/grouping/group_from_rag.cc | 240 ++++++++++++++++++++++ scribo/text/grouping/group_with_rag.hh | 99 +++++++++ scribo/text/grouping/internal/have_link_valid.hh | 83 ++++++++ 4 files changed, 431 insertions(+), 0 deletions(-) create mode 100644 scribo/src/text/grouping/group_from_rag.cc create mode 100644 scribo/text/grouping/group_with_rag.hh create mode 100644 scribo/text/grouping/internal/have_link_valid.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 472640e..23c8c0d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + New object grouping routine based on a rag. + + * text/grouping/group_with_rag.hh, + * text/grouping/internal/have_link_valid.hh: New. + + * src/text/grouping/group_from_rag.cc: New related example. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * src/text_in_photo.cc: Improve results quality. 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/src/text/grouping/group_from_rag.cc b/scribo/src/text/grouping/group_from_rag.cc new file mode 100644 index 0000000..944624c --- /dev/null +++ b/scribo/src/text/grouping/group_from_rag.cc @@ -0,0 +1,240 @@ +// 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. + +#include <iostream> + +#include <mln/core/var.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/core/image/vertex_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/value/label_16.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/pbm/load.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/literal/colors.hh> +#include <mln/labeling/colorize.hh> +#include <mln/labeling/compute.hh> +#include <mln/make/p_vertices_with_mass_centers.hh> +#include <mln/make/edge_image.hh> +#include <mln/make/vertex_image.hh> +#include <mln/debug/draw_graph.hh> +#include <mln/util/graph.hh> +#include <mln/accu/center.hh> + +#include <scribo/extract/primitive/objects.hh> +#include <scribo/text/grouping/group_with_rag.hh> +//#include <scribo/text/grouping/group_from_rag.hh> + +#include <scribo/filter/small_objects.hh> +#include <scribo/filter/thin_objects.hh> +#include <scribo/filter/thick_objects.hh> + + +#include <scribo/fun/v2b/small_objects_filter.hh> +#include <scribo/debug/save_bboxes_image.hh> +#include <scribo/debug/save_linked_bboxes_image.hh> +#include <scribo/make/debug_filename.hh> + +int usage(const char *name) +{ + std::cout << "Usage: " << name << " <input.pbm> " << std::endl; + return 1; +} + + + +namespace scribo +{ + + using namespace mln; + + + namespace graph + { + + template <typename A, typename G, typename I> + inline + vertex_image<void,mln_result(A),G> + compute_vertex(const Accumulator<A>& accu, + const Graph<G>& g_, + const Image<I>& lbl_, + const mln_value(I)& nlabels) + { + const G& g = exact(g_); + const I& lbl = exact(lbl_); + + mln_precondition(g.is_valid()); + mln_precondition(lbl.is_valid()); + + util::array<mln_result(A)> + values = labeling::compute(accu, lbl_, nlabels); + + vertex_image<void, mln_result(A), G> + v_ima = mln::make::vertex_image(g, values); + + return v_ima; + } + + } // end of namespace scribo::graph + + + template <typename I> + struct edge_color : mln::Function_v2b< edge_color<I> > + { + typedef value::rgb8 result; + + edge_color(const Image<I>& mask) : mask_(exact(mask)) {} + + value::rgb8 operator()(const unsigned id) const + { + if (mask_(id)) + return literal::green; + return literal::red; + } + + I mask_; + }; + + + /// Compute a distance between two rgb8 values. + struct dist : Function_vv2v< dist > + { + + typedef bool result; + + bool operator()(const point2d& p1, const point2d& p2) const + { + return (math::sqrt(math::sqr(p1.row() - p2.row()) + + math::sqr(p1.col() - p2.col()))) < 5; + } + + }; + + + namespace filter + { + + template <typename P, typename V, typename G, typename F, typename FP> + edge_image<void,bool,G> + graph_edges(const vertex_image<P,V,G>& v_ima, + const Function<F>& edge_values, + const Function<FP>& predicate) + { + typedef edge_image<void,bool,util::graph> e_filter_t; + e_filter_t e_filter = mln::make::edge_image(v_ima, dist()); + + + } + + } // end of namespace scribo::filter + + +} + + + +int main(int argc, char* argv[]) +{ + using namespace scribo; + using namespace mln; + + if (argc != 2) + return usage(argv[0]); + + scribo::make::internal::debug_filename_prefix = "group_with_rag"; + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + + typedef image2d<value::label_16> L; + value::label_16 nbboxes; + typedef object_image(L) objects_t; + objects_t objects = extract::primitive::objects(input, c8(), nbboxes); + + /// First filtering. + objects_t filtered_objects + = scribo::filter::small_objects(objects, 6); + + filtered_objects + = scribo::filter::thin_objects(filtered_objects, 3); + + filtered_objects + = scribo::filter::thick_objects(filtered_objects, + math::min(input.ncols(), input.nrows()) / 6); + + + /// Getting objects links from a Region Adjacency graph. + mln_VAR(rag_data, text::grouping::group_with_rag(filtered_objects, c8())); + + + mln_VAR(v_ima, scribo::graph::compute_vertex(accu::center<point2d>(), + rag_data.first(), + filtered_objects, + filtered_objects.nlabels())); + + //FOR DEBUGGING PURPOSE + { + image2d<value::rgb8> + before_grouping = data::convert(value::rgb8(), input); + + scribo::draw::bounding_boxes(before_grouping, + filtered_objects.bboxes(), + literal::blue); + + mln_VAR(pv, mln::make::p_vertices_with_mass_centers(filtered_objects, rag_data.first())); + mln::debug::draw_graph(before_grouping, pv, literal::green, literal::green); + + io::ppm::save(before_grouping, + scribo::make::debug_filename("before_grouping.ppm")); + } + + + + typedef edge_image<void,bool,util::graph> e_filter_t; + e_filter_t e_filter = mln::make::edge_image(v_ima, dist()); + + + + + //FOR DEBUGGING PURPOSE +// { +// image2d<value::rgb8> +// after_grouping = data::convert(value::rgb8(), input); + + +// scribo::draw::bounding_boxes(after_grouping, +// filtered_objects.bboxes(), +// literal::blue); + +// mln::debug::draw_graph(after_grouping, v_ima.domain(), +// pw::cst(literal::black), edge_color<e_filter_t>(e_filter)); + +// io::ppm::save(after_grouping, "after_grouping.ppm"); +// } +} + + diff --git a/scribo/text/grouping/group_with_rag.hh b/scribo/text/grouping/group_with_rag.hh new file mode 100644 index 0000000..c995335 --- /dev/null +++ b/scribo/text/grouping/group_with_rag.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_TEXT_GROUPING_GROUP_WITH_RAG_HH +# define SCRIBO_TEXT_GROUPING_GROUP_WITH_RAG_HH + + +/// \file +/// +/// Group objects with a region adjacency graph. + +# include <mln/core/concept/neighborhood.hh> + +# include <mln/util/graph.hh> +# include <mln/util/couple.hh> + +# include <mln/transform/influence_zone_geodesic.hh> + +# include <mln/make/influence_zone_adjacency_graph.hh> + + +# include <scribo/core/macros.hh> +# include <scribo/core/object_image.hh> + + +namespace scribo +{ + + namespace text + { + + namespace grouping + { + + using namespace mln; + + + template <typename L, typename N> + util::couple<mln::util::graph, mln_concrete(L)> + group_with_rag(const object_image(L)& objects, + const Neighborhood<N>& nbh); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L, typename N> + util::couple<mln::util::graph, mln_concrete(L)> + group_with_rag(const object_image(L)& objects, + const Neighborhood<N>& nbh) + { + trace::entering("scribo::text::grouping::group_with_rag"); + + mln_precondition(objects.is_valid()); + + mln_concrete(L) + iz = transform::influence_zone_geodesic(objects, nbh); + + mln::util::graph + g = mln::make::influence_zone_adjacency_graph(iz, + nbh, + objects.nlabels()); + + trace::exiting("scribo::text::grouping::group_with_rag"); + return make::couple(g, iz); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::text::grouping + + } // end of namespace scribo::text + +} // end of namespace scribo + +#endif // ! SCRIBO_TEXT_GROUPING_GROUP_WITH_RAG_HH diff --git a/scribo/text/grouping/internal/have_link_valid.hh b/scribo/text/grouping/internal/have_link_valid.hh new file mode 100644 index 0000000..bdc6f18 --- /dev/null +++ b/scribo/text/grouping/internal/have_link_valid.hh @@ -0,0 +1,83 @@ +// 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_TEXT_GROUPING_INTERNAL_HAVE_LINK_VALID_HH +# define SCRIBO_TEXT_GROUPING_INTERNAL_HAVE_LINK_VALID_HH + +/// \file +/// +/// Tells whether a component have at least one valid link + + +# include <mln/util/array.hh> +# include <mln/util/couple.hh> + +namespace scribo +{ + + namespace text + { + + namespace grouping + { + + namespace internal + { + + /// Tells whether a component have at least one valid link link. + /// + /// \param[in] left_link Left link of components. + /// \param[in] right_link Right link of components. + /// \param[in] i The component id. + /// + /// \return True if the \p i-th component has at least one + /// valid link. + bool + have_link_valid(const mln::util::array<unsigned>& left_link, + const mln::util::array<unsigned>& right_link, + unsigned i); + +# ifndef MLN_INCLUDE_ONLY + + bool + have_link_valid(const mln::util::array<unsigned>& left_link, + const mln::util::array<unsigned>& right_link, + unsigned i) + { + return (right_link[left_link[i]] == i && left_link[i] != i) + || (left_link[right_link[i]] == i && right_link[i] != i); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::text::grouping::internal + + } // end of namespace scribo::text::grouping + + } // end of namespace scribo::text + +} // end of namespace scribo + +#endif // ! SCRIBO_TEXT_GROUPING_INTERNAL_HAVE_LINK_VALID_HH -- 1.5.6.5

14 years, 8 months

4392: src/text_in_photo.cc: Improve results quality.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++ scribo/src/text_in_photo.cc | 109 +++++++++++++++++++++++++++++++++--------- 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 854e523..472640e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * src/text_in_photo.cc: Improve results quality. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * filter/small_object_groups.hh: New filter. 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/src/text_in_photo.cc b/scribo/src/text_in_photo.cc index d13d741..d51ba37 100644 --- a/scribo/src/text_in_photo.cc +++ b/scribo/src/text_in_photo.cc @@ -23,6 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <libgen.h> #include <iostream> #include <mln/core/image/image2d.hh> @@ -35,13 +36,21 @@ #include <mln/math/min.hh> +#include <mln/literal/colors.hh> +#include <mln/value/rgb8.hh> + +#include <mln/draw/box.hh> + #include <scribo/extract/primitive/objects.hh> #include <scribo/text/grouping/group_with_single_left_link.hh> #include <scribo/text/grouping/group_with_single_right_link.hh> #include <scribo/text/grouping/group_from_double_link.hh> +#include <scribo/text/grouping/group_from_single_link.hh> +#include <scribo/text/grouping/internal/have_link_valid.hh> #include <scribo/filter/small_objects.hh> #include <scribo/filter/thin_objects.hh> #include <scribo/filter/thick_objects.hh> +#include <scribo/filter/small_object_groups.hh> #include <scribo/make/debug_filename.hh> #include <scribo/debug/save_bboxes_image.hh> @@ -62,12 +71,12 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - scribo::make::internal::debug_filename_prefix = "photo"; + scribo::make::internal::debug_filename_prefix = argv[2]; if (argc != 3) return scribo::debug::usage(argv, "Find text in a binarized photo.", - "input.pbm output.ppm", + "input.pbm output_dir", args_desc, "A color image where the text is \ highlighted."); @@ -78,46 +87,98 @@ highlighted."); io::pbm::load(input, argv[1]); typedef image2d<value::label_16> L; + + /// Finding objects. value::label_16 nobjects; - object_image(L) objects = scribo::extract::primitive::objects(input, c8(), nobjects); + object_image(L) + objects = scribo::extract::primitive::objects(input, c8(), nobjects); + + /// First filtering. object_image(L) filtered_objects = scribo::filter::small_objects(objects, 6); filtered_objects - = scribo::filter::thin_objects(filtered_objects, 3); + = scribo::filter::thin_objects(filtered_objects, 1); filtered_objects = scribo::filter::thick_objects(filtered_objects, - math::min(input.ncols(), input.nrows()) / 6); - + math::min(input.ncols(), input.nrows()) / 5); + /// Grouping potential objects mln::util::array<unsigned> left_link - = text::grouping::group_with_single_left_link(objects, 30); + = text::grouping::group_with_single_left_link(filtered_objects, 30); mln::util::array<unsigned> right_link - = text::grouping::group_with_single_right_link(objects, 30); + = text::grouping::group_with_single_right_link(filtered_objects, 30); + +#ifndef NOUT std::cout << "BEFORE - nobjects = " << nobjects << std::endl; -// scribo::debug::save_linked_bboxes_image(input, -// filtered_textbboxes, left_link, right_link, -// literal::red, literal::cyan, literal::yellow, -// literal::green, -// scribo::make::debug_filename("links.ppm")); -// -// scribo::debug::save_bboxes_image(input, filtered_textbboxes.bboxes(), -// literal::red, -// scribo::make::debug_filename("test_graph_filtered_text.ppm")); + scribo::debug::save_linked_bboxes_image(input, + filtered_objects, + left_link, right_link, + literal::red, literal::cyan, + literal::yellow, + literal::green, + scribo::make::debug_filename("links.ppm")); +#endif + + // Trying to group objects + mln::util::array<unsigned> parent_link; + text::grouping::group_from_double_link(filtered_objects, + left_link, right_link, + parent_link); + + // Remove objects part of groups with less than 3 objects. + mln::util::array<bool> + to_be_kept = filter::small_object_groups(parent_link, 3); + + + // FOR DEBUGGING PURPOSE. + image2d<value::rgb8> decision_image = data::convert(value::rgb8(), input); + + + for (unsigned i = 1; i < to_be_kept.size(); ++i) + { + if (!to_be_kept(i)) + mln::draw::box(decision_image, filtered_objects.bbox(i), literal::red); + else + mln::draw::box(decision_image, filtered_objects.bbox(i), literal::green); + } + // END OF DEBUG + + + filtered_objects.relabel(to_be_kept); + + + /// Objects have been removed we need to update object links again. + /// This time a single link is enough since non-wanted objects have + /// been removed. + left_link + = text::grouping::group_with_single_left_link(filtered_objects, 30); + + + + /// Grouping objects again. object_image(L) grouped_objects - = text::grouping::group_from_double_link(filtered_objects, left_link, right_link); + = text::grouping::group_from_single_link(filtered_objects, left_link); + +#ifndef NOUT + /// FOR DEBUG PURPOSE. + for (unsigned i = 1; i < grouped_objects.nlabels(); ++i) + mln::draw::box(decision_image, grouped_objects.bbox(i), literal::blue); + io::ppm::save(decision_image, scribo::make::debug_filename("decision_image.ppm")); + std::cout << "AFTER - nobjects = " << grouped_objects.nlabels() << std::endl; +#endif + + io::ppm::save(mln::labeling::colorize(value::rgb8(), + grouped_objects, + grouped_objects.nlabels()), +// "/dev/null"); + scribo::make::debug_filename("out.ppm")); -// scribo::debug::save_bboxes_image(input, grouped_textbboxes.bboxes(), -// literal::red, -// scribo::make::debug_filename("test_graph_grouped_text.ppm")); -// - io::ppm::save(mln::labeling::colorize(value::rgb8(), grouped_objects, grouped_objects.nlabels()), - argv[2]); trace::exiting("main"); } -- 1.5.6.5

14 years, 8 months

4391: filter/small_object_groups.hh: New filter.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++ scribo/filter/small_object_groups.hh | 89 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) create mode 100644 scribo/filter/small_object_groups.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 14d8305..854e523 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * filter/small_object_groups.hh: New filter. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Various small fixes in Scribo. * extract/primitive/lines_h_thick.hh, diff --git a/scribo/filter/small_object_groups.hh b/scribo/filter/small_object_groups.hh new file mode 100644 index 0000000..7f10e1d --- /dev/null +++ b/scribo/filter/small_object_groups.hh @@ -0,0 +1,89 @@ +// 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_FILTER_SMALL_OBJECT_GROUPS_HH +# define SCRIBO_FILTER_SMALL_OBJECT_GROUPS_HH + +/// \file +/// +/// Remove small objects groups. + + +# include <mln/util/array.hh> + +namespace scribo +{ + + namespace filter + { + + using namespace mln; + + + /*! \brief Remove objects within a group with less than \p n + links. + + \param[in] parent_link Information about object links. + \param[in] n_links The minimum number of links per group. + + \return A function mapping an object id to a bool. It is set to + true if an object is part of a group with more than \p n_links + links. + */ + mln::util::array<bool> + small_object_groups(const mln::util::array<unsigned>& parent_link, + unsigned n_links); + + +# ifndef MLN_INCLUDE_ONLY + + + inline + mln::util::array<bool> + small_object_groups(const mln::util::array<unsigned>& parent_link, + unsigned n_links) + { + // Counting the number of objects per group. + mln::util::array<unsigned> group_size(parent_link.size(), 0); + for (unsigned i = 1; i < group_size.size(); ++i) + ++group_size[parent_link[i]]; + + mln::util::array<bool> f(parent_link.size()); + f(0) = true; + for (unsigned i = 1; i < f.size(); ++i) + f(i) = (group_size[parent_link[i]] >= n_links); + + return f; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::filter + +} // end of namespace scribo + +#endif // ! SCRIBO_FILTER_SMALL_OBJECT_GROUPS_HH + -- 1.5.6.5

14 years, 8 months

4390: Various small fixes in Scribo.

by Guillaume Lazzara

* extract/primitive/lines_h_thick.hh, * debug/save_linked_bboxes_image.hh: Reindent. * demo/Makefile.am: Use $(srcdir). * draw/bounding_box_links.hh: Fix use of invalid sites. * extract/primitive/lines_h_pattern.hh, * extract/primitive/lines_v_pattern.hh: Add fixmes. * filter/large_objects.hh, * filter/thick_objects.hh: Set a specific value for the background. * text/grouping/group_from_double_link.hh: Update doc and add an overload. * text/grouping/group_from_single_link.hh, * text/grouping/group_with_graph.hh: Update doc. * text/grouping/internal/is_link_valid.hh: Add a missing test. --- scribo/ChangeLog | 26 ++++++++++++ scribo/debug/save_linked_bboxes_image.hh | 6 +- scribo/demo/Makefile.am | 2 +- scribo/draw/bounding_box_links.hh | 38 ++++++++++++++---- scribo/extract/primitive/lines_h_pattern.hh | 2 + scribo/extract/primitive/lines_h_thick.hh | 8 ++-- scribo/extract/primitive/lines_v_pattern.hh | 2 + scribo/filter/large_objects.hh | 2 + scribo/filter/thick_objects.hh | 2 + scribo/text/grouping/group_from_double_link.hh | 49 ++++++++++++++++++----- scribo/text/grouping/group_from_single_link.hh | 12 +++-- scribo/text/grouping/group_with_graph.hh | 44 ++++++++++++--------- scribo/text/grouping/internal/is_link_valid.hh | 3 +- 13 files changed, 145 insertions(+), 51 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c9878a4..14d8305 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,31 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Various small fixes in Scribo. + + * extract/primitive/lines_h_thick.hh, + * debug/save_linked_bboxes_image.hh: Reindent. + + * demo/Makefile.am: Use $(srcdir). + + * draw/bounding_box_links.hh: Fix use of invalid sites. + + * extract/primitive/lines_h_pattern.hh, + * extract/primitive/lines_v_pattern.hh: Add fixmes. + + * filter/large_objects.hh, + * filter/thick_objects.hh: Set a specific value for the + background. + + * text/grouping/group_from_double_link.hh: Update doc and add an + overload. + + * text/grouping/group_from_single_link.hh, + * text/grouping/group_with_graph.hh: Update doc. + + * text/grouping/internal/is_link_valid.hh: Add a missing test. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new routines for line extraction. * extract/primitive/lines_h_single.hh, diff --git a/scribo/debug/save_linked_bboxes_image.hh b/scribo/debug/save_linked_bboxes_image.hh index f9ec7c9..ed35622 100644 --- a/scribo/debug/save_linked_bboxes_image.hh +++ b/scribo/debug/save_linked_bboxes_image.hh @@ -216,9 +216,9 @@ namespace scribo mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); mln::util::array<mln_result(accu::center<mln_psite(L)>)> - mass_center = labeling::compute(accu::meta::center(), - objects, - objects.nlabels()); + mass_center = labeling::compute(accu::meta::center(), + objects, + objects.nlabels()); draw::bounding_boxes(tmp, objects.bboxes(), box_value); draw::bounding_box_links(tmp, mass_center, diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index 19948cb..b51084e 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/scribo/scribo.mk .PHONY : demo Makefile.demo: - qmake-qt4 $(top_srcdir)/scribo/demo/demo.pro -o Makefile.demo + qmake-qt4 $(srcdir)/demo/demo.pro -o Makefile.demo demo: Makefile.demo make -f Makefile.demo all diff --git a/scribo/draw/bounding_box_links.hh b/scribo/draw/bounding_box_links.hh index c1dc997..908da17 100644 --- a/scribo/draw/bounding_box_links.hh +++ b/scribo/draw/bounding_box_links.hh @@ -142,6 +142,17 @@ namespace scribo namespace internal { + + template <typename I> + mln_site(I) + shift_site(const I& ima, + const mln_site(I)& p, const mln_dpsite(mln_site_(I))& dp) + { + if (ima.has(p + dp)) + return p + dp; + return p; + } + /// Draw a link graph in an image. /// Functor to be passed to depth_first_search. template <typename I> @@ -288,24 +299,32 @@ namespace scribo I& input = exact(input_); mln_precondition(input.is_valid()); - mln_site(I)::vec dleft = literal::origin; + typedef mln_site(I) P; + + mln_dpsite(P) dleft = literal::zero; dleft[0] = 2; - mln_site(I)::vec dright = literal::origin; + mln_dpsite(P) dright = literal::zero; dright[0] = -2; for_all_components(i, left_link) { mln::draw::line(input, - mass_centers[i] + dleft, - mass_centers[left_link[i]] + dleft, + internal::shift_site(input, mass_centers[i], dleft), + internal::shift_site(input, + mass_centers[left_link[i]], + dleft), left_link_value); mln::draw::line(input, - mass_centers[i] + dright, - mass_centers[right_link[i]] + dright, + internal::shift_site(input, mass_centers[i], dright), + internal::shift_site(input, + mass_centers[right_link[i]], + dright), right_link_value); mln::util::couple<bool, unsigned> - nbh = text::grouping::internal::is_link_valid(left_link, right_link, i); + nbh = text::grouping::internal::is_link_valid(left_link, + right_link, + i); if (nbh.first()) mln::draw::line(input, @@ -335,6 +354,7 @@ namespace scribo I& input = exact(input_); mln_precondition(input.is_valid()); + typedef mln_site(I) P; mln_site(I)::vec dleft = literal::origin; dleft[0] = 2; mln_site(I)::vec dright = literal::origin; @@ -352,7 +372,9 @@ namespace scribo right_link_value); mln::util::couple<bool, unsigned> - nbh = text::grouping::internal::is_link_valid(left_link, right_link, i); + nbh = text::grouping::internal::is_link_valid(left_link, + right_link, + i); if (nbh.first()) mln::draw::line(input, diff --git a/scribo/extract/primitive/lines_h_pattern.hh b/scribo/extract/primitive/lines_h_pattern.hh index 10dcfe5..2aa531e 100644 --- a/scribo/extract/primitive/lines_h_pattern.hh +++ b/scribo/extract/primitive/lines_h_pattern.hh @@ -82,8 +82,10 @@ namespace scribo window2d win; convert::from_to(win_def, win); + //FIXME: Add reconstruction instead of this arbitrary dilation. win::hline2d hwin(length/2 + 2); return morpho::dilation(lines_pattern(input, length, 1, win), hwin); +// return lines_pattern(input, length, 1, win); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/extract/primitive/lines_h_thick.hh b/scribo/extract/primitive/lines_h_thick.hh index 74ea67e..cfbf1cc 100644 --- a/scribo/extract/primitive/lines_h_thick.hh +++ b/scribo/extract/primitive/lines_h_thick.hh @@ -77,8 +77,8 @@ namespace scribo template <typename I, typename N, typename V> void lines_h_thick_tests(const Image<I>& input, - const Neighborhood<N>& nbh, V& nlines, - unsigned line_length) + const Neighborhood<N>& nbh, V& nlines, + unsigned line_length) { mlc_equal(mln_value(I),bool)::check(); mlc_bool(mln_site_(I)::dim == 2)::check(); @@ -101,8 +101,8 @@ namespace scribo template <typename I, typename N, typename V> object_image(mln_ch_value(I,V)) lines_h_thick(const Image<I>& input, - const Neighborhood<N>& nbh, V& nlines, - unsigned line_length) + const Neighborhood<N>& nbh, V& nlines, + unsigned line_length) { trace::entering("scribo::primitive::lines_h_thick"); diff --git a/scribo/extract/primitive/lines_v_pattern.hh b/scribo/extract/primitive/lines_v_pattern.hh index 43727d1..be920fc 100644 --- a/scribo/extract/primitive/lines_v_pattern.hh +++ b/scribo/extract/primitive/lines_v_pattern.hh @@ -76,8 +76,10 @@ namespace scribo window2d win; convert::from_to(win_def, win); + //FIXME: Add reconstruction instead of this arbitrary dilation. win::vline2d vwin(length/2 + 2); return morpho::dilation(lines_pattern(input, length, 0, win), vwin); +// return lines_pattern(input, length, 0, win); } diff --git a/scribo/filter/large_objects.hh b/scribo/filter/large_objects.hh index 336cdb7..e7e4f25 100644 --- a/scribo/filter/large_objects.hh +++ b/scribo/filter/large_objects.hh @@ -119,6 +119,8 @@ namespace scribo /// \p max_size_. bool operator()(const mln_value(L)& l) const { + if (l == literal::zero) + return true; return card_[l] <= max_size_; } diff --git a/scribo/filter/thick_objects.hh b/scribo/filter/thick_objects.hh index 258dbed..15b4c78 100644 --- a/scribo/filter/thick_objects.hh +++ b/scribo/filter/thick_objects.hh @@ -109,6 +109,8 @@ namespace scribo /// \param[in] l An image value. bool operator()(const mln_value(L)& l) const { + if (l == literal::zero) + return true; return objects_.bbox(l).nrows() < max_thickness_ && objects_.bbox(l).ncols() < max_thickness_; } diff --git a/scribo/text/grouping/group_from_double_link.hh b/scribo/text/grouping/group_from_double_link.hh index 2b1a27f..5c82cb2 100644 --- a/scribo/text/grouping/group_from_double_link.hh +++ b/scribo/text/grouping/group_from_double_link.hh @@ -29,7 +29,7 @@ /// \file /// -/// Group text bounding boxes from left and right links and validate +/// Group objects from left and right links information and validate /// These links. A link must exist in both ways to be validated. @@ -61,24 +61,34 @@ namespace scribo namespace grouping { - /// Group text bounding boxes from left and right links and validate - /// These links. A link must exist in both ways to be validated. - /*! - ** \param[in] objects The Lines of text. - ** \param[in] left_link The left neighbor of each line of text. - ** \param[in] right_link The right neighbor of each line of text. - ** - ** \return New lines of text. Some of the lines of \p text may have - ** been grouped. + /*! Group objects from left and right links information and + validate These links. A link must exist in both ways to be + validated. + + \param[in] objects The Lines of text. + \param[in] left_link The left neighbor of each line of text. + \param[in] right_link The right neighbor of each line of text. + \param[in] parent_link The function used to group components. + + \return An image of grouped objects. */ template <typename L> object_image(L) group_from_double_link(const object_image(L)& objects, const mln::util::array<unsigned>& left_link, + const mln::util::array<unsigned>& right_link, + mln::util::array<unsigned>& parent_link); + + /// \overload + template <typename L> + object_image(L) + group_from_double_link(const object_image(L)& objects, + const mln::util::array<unsigned>& left_link, const mln::util::array<unsigned>& right_link); + # ifndef MLN_INCLUDE_ONLY @@ -87,7 +97,8 @@ namespace scribo object_image(L) group_from_double_link(const object_image(L)& objects, const mln::util::array<unsigned>& left_link, - const mln::util::array<unsigned>& right_link) + const mln::util::array<unsigned>& right_link, + mln::util::array<unsigned>& parent_link) { trace::entering("scribo::text::grouping::group_from_double_link"); @@ -116,11 +127,27 @@ namespace scribo output.init_from_(objects); output.relabel(parent); + parent_link = parent; trace::exiting("scribo::text::grouping::group_from_double_link"); return output; } + template <typename L> + inline + object_image(L) + group_from_double_link(const object_image(L)& objects, + const mln::util::array<unsigned>& left_link, + const mln::util::array<unsigned>& right_link) + { + mln::util::array<unsigned> parent_link; + return group_from_double_link(objects, + left_link, + right_link, + parent_link); + } + + # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/text/grouping/group_from_single_link.hh b/scribo/text/grouping/group_from_single_link.hh index e70d8e1..0f4e7b3 100644 --- a/scribo/text/grouping/group_from_single_link.hh +++ b/scribo/text/grouping/group_from_single_link.hh @@ -55,12 +55,14 @@ namespace scribo using namespace mln; - /// Link text objects with their neighbor line if they have one. /*! - ** \param[in] objects An object image. - ** \param[in] link_array The neighbor line of each line. - ** - ** \return An object image with grouped objects. + \brief Link text objects with their neighbor line if they + have one. + + \param[in] objects An object image. + \param[in] link_array The neighbor line of each line. + + \return An object image with grouped objects. */ template <typename L> object_image(L) diff --git a/scribo/text/grouping/group_with_graph.hh b/scribo/text/grouping/group_with_graph.hh index c9af430..e13e2e9 100644 --- a/scribo/text/grouping/group_with_graph.hh +++ b/scribo/text/grouping/group_with_graph.hh @@ -45,7 +45,8 @@ # include <scribo/core/object_image.hh> # include <scribo/text/grouping/internal/init_link_array.hh> # include <scribo/text/grouping/internal/find_graph_link.hh> -# include <scribo/util/text.hh> + + namespace scribo { @@ -56,62 +57,69 @@ namespace scribo namespace grouping { - /// Construct the links between each line of text and store - /// it as a graph. - /// Look up for neighbors on the right of each box. /*! - ** \param[in] text The lines of text. - ** \param[in] neighb_max_distance The maximum distance allowed to - ** look for a neighbor. - ** - ** \return A graph of relationship. + Construct the links between each line of text and store + it as a graph. + Look up for neighbors on the right of each box. + + \param[in] objects An object image. + \param[in] neighb_max_distance The maximum distance allowed to + look for a neighbor. + + \return A graph of relationship. */ template <typename L> mln::util::graph - group_with_graph(const object_image(L)& text, + group_with_graph(const object_image(L)& objects, unsigned neighb_max_distance); + # ifndef MLN_INCLUDE_ONLY template <typename L> inline mln::util::graph - group_with_graph(const object_image(L)& text, + group_with_graph(const object_image(L)& objects, unsigned neighb_max_distance) { trace::entering("scribo::text::grouping::group_with_graph"); - mln::util::graph g(text.nlabels().next()); + mln_precondition(objects.is_valid()); - for_all_ncomponents(i, text.nlabels()) + mln::util::graph g(objects.nlabels().next()); + + for_all_ncomponents(i, objects.nlabels()) { - unsigned midcol = (text.bbox(i).pmax().col() - - text.bbox(i).pmin().col()) / 2; + unsigned midcol = (objects.bbox(i).pmax().col() + - objects.bbox(i).pmin().col()) / 2; int dmax = midcol + neighb_max_distance; mln::util::array<mln_result(accu::center<mln_psite(L)>)> mass_center = labeling::compute(accu::meta::center(), - text, - text.nlabels()); + objects, + objects.nlabels()); // ------- // | | // | X-------> // | | // ------- - internal::find_graph_link(g, text, i, dmax, mass_center[i]); + internal::find_graph_link(g, objects, i, dmax, mass_center[i]); } trace::exiting("scribo::text::grouping::group_with_graph"); return g; } + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace scribo::text::grouping } // end of namespace scribo::text } // end of namespace scribo + #endif // ! SCRIBO_TEXT_GROUPING_GROUP_WITH_GRAPH_HH diff --git a/scribo/text/grouping/internal/is_link_valid.hh b/scribo/text/grouping/internal/is_link_valid.hh index 4c54970..32d6747 100644 --- a/scribo/text/grouping/internal/is_link_valid.hh +++ b/scribo/text/grouping/internal/is_link_valid.hh @@ -66,7 +66,8 @@ namespace scribo const mln::util::array<unsigned>& right_link, unsigned i) { - return mln::make::couple(right_link[left_link[i]] == i, left_link[i]); + bool b = (right_link[left_link[i]] == i && left_link[i] != i); + return mln::make::couple(b, left_link[i]); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

14 years, 8 months

4389: Add new routines for line extraction.

by Guillaume Lazzara

* extract/primitive/lines_h_single.hh, * extract/primitive/lines_v_single.hh: New. --- scribo/ChangeLog | 7 + scribo/extract/primitive/lines_h_single.hh | 203 ++++++++++++++++++++++++++++ scribo/extract/primitive/lines_v_single.hh | 199 +++++++++++++++++++++++++++ 3 files changed, 409 insertions(+), 0 deletions(-) create mode 100644 scribo/extract/primitive/lines_h_single.hh create mode 100644 scribo/extract/primitive/lines_v_single.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0fd3083..c9878a4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new routines for line extraction. + + * extract/primitive/lines_h_single.hh, + * extract/primitive/lines_v_single.hh: New. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add/improve line extraction examples. * src/extract/primitive/Makefile.am: Add new examples. diff --git a/scribo/extract/primitive/lines_h_single.hh b/scribo/extract/primitive/lines_h_single.hh new file mode 100644 index 0000000..9146483 --- /dev/null +++ b/scribo/extract/primitive/lines_h_single.hh @@ -0,0 +1,203 @@ +// 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_SINGLE_HH +# define SCRIBO_EXTRACT_PRIMITIVE_LINES_H_SINGLE_HH + +/// \file +/// +/// Fast Extraction of single horizontal thick lines. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/win/hline2d.hh> + +# include <scribo/core/object_image.hh> + + +namespace scribo +{ + + namespace extract + { + + namespace primitive + { + + + using namespace mln; + + /// Fast Extraction of single horizontal thick lines. + /*! + * Only single non discontinued lines are correctly extracted + * with this routine. + * + * \param[in] input_ A binary image. + * \param[in] nbh_ The neighborhood used for labeling image + * components. + * \param[in,out] nlines Type used for labeling. + * \param[in] line_length The minimum line length. + * \param[in] w_h_ratio The minimum ratio width/height object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which only horizontal single lines are + * labeled. + */ + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_v_single(const Image<I>& input, + const Neighborhood<N>& nbh, V& nlines, + unsigned min_line_length, + float w_h_ratio); + + + /// Fast Extraction of single horizontal thick lines. + /*! + * Only single non discontinued lines are correctly extracted + * with this routine. + * + * \param[in] objects A labeled image. + * \param[in] line_length The minimum line length. + * \param[in] w_h_ratio The minimum ratio width/height object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which only horizontal single lines are + * labeled. + */ + template <typename L> + object_image(L) + lines_h_single(const object_image(L)& objects, + unsigned min_line_length, + float w_h_ratio); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename L> + struct is_line_h_single + : Function_v2b<is_line_h_single<L> > + { + typedef bool result; + + is_line_h_single(const object_image(L)& objects, + float w_h_ratio, unsigned min_line_length) + : objects_(objects), + w_h_ratio_(w_h_ratio), min_line_length_(min_line_length) + { + } + + + bool operator()(const mln_value(L)& label) const + { + mln_domain(L) box = objects_.bbox(label); + + unsigned + height = box.pmax().row() - box.pmin().row() + 1, + width = box.pmax().col() - box.pmin().col() + 1; + + return ((width / (float)height) > w_h_ratio_ + && width > min_line_length_); + } + + float w_h_ratio_; + unsigned min_line_length_; + + object_image(L) objects_; + }; + + + } // end of namespace mln::internal + + + + + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_h_single(const Image<I>& input_, + const Neighborhood<N>& nbh_, V& nlines, + unsigned min_line_length, + float w_h_ratio) + { + trace::entering("scribo::primitive::lines_h_single"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.is_valid()); + mln_precondition(nbh.is_valid()); + + typedef mln_ch_value(I,V) L; + object_image(L) + output = objects(input, nbh, nlines); + + internal::is_line_h_single<L> + is_line(output, w_h_ratio, min_line_length); + + output.relabel(is_line); + nlines = output.nlabels(); + + trace::exiting("scribo::primitive::lines_h_single"); + return output; + } + + + + + template <typename L> + object_image(L) + lines_h_single(const object_image(L)& objects, + unsigned min_line_length, + float w_h_ratio) + { + trace::entering("scribo::primitive::lines_h_single"); + + mln_precondition(objects.is_valid()); + + internal::is_line_h_single<L> + is_line(objects, w_h_ratio, min_line_length); + + object_image(L) output; + output.init_from_(objects); + output.relabel(is_line); + + trace::exiting("scribo::primitive::lines_h_single"); + 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_H_SINGLE_HH diff --git a/scribo/extract/primitive/lines_v_single.hh b/scribo/extract/primitive/lines_v_single.hh new file mode 100644 index 0000000..ee49eb8 --- /dev/null +++ b/scribo/extract/primitive/lines_v_single.hh @@ -0,0 +1,199 @@ +// 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_SINGLE_HH +# define SCRIBO_EXTRACT_PRIMITIVE_LINES_V_SINGLE_HH + +/// \file +/// +/// Fast Extraction of single vertical thick lines. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/win/hline2d.hh> + +# include <scribo/core/object_image.hh> + + +namespace scribo +{ + + namespace extract + { + + namespace primitive + { + + using namespace mln; + + /// Fast Extraction of single vertical thick lines. + /*! + * Only single non discontinued lines are correctly extracted + * with this routine. + * + * \param[in] input_ A binary image. + * \param[in] nbh_ The neighborhood used for labeling image + * components. + * \param[in,out] nlines Type used for labeling. + * \param[in] line_length The minimum line length. + * \param[in] h_w_ratio The minimum ratio height/width object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which only vertical single lines are + * labeled. + */ + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_v_single(const Image<I>& input, + const Neighborhood<N>& nbh, V& nlines, + unsigned min_line_length, + float h_w_ratio); + + + /// Fast Extraction of single vertical thick lines. + /*! + * Only single non discontinued lines are correctly extracted + * with this routine. + * + * \param[in] objects A labeled image. + * \param[in] line_length The minimum line length. + * \param[in] h_w_ratio The minimum ratio height/width object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which only vertical single lines are + * labeled. + */ + template <typename L> + object_image(L) + lines_v_single(const object_image(L)& objects, + unsigned min_line_length, + float h_w_ratio); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename L> + struct is_line_v_single + : Function_v2b<is_line_v_single<L> > + { + typedef bool result; + + is_line_v_single(const object_image(L)& objects, + float h_w_ratio, unsigned min_line_length) + : objects_(objects), + h_w_ratio_(h_w_ratio), min_line_length_(min_line_length) + { + } + + + bool operator()(const mln_value(L)& label) const + { + mln_domain(L) box = objects_.bbox(label); + unsigned + height = box.pmax().row() - box.pmin().row() + 1, + width = box.pmax().col() - box.pmin().col() + 1; + + return ((height / (float)width) > h_w_ratio_ + && height > min_line_length_); + } + + float h_w_ratio_; + unsigned min_line_length_; + + object_image(L) objects_; + }; + + + } // end of namespace mln::internal + + + + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_v_single(const Image<I>& input_, + const Neighborhood<N>& nbh_, V& nlines, + unsigned min_line_length, + float h_w_ratio) + { + trace::entering("scribo::primitive::lines_v_single"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.is_valid()); + mln_precondition(nbh.is_valid()); + + typedef mln_ch_value(I,V) L; + object_image(L) + output = objects(input, nbh, nlines); + + internal::is_line_v_single<L> + is_line(output, h_w_ratio, min_line_length); + + output.relabel(is_line); + nlines = output.nlabels(); + + trace::exiting("scribo::primitive::lines_v_single"); + return output; + } + + + + template <typename L> + object_image(L) + lines_v_single(const object_image(L)& objects, + unsigned min_line_length, + float h_w_ratio) + { + trace::entering("scribo::primitive::lines_v_single"); + + mln_precondition(objects.is_valid()); + + internal::is_line_v_single<L> + is_line(objects, h_w_ratio, min_line_length); + + object_image(L) output; + output.init_from_(objects); + output.relabel(is_line); + + trace::exiting("scribo::primitive::lines_v_single"); + 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_V_SINGLE_HH -- 1.5.6.5

14 years, 8 months

4388: Add/improve line extraction examples.

by Guillaume Lazzara

* src/extract/primitive/Makefile.am: Add new examples. * src/extract/primitive/find_discontinued_lines.cc: Cleanup. * src/extract/primitive/find_single_lines.cc, * src/extract/primitive/find_thick_lines.cc: New. --- scribo/ChangeLog | 11 +++ scribo/src/extract/primitive/Makefile.am | 6 ++- .../extract/primitive/find_discontinued_lines.cc | 23 +++---- ..._discontinued_lines.cc => find_single_lines.cc} | 52 +++++++++----- ...d_discontinued_lines.cc => find_thick_lines.cc} | 76 ++++++++++++++----- 5 files changed, 115 insertions(+), 53 deletions(-) copy scribo/src/extract/primitive/{find_discontinued_lines.cc => find_single_lines.cc} (59%) copy scribo/src/extract/primitive/{find_discontinued_lines.cc => find_thick_lines.cc} (51%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a1ffa34..0fd3083 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add/improve line extraction examples. + + * src/extract/primitive/Makefile.am: Add new examples. + + * src/extract/primitive/find_discontinued_lines.cc: Cleanup. + + * src/extract/primitive/find_single_lines.cc, + * src/extract/primitive/find_thick_lines.cc: New. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * extract/primitive/objects.hh: use blobs_and_compute. 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/src/extract/primitive/Makefile.am b/scribo/src/extract/primitive/Makefile.am index bab3f62..99be780 100644 --- a/scribo/src/extract/primitive/Makefile.am +++ b/scribo/src/extract/primitive/Makefile.am @@ -26,7 +26,9 @@ bin_PROGRAMS = \ extract_discontinued_hlines \ extract_thick_vlines \ extract_thick_hlines \ - find_discontinued_lines + find_discontinued_lines \ + find_single_lines \ + find_thick_lines extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc @@ -34,5 +36,7 @@ extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc extract_thick_vlines_SOURCES = extract_thick_vlines.cc extract_thick_hlines_SOURCES = extract_thick_hlines.cc find_discontinued_lines_SOURCES = find_discontinued_lines.cc +find_single_lines_SOURCES = find_single_lines.cc +find_thick_lines_SOURCES = find_thick_lines.cc diff --git a/scribo/src/extract/primitive/find_discontinued_lines.cc b/scribo/src/extract/primitive/find_discontinued_lines.cc index 4fc76f6..ac3725a 100644 --- a/scribo/src/extract/primitive/find_discontinued_lines.cc +++ b/scribo/src/extract/primitive/find_discontinued_lines.cc @@ -34,6 +34,7 @@ #include <scribo/debug/usage.hh> +#include <scribo/core/object_image.hh> #include <scribo/extract/primitive/lines_h_pattern.hh> #include <scribo/extract/primitive/lines_v_pattern.hh> @@ -52,26 +53,22 @@ int main(int argc, char *argv[]) if (argc != 4) return scribo::debug::usage(argv, "Extract discontinued horizontal and vertical lines", - "input.pbm length output.pbm", + "input.pbm length output.ppm", args_desc, - "A binary image of horizontal and vertical lines."); + "A color image. Horizontal lines are in red and vertical lines in green."); trace::entering("main"); - image2d<bool> input; + typedef image2d<bool> I; + I input; io::pbm::load(input, argv[1]); - value::label_16 nhlines; - image2d<bool> hlines - = data::convert(bool(), - 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_pattern(input, atoi(argv[2]))); + I hlines = scribo::extract::primitive::lines_h_pattern(input, atoi(argv[2])); + I vlines = scribo::extract::primitive::lines_v_pattern(input, atoi(argv[2])); + + image2d<value::rgb8> out = debug::superpose(input, hlines, literal::red); + out = debug::superpose(out, vlines, literal::green); - data::fill((hlines | pw::value(vlines)).rw(), true); - image2d<value::rgb8> out = debug::superpose(input, hlines); io::ppm::save(out, argv[3]); trace::exiting("main"); diff --git a/scribo/src/extract/primitive/find_discontinued_lines.cc b/scribo/src/extract/primitive/find_single_lines.cc similarity index 59% copy from scribo/src/extract/primitive/find_discontinued_lines.cc copy to scribo/src/extract/primitive/find_single_lines.cc index 4fc76f6..bd7b559 100644 --- a/scribo/src/extract/primitive/find_discontinued_lines.cc +++ b/scribo/src/extract/primitive/find_single_lines.cc @@ -34,13 +34,17 @@ #include <scribo/debug/usage.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/extract/primitive/lines_h_single.hh> +#include <scribo/extract/primitive/lines_v_single.hh> const char *args_desc[][2] = { - { "input.pbm", "A binary image." }, - { "length", " Minimum line length." }, + { "input.pbm", "A binary image. Background must be set to False." }, + { "hlength", "Minimum horizontal line length." }, + { "hbratio", "Bbox size ratio for horizontal lines." }, + { "vlength", "Minimum vertical line length." }, + { "vbratio", "Bbox size ratio for vertical lines." }, {0, 0} }; @@ -49,30 +53,40 @@ int main(int argc, char *argv[]) { using namespace mln; - if (argc != 4) + if (argc != 7) return scribo::debug::usage(argv, - "Extract discontinued horizontal and vertical lines", - "input.pbm length output.pbm", + "Extract single horizontal and vertical lines. \ +\n Common argument values: 100 10 100 10", + "<input.pbm> <length> <hbratio> <vbratio>\ + <output.pbm>", args_desc, - "A binary image of horizontal and vertical lines."); + "A binary image of horizontal and vertical single lines."); trace::entering("main"); image2d<bool> input; io::pbm::load(input, argv[1]); + typedef image2d<value::label_16> L; + value::label_16 nhlines; - image2d<bool> hlines - = data::convert(bool(), - 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_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[3]); + object_image(L) + objects = scribo::extract::primitive::objects(input, c8(), nhlines); + + + object_image(L) + hlines = scribo::extract::primitive::lines_h_single(objects, + atoi(argv[2]), + atof(argv[3])); + + object_image(L) + vlines = scribo::extract::primitive::lines_v_single(objects, + atoi(argv[4]), + atof(argv[5])); + + image2d<value::rgb8> out = debug::superpose(input, hlines, literal::red); + out = debug::superpose(out, vlines, literal::green); + io::ppm::save(out, argv[6]); trace::exiting("main"); } diff --git a/scribo/src/extract/primitive/find_discontinued_lines.cc b/scribo/src/extract/primitive/find_thick_lines.cc similarity index 51% copy from scribo/src/extract/primitive/find_discontinued_lines.cc copy to scribo/src/extract/primitive/find_thick_lines.cc index 4fc76f6..ed5fb8c 100644 --- a/scribo/src/extract/primitive/find_discontinued_lines.cc +++ b/scribo/src/extract/primitive/find_thick_lines.cc @@ -34,13 +34,22 @@ #include <scribo/debug/usage.hh> -#include <scribo/extract/primitive/lines_h_pattern.hh> -#include <scribo/extract/primitive/lines_v_pattern.hh> +#include <scribo/core/object_image.hh> +#include <scribo/extract/primitive/lines_h_thick.hh> +#include <scribo/extract/primitive/lines_v_thick.hh> + +#include <scribo/extract/primitive/lines_h_single.hh> +#include <scribo/extract/primitive/lines_v_single.hh> + +#include <mln/util/timer.hh> const char *args_desc[][2] = { - { "input.pbm", "A binary image." }, - { "length", " Minimum line length." }, + { "input.pbm", "A binary image. Objects are set to True." }, + { "vlength ", "Minimum vertical line length." }, + { "vratio " "Minimum vertical ratio height/width." }, + { "hlength ", "Minimum horizontal line length." }, + { "hratio " "Minimum horizontal ratio width/height." }, {0, 0} }; @@ -49,29 +58,56 @@ int main(int argc, char *argv[]) { using namespace mln; - if (argc != 4) + if (argc != 7) return scribo::debug::usage(argv, - "Extract discontinued horizontal and vertical lines", - "input.pbm length output.pbm", + "Extract thick horizontal and vertical lines.\ +\n Common argument values: 150 10 150 10.", + "<input.pbm> <vlength> <vratio> <hlength>\ + <hration> <output.ppm>", args_desc, - "A binary image of horizontal and vertical lines."); + "A color image. Horizontal lines are in red\ + and vertical lines in green."); trace::entering("main"); - image2d<bool> input; + typedef image2d<bool> I; + I input; io::pbm::load(input, argv[1]); - value::label_16 nhlines; - image2d<bool> hlines - = data::convert(bool(), - 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_pattern(input, atoi(argv[2]))); - - data::fill((hlines | pw::value(vlines)).rw(), true); - image2d<value::rgb8> out = debug::superpose(input, hlines); + typedef image2d<value::label_16> L; + + value::label_16 + nhlines, + nvlines; + + util::timer t; + + t.start(); + + object_image(L) + hlines = scribo::extract::primitive::lines_h_thick(input, c8(), + nhlines, atoi(argv[2])), + vlines = scribo::extract::primitive::lines_v_thick(input, c8(), + nvlines, atoi(argv[2])); + std::cout << "lines thick done" << std::endl; + std::cout << t << std::endl; + t.restart(); + + + hlines = scribo::extract::primitive::lines_h_single(hlines, + atoi(argv[2]), + 10); + + vlines = scribo::extract::primitive::lines_v_single(vlines, + atoi(argv[2]), + 10); + + std::cout << "lines single done" << std::endl; + std::cout << t << std::endl; + + image2d<value::rgb8> out = debug::superpose(input, hlines, literal::red); + out = debug::superpose(out, vlines, literal::green); + io::ppm::save(out, argv[3]); trace::exiting("main"); -- 1.5.6.5

14 years, 8 months

4387: extract/primitive/objects.hh: use blobs_and_compute.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/extract/primitive/objects.hh | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3ab33cd..a1ffa34 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * extract/primitive/objects.hh: use blobs_and_compute. + +2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Move example files. * src/Makefile.am: update. diff --git a/scribo/extract/primitive/objects.hh b/scribo/extract/primitive/objects.hh index 29bde29..a4110e2 100644 --- a/scribo/extract/primitive/objects.hh +++ b/scribo/extract/primitive/objects.hh @@ -34,7 +34,9 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/box.hh> -# include <mln/labeling/blobs.hh> +# include <mln/accu/shape/bbox.hh> + +# include <mln/labeling/blobs_and_compute.hh> # include <mln/labeling/compute.hh> # include <mln/util/array.hh> @@ -109,9 +111,15 @@ namespace scribo internal::objects_tests(input, nbh, nobjects); - mln_ch_value(I,V) objects = labeling::blobs(input, nbh, nobjects); + typedef mln_ch_value(I,V) L; + typedef accu::shape::bbox<mln_psite(I)> accu_bbox; + + util::couple<L, util::array<mln_box(I)> > + results = labeling::blobs_and_compute(input, nbh, nobjects, + accu_bbox()); - object_image(mln_ch_value(I,V)) output(objects, nobjects); + object_image(L) + output(results.first(), nobjects, results.second()); trace::exiting("scribo::objects"); return output; -- 1.5.6.5

14 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches August 2009