March 2011 - Olena-patches

last-svn-commit-775-gfd62480 configure.ac: scribo/src/primitive/remove.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fedefa..30f8b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: scribo/src/primitive/remove. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: configure scribo/tests/convert. 2011-03-14 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index e30f010..44f359b 100644 --- a/configure.ac +++ b/configure.ac @@ -332,6 +332,7 @@ AC_CONFIG_FILES([ scribo/src/primitive/extract/Makefile scribo/src/primitive/find/Makefile scribo/src/primitive/group/Makefile + scribo/src/primitive/remove/Makefile scribo/src/table/Makefile scribo/src/text/Makefile scribo/src/toolchain/Makefile -- 1.5.6.5

1 0

last-svn-commit-774-gcc8c9ed Add new tools in Scribo.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* src/primitive/extract/Makefile.am, * src/primitive/remove/Makefile.am: Add new targets. * src/primitive/extract/separators_nonvisible.cc, * src/primitive/remove/separators.cc: New. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/primitive/extract/Makefile.am | 2 ++ .../extract/separators_nonvisible.cc} | 19 ++++++++++--------- scribo/src/primitive/{ => remove}/Makefile.am | 11 ++++++----- .../negate.cc => primitive/remove/separators.cc} | 20 ++++++++++++-------- 5 files changed, 40 insertions(+), 22 deletions(-) copy scribo/src/{misc/negate.cc => primitive/extract/separators_nonvisible.cc} (79%) copy scribo/src/primitive/{ => remove}/Makefile.am (82%) copy scribo/src/{misc/negate.cc => primitive/remove/separators.cc} (76%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0aa4ba2..8b7ad7f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new tools in Scribo. + + * src/primitive/extract/Makefile.am, + * src/primitive/remove/Makefile.am: Add new targets. + + * src/primitive/extract/separators_nonvisible.cc, + * src/primitive/remove/separators.cc: New. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. * scribo/core/macros.hh: Update comments. diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index a46cd68..22d6bfd 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = \ discontinued_lines \ discontinued_vlines \ discontinued_hlines \ + separators_nonvisible \ thick_vlines \ thick_hlines \ lines_pattern @@ -29,6 +30,7 @@ noinst_PROGRAMS = \ discontinued_lines_SOURCES = discontinued_lines.cc discontinued_vlines_SOURCES = discontinued_vlines.cc discontinued_hlines_SOURCES = discontinued_hlines.cc +separators_nonvisible_SOURCES = separators_nonvisible.cc thick_vlines_SOURCES = thick_vlines.cc thick_hlines_SOURCES = thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc diff --git a/scribo/src/misc/negate.cc b/scribo/src/primitive/extract/separators_nonvisible.cc similarity index 79% copy from scribo/src/misc/negate.cc copy to scribo/src/primitive/extract/separators_nonvisible.cc index da6fad6..82d4787 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/primitive/extract/separators_nonvisible.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -25,35 +24,37 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> #include <mln/io/pbm/all.hh> +#include <mln/data/convert.hh> +#include <scribo/primitive/extract/separators_nonvisible2.hh> #include <scribo/debug/usage.hh> - const char *args_desc[][2] = { { "input.pbm", "A binary image." }, + { "output.pbm", "Output image." }, {0, 0} }; int main(int argc, char *argv[]) { - mln::trace::entering("main"); using namespace mln; + using namespace scribo; if (argc != 3) return scribo::debug::usage(argv, - "Negate a binary image", + "Extract non visible separators (whitespaces)", "input.pbm output.pbm", args_desc); + trace::entering("main"); + image2d<bool> input; io::pbm::load(input, argv[1]); - io::pbm::save(logical::not_(input), argv[2]); - - mln::trace::exiting("main"); + io::pbm::save(primitive::extract::separators_nonvisible(input), argv[2]); + trace::exiting("main"); } diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/remove/Makefile.am similarity index 82% copy from scribo/src/primitive/Makefile.am copy to scribo/src/primitive/remove/Makefile.am index 7e46a66..a673886 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/remove/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,7 +16,8 @@ include $(top_srcdir)/scribo/scribo.mk -SUBDIRS = \ - extract \ - find \ - group + +noinst_PROGRAMS = \ + separators + +separators_SOURCES = separators.cc diff --git a/scribo/src/misc/negate.cc b/scribo/src/primitive/remove/separators.cc similarity index 76% copy from scribo/src/misc/negate.cc copy to scribo/src/primitive/remove/separators.cc index da6fad6..46e977f 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/primitive/remove/separators.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -25,35 +24,40 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> #include <mln/io/pbm/all.hh> +#include <mln/data/convert.hh> +#include <scribo/primitive/extract/separators.hh> +#include <scribo/primitive/remove/separators.hh> #include <scribo/debug/usage.hh> - const char *args_desc[][2] = { { "input.pbm", "A binary image." }, + { "output.pbm", "Output image." }, {0, 0} }; int main(int argc, char *argv[]) { - mln::trace::entering("main"); using namespace mln; + using namespace scribo; if (argc != 3) return scribo::debug::usage(argv, - "Negate a binary image", + "Remove visible separators", "input.pbm output.pbm", args_desc); + trace::entering("main"); + image2d<bool> input; io::pbm::load(input, argv[1]); - io::pbm::save(logical::not_(input), argv[2]); + image2d<bool> seps = primitive::extract::separators(input, 81); - mln::trace::exiting("main"); + io::pbm::save(primitive::remove::separators(input, seps), argv[2]); + trace::exiting("main"); } -- 1.5.6.5

1 0

last-svn-commit-773-gc65020d Small fixes in Scribo.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* scribo/core/macros.hh: Update comments. * scribo/text/merging.hh: Add comments and fix line data swap. * scribo/text/recognition.hh: Make use of is_textline. * src/text_in_picture.cc: Initialize ImageMagick. --- scribo/ChangeLog | 12 ++++++++++++ scribo/scribo/core/macros.hh | 7 +++---- scribo/scribo/text/merging.hh | 6 +++--- scribo/scribo/text/recognition.hh | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d783c5c..0aa4ba2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. + + * scribo/core/macros.hh: Update comments. + + * scribo/text/merging.hh: Add comments and fix line data swap. + + * scribo/text/recognition.hh: Make use of is_textline. + + * src/text_in_picture.cc: Initialize ImageMagick. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve and cleanup whitespace separator detection. * scribo/core/tag/anchor.hh: Add new anchors. diff --git a/scribo/scribo/core/macros.hh b/scribo/scribo/core/macros.hh index 887539f..c6de1ff 100644 --- a/scribo/scribo/core/macros.hh +++ b/scribo/scribo/core/macros.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -33,8 +33,6 @@ # define for_all_elements(E, S) \ for (unsigned E = 0; E < S.nelements(); ++E) - -// FIXME: we want to replace previous macros by these ones. # define for_all_comps(C, S) \ for (unsigned C = 1; C <= S.nelements(); ++C) @@ -56,6 +54,7 @@ # define for_all_line_comps(E, S) \ for_all_elements(E, S) +// Internal use only. # define for_all_lines_info(E, S) \ for_all_comp_data(E, S) diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 3087465..f433e51 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -192,7 +192,7 @@ namespace scribo { // we transfer data from the largest item to the root one. scribo::line_info<L> tmp = lines(l1); - lines(l1) = lines(l2); + std::swap(lines(l1), lines(l2)); lines(l1).fast_merge(tmp); // We must set manually the tag for lines(l2) since it is @@ -504,8 +504,8 @@ namespace scribo void one_merge_pass(unsigned ith_pass, const box2d& domain, - std::vector<scribo::line_id_t>& v, - scribo::line_set<L>& lines, + std::vector<scribo::line_id_t>& v, // Ids sorted by bbox size. + scribo::line_set<L>& lines, // Tagged Lines (looks_like_a_text_line?) mln::util::array<unsigned>& parent) { image2d<unsigned> billboard(domain); diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 59f269e..3a9742b 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -127,7 +127,7 @@ namespace scribo /// Use text bboxes with Tesseract for_all_lines(i, lines) { - if (! lines(i).is_valid() || lines(i).is_hidden() || lines(i).type() != line::Text) + if (! lines(i).is_textline()) continue; mln_domain(I) box = lines(i).bbox(); -- 1.5.6.5

1 0

last-svn-commit-772-g4756e17 Improve and cleanup whitespace separator detection.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* scribo/core/tag/anchor.hh: Add new anchors. * scribo/filter/internal/alignment_angle.hh, * scribo/primitive/link/internal/compute_anchor.hh: Support new anchors. * scribo/primitive/extract/separators_nonvisible.hh: Remove dead code and comment debug code. * scribo/toolchain/internal/content_in_doc_functor.hh: Detect horizontal whitespace. --- scribo/ChangeLog | 16 + scribo/scribo/core/tag/anchor.hh | 5 +- scribo/scribo/filter/internal/alignment_angle.hh | 144 +++-- .../primitive/extract/separators_nonvisible.hh | 673 +++++++++----------- .../primitive/link/internal/compute_anchor.hh | 26 +- .../toolchain/internal/content_in_doc_functor.hh | 13 +- 6 files changed, 447 insertions(+), 430 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ab498cc..d783c5c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,21 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve and cleanup whitespace separator detection. + + * scribo/core/tag/anchor.hh: Add new anchors. + + * scribo/filter/internal/alignment_angle.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Support new + anchors. + + * scribo/primitive/extract/separators_nonvisible.hh: Remove dead + code and comment debug code. + + * scribo/toolchain/internal/content_in_doc_functor.hh: Detect + horizontal whitespace. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new conversion routines from string to tag. * scribo/core/tag/component.hh, diff --git a/scribo/scribo/core/tag/anchor.hh b/scribo/scribo/core/tag/anchor.hh index 262a32d..bb6780c 100644 --- a/scribo/scribo/core/tag/anchor.hh +++ b/scribo/scribo/core/tag/anchor.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -43,9 +44,11 @@ namespace scribo ActualRight, Right, TopLeft, + TopStrictLeft, TopRight, BottomLeft, BottomRight, + BottomStrictRight, Invalid }; diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index 5b88012..33855a8 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -73,76 +73,98 @@ namespace scribo unsigned current_object, unsigned nbh_object, anchor::Type anchor) { - trace::entering("scribo::filter::internal::alignment_angle_rad"); + trace::entering("scribo::filter::internal::alignment_angle"); mln_precondition(comps.is_valid()); - float dr, dc; + float dr, dc, result = 0; if (nbh_object == current_object) return 0; - // Center - if (anchor == anchor::Center) + switch(anchor) { - dr = math::abs(comps(current_object).bbox().pcenter().row() - - comps(nbh_object).bbox().pcenter().row()); - dc = math::abs(comps(current_object).bbox().pcenter().col() - - comps(nbh_object).bbox().pcenter().col()); - - return std::atan(dr / dc); - } - - // Top - else if (anchor == anchor::Top) - { - dr = math::abs(comps(current_object).bbox().pmin().row() - - comps(nbh_object).bbox().pmin().row()); - dc = math::abs(comps(current_object).bbox().pcenter().col() - - comps(nbh_object).bbox().pcenter().col()); - - return std::atan(dr / dc); + // Center + case anchor::Center: + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + result = std::atan(dr / dc); + } + break; + + // Mass Center + case anchor::MassCenter: + { + dr = math::abs(comps(current_object).mass_center().row() + - comps(nbh_object).mass_center().row()); + dc = math::abs(comps(current_object).mass_center().col() + - comps(nbh_object).mass_center().col()); + + result = std::atan(dr / dc); + } + break; + + // Top + case anchor::TopStrictLeft: + case anchor::Top: + { + dr = math::abs(comps(current_object).bbox().pmin().row() + - comps(nbh_object).bbox().pmin().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + result = std::atan(dr / dc); + } + break; + + // Bottom + case anchor::BottomStrictRight: + case anchor::Bottom: + { + dr = math::abs(comps(current_object).bbox().pmax().row() + - comps(nbh_object).bbox().pmax().row()); + dc = math::abs(comps(current_object).bbox().pcenter().col() + - comps(nbh_object).bbox().pcenter().col()); + + result = std::atan(dr / dc); + } + break; + + // Left + case anchor::Left: + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pmin().col() + - comps(nbh_object).bbox().pmin().col()); + + result = std::atan(dc / dr); + } + break; + + // Right + case anchor::Right: + { + dr = math::abs(comps(current_object).bbox().pcenter().row() + - comps(nbh_object).bbox().pcenter().row()); + dc = math::abs(comps(current_object).bbox().pmax().col() + - comps(nbh_object).bbox().pmax().col()); + + result = std::atan(dc / dr); + } + break; + + default: + trace::warning("scribo::filter::internal::alignment_angle," + " Invalid anchor value... Aborting computation."); } - // Bottom - else if (anchor == anchor::Bottom) - { - dr = math::abs(comps(current_object).bbox().pmax().row() - - comps(nbh_object).bbox().pmax().row()); - dc = math::abs(comps(current_object).bbox().pcenter().col() - - comps(nbh_object).bbox().pcenter().col()); - - return std::atan(dr / dc); - } - - // Left - else if (anchor == anchor::Left) - { - dr = math::abs(comps(current_object).bbox().pcenter().row() - - comps(nbh_object).bbox().pcenter().row()); - dc = math::abs(comps(current_object).bbox().pmin().col() - - comps(nbh_object).bbox().pmin().col()); - - return std::atan(dc / dr); - } - - // Right - else if (anchor == anchor::Right) - { - dr = math::abs(comps(current_object).bbox().pcenter().row() - - comps(nbh_object).bbox().pcenter().row()); - dc = math::abs(comps(current_object).bbox().pmax().col() - - comps(nbh_object).bbox().pmax().col()); - - return std::atan(dc / dr); - } - - else - trace::warning("Invalid anchor value... Aborting computation."); - - trace::exiting("scribo::filter::internal::alignment_angle_rad"); - return 0; - + trace::exiting("scribo::filter::internal::alignment_angle"); + return result; } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 81ebd64..4e31650 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -86,6 +86,8 @@ #include <scribo/preprocessing/denoise_fg.hh> #include <scribo/preprocessing/rotate_90.hh> +#include <scribo/primitive/link/internal/compute_anchor.hh> + #include <scribo/primitive/link/internal/dmax_default.hh> #include <scribo/primitive/link/with_single_right_link_dmax_ratio.hh> @@ -128,80 +130,6 @@ namespace scribo namespace internal { - template <typename L> - void filter_bad_groups(object_groups<L>& top_groups, - object_groups<L>& bot_groups) - { - const component_set<L>& comps = top_groups.components(); - const L& lbl = comps.labeled_image(); - - for_all_groups(c, top_groups) - { - box2d b = comps(c).bbox(); - b.enlarge(0, comps(c).bbox().height()); - b.crop_wrt(lbl.domain()); - - typedef mln_value(L) V; - - const V* top_ptr = & lbl(b.pmin()); - const V* bot_ptr = & lbl(point2d(b.pmax().row(), b.pmin().col())); - - unsigned ntop = 0, nbot = 0; - for (unsigned n = 0; n < b.width(); ++n) - { - if (*top_ptr) - ++ntop; - if (*bot_ptr) - ++nbot; - } - - if (ntop / b.width() > 0.50f) - top_groups(c) = c; - - if (nbot / b.width() > 0.50f) - bot_groups(c) = c; - } - - } - - - template <typename L> - mln_site(L) - my_anchors(const component_set<L>& comps, - unsigned current_object, - anchor::Type anchor) - { - mln_site(L) sp;// = comps(current_object).bbox().pcenter(); - - unsigned h = comps(current_object).bbox().height(); - - switch (anchor) - { - default: - return sp; - - - // Bounding box top center - case anchor::Top: // FIXME: rename as TopLeft - sp.col() = comps(current_object).bbox().pmin().col(); - sp.row() = comps(current_object).bbox().pmin().row() - + math::min(2u, (h + 1) / 2 - 1); - break; - - - // Bounding box bottom center - case anchor::Bottom: // FIXME: rename as BottomLeft - sp.col() = comps(current_object).bbox().pmax().col(); - sp.row() = comps(current_object).bbox().pmax().row() - - math::min(2u, (h + 1) / 2 - 1); - break; - } - - return sp; - } - - - using namespace primitive::link::internal; template <typename L, typename E> @@ -225,12 +153,17 @@ namespace scribo anchor::Horizontal, dmax_default(dmax)), anchor(anchor_), - debug_(data::convert(value::rgb8(), input)), - debug_angle_(data::convert(value::rgb8(), input)), _debug_(debug) { + (void) input; // FIXME : remove this argument min_alpha_rad = (min_angle / 180.0f) * math::pi; max_alpha_rad = (max_angle / 180.0f) * math::pi; + + // if (_debug_) + // { + // debug_ = data::convert(value::rgb8(), input); + // debug_angle_ = data::convert(value::rgb8(), input); + // } } void compute_next_site_(P& p) @@ -247,7 +180,8 @@ namespace scribo mln_site(L) start_point_(unsigned current_object, anchor::Type anchor) { - return my_anchors(this->components_, current_object, anchor); + return link::internal::compute_anchor(this->components_, + current_object, anchor); } @@ -303,27 +237,29 @@ namespace scribo { super_::validate_link_(current_object, start_point, p, anchor); - if (_debug_) - { - mln_site(L) - p1 = my_anchors(this->components_, current_object, anchor), - p2 = my_anchors(this->components_, this->labeled_image_(p), - anchor); - mln::draw::line(debug_, p1, p2, literal::green); - - - float - angle = filter::internal::alignment_angle(this->components_, - current_object, - this->labeled_image_(p), - anchor); - angle = (angle * 180.0f) / math::pi; - angle = angle * 20.0f + 1.0f; - mln::draw::line(debug_angle_, p1, p2, - value::rgb8(unsigned(angle), - unsigned(angle), - unsigned(angle))); - } + // if (_debug_) + // { + // mln_site(L) + // p1 = link::internal::compute_anchor(this->components_, + // current_object, anchor), + // p2 = link::internal::compute_anchor(this->components_, + // this->labeled_image_(p), + // anchor); + // mln::draw::line(debug_, p1, p2, literal::green); + + + // float + // angle = filter::internal::alignment_angle(this->components_, + // current_object, + // this->labeled_image_(p), + // anchor); + // angle = (angle * 180.0f) / math::pi; + // angle = angle * 20.0f + 1.0f; + // mln::draw::line(debug_angle_, p1, p2, + // value::rgb8(unsigned(angle), + // unsigned(angle), + // unsigned(angle))); + // } } void invalidate_link_(unsigned current_object, @@ -333,33 +269,36 @@ namespace scribo { super_::invalidate_link_(current_object, start_point, p, anchor); - if (_debug_) - { - if (this->labeled_image_.domain().has(p) && this->labeled_image_(p) != 0) - { - mln_site(L) - p1 = my_anchors(this->components_, current_object, anchor), - p2 = my_anchors(this->components_, this->labeled_image_(p), - anchor); - if (this->labeled_image_.domain().has(p2) && norm::l1_distance(p1.to_vec(), p2.to_vec()) < 300) - { - mln::draw::line(debug_, p1, p2, literal::red); - } - - - float - angle = filter::internal::alignment_angle(this->components_, - current_object, - this->labeled_image_(p), - anchor); - angle = (angle * 180.0f) / math::pi; - angle = angle * 20.0f + 1.0f; - mln::draw::line(debug_angle_, p1, p2, - value::rgb8(unsigned(angle), - unsigned(angle), - unsigned(angle))); - } - } + // if (_debug_) + // { + // if (this->labeled_image_.domain().has(p) && this->labeled_image_(p) != 0) + // { + // mln_site(L) + // p1 = link::internal::compute_anchor(this->components_, + // current_object, anchor), + // p2 = link::internal::compute_anchor(this->components_, + // this->labeled_image_(p), + // anchor); + // if (this->labeled_image_.domain().has(p2) + // && norm::l1_distance(p1.to_vec(), p2.to_vec()) < 300) + // { + // mln::draw::line(debug_, p1, p2, literal::red); + // } + + + // float + // angle = filter::internal::alignment_angle(this->components_, + // current_object, + // this->labeled_image_(p), + // anchor); + // angle = (angle * 180.0f) / math::pi; + // angle = angle * 20.0f + 1.0f; + // mln::draw::line(debug_angle_, p1, p2, + // value::rgb8(unsigned(angle), + // unsigned(angle), + // unsigned(angle))); + // } + // } } @@ -368,8 +307,8 @@ namespace scribo anchor::Type anchor; - mln_ch_value(L, value::rgb8) debug_; - mln_ch_value(L, value::rgb8) debug_angle_; + // mln_ch_value(L, value::rgb8) debug_; + // mln_ch_value(L, value::rgb8) debug_angle_; bool _debug_; }; @@ -392,7 +331,8 @@ namespace scribo float max_angle, anchor::Type anchor, bool debug) - : super_(input, components, dmax, min_angle, max_angle, anchor, debug) + : super_(input, components, dmax, min_angle, + max_angle, anchor, debug) { } @@ -427,7 +367,8 @@ namespace scribo float max_angle, anchor::Type anchor, bool debug) - : super_(input, components, dmax, min_angle, max_angle, anchor, debug) + : super_(input, components, dmax, min_angle, + max_angle, anchor, debug) { } @@ -455,6 +396,8 @@ namespace scribo mln_concrete(I) separators_nonvisible(const Image& in_) { + trace::entering("scribo::primitive::extract::separators_nonvisible"); + const I& in = exact(in_); mln_precondition(in.is_valid()); typedef mln_value(I) Vi; @@ -469,42 +412,35 @@ namespace scribo util::timer t; util::timer gt; - // Load (OK) - t.start(); - float t_ = t; - std::cout << "Image loaded - " << t_ << std::endl; - gt.start(); - // Remove horizontal lines. - t.restart(); + // // Remove horizontal lines. + // t.restart(); - mln_concrete(I) hlines = primitive::extract::lines_h_pattern(in, 50, 3); - mln_concrete(I) input = primitive::remove::separators(in, hlines); + // mln_concrete(I) hlines = primitive::extract::lines_h_pattern(in, 50, 3); + // mln_concrete(I) input = primitive::remove::separators(in, hlines); - t_ = t; - std::cout << "Horizontal lines removed - " << t_ << std::endl; + // t_ = t; + // std::cout << "Horizontal lines removed - " << t_ << std::endl; // Closing structural - Connect characters. - t.restart(); + t.start(); win::hline2d vl(17); - mln_concrete(I) input_clo = morpho::closing::structural(input, vl); + mln_concrete(I) input_clo = morpho::closing::structural(in, vl); -// input_clo = scribo::preprocessing::rotate_90(input_clo, true); - - t_ = t; + float t_ = t; std::cout << "closing_structural - " << t_ << std::endl; - if (_debug_) - { - // Restore input orientation. - input = scribo::preprocessing::rotate_90(input, false); + // if (_debug_) + // { + // // Restore input orientation. + // input = scribo::preprocessing::rotate_90(input, false); - io::pbm::save(input_clo, "input_clo.pbm"); - } + // io::pbm::save(input_clo, "input_clo.pbm"); + // } // Rotate (OK) t.restart(); @@ -526,9 +462,9 @@ namespace scribo t_ = t; std::cout << "extract::components - " << t_ << std::endl; - if (_debug_) - io::pgm::save(data::convert(value::int_u8(), components.labeled_image()), - "lbl.pgm"); + // if (_debug_) + // io::pgm::save(data::convert(value::int_u8(), components.labeled_image()), + // "lbl.pgm"); unsigned dmax = 5; @@ -543,39 +479,42 @@ namespace scribo { // Right internal::single_right_dmax_ratio_aligned_functor<L> - functor(input_clo, components, dmax, min_angle, max_angle, anchor::Top, _debug_); -// top_right = primitive::link::impl::compute_fastest(functor, anchor::Top); - top_right = primitive::link::compute(functor, anchor::Top); + functor(input_clo, components, dmax, min_angle, max_angle, + anchor::TopStrictLeft, _debug_); +// top_right = primitive::link::impl::compute_fastest(functor, anchor::TopStrictLeft); + top_right = primitive::link::compute(functor, anchor::TopStrictLeft); t.stop(); - if (_debug_) - { - io::ppm::save(functor.debug_, "right_top.ppm"); - io::ppm::save(functor.debug_angle_, "right_top_angle.ppm"); - } + // if (_debug_) + // { + // io::ppm::save(functor.debug_, "right_top.ppm"); + // io::ppm::save(functor.debug_angle_, "right_top_angle.ppm"); + // } t.resume(); // Left internal::single_left_dmax_ratio_aligned_functor<L> - lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Top, _debug_); - top_left = primitive::link::compute(lfunctor, anchor::Top); + lfunctor(input_clo, components, dmax, min_angle, max_angle, + anchor::TopStrictLeft, _debug_); + top_left = primitive::link::compute(lfunctor, anchor::TopStrictLeft); t.stop(); - if (_debug_) - { - io::ppm::save(lfunctor.debug_, "left_top.ppm"); - io::ppm::save(lfunctor.debug_angle_, "left_top_angle.ppm"); + // if (_debug_) + // { + // io::ppm::save(lfunctor.debug_, "left_top.ppm"); + // io::ppm::save(lfunctor.debug_angle_, "left_top_angle.ppm"); - mln_ch_value(I, value::rgb8) output = duplicate(functor.debug_); - data::paste((lfunctor.debug_ | (pw::value(lfunctor.debug_) != pw::cst(literal::black))) | (pw::value(lfunctor.debug_) != pw::cst(literal::white)), output); + // mln_ch_value(I, value::rgb8) output = duplicate(functor.debug_); + // data::paste((lfunctor.debug_ | (pw::value(lfunctor.debug_) != pw::cst(literal::black))) + // | (pw::value(lfunctor.debug_) != pw::cst(literal::white)), output); - io::ppm::save(output, "left_right_top.ppm"); - } + // io::ppm::save(output, "left_right_top.ppm"); + // } t.resume(); } @@ -585,105 +524,53 @@ namespace scribo { // Right internal::single_right_dmax_ratio_aligned_functor<L> - functor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom, _debug_); - bot_right = primitive::link::compute(functor, anchor::Bottom); + functor(input_clo, components, dmax, min_angle, max_angle, + anchor::BottomStrictRight, _debug_); + bot_right = primitive::link::compute(functor, anchor::BottomStrictRight); t.stop(); - if (_debug_) - { - io::ppm::save(functor.debug_, "right_bot.ppm"); - io::ppm::save(functor.debug_angle_, "right_bot_angle.ppm"); - } + // if (_debug_) + // { + // io::ppm::save(functor.debug_, "right_bot.ppm"); + // io::ppm::save(functor.debug_angle_, "right_bot_angle.ppm"); + // } t.resume(); // Left internal::single_left_dmax_ratio_aligned_functor<L> - lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom, _debug_); - bot_left = primitive::link::compute(lfunctor, anchor::Bottom); + lfunctor(input_clo, components, dmax, min_angle, max_angle, + anchor::BottomStrictRight, _debug_); + bot_left = primitive::link::compute(lfunctor, anchor::BottomStrictRight); t.stop(); - if (_debug_) - { - io::ppm::save(lfunctor.debug_, "left_bot.ppm"); - io::ppm::save(lfunctor.debug_angle_, "left_bot_angle.ppm"); - } + // if (_debug_) + // { + // io::ppm::save(lfunctor.debug_, "left_bot.ppm"); + // io::ppm::save(lfunctor.debug_angle_, "left_bot_angle.ppm"); - if (_debug_) - { - mln_ch_value(I, value::rgb8) output = duplicate(functor.debug_); - data::paste((lfunctor.debug_ | (pw::value(lfunctor.debug_) != pw::cst(literal::black))) | (pw::value(lfunctor.debug_) != pw::cst(literal::white)), output); + // mln_ch_value(I, value::rgb8) output = duplicate(functor.debug_); + // data::paste((lfunctor.debug_ | (pw::value(lfunctor.debug_) != pw::cst(literal::black))) + // | (pw::value(lfunctor.debug_) != pw::cst(literal::white)), output); - io::ppm::save(output, "left_right_bot.ppm"); - } + // io::ppm::save(output, "left_right_bot.ppm"); + // } } t_ = t; std::cout << "links - " << t_ << std::endl; - + // Merge links and build CC groups t.restart(); - std::cout << "group - top" << std::endl; object_groups<L> top_groups = primitive::group::from_double_link_any(top_left, top_right); - std::cout << "group - bot" << std::endl; object_groups<L> bot_groups = primitive::group::from_double_link_any(bot_left, bot_right); t_ = t; std::cout << "group - " << t_ << std::endl; - t.restart(); - util::array<accu::shape::bbox<point2d> > - btop_accu(top_groups.nelements()), - bbot_accu(bot_groups.nelements()); - - - for_all_groups(c, top_groups) - { - btop_accu(top_groups(c)).take(components(c).bbox()); - bbot_accu(bot_groups(c)).take(components(c).bbox()); - } - t_ = t; - std::cout << "groups to group bboxes - " << t_ << std::endl; - - - - if (_debug_) - { - - mln_ch_value(I, value::rgb8) - wo_filtering = data::convert(value::rgb8(), input); - - for_all_comp_data(d, btop_accu) - { - if (btop_accu(d).is_valid()) - { - mln::draw::line(wo_filtering, - btop_accu(d).to_result().pmin(), - point2d(btop_accu(d).to_result().pmin().row(), - btop_accu(d).to_result().pmax().col()), - literal::green); - - } - } - - for_all_comp_data(d, bbot_accu) - { - if (bbot_accu(d).is_valid()) - { - mln::draw::line(wo_filtering, - point2d(bbot_accu(d).to_result().pmax().row(), - bbot_accu(d).to_result().pmin().col()), - bbot_accu(d).to_result().pmax(), - literal::green); - } - - } - io::ppm::save(wo_filtering, "wo_filtering.ppm"); - } - - + // Filter CC groups t.restart(); top_groups = filter::object_groups_small(top_groups, min_card); bot_groups = filter::object_groups_small(bot_groups, min_card); @@ -691,7 +578,7 @@ namespace scribo std::cout << "small groups - " << t_ << std::endl; - + // Compute group bboxes t.restart(); util::array<accu::shape::bbox<point2d> > top_accu(top_groups.nelements()), @@ -708,78 +595,35 @@ namespace scribo - - - - - t.restart(); mln_concrete(I) separators; initialize(separators, input_clo); + + // FIXME: any way to fill border AND data at the same time? data::fill(separators, false); + extension::fill(separators, false); + t_ = t; std::cout << "Initialize separators image - " << t_ << std::endl; - mln_ch_value(I, value::rgb8) both; - - if (_debug_) - both = data::convert(value::rgb8(), input); - - - t.restart(); for_all_comp_data(d, top_accu) { - if (top_accu(d).is_valid() || btop_accu(d).is_valid()) + if (top_accu(d).is_valid()) { - if (top_accu(d).is_valid()) - { - if (_debug_) - mln::draw::line(both, - top_accu(d).to_result().pmin(), - point2d(top_accu(d).to_result().pmin().row(), - top_accu(d).to_result().pmax().col()), - literal::green); - - mln::draw::line(separators, - top_accu(d).to_result().pmin(), - point2d(top_accu(d).to_result().pmin().row(), - top_accu(d).to_result().pmax().col()), - true); - } - else - if (_debug_ && btop_accu(d).is_valid()) - mln::draw::line(both, - btop_accu(d).to_result().pmin(), - point2d(btop_accu(d).to_result().pmin().row(), - btop_accu(d).to_result().pmax().col()), - literal::yellow); - + mln::draw::line(separators, + top_accu(d).to_result().pmin(), + point2d(top_accu(d).to_result().pmin().row(), + top_accu(d).to_result().pmax().col()), + true); } - if (bot_accu(d).is_valid() || bbot_accu(d).is_valid()) + if (bot_accu(d).is_valid()) { - if (bot_accu(d).is_valid()) - { - if (_debug_) - mln::draw::line(both, - point2d(bot_accu(d).to_result().pmax().row(), - bot_accu(d).to_result().pmin().col()), - bot_accu(d).to_result().pmax(), - literal::green); - - mln::draw::line(separators, - point2d(bot_accu(d).to_result().pmax().row(), - bot_accu(d).to_result().pmin().col()), - bot_accu(d).to_result().pmax(), - true); - } - else - if (_debug_ && bbot_accu(d).is_valid()) - mln::draw::line(both, - point2d(bbot_accu(d).to_result().pmax().row(), - bbot_accu(d).to_result().pmin().col()), - bbot_accu(d).to_result().pmax(), - literal::yellow); + mln::draw::line(separators, + point2d(bot_accu(d).to_result().pmax().row(), + bot_accu(d).to_result().pmin().col()), + bot_accu(d).to_result().pmax(), + true); } } @@ -787,22 +631,112 @@ namespace scribo std::cout << "Drawing output image - " << t_ << std::endl; - if (_debug_) - { - io::ppm::save(both, "both.ppm"); - io::pbm::save(separators, "separators.pbm"); - } + // if (_debug_) + // { + // // Restore input orientation. + // mln_concrete(I) input = scribo::preprocessing::rotate_90(in, false); + + + // // Debug group bboxes (includes all bboxes before filtering) + // util::array<accu::shape::bbox<point2d> > + // btop_accu(top_groups.nelements()), + // bbot_accu(bot_groups.nelements()); + + + // for_all_groups(c, top_groups) + // { + // btop_accu(top_groups(c)).take(components(c).bbox()); + // bbot_accu(bot_groups(c)).take(components(c).bbox()); + // } + + // mln_ch_value(I, value::rgb8) + // wo_filtering = data::convert(value::rgb8(), input); + + // for_all_comp_data(d, btop_accu) + // { + // if (btop_accu(d).is_valid()) + // { + // mln::draw::line(wo_filtering, + // btop_accu(d).to_result().pmin(), + // point2d(btop_accu(d).to_result().pmin().row(), + // btop_accu(d).to_result().pmax().col()), + // literal::green); + + // } + // } + + // for_all_comp_data(d, bbot_accu) + // { + // if (bbot_accu(d).is_valid()) + // { + // mln::draw::line(wo_filtering, + // point2d(bbot_accu(d).to_result().pmax().row(), + // bbot_accu(d).to_result().pmin().col()), + // bbot_accu(d).to_result().pmax(), + // literal::green); + // } + + // } + // io::ppm::save(wo_filtering, "wo_filtering.ppm"); + + // mln_ch_value(I, value::rgb8) both = data::convert(value::rgb8(), input); + + // for_all_comp_data(d, top_accu) + // { + // if (top_accu(d).is_valid() || btop_accu(d).is_valid()) + // { + // if (top_accu(d).is_valid()) + // { + // mln::draw::line(both, + // top_accu(d).to_result().pmin(), + // point2d(top_accu(d).to_result().pmin().row(), + // top_accu(d).to_result().pmax().col()), + // literal::green); + // } + // else + // if (btop_accu(d).is_valid()) + // mln::draw::line(both, + // btop_accu(d).to_result().pmin(), + // point2d(btop_accu(d).to_result().pmin().row(), + // btop_accu(d).to_result().pmax().col()), + // literal::yellow); + + // } + // if (bot_accu(d).is_valid() || bbot_accu(d).is_valid()) + // { + // if (bot_accu(d).is_valid()) + // { + // mln::draw::line(both, + // point2d(bot_accu(d).to_result().pmax().row(), + // bot_accu(d).to_result().pmin().col()), + // bot_accu(d).to_result().pmax(), + // literal::green); + // } + // else + // if (bbot_accu(d).is_valid()) + // mln::draw::line(both, + // point2d(bbot_accu(d).to_result().pmax().row(), + // bbot_accu(d).to_result().pmin().col()), + // bbot_accu(d).to_result().pmax(), + // literal::yellow); + // } + + // } + + // io::ppm::save(both, "both.ppm"); + // io::pbm::save(separators, "separators.pbm"); + // } // Hit or miss { - if (_debug_) - { - mln_concrete(I) input_with_seps = duplicate(input_clo); - data::paste(separators | pw::value(separators), input_with_seps); + // if (_debug_) + // { + // mln_concrete(I) input_with_seps = duplicate(input_clo); + // data::paste(separators | pw::value(separators), input_with_seps); - io::pbm::save(input_with_seps, "input_with_seps.pbm"); - } + // io::pbm::save(input_with_seps, "input_with_seps.pbm"); + // } t.restart(); unsigned length = 25; @@ -819,11 +753,12 @@ namespace scribo typedef mln_ch_value(I,unsigned) J; J tmp = accu::transform_line(accu, input_clo, length, 1); + t_ = t; std::cout << "* accu::transform_line - " << t_ << std::endl; - if (_debug_) - io::pgm::save(data::convert(value::int_u8(), tmp), "tmp.pgm"); + // if (_debug_) + // io::pgm::save(data::convert(value::int_u8(), tmp), "tmp.pgm"); t.restart(); @@ -841,25 +776,53 @@ namespace scribo unsigned invalid_ratio = unsigned(length * 0.30f); - mln_piter(I) p(separators.domain()); - for_all(p) - if (separators(p)) - { - unsigned lbl = sep_lbl(p); + extension::adjust_fill(tmp, 21, 0); + + value::int_u8 *sep_lbl_ptr = sep_lbl.buffer() + sep_lbl.index_of_point(sep_lbl.domain().pmin()); + bool *separators_ptr = separators.buffer() + separators.index_of_point(separators.domain().pmin()); + unsigned *tmp_ptr = tmp.buffer() + tmp.index_of_point(tmp.domain().pmin());; + int idx1 = tmp.delta_index(dp1); + int idx2 = tmp.delta_index(dp2); + + unsigned nrows = separators.nrows(); + unsigned ncols = separators.ncols(); - unsigned - top_count = tmp(p + dp1), - bot_count = tmp(p + dp2); + unsigned row_idx_sep_lbl = sep_lbl.delta_index(dpoint2d(+1, - ncols)); + unsigned row_idx_separators = separators.delta_index(dpoint2d(+1, - ncols)); + unsigned row_idx_tmp = tmp.delta_index(dpoint2d(+1, - ncols)); - // This site is wrapped between two lines of text so we don't - // want it. - if (top_count >= invalid_ratio + 1 - && bot_count >= invalid_ratio + 1) + for (unsigned row = 0; row < nrows; ++row) + { + for (unsigned col = 0; col < ncols; ++col) + { + if (*separators_ptr) { - relbl(lbl) = false; + unsigned lbl = *sep_lbl_ptr; + + unsigned + top_count = *(tmp_ptr + idx1), + bot_count = *(tmp_ptr + idx2); + + // This site is wrapped between two lines of text so we don't + // want it. + if (top_count >= invalid_ratio + 1 + && bot_count >= invalid_ratio + 1) + { + relbl(lbl) = false; + } } + + ++tmp_ptr; + ++sep_lbl_ptr; + ++separators_ptr; } + tmp_ptr += row_idx_tmp; + sep_lbl_ptr += row_idx_sep_lbl; + separators_ptr += row_idx_separators; + } + + t_ = t; std::cout << "* reading data - " << t_ << std::endl; @@ -870,37 +833,35 @@ namespace scribo mln_concrete(I) output = data::convert(bool(), sep_lbl); - if (_debug_) - { - io::pbm::save(output, "separators_hom.pbm"); - io::pbm::save(separators, "separators_filtered.pbm"); - } + // if (_debug_) + // { + // io::pbm::save(output, "separators_hom.pbm"); + // io::pbm::save(separators, "separators_filtered.pbm"); - t.restart(); - value::int_u16 ncomps; - component_set<L> comps = primitive::extract::components(output, c8(), ncomps); - mln_ch_value(I, value::rgb8) both; + // // value::int_u16 ncomps; + // // component_set<L> comps = primitive::extract::components(output, c8(), ncomps); + // // mln_ch_value(I, value::rgb8) both; - both = data::convert(value::rgb8(), input); + // // both = data::convert(value::rgb8(), input); - // Needed since the rotated image origin is (0,0). Rotation does - // not preserve rotated coordinates. - dpoint2d dp(input.domain().pcenter() - input_clo.domain().pcenter()); + // // // Needed since the rotated image origin is (0,0). + // // dpoint2d dp(input.domain().pcenter() - input_clo.domain().pcenter()); + + // // for_all_comps(c, comps) + // // { + // // box2d b = geom::rotate(comps(c).bbox(), -90, input_clo.domain().pcenter()); + // // mln::draw::line(both, + // // b.pmin() + dp, + // // b.pmax() + dp, + // // literal::green); + // // } + // } - for_all_comps(c, comps) - { - box2d b = geom::rotate(comps(c).bbox(), -90, input_clo.domain().pcenter()); - mln::draw::line(both, - b.pmin() + dp, - b.pmax() + dp, - literal::green); - } - t_ = t; - std::cout << "Output image - " << t_ << std::endl; gt.stop(); t_ = gt; - std::cout << "Total time: " << t_ << std::endl; + std::cout << "Non visible separators: " << t_ << std::endl; + trace::exiting("scribo::primitive::extract::separators_nonvisible"); return scribo::preprocessing::rotate_90(output, true); } } diff --git a/scribo/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh index 1c52b91..c1a9106 100644 --- a/scribo/scribo/primitive/link/internal/compute_anchor.hh +++ b/scribo/scribo/primitive/link/internal/compute_anchor.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -88,10 +88,8 @@ namespace scribo { typedef mln_site(L) P; - unsigned h = components(current_object).bbox().pmax().row() - - components(current_object).bbox().pmin().row(); - unsigned w = components(current_object).bbox().pmax().col() - - components(current_object).bbox().pmin().col(); + unsigned h = components(current_object).bbox().height(); + unsigned w = components(current_object).bbox().width(); mln_site(L) sp = components(current_object).bbox().pcenter(); @@ -113,6 +111,22 @@ namespace scribo break; + // Bounding box top left + case anchor::TopStrictLeft: + sp.col() = components(current_object).bbox().pmin().col(); + sp.row() = components(current_object).bbox().pmin().row() + + math::min(2u, (h + 1) / 2 - 1); + break; + + + // Bounding box bottom right + case anchor::BottomStrictRight: + sp.col() = components(current_object).bbox().pmax().col(); + sp.row() = components(current_object).bbox().pmax().row() + - math::min(2u, (h + 1) / 2 - 1); + break; + + // Bounding box bottom center case anchor::Bottom: if (h < 30) diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index ed691e8..48098ba 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -34,11 +34,11 @@ # include <scribo/core/line_set.hh> # include <scribo/core/paragraph_set.hh> -# include <scribo/primitive/extract/elements.hh> +# include <scribo/primitive/extract/non_text.hh> # include <scribo/primitive/extract/components.hh> -# include <scribo/primitive/extract/vertical_separators.hh> +//# include <scribo/primitive/extract/vertical_separators.hh> +# include <scribo/primitive/extract/separators.hh> # include <scribo/primitive/extract/separators_nonvisible.hh> -# include <scribo/primitive/extract/elements.hh> # include <scribo/primitive/identify.hh> @@ -168,16 +168,17 @@ namespace scribo input_cleaned = exact(processed_image); if (enable_line_seps) { - on_new_progress_label("Find vertical separators..."); + on_new_progress_label("Find vertical and horizontal separators..."); - // Vertical separators - separators = primitive::extract::vertical_separators(processed_image, 81); + // Vertical and horizontal separators + separators = primitive::extract::separators(processed_image, 81); on_progress(); on_new_progress_label("Remove separators..."); input_cleaned = primitive::remove::separators(processed_image, separators); + doc.set_line_separators(separators); on_progress(); } -- 1.5.6.5

1 0

last-svn-commit-771-gf67cec4 Add new conversion routines from string to tag.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* scribo/core/tag/component.hh, * scribo/core/tag/line.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/core/tag/component.hh | 35 +++++++++++++++++++++++++++++++++++ scribo/scribo/core/tag/line.hh | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ab028c3..ab498cc 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new conversion routines from string to tag. + + * scribo/core/tag/component.hh, + * scribo/core/tag/line.hh: Here. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Various changes in scribo core structures. * scribo/scribo/core/component_info.hh: Remove useless line_id. diff --git a/scribo/scribo/core/tag/component.hh b/scribo/scribo/core/tag/component.hh index f773932..10b86a6 100644 --- a/scribo/scribo/core/tag/component.hh +++ b/scribo/scribo/core/tag/component.hh @@ -61,6 +61,14 @@ namespace scribo Image }; + + std::ostream& operator<<(std::ostream& ostr, const Tag& tag); + Tag str2tag(const std::string& str); + + std::ostream& operator<<(std::ostream& ostr, const Type& type); + Type str2type(const std::string& str); + + # ifndef MLN_INCLUDE_ONLY @@ -85,6 +93,16 @@ namespace scribo inline + Tag str2tag(const std::string& str) + { + if (str == "Ignored") + return Ignored; + + return None; + } + + + inline std::ostream& operator<<(std::ostream& ostr, const Type& type) { @@ -116,6 +134,23 @@ namespace scribo } + inline + Type str2type(const std::string& str) + { + if (str == "Character") + return Character; + else if (str == "Separator") + return Separator; + else if (str == "Noise") + return Noise; + else if (str == "Punctuation") + return Punctuation; + else if (str == "Image") + return Image; + + return Undefined; + } + # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/core/tag/line.hh b/scribo/scribo/core/tag/line.hh index 0444a11..3fb1fdf 100644 --- a/scribo/scribo/core/tag/line.hh +++ b/scribo/scribo/core/tag/line.hh @@ -96,7 +96,7 @@ namespace scribo std::ostream& operator<<(std::ostream& ostr, const Type& type); - + Type str2type(const std::string& str); # ifndef MLN_INCLUDE_ONLY @@ -208,6 +208,38 @@ namespace scribo return ostr << str; } + inline + Type str2type(const std::string& str) + { + if (str == "caption") + return Caption; + else if (str == "credit") + return Credit; + else if (str == "drop-capital") + return DropCapital; + else if (str == "floating") + return Floating; + else if (str == "footer") + return Footer; + else if (str == "header") + return Header; + else if (str == "heading") + return Heading; + else if (str == "page-number") + return PageNumber; + else if (str == "paragraph") + return Paragraph; + + // Values unsupported by the XSD + else if(str == "punctuation") + return Punctuation; + else if (str == "text") + return Text; + + return Undefined; + } + + # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

last-svn-commit-770-g2a17f6d Various changes in scribo core structures.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* scribo/scribo/core/component_info.hh: Remove useless line_id. * scribo/scribo/core/line_set.hh, * scribo/scribo/core/component_set.hh: Add new constructors. * scribo/scribo/core/document.hh: Store line separators. * scribo/scribo/core/line_info.hh: Share attributes and add new constructors. (is_textline): New method. * scribo/scribo/core/line_links.hh: Do not allocate useless data. * scribo/scribo/core/paragraph_info.hh (operator<<): New. * scribo/scribo/core/paragraph_set.hh: Share attributes and add new constructors. --- scribo/ChangeLog | 22 ++ scribo/scribo/core/component_info.hh | 17 +-- scribo/scribo/core/component_set.hh | 65 +++++-- scribo/scribo/core/document.hh | 48 +++++- scribo/scribo/core/line_info.hh | 367 ++++++++++++++++++---------------- scribo/scribo/core/line_links.hh | 2 +- scribo/scribo/core/line_set.hh | 29 +++- scribo/scribo/core/paragraph_info.hh | 10 + scribo/scribo/core/paragraph_set.hh | 84 +++++++- 9 files changed, 425 insertions(+), 219 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e08f2fd..ab028c3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,27 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Various changes in scribo core structures. + + * scribo/scribo/core/component_info.hh: Remove useless line_id. + + * scribo/scribo/core/line_set.hh, + * scribo/scribo/core/component_set.hh: Add new constructors. + + * scribo/scribo/core/document.hh: Store line separators. + + * scribo/scribo/core/line_info.hh: Share attributes and add new + constructors. + (is_textline): New method. + + * scribo/scribo/core/line_links.hh: Do not allocate useless data. + + * scribo/scribo/core/paragraph_info.hh (operator<<): New. + + * scribo/scribo/core/paragraph_set.hh: Share attributes and add new + constructors. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename files in Scribo. * scribo/primitive/extract/elements.hh, diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index 4ed6db7..1b03318 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -47,7 +47,6 @@ namespace scribo class component_info { typedef mln::util::object_id<scribo::ComponentId, unsigned> component_id_t; - typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; public: component_info(); @@ -69,9 +68,6 @@ namespace scribo component::Type type() const; void update_type(component::Type type); - // The line it is rattached to. 0 means an invalid line. - line_id_t line_id() const; - bool is_valid() const; private: @@ -82,8 +78,6 @@ namespace scribo component::Tag tag_; component::Type type_; - - line_id_t line_id_; }; @@ -109,7 +103,7 @@ namespace scribo const mln::point2d& mass_center, unsigned card) : id_(id), bbox_(bbox), mass_center_(mass_center), card_(card), - tag_(component::None), type_(component::Undefined), line_id_(0) + tag_(component::None), type_(component::Undefined) { } @@ -179,14 +173,6 @@ namespace scribo inline - component_info::line_id_t - component_info::line_id() const - { - return line_id_; - } - - - inline bool component_info::is_valid() const { @@ -204,7 +190,6 @@ namespace scribo << ", mass_center=" << info.mass_center() << ", card=" << info.card() << ", tag=" << info.tag() - << ", line_id=" << info.line_id() << ")" << std::endl; } diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index 103826f..7ddcf16 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,6 +55,8 @@ # include <mln/core/routine/duplicate.hh> +# include <mln/value/next.hh> + # include <scribo/core/macros.hh> # include <scribo/core/component_info.hh> @@ -95,6 +97,8 @@ namespace scribo void fill_infos(const mln::util::array<pair_data_t>& attribs); + // Useful while constructing incrementaly (XML loading). + void soft_init(const mln_value(L) ncomps); L ima_; mln_value(L) ncomps_; @@ -128,6 +132,9 @@ namespace scribo /// Constructor without argument. component_set(); + // Constructor from internal data. + component_set(const mln::util::tracked_ptr<data_t>& data); + /// Constructor from an image \p ima and the number of labels \p ncomps. component_set(const L& ima, const mln_value(L)& ncomps); @@ -348,6 +355,19 @@ namespace scribo } + template <typename L> + inline + void + component_set_data<L>::soft_init(const mln_value(L) ncomps) + { + mln_precondition(infos_.nelements() == 0); + + ncomps_ = ncomps; + infos_.reserve(ncomps_); + infos_.append(component_info()); // Component 0, i.e. the background. + } + + } // end of namespace mln::internal @@ -361,6 +381,13 @@ namespace scribo template <typename L> inline + component_set<L>::component_set(const mln::util::tracked_ptr<data_t>& data) + { + data_ = data; + } + + template <typename L> + inline component_set<L>::component_set(const L& ima, const mln_value(L)& ncomps) { data_ = new internal::component_set_data<L>(ima, ncomps); @@ -400,7 +427,7 @@ namespace scribo const component_info& component_set<L>::info(const mln_value(L)& id) const { - return this->data_->infos_[id]; + return data_->infos_[id]; } template <typename L> @@ -408,7 +435,7 @@ namespace scribo component_info& component_set<L>::info(const mln_value(L)& id) { - return this->data_->infos_[id]; + return data_->infos_[id]; } // template <typename L> @@ -416,7 +443,7 @@ namespace scribo // const component_info& // component_set<L>::operator()(const mln_value(L)& id) const // { -// return this->data_->infos_[id]; +// return data_->infos_[id]; // } // template <typename L> @@ -424,7 +451,7 @@ namespace scribo // component_info& // component_set<L>::operator()(const mln_value(L)& id) // { -// return this->data_->infos_[id]; +// return data_->infos_[id]; // } template <typename L> @@ -432,7 +459,7 @@ namespace scribo const component_info& component_set<L>::operator()(const component_id_t& id) const { - return this->data_->infos_[id]; + return data_->infos_[id]; } template <typename L> @@ -440,7 +467,7 @@ namespace scribo component_info& component_set<L>::operator()(const component_id_t& id) { - return this->data_->infos_[id]; + return data_->infos_[id]; } @@ -476,7 +503,7 @@ namespace scribo const L& component_set<L>::labeled_image() const { - return this->data_->ima_; + return data_->ima_; } @@ -485,7 +512,7 @@ namespace scribo bool component_set<L>::is_valid() const { - return this->data_->ima_.is_valid(); + return data_ != 0 && data_->ima_.is_valid(); } @@ -503,7 +530,7 @@ namespace scribo L& component_set<L>::labeled_image_() { - return this->data_->ima_; + return data_->ima_; } @@ -512,7 +539,7 @@ namespace scribo mln_concrete(L) component_set<L>::valid_comps_image_() const { - mln::util::array<bool> f(mln::value::next(this->data_->ncomps_)); + mln::util::array<bool> f(mln::value::next(data_->ncomps_)); f(0) = true; for_all_comps(c, (*this)) @@ -520,8 +547,8 @@ namespace scribo mln_value(L) new_ncomps; mln_concrete(L) - output = mln::labeling::relabel(this->data_->ima_, - this->data_->ncomps_, + output = mln::labeling::relabel(data_->ima_, + data_->ncomps_, new_ncomps, f); @@ -534,7 +561,7 @@ namespace scribo bool component_set<L>::has_separators() const { - return this->data_->separators_.is_valid(); + return data_->separators_.is_valid(); } @@ -544,9 +571,9 @@ namespace scribo component_set<L>::add_separators(const mln_ch_value(L, bool)& ima) { if (! has_separators()) - this->data_->separators_ = ima; + data_->separators_ = ima; else - mln::logical::or_inplace(this->data_->separators_, ima); + mln::logical::or_inplace(data_->separators_, ima); } @@ -555,7 +582,7 @@ namespace scribo const mln_ch_value(L, bool)& component_set<L>::separators() const { - return this->data_->separators_; + return data_->separators_; } @@ -564,7 +591,7 @@ namespace scribo void component_set<L>::clear_separators() { - this->data_->separators_.destroy(); + data_->separators_.destroy(); } diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index f112410..e5ac825 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -91,16 +91,24 @@ namespace scribo const component_set<L>& whitespace_seps_comps() const; void set_whitespace_separators(const image2d<bool>& whitespace_seps); + bool has_line_seps() const; + const mln::image2d<bool>& line_seps() const; + const component_set<L>& line_seps_comps() const; + void set_line_separators(const image2d<bool>& line_seps); + + private: const char *filename_; mln::image2d<mln::value::rgb8> image_; - line_set<L> lines_; paragraph_set<L> parset_; component_set<L> elements_; mln::image2d<bool> whitespace_seps_; component_set<L> whitespace_seps_comps_; + + mln::image2d<bool> line_seps_; + component_set<L> line_seps_comps_; }; @@ -201,7 +209,6 @@ namespace scribo return parset_.lines(); } - template <typename L> const paragraph_set<L>& document<L>::paragraphs() const @@ -294,6 +301,43 @@ namespace scribo } + template <typename L> + bool + document<L>::has_line_seps() const + { + return line_seps_.is_valid(); + } + + + template <typename L> + const mln::image2d<bool>& + document<L>::line_seps() const + { + return line_seps_; + } + + + template <typename L> + const component_set<L>& + document<L>::line_seps_comps() const + { + return line_seps_comps_; + } + + + template <typename L> + void + document<L>::set_line_separators(const image2d<bool>& line_seps) + { + line_seps_ = line_seps; + + mln_value(L) ncomps; + line_seps_comps_ = primitive::extract::components(line_seps, + mln::c8(), ncomps); + } + + + # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 54a5094..c82160a 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -58,12 +58,76 @@ namespace scribo // Forward declarations. template <typename L> class line_set; + template <typename L> class line_info; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; + + namespace internal + { + /// Data structure for \c scribo::line_info. + template <typename L> + struct line_info_data + { + line_info_data(); + line_info_data(const line_set<L>& holder, + const mln::util::array<component_id_t>& comps); + + + bool hidden_; + line::Tag tag_; + mln::box2d bbox_; + mln::box2d ebbox_; + mln::util::array<component_id_t> components_; + + // Values relative to the line bbox. + int baseline_; + int meanline_; + + // Values relative to the baseline. + unsigned x_height_; + int d_height_; + int a_height_; + + // Character related stats. + unsigned char_space_; + unsigned char_width_; + + // Words related stats. + unsigned word_space_; + + // Reading direction + line::ReadingDirection reading_direction_; + + // Line type + line::Type type_; + + // Is this line in reverse video? + bool reverse_video_; + + // Text orientation + float orientation_; + + // Text reading orientation + float reading_orientation_; + + bool indented_; + + std::string text_; + + // Line set holding this element. + line_set<L> holder_; + + }; + + } // end of namespace scribo::internal + + + template <typename L> class line_info { + typedef internal::line_info_data<L> data_t; typedef mln::util::object_id<scribo::ComponentId, unsigned> component_id_t; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; @@ -74,6 +138,8 @@ namespace scribo line_info(); + line_info(const line_id_t& id, data_t* data); + line_info(const line_set<L>& holder, const line_id_t& id, const mln::util::array<component_id_t>& comps); @@ -134,9 +200,10 @@ namespace scribo const std::string& text() const; void update_text(const std::string& str); - bool is_valid() const; + bool is_textline() const; + /// Hidden status. /// /// When a line is hidden, it should not be used in routines @@ -180,6 +247,9 @@ namespace scribo /// Returns the delta used to compute the extended bbox. int delta_of_line() const; + /// Update the extended bbox. + void update_ebbox(); + private: // Members void copy_data(const line_info<L>& other); @@ -189,81 +259,59 @@ namespace scribo /// Update bbox and ebbox_ attributes. void update_bbox_and_ebox(line_info<L>& other); - /// Update the extended bbox. - void update_ebbox(); - mln::box2d merged_ebbox(const scribo::line_info<L>& info_l, const scribo::line_info<L>& info); void update_components_type(component::Type type); private: // Attributes - // WARNING: NEVER FORGET TO UPDATE COPY CONSTRUCTOR REDEFINITION!!!! - line_id_t id_; - bool hidden_; - line::Tag tag_; - mln::box2d bbox_; - mln::box2d ebbox_; - mln::util::array<component_id_t> components_; - - // Values relative to the line bbox. - int baseline_; - int meanline_; - - // Values relative to the baseline. - unsigned x_height_; - int d_height_; - int a_height_; - - // WARNING: NEVER FORGET TO UPDATE COPY CONSTRUCTOR REDEFINITION!!!! - - // Character related stats. - unsigned char_space_; - unsigned char_width_; - - // Words related stats. - unsigned word_space_; - - // Reading direction - line::ReadingDirection reading_direction_; - - // Line type - line::Type type_; + mln::util::tracked_ptr<data_t> data_; + }; - // Is this line in reverse video? - bool reverse_video_; - // Text orientation - float orientation_; + template <typename L> + std::ostream& + operator<<(std::ostream& ostr, const line_info<L>& info); - // Text reading orientation - float reading_orientation_; - bool indented_; +# ifndef MLN_INCLUDE_ONLY - std::string text_; + namespace internal + { - // Line set holding this element. - line_set<L> holder_; + template <typename L> + line_info_data<L>::line_info_data() + { + hidden_ = false; + } - // WARNING: NEVER FORGET TO UPDATE COPY CONSTRUCTOR REDEFINITION!!!! - }; + template <typename L> + line_info_data<L>::line_info_data(const line_set<L>& holder, + const mln::util::array<component_id_t>& comps) + : hidden_(false), tag_(line::None), components_(comps), + type_(line::Undefined), holder_(holder) + { + // FIXME: set valid information for these attributes in + // force_stats_update. + word_space_ = 0; + reading_direction_ = line::LeftToRight; + reverse_video_ = false; - template <typename L> - std::ostream& - operator<<(std::ostream& ostr, const line_info<L>& info); + orientation_ = 0.; + reading_orientation_ = 0.; + indented_ = false; + } -# ifndef MLN_INCLUDE_ONLY + } // end of namespace scribo::internal template <typename L> line_info<L>::line_info() - : id_(0), hidden_(false) + : id_(0) { - } template <typename L> @@ -275,47 +323,24 @@ namespace scribo if (! is_valid()) id_ = other.id(); - hidden_ = other.hidden_; - - tag_ = other.tag(); - bbox_ = other.bbox(); - ebbox_ = other.ebbox(); - components_ = other.components(); - - baseline_ = other.baseline(); - meanline_ = other.meanline(); - - x_height_ = other.x_height(); - d_height_ = other.d_height(); - a_height_ = other.a_height(); - - char_space_ = other.char_space(); - char_width_ = other.char_width(); - - word_space_ = other.word_space(); - - reading_direction_ = other.reading_direction(); - - type_ = other.type(); - - reverse_video_ = other.reverse_video(); - - orientation_ = other.orientation(); - - reading_orientation_ = other.reading_orientation(); - - indented_ = other.indented(); + data_ = other.data_; + } - text_ = other.text(); - holder_ = other.holder(); + template <typename L> + inline + line_info<L>::line_info(const line_id_t& id, data_t *data) + : id_(id), data_(data) + { } + template <typename L> inline line_info<L>::line_info(const line_info<L>& other) - : id_(0), hidden_(false) + : id_(0) { + //data_->hidden_ = false; copy_data(other); } @@ -357,22 +382,10 @@ namespace scribo line_info<L>::line_info(const line_set<L>& holder, const line_id_t& id, const mln::util::array<component_id_t>& comps) - : id_(id), hidden_(false), tag_(line::None), components_(comps), - type_(line::Undefined), holder_(holder) + : id_(id) { - + data_ = new data_t(holder, comps); force_stats_update(); - - // FIXME: set valid information for these attributes in - // force_stats_update. - word_space_ = 0; - reading_direction_ = line::LeftToRight; - reverse_video_ = false; - - orientation_ = 0.; - reading_orientation_ = 0.; - - indented_ = false; } @@ -397,7 +410,7 @@ namespace scribo line::Tag line_info<L>::tag() const { - return tag_; + return data_->tag_; } @@ -405,7 +418,7 @@ namespace scribo void line_info<L>::update_tag(line::Tag tag) { - tag_ = tag; + data_->tag_ = tag; } @@ -413,14 +426,14 @@ namespace scribo const mln::box2d& line_info<L>::bbox() const { - return bbox_; + return data_->bbox_; } template <typename L> const mln::box2d& line_info<L>::ebbox() const { - return ebbox_; + return data_->ebbox_; } @@ -428,14 +441,14 @@ namespace scribo const mln::util::array<typename line_info<L>::component_id_t>& line_info<L>::components() const { - return components_; + return data_->components_; } template <typename L> unsigned line_info<L>::card() const { - return components_.size(); + return data_->components_.size(); } @@ -443,7 +456,7 @@ namespace scribo int line_info<L>::baseline() const { - return baseline_; + return data_->baseline_; } @@ -451,7 +464,7 @@ namespace scribo int line_info<L>::meanline() const { - return meanline_; + return data_->meanline_; } @@ -459,7 +472,7 @@ namespace scribo int line_info<L>::ascent() const { - return baseline_ - a_height() + 1; + return data_->baseline_ - a_height() + 1; } @@ -467,7 +480,7 @@ namespace scribo int line_info<L>::descent() const { - return baseline_ - d_height(); + return data_->baseline_ - d_height(); } @@ -475,7 +488,7 @@ namespace scribo unsigned line_info<L>::x_height() const { - return x_height_; + return data_->x_height_; } @@ -483,7 +496,7 @@ namespace scribo int line_info<L>::d_height() const { - return d_height_; + return data_->d_height_; } @@ -491,7 +504,7 @@ namespace scribo int line_info<L>::a_height() const { - return a_height_; + return data_->a_height_; } @@ -499,7 +512,7 @@ namespace scribo unsigned line_info<L>::char_space() const { - return char_space_; + return data_->char_space_; } @@ -507,7 +520,7 @@ namespace scribo unsigned line_info<L>::char_width() const { - return char_width_; + return data_->char_width_; } @@ -515,7 +528,7 @@ namespace scribo unsigned line_info<L>::word_space() const { - return word_space_; + return data_->word_space_; } @@ -523,14 +536,14 @@ namespace scribo line::ReadingDirection line_info<L>::reading_direction() const { - return reading_direction_; + return data_->reading_direction_; } template <typename L> line::Type line_info<L>::type() const { - return type_; + return data_->type_; } @@ -538,10 +551,10 @@ namespace scribo void line_info<L>::update_components_type(component::Type type) { - for_all_elements(i, components_) + for_all_elements(i, data_->components_) { - unsigned c = components_[i]; - holder_.components_()(c).update_type(type); + unsigned c = data_->components_[i]; + data_->holder_.components_()(c).update_type(type); } } @@ -550,7 +563,7 @@ namespace scribo void line_info<L>::update_type(line::Type type) { - type_ = type; + data_->type_ = type; // Some line types may involve updating components type as well. if (type == line::Punctuation) @@ -564,7 +577,7 @@ namespace scribo bool line_info<L>::reverse_video() const { - return reverse_video_; + return data_->reverse_video_; } @@ -572,7 +585,7 @@ namespace scribo float line_info<L>::orientation() const { - return orientation_; + return data_->orientation_; } @@ -580,7 +593,7 @@ namespace scribo float line_info<L>::reading_orientation() const { - return reading_orientation_; + return data_->reading_orientation_; } @@ -588,21 +601,21 @@ namespace scribo bool line_info<L>::indented() const { - return indented_; + return data_->indented_; } template <typename L> bool line_info<L>::has_text() const { - return !text_.empty(); + return !data_->text_.empty(); } template <typename L> const std::string& line_info<L>::text() const { - return text_; + return data_->text_; } @@ -610,7 +623,7 @@ namespace scribo void line_info<L>::update_text(const std::string& str) { - text_ = str; + data_->text_ = str; } @@ -624,9 +637,19 @@ namespace scribo template <typename L> bool + line_info<L>::is_textline() const + { + return is_valid() + && !is_hidden() + && type() == line::Text; + } + + + template <typename L> + bool line_info<L>::is_hidden() const { - return hidden_; + return data_->hidden_; } @@ -634,7 +657,7 @@ namespace scribo void line_info<L>::set_hidden(bool b) { - hidden_ = b; + data_->hidden_ = b; } @@ -665,8 +688,8 @@ namespace scribo void line_info<L>::update_ebbox() { - int A = a_height_ - x_height_; - int D = - d_height_; + int A = data_->a_height_ - data_->x_height_; + int D = - data_->d_height_; if (A <= 2 && D > 2) A = D; if (D <= 2 && A > 2) @@ -674,10 +697,12 @@ namespace scribo int delta = delta_of_line(); - ebbox_ = mln::make::box2d(meanline_ - A, bbox().pmin().col() - delta, - baseline_ + D, bbox().pmax().col() + delta); + data_->ebbox_ = mln::make::box2d(data_->meanline_ - A, + bbox().pmin().col() - delta, + data_->baseline_ + D, + bbox().pmax().col() + delta); - ebbox_.crop_wrt(holder_.components().labeled_image().domain()); + data_->ebbox_.crop_wrt(data_->holder_.components().labeled_image().domain()); } @@ -729,20 +754,20 @@ namespace scribo // Adjusting ebboxes with the highest delta and merging ebboxes. int d_delta = other.delta_of_line() - this->delta_of_line(); if (d_delta < 0) // other.delta_of_line() < this->delta_of_line() - ebbox_.merge(enlarge(other.ebbox(), - d_delta)); + data_->ebbox_.merge(enlarge(other.ebbox(), - d_delta)); else { - mln::box2d b = ebbox_; - ebbox_ = other.bbox(); - ebbox_.merge(enlarge(b, d_delta)); + mln::box2d b = data_->ebbox_; + data_->ebbox_ = other.bbox(); + data_->ebbox_.merge(enlarge(b, d_delta)); } - ebbox_.crop_wrt(holder_.components().labeled_image().domain()); + data_->ebbox_.crop_wrt(data_->holder_.components().labeled_image().domain()); } else // /other/ IS NOT a text line. { - ebbox_.merge(other.ebbox()); - ebbox_.merge(merged_ebbox(*this, other)); + data_->ebbox_.merge(other.ebbox()); + data_->ebbox_.merge(merged_ebbox(*this, other)); } } else // /this/ is NOT a text line @@ -755,15 +780,15 @@ namespace scribo } update_type(line::Text); - ebbox_.merge(other.ebbox()); - ebbox_.merge(merged_ebbox(other, *this)); + data_->ebbox_.merge(other.ebbox()); + data_->ebbox_.merge(merged_ebbox(other, *this)); } // Merging bboxes. - bbox_.merge(other.bbox()); + data_->bbox_.merge(other.bbox()); // Make sure the ebbox is included in the image domain. - ebbox_.crop_wrt(holder_.components().labeled_image().domain()); + data_->ebbox_.crop_wrt(data_->holder_.components().labeled_image().domain()); } @@ -771,14 +796,14 @@ namespace scribo void line_info<L>::fast_merge(line_info<L>& other, bool hide) { - tag_ = line::Needs_Precise_Stats_Update; + data_->tag_ = line::Needs_Precise_Stats_Update; other.update_tag(line::Merged); other.set_hidden(hide); // Update bbox and ebbox update_bbox_and_ebox(other); - components_.append(other.components()); + data_->components_.append(other.components()); } @@ -795,7 +820,7 @@ namespace scribo line_info<L>::force_stats_update() { typedef mln_site(L) P; - const component_set<L>& comp_set = holder_.components(); + const component_set<L>& comp_set = data_->holder_.components(); // Init. typedef mln::value::int_u<12> median_data_t; @@ -814,21 +839,21 @@ namespace scribo // Workaround to avoid overflow with int_u<12> in median accumulators. // // FIXME: not optimal... - for_all_elements(i, components_) + for_all_elements(i, data_->components_) { - unsigned c = components_(i); + unsigned c = data_->components_(i); // Ignore punctuation for stats computation but not for bbox // computation. - if (holder_.components()(c).type() == component::Punctuation) + if (data_->holder_.components()(c).type() == component::Punctuation) continue; ref_line = mln::math::min(comp_set(c).bbox().pmin().row(), ref_line); } - for_all_elements(i, components_) + for_all_elements(i, data_->components_) { - unsigned c = components_(i); + unsigned c = data_->components_(i); const mln::box2d& bb = comp_set(c).bbox(); @@ -837,7 +862,7 @@ namespace scribo // Ignore punctuation for stats computation but not for bbox // computation. - if (holder_.components()(c).type() == component::Punctuation) + if (data_->holder_.components()(c).type() == component::Punctuation) continue; @@ -853,11 +878,11 @@ namespace scribo // (right link) (left link) // Space between characters. - if (holder_.links()(c) != c) + if (data_->holder_.links()(c) != c) { int space = bb.pmin().col() - - comp_set(holder_.links()(c)).bbox().pmax().col() - 1; + - comp_set(data_->holder_.links()(c)).bbox().pmax().col() - 1; // -- Ignore overlapped characters. if (space > 0) @@ -884,31 +909,31 @@ namespace scribo // Finalization { - tag_ = line::None; - bbox_ = bbox.to_result(); + data_->tag_ = line::None; + data_->bbox_ = bbox.to_result(); // Char space if (char_space.card() < 2) - char_space_ = 0; + data_->char_space_ = 0; else - char_space_ = char_space.to_result(); + data_->char_space_ = char_space.to_result(); // Char width if (card() == 2) - char_width_ = (comp_set(components_[0]).bbox().width() - + comp_set(components_[1]).bbox().width()) / 2; + data_->char_width_ = (comp_set(data_->components_[0]).bbox().width() + + comp_set(data_->components_[1]).bbox().width()) / 2; else - char_width_ = char_width.to_result(); + data_->char_width_ = char_width.to_result(); mln::def::coord absolute_baseline_r = baseline.to_result() + ref_line, absolute_meanline_r = meanline.to_result() + ref_line; - baseline_ = absolute_baseline_r; - meanline_ = absolute_meanline_r; - x_height_ = baseline_ - meanline_ + 1; - d_height_ = baseline_ - bbox.to_result().pmax().row(); - a_height_ = baseline_ - bbox.to_result().pmin().row() + 1; + data_->baseline_ = absolute_baseline_r; + data_->meanline_ = absolute_meanline_r; + data_->x_height_ = data_->baseline_ - data_->meanline_ + 1; + data_->d_height_ = data_->baseline_ - bbox.to_result().pmax().row(); + data_->a_height_ = data_->baseline_ - bbox.to_result().pmin().row() + 1; //FIXME // @@ -929,7 +954,7 @@ namespace scribo const line_set<L>& line_info<L>::holder() const { - return holder_; + return data_->holder_; } diff --git a/scribo/scribo/core/line_links.hh b/scribo/scribo/core/line_links.hh index 85c45e8..de62158 100644 --- a/scribo/scribo/core/line_links.hh +++ b/scribo/scribo/core/line_links.hh @@ -139,8 +139,8 @@ namespace scribo template <typename L> line_links<L>::line_links() + : data_(0) { - data_ = new data_t(); } diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 29795b2..bfa9240 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -99,6 +99,10 @@ namespace scribo /// Constructor from object groups. line_set(const object_groups<L>& groups); + + /// Constructor useful for delayed construction (loading from file). + line_set(const object_groups<L>& groups, + const mln::util::array<line_info<L> >& line_data); /// @} /// Compute line stats and fill the underlying information. @@ -155,8 +159,14 @@ namespace scribo /// @} + /// Return false if it is not initialized (built with the default + /// constructor). bool is_valid() const; + + void update_line_data_(const mln::util::array<line_info<L> >& line_data); + + private: /// Duplicate the underlying image and create a new line_set. void init_(const line_set<L>& model); @@ -233,6 +243,15 @@ namespace scribo template <typename L> + inline + line_set<L>::line_set(const object_groups<L>& groups, + const mln::util::array<line_info<L> >& line_data) + { + data_ = new internal::line_set_data<L>(line_data, groups); + } + + + template <typename L> void line_set<L>::compute_lines(const object_groups<L>& groups) { @@ -396,7 +415,15 @@ namespace scribo bool line_set<L>::is_valid() const { - return data_->links_.is_valid() && data_->groups_.is_valid(); + return data_ && data_->groups_.is_valid(); + } + + template <typename L> + inline + void + line_set<L>::update_line_data_(const mln::util::array<line_info<L> >& line_data) + { + data_->infos_ = line_data; } template <typename L> diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh index a8c623a..17f847f 100644 --- a/scribo/scribo/core/paragraph_info.hh +++ b/scribo/scribo/core/paragraph_info.hh @@ -113,6 +113,16 @@ namespace scribo } + template <typename L> + std::ostream& + operator<<(std::ostream& ostr, const paragraph_info<L>& info) + { + return ostr << "paragraph_info(" + << "line_ids=" << info.line_ids() + << ", bbox=" << info.bbox() + << ")" << std::endl; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace scribo diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 355eaa9..6597189 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -36,6 +36,25 @@ namespace scribo { + namespace internal + { + + /// Data structure for \c scribo::paragraph_set. + template <typename L> + struct paragraph_set_data + { + paragraph_set_data(); + paragraph_set_data(const line_links<L>& llines, unsigned npars); + + mln::util::array<paragraph_info<L> > pars_; + line_set<L> lines_; + line_links<L> links_; + }; + + } // end of namespace scribo::internal + + + /*! \brief Paragraph container. Paragraph ids start from 1. @@ -46,6 +65,7 @@ namespace scribo { public: paragraph_set(); + paragraph_set(internal::paragraph_set_data<L>* data); paragraph_set(const line_links<L>& llinks, unsigned npars); unsigned nelements() const; @@ -57,9 +77,10 @@ namespace scribo const line_set<L>& lines() const; + const line_links<L>& links() const; + private: - mln::util::array<paragraph_info<L> > pars_; - line_set<L> lines_; + mln::util::tracked_ptr< internal::paragraph_set_data<L> > data_; }; @@ -77,37 +98,72 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + // paragraph_set_data<L> > + + namespace internal + { + + // data< paragraph_set<L> > + + + template <typename L> + inline + paragraph_set_data<L>::paragraph_set_data() + { + } + + + template <typename L> + inline + paragraph_set_data<L>::paragraph_set_data(const line_links<L>& llinks, unsigned npars) + : pars_(npars + 1, paragraph_info<L>(llinks)), links_(llinks) + { + lines_ = llinks.lines(); + } + + } // end of namespace mln::internal + + template <typename L> paragraph_set<L>::paragraph_set() + : data_(0) { } template <typename L> + paragraph_set<L>::paragraph_set(internal::paragraph_set_data<L>* data) + { + data_ = data; + } + + template <typename L> paragraph_set<L>::paragraph_set(const line_links<L>& llinks, unsigned npars) - : pars_(npars + 1, paragraph_info<L>(llinks)) { - lines_ = llinks.lines(); + data_ = new internal::paragraph_set_data<L>(llinks, npars); } template <typename L> unsigned paragraph_set<L>::nelements() const { - return pars_.nelements() - 1; + mln_precondition(data_ != 0); + return data_->pars_.nelements() - 1; } template <typename L> paragraph_info<L>& paragraph_set<L>::operator()(unsigned i) { - return pars_[i]; + mln_precondition(data_ != 0); + return data_->pars_[i]; } template <typename L> const paragraph_info<L>& paragraph_set<L>::operator()(unsigned i) const { - return pars_[i]; + mln_precondition(data_ != 0); + return data_->pars_[i]; } @@ -115,7 +171,7 @@ namespace scribo bool paragraph_set<L>::is_valid() const { - return !pars_.is_empty(); + return data_ && !data_->pars_.is_empty(); } @@ -123,7 +179,17 @@ namespace scribo const line_set<L>& paragraph_set<L>::lines() const { - return lines_; + mln_precondition(data_ != 0); + return data_->lines_; + } + + + template <typename L> + const line_links<L>& + paragraph_set<L>::links() const + { + mln_precondition(data_ != 0); + return data_->links_; } -- 1.5.6.5

1 0

last-svn-commit-769-g77429c3 Rename files in Scribo.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* scribo/primitive/extract/elements.hh, * src/primitive/extract/extract_discontinued_hlines.cc, * src/primitive/extract/extract_discontinued_lines.cc, * src/primitive/extract/extract_discontinued_vlines.cc, * src/primitive/extract/extract_thick_hlines.cc, * src/primitive/extract/extract_thick_vlines.cc: Rename to... * scribo/primitive/extract/non_text.hh, * src/primitive/extract/discontinued_hlines.cc, * src/primitive/extract/discontinued_lines.cc, * src/primitive/extract/discontinued_vlines.cc, * src/primitive/extract/thick_hlines.cc, * src/primitive/extract/thick_vlines.cc: ... this. * scribo/toolchain/internal/content_in_doc_functor.hh: Rename function call from extract::elements to extract_non_text. * src/primitive/extract/Makefile.am: Update target names. --- scribo/ChangeLog | 23 +++++++ .../primitive/extract/{elements.hh => non_text.hh} | 64 +++++++++++--------- .../toolchain/internal/content_in_doc_functor.hh | 2 +- scribo/src/primitive/extract/Makefile.am | 26 ++++---- ...scontinued_hlines.cc => discontinued_hlines.cc} | 0 ...discontinued_lines.cc => discontinued_lines.cc} | 0 ...scontinued_vlines.cc => discontinued_vlines.cc} | 0 .../{extract_thick_hlines.cc => thick_hlines.cc} | 0 .../{extract_thick_vlines.cc => thick_vlines.cc} | 0 9 files changed, 73 insertions(+), 42 deletions(-) rename scribo/scribo/primitive/extract/{elements.hh => non_text.hh} (82%) rename scribo/src/primitive/extract/{extract_discontinued_hlines.cc => discontinued_hlines.cc} (100%) rename scribo/src/primitive/extract/{extract_discontinued_lines.cc => discontinued_lines.cc} (100%) rename scribo/src/primitive/extract/{extract_discontinued_vlines.cc => discontinued_vlines.cc} (100%) rename scribo/src/primitive/extract/{extract_thick_hlines.cc => thick_hlines.cc} (100%) rename scribo/src/primitive/extract/{extract_thick_vlines.cc => thick_vlines.cc} (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9cbfca1..e08f2fd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,28 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename files in Scribo. + + * scribo/primitive/extract/elements.hh, + * src/primitive/extract/extract_discontinued_hlines.cc, + * src/primitive/extract/extract_discontinued_lines.cc, + * src/primitive/extract/extract_discontinued_vlines.cc, + * src/primitive/extract/extract_thick_hlines.cc, + * src/primitive/extract/extract_thick_vlines.cc: Rename to... + + * scribo/primitive/extract/non_text.hh, + * src/primitive/extract/discontinued_hlines.cc, + * src/primitive/extract/discontinued_lines.cc, + * src/primitive/extract/discontinued_vlines.cc, + * src/primitive/extract/thick_hlines.cc, + * src/primitive/extract/thick_vlines.cc: ... this. + + * scribo/toolchain/internal/content_in_doc_functor.hh: Rename + function call from extract::elements to extract_non_text. + + * src/primitive/extract/Makefile.am: Update target names. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add Base64 conversion routines. * scribo/scribo/convert/from_base64.hh, diff --git a/scribo/scribo/primitive/extract/elements.hh b/scribo/scribo/primitive/extract/non_text.hh similarity index 82% rename from scribo/scribo/primitive/extract/elements.hh rename to scribo/scribo/primitive/extract/non_text.hh index ddf2c92..a017f1f 100644 --- a/scribo/scribo/primitive/extract/elements.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -26,12 +26,12 @@ /// \file /// -/// \brief Find in a document elements which are not text. +/// \brief Find in a document non text which are not text. /// /// \fixme To be optimized! -#ifndef SCRIBO_PRIMITIVE_EXTRACT_ELEMENTS_HH -# define SCRIBO_PRIMITIVE_EXTRACT_ELEMENTS_HH +#ifndef SCRIBO_PRIMITIVE_EXTRACT_NON_TEXT_HH +# define SCRIBO_PRIMITIVE_EXTRACT_NON_TEXT_HH # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> @@ -58,6 +58,10 @@ # include <mln/clustering/kmean_rgb.hh> # include <mln/fun/v2v/rgb8_to_rgbn.hh> +# include <mln/util/timer.hh> + +# include <mln/io/pbm/save.hh> + namespace scribo { @@ -72,7 +76,7 @@ namespace scribo template <typename L, typename I> component_set<L> - elements(const document<L>& doc, const Image& input); + non_text(const document<L>& doc, const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -107,9 +111,9 @@ namespace scribo template <typename L, typename I> component_set<L> - elements(const document<L>& doc, const Image& input_) + non_text(const document<L>& doc, const Image& input_) { - trace::entering("scribo::primitive::extract::elements"); + trace::entering("scribo::primitive::extract::non_text"); const I& input = exact(input_); mln_precondition(doc.is_valid()); @@ -135,9 +139,16 @@ namespace scribo image2d<t_rgb5> img_rgb5 = mln::data::transform(doc.image(), t_rgb8_to_rgb5()); + // DEBUG + io::pbm::save(content, "text_area.pbm"); + + mln::util::timer t; + t.start(); img_lbl8 = mln::clustering::kmean_rgb<double,5>((img_rgb5 | pw::value(content)), 3, 10, 10).unmorph_(); data::fill((img_lbl8 | !pw::value(content)).rw(), 0u); + t.stop(); + std::cout << t << std::endl; mln::util::array<unsigned> card = mln::labeling::compute(accu::math::count<value::label_8>(), @@ -162,15 +173,25 @@ namespace scribo std::cout << "Removing small elements" << std::endl; { - image2d<bool> elts; - initialize(elts, img_lbl8); - data::fill(elts, false); - data::fill((elts | (pw::value(img_lbl8) != pw::cst(0))).rw(), true); + image2d<bool> elts; + initialize(elts, img_lbl8); + data::fill(elts, false); + data::fill((elts | (pw::value(img_lbl8) != pw::cst(0))).rw(), true); + + // DEBUG + data::fill((elts | (pw::value(doc.line_seps()) != pw::cst(0))).rw(), + false); + // END OF DEBUG + - scribo::def::lbl_type nlabels; - elts = filter::components_small(elts, c8(), nlabels, 40); + scribo::def::lbl_type nlabels; + elts = filter::components_small(elts, c8(), nlabels, 40); - output = primitive::extract::components(elts, c8(), nlabels); + // DEBUG + io::pbm::save(elts, "elements.pbm"); + // END OF DEBUG + + output = primitive::extract::components(elts, c8(), nlabels); } @@ -207,20 +228,7 @@ namespace scribo } } -// mln::io::pbm::save(merged_elts, "merged_elts.pbm"); - -// mln::util::array<image2d<value::rgb8> > elt_ima; -// unsigned i = 0; -// for_all_comps(c, elt_comp) -// if (elt_comp(c).is_valid()) -// { -// elt_ima.append(preprocessing::crop(doc.image(), elt_comp(c).bbox())); -// mln::io::ppm::save(elt_ima(i), mln::debug::filename("elt.ppm", i)); -// ++i; -// } - - - trace::exiting("scribo::primitive::extract::elements"); + trace::exiting("scribo::primitive::extract::non_text"); return output; } @@ -233,4 +241,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_PRIMITIVE_EXTRACT_ELEMENTS_HH +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_NON_TEXT_HH diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index b8aa56d..ed691e8 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -463,7 +463,7 @@ namespace scribo // Extract other Elements on_new_progress_label("Extracting Elements"); component_set<L> - elements = scribo::primitive::extract::elements(doc, original_image); + elements = scribo::primitive::extract::non_text(doc, original_image); on_progress(); diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 2c8188e..a46cd68 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -18,17 +18,17 @@ include $(top_srcdir)/scribo/scribo.mk -noinst_PROGRAMS = \ - extract_discontinued_lines \ - extract_discontinued_vlines \ - extract_discontinued_hlines \ - extract_thick_vlines \ - extract_thick_hlines \ +noinst_PROGRAMS = \ + discontinued_lines \ + discontinued_vlines \ + discontinued_hlines \ + thick_vlines \ + thick_hlines \ lines_pattern -extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc -extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc -extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc -extract_thick_vlines_SOURCES = extract_thick_vlines.cc -extract_thick_hlines_SOURCES = extract_thick_hlines.cc +discontinued_lines_SOURCES = discontinued_lines.cc +discontinued_vlines_SOURCES = discontinued_vlines.cc +discontinued_hlines_SOURCES = discontinued_hlines.cc +thick_vlines_SOURCES = thick_vlines.cc +thick_hlines_SOURCES = thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc diff --git a/scribo/src/primitive/extract/extract_discontinued_hlines.cc b/scribo/src/primitive/extract/discontinued_hlines.cc similarity index 100% rename from scribo/src/primitive/extract/extract_discontinued_hlines.cc rename to scribo/src/primitive/extract/discontinued_hlines.cc diff --git a/scribo/src/primitive/extract/extract_discontinued_lines.cc b/scribo/src/primitive/extract/discontinued_lines.cc similarity index 100% rename from scribo/src/primitive/extract/extract_discontinued_lines.cc rename to scribo/src/primitive/extract/discontinued_lines.cc diff --git a/scribo/src/primitive/extract/extract_discontinued_vlines.cc b/scribo/src/primitive/extract/discontinued_vlines.cc similarity index 100% rename from scribo/src/primitive/extract/extract_discontinued_vlines.cc rename to scribo/src/primitive/extract/discontinued_vlines.cc diff --git a/scribo/src/primitive/extract/extract_thick_hlines.cc b/scribo/src/primitive/extract/thick_hlines.cc similarity index 100% rename from scribo/src/primitive/extract/extract_thick_hlines.cc rename to scribo/src/primitive/extract/thick_hlines.cc diff --git a/scribo/src/primitive/extract/extract_thick_vlines.cc b/scribo/src/primitive/extract/thick_vlines.cc similarity index 100% rename from scribo/src/primitive/extract/extract_thick_vlines.cc rename to scribo/src/primitive/extract/thick_vlines.cc -- 1.5.6.5

1 0

last-svn-commit-768-g8f266e9 mln/util/array.hh: Add last() method.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

--- milena/ChangeLog | 4 ++++ milena/mln/util/array.hh | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e03d35c..c4bed2c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/util/array.hh: Add last() method. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an optional base index for debug::iota. * mln/debug/iota.hh, diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index 0fe34e7..c7febfe 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -187,6 +187,11 @@ namespace mln /// \pre i < nelements() mutable_result operator[](unsigned i); + /// \brief Return the last element. + ro_result last() const; + + /// \brief Return the last element. + mutable_result last(); /// Empty the array. All elements contained in the array are /// destroyed. \post is_empty() == true @@ -553,6 +558,22 @@ namespace mln template <typename T> inline + typename array<T>::ro_result + array<T>::last() const + { + return v_[nelements() - 1]; + } + + template <typename T> + inline + typename array<T>::mutable_result + array<T>::last() + { + return v_[nelements() - 1]; + } + + template <typename T> + inline bool array<T>::is_empty() const { -- 1.5.6.5

1 0

last-svn-commit-767-g5dbed1a Add an optional base index for debug::iota.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

* mln/debug/iota.hh, * mln/debug/iota.spe.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/debug/iota.hh | 22 +++++++++++++++++----- milena/mln/debug/iota.spe.hh | 9 +++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7a28158..e03d35c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add an optional base index for debug::iota. + + * mln/debug/iota.hh, + * mln/debug/iota.spe.hh: Here. + 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/convert/to_qimage_nocopy.cc: Fix a warning. diff --git a/milena/mln/debug/iota.hh b/milena/mln/debug/iota.hh index cfc3ae9..3e569b9 100644 --- a/milena/mln/debug/iota.hh +++ b/milena/mln/debug/iota.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,7 +50,7 @@ namespace mln * assigned. */ template <typename I> - void iota(Image& input); + void iota(Image& input, unsigned base_index); # ifndef MLN_INCLUDE_ONLY @@ -60,9 +61,9 @@ namespace mln template <typename I> inline void - iota(trait::image::speed::any, I& input) + iota(trait::image::speed::any, I& input, unsigned base_index) { - unsigned i = 0; + unsigned i = base_index; mln_piter(I) p(input.domain()); for_all(p) input(p) = ++i % mln_max(mln_value(I)); @@ -71,17 +72,28 @@ namespace mln } // end of namespace mln::debug::impl + template <typename I> inline void iota(Image& input) { + iota(input, 0); + } + + + template <typename I> + inline + void + iota(Image& input, unsigned base_index) + { trace::entering("debug::iota"); mln_precondition(exact(input).is_valid()); - impl::iota(mln_trait_image_speed(I)(), exact(input)); + impl::iota(mln_trait_image_speed(I)(), exact(input), base_index); trace::exiting("debug::iota"); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::debug diff --git a/milena/mln/debug/iota.spe.hh b/milena/mln/debug/iota.spe.hh index 9a22bca..37e17d9 100644 --- a/milena/mln/debug/iota.spe.hh +++ b/milena/mln/debug/iota.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -48,16 +49,16 @@ namespace mln { template <typename I> - void iota(trait::image::speed::fastest, I& input); + void iota(trait::image::speed::fastest, I& input, unsigned base_index); # ifndef MLN_INCLUDE_ONLY template <typename I> inline void - iota(trait::image::speed::fastest, I& input) + iota(trait::image::speed::fastest, I& input, unsigned base_index) { - unsigned i = 0; + unsigned i = base_index; mln_pixter(I) p(input); for_all(p) p.val() = static_cast<mln_value(I)>(++i % mln_max(mln_value(I))); -- 1.5.6.5

1 0

last-svn-commit-766-g959710d configure.ac: configure scribo/tests/convert.
by Guillaume Lazzara 28 Mar '11

28 Mar '11

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3eb76e4..9fedefa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: configure scribo/tests/convert. + 2011-03-14 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr> * milena/mln/labeling/regional_maxima.hh diff --git a/configure.ac b/configure.ac index d22f65f..e30f010 100644 --- a/configure.ac +++ b/configure.ac @@ -343,6 +343,7 @@ AC_CONFIG_FILES([scribo/tests/data.hh]) AC_CONFIG_FILES([ scribo/tests/Makefile scribo/tests/binarization/Makefile + scribo/tests/convert/Makefile scribo/tests/core/Makefile scribo/tests/filter/Makefile scribo/tests/preprocessing/Makefile -- 1.5.6.5

1 0