Olena-patches March 2011

olena-patches@lrde.epita.fr

7 participants
277 discussions

last-svn-commit-763-g12c45b0 Deactivate erroneous assertion in regional_maxima.hh.

by Thierry Geraud

--- ChangeLog | 6 ++++++ milena/mln/labeling/regional_maxima.hh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 686b84a..3eb76e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-14 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr> + + * milena/mln/labeling/regional_maxima.hh + (do_no_union_): Deactivate assertion since it is + not verified for all cases. + 2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Make Boost dependency optional. diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index a3c12eb..861066f 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -97,8 +97,8 @@ namespace mln bool labels_(unsigned p) const { return attr.element(p); } bool equiv_(unsigned n, unsigned p) const { return input.element(n) == input.element(p); } - void do_no_union_(unsigned n, unsigned p) { mln_invariant(input.element(n) > - input.element(p)); + void do_no_union_(unsigned n, unsigned p) { // mln_invariant(input.element(n) > + // input.element(p)); attr.element(p) = false; (void) n; } -- 1.5.6.5

13 years, 9 months

last-svn-commit-757-gc4bfdc8 Deactivate erroneous assertion in regional_maxima.hh.

by Thierry Geraud

13 years, 9 months

last-svn-commit-802-g742d012 Spread anchor value to more methods in link functors.

by Guillaume Lazzara

* scribo/primitive/link/internal/find_link.hh, * scribo/primitive/link/internal/link_functor_base.hh, * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. --- scribo/ChangeLog | 8 +++++ scribo/scribo/primitive/link/internal/find_link.hh | 5 ++- .../primitive/link/internal/link_functor_base.hh | 31 +++++++++++++------- .../link/internal/link_single_dmax_ratio_base.hh | 7 +++- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1e9b57e..10a8269 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Spread anchor value to more methods in link functors. + + * scribo/primitive/link/internal/find_link.hh, + * scribo/primitive/link/internal/link_functor_base.hh, + * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. * scribo/debug/logger.hh: New. diff --git a/scribo/scribo/primitive/link/internal/find_link.hh b/scribo/scribo/primitive/link/internal/find_link.hh index dd0b308..7220b0c 100644 --- a/scribo/scribo/primitive/link/internal/find_link.hh +++ b/scribo/scribo/primitive/link/internal/find_link.hh @@ -87,10 +87,11 @@ namespace scribo while (functor.components().labeled_image().domain().has(p) && ! functor.is_potential_link(current_object, start_point, p) - && functor.verify_link_criterion(current_object, start_point, p)) + && functor.verify_link_criterion(current_object, start_point, + p, anchor)) functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh index ad3d71b..d214c91 100644 --- a/scribo/scribo/primitive/link/internal/link_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/link_functor_base.hh @@ -88,13 +88,15 @@ namespace scribo bool verify_link_criterion(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool is_potential_link(unsigned current_object, const P& start_point, const P& p) const; bool valid_link(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); @@ -147,10 +149,12 @@ namespace scribo const P& start_point, const P& p) const; bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool valid_link_(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); void validate_link_(unsigned current_object, const P& start_point, const P& p, @@ -263,14 +267,15 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { return // Do not link with separators... ! this->components_.separators()(p) // ... and perform custom checks. && exact(this)->verify_link_criterion_(current_object, - start_point, p); + start_point, p, anchor); } template <typename L, typename E> @@ -278,10 +283,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return this->labeled_image_.domain().has(p) - && exact(this)->valid_link_(current_object, start_point, p); + && exact(this)->valid_link_(current_object, start_point, p, anchor); } @@ -428,11 +434,13 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; (void) start_point; (void) p; + (void) anchor; // No-Op return true; } @@ -443,10 +451,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link_(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return is_potential_link(current_object, start_point, p) - && verify_link_criterion(current_object, start_point, p); + && verify_link_criterion(current_object, start_point, p, anchor); } diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh index d3aba42..3abe663 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh @@ -86,7 +86,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; mln_site(L) start_point_(unsigned current_object, anchor::Type anchor); @@ -123,9 +124,11 @@ namespace scribo link_single_dmax_ratio_base<L, F, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

13 years, 9 months

last-svn-commit-801-g1d1a977 Spread anchor value to more methods in link functors.

by Guillaume Lazzara

* scribo/primitive/link/internal/find_link.hh, * scribo/primitive/link/internal/link_functor_base.hh, * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. --- scribo/ChangeLog | 8 +++++ scribo/scribo/primitive/link/internal/find_link.hh | 5 ++- .../primitive/link/internal/link_functor_base.hh | 31 +++++++++++++------- .../link/internal/link_single_dmax_ratio_base.hh | 7 +++- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd7b036..fc78930 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Spread anchor value to more methods in link functors. + + * scribo/primitive/link/internal/find_link.hh, + * scribo/primitive/link/internal/link_functor_base.hh, + * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. * scribo/debug/logger.hh: New. diff --git a/scribo/scribo/primitive/link/internal/find_link.hh b/scribo/scribo/primitive/link/internal/find_link.hh index dd0b308..7220b0c 100644 --- a/scribo/scribo/primitive/link/internal/find_link.hh +++ b/scribo/scribo/primitive/link/internal/find_link.hh @@ -87,10 +87,11 @@ namespace scribo while (functor.components().labeled_image().domain().has(p) && ! functor.is_potential_link(current_object, start_point, p) - && functor.verify_link_criterion(current_object, start_point, p)) + && functor.verify_link_criterion(current_object, start_point, + p, anchor)) functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh index ad3d71b..d214c91 100644 --- a/scribo/scribo/primitive/link/internal/link_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/link_functor_base.hh @@ -88,13 +88,15 @@ namespace scribo bool verify_link_criterion(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool is_potential_link(unsigned current_object, const P& start_point, const P& p) const; bool valid_link(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); @@ -147,10 +149,12 @@ namespace scribo const P& start_point, const P& p) const; bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool valid_link_(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); void validate_link_(unsigned current_object, const P& start_point, const P& p, @@ -263,14 +267,15 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { return // Do not link with separators... ! this->components_.separators()(p) // ... and perform custom checks. && exact(this)->verify_link_criterion_(current_object, - start_point, p); + start_point, p, anchor); } template <typename L, typename E> @@ -278,10 +283,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return this->labeled_image_.domain().has(p) - && exact(this)->valid_link_(current_object, start_point, p); + && exact(this)->valid_link_(current_object, start_point, p, anchor); } @@ -428,11 +434,13 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; (void) start_point; (void) p; + (void) anchor; // No-Op return true; } @@ -443,10 +451,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link_(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return is_potential_link(current_object, start_point, p) - && verify_link_criterion(current_object, start_point, p); + && verify_link_criterion(current_object, start_point, p, anchor); } diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh index d3aba42..3abe663 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh @@ -86,7 +86,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; mln_site(L) start_point_(unsigned current_object, anchor::Type anchor); @@ -123,9 +124,11 @@ namespace scribo link_single_dmax_ratio_base<L, F, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

13 years, 9 months

last-svn-commit-801-g1a5cc61 Spread anchor value to more methods in link functors.

by Guillaume Lazzara

* scribo/primitive/link/internal/find_link.hh, * scribo/primitive/link/internal/link_functor_base.hh, * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. --- scribo/ChangeLog | 8 +++++ scribo/scribo/primitive/link/internal/find_link.hh | 5 ++- .../primitive/link/internal/link_functor_base.hh | 31 +++++++++++++------- .../link/internal/link_single_dmax_ratio_base.hh | 7 +++- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd7b036..fc78930 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Spread anchor value to more methods in link functors. + + * scribo/primitive/link/internal/find_link.hh, + * scribo/primitive/link/internal/link_functor_base.hh, + * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. * scribo/debug/logger.hh: New. diff --git a/scribo/scribo/primitive/link/internal/find_link.hh b/scribo/scribo/primitive/link/internal/find_link.hh index dd0b308..7220b0c 100644 --- a/scribo/scribo/primitive/link/internal/find_link.hh +++ b/scribo/scribo/primitive/link/internal/find_link.hh @@ -87,10 +87,11 @@ namespace scribo while (functor.components().labeled_image().domain().has(p) && ! functor.is_potential_link(current_object, start_point, p) - && functor.verify_link_criterion(current_object, start_point, p)) + && functor.verify_link_criterion(current_object, start_point, + p, anchor)) functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh index ad3d71b..d214c91 100644 --- a/scribo/scribo/primitive/link/internal/link_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/link_functor_base.hh @@ -88,13 +88,15 @@ namespace scribo bool verify_link_criterion(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool is_potential_link(unsigned current_object, const P& start_point, const P& p) const; bool valid_link(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); @@ -147,10 +149,12 @@ namespace scribo const P& start_point, const P& p) const; bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; bool valid_link_(unsigned current_object, - const P& start_point, const P& p); + const P& start_point, const P& p, + anchor::Type anchor); void validate_link_(unsigned current_object, const P& start_point, const P& p, @@ -263,14 +267,15 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { return // Do not link with separators... ! this->components_.separators()(p) // ... and perform custom checks. && exact(this)->verify_link_criterion_(current_object, - start_point, p); + start_point, p, anchor); } template <typename L, typename E> @@ -278,10 +283,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return this->labeled_image_.domain().has(p) - && exact(this)->valid_link_(current_object, start_point, p); + && exact(this)->valid_link_(current_object, start_point, p, anchor); } @@ -428,11 +434,13 @@ namespace scribo bool link_functor_base<L,E>::verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; (void) start_point; (void) p; + (void) anchor; // No-Op return true; } @@ -443,10 +451,11 @@ namespace scribo bool link_functor_base<L,E>::valid_link_(unsigned current_object, const P& start_point, - const P& p) + const P& p, + anchor::Type anchor) { return is_potential_link(current_object, start_point, p) - && verify_link_criterion(current_object, start_point, p); + && verify_link_criterion(current_object, start_point, p, anchor); } diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh index d3aba42..3abe663 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh @@ -86,7 +86,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; mln_site(L) start_point_(unsigned current_object, anchor::Type anchor); @@ -123,9 +124,11 @@ namespace scribo link_single_dmax_ratio_base<L, F, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

13 years, 9 months

last-svn-commit-800-g303e38d Introduce a logger class.

by Guillaume Lazzara

* scribo/debug/logger.hh: New. --- scribo/ChangeLog | 6 + scribo/scribo/debug/logger.hh | 293 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/debug/logger.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d28a95b..a377ba0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. + + * scribo/debug/logger.hh: New. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce new anchors. * scribo/core/tag/anchor.hh: New anchors. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh new file mode 100644 index 0000000..d955f08 --- /dev/null +++ b/scribo/scribo/debug/logger.hh @@ -0,0 +1,293 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_LOGGER_HH +# define SCRIBO_CORE_LOGGER_HH + +# include <mln/core/concept/image.hh> +# include <mln/data/wrap.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/filename.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/ppm/save.hh> + +namespace scribo +{ + + namespace debug + { + + enum Level + { + None = 0, + Special, // Reserved + Results, + AuxiliaryResults, + All + }; + + + namespace internal + { + using namespace mln; + + class logger_ + { + public: + static logger_& instance(); + + bool is_enabled() const; + bool is_at_level(Level level) const; + + void set_level(Level level); + Level level() const; + + void set_filename_prefix(const char *name); + const char *filename_prefix() const; + + template <typename I> + void log_image(Level dbg_level, + const Image& ima, const char *name); + + private: // Methods + logger_(); + logger_(const logger_&); + + template <unsigned n, typename I> + void log_image_dispatch(const value::int_u<n>&, + const Image& ima, const char *name); + + template <unsigned n, typename I> + void + log_image_dispatch(const value::label<n>&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const mln_value(I)&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const value::rgb8&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const bool&, + const Image& ima, const char *name); + + template <typename I> + void log_image_rgb(const I& ima, const std::string& name); + + template <typename I> + void log_image_bool(const I& ima, const std::string& name); + + template <typename I> + void log_image_grayscale(const I& ima, const std::string& name); + + private: // Attributes + Level level_; + + }; + + } // end of namespace scribo::debug::internal + + + // Return a reference to the logger. + scribo::debug::internal::logger_& logger(); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + inline + logger_& + logger_::instance() + { + static logger_ log; + return log; + } + + + inline + logger_::logger_() + : level_(None) + { + // Magick::InitializeMagick(0); + } + + + inline + logger_::logger_(const logger_&) + { + abort(); + } + + + inline + bool + logger_::is_enabled() const + { + return level_ != None; + } + + + inline + bool + logger_::is_at_level(Level level) const + { + return level_ >= level; + } + + + inline + void + logger_::set_filename_prefix(const char *name) + { + mln::debug::internal::filename_prefix = name; + } + + + inline + const char * + logger_::filename_prefix() const + { + return mln::debug::internal::filename_prefix.c_str(); + } + + + inline + void logger_::set_level(Level level) + { + level_ = level; + } + + + inline + Level logger_::level() const + { + return level_; + } + + + template <typename I> + void + logger_::log_image(Level dbg_level, + const Image& ima, const char *name) + { +# ifndef SCRIBO_NDEBUG + if (level_ < dbg_level) + return; + + std::cerr << "Logger - Saving image " << name << std::endl; + mln_assertion(exact(ima).is_valid()); + + typedef mln_value(I) V; + log_image_dispatch(V(), ima, name); +# endif // ! SCRIBO_NDEBUG + } + + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::int_u<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::label<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + + template <typename I> + void + logger_::log_image_dispatch(const value::rgb8&, const Image& ima, const char *name) + { + log_image_rgb(exact(ima), name); + } + + template <typename I> + void + logger_::log_image_dispatch(const bool&, const Image& ima, const char *name) + { + log_image_bool(exact(ima), name); + } + + + // template <typename I> + // void + // logger_::log_image_generic(const I& ima, const std::string& name) + // { + // io::magick::save(ima, mln::debug::filename(name + ".png")); + // } + + template <typename I> + void + logger_::log_image_rgb(const I& ima, const std::string& name) + { + io::ppm::save(ima, mln::debug::filename(name + ".ppm")); + } + + + template <typename I> + void + logger_::log_image_bool(const I& ima, const std::string& name) + { + io::pbm::save(ima, mln::debug::filename(name + ".pbm")); + } + + + template <typename I> + void + logger_::log_image_grayscale(const I& ima, const std::string& name) + { + io::pgm::save(data::wrap(value::int_u8(), ima), + mln::debug::filename(name + ".pgm")); + } + + } // end of namespace scribo::debug::internal + + + inline + scribo::debug::internal::logger_& + logger() + { + return scribo::debug::internal::logger_::instance(); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::debug + +} // end of namespace scribo + +#endif // ! SCRIBO_CORE_LOGGER_HH -- 1.5.6.5

13 years, 9 months

last-svn-commit-799-gfe898e7 Introduce a logger class.

by Guillaume Lazzara

* scribo/debug/logger.hh: New. --- scribo/ChangeLog | 6 + scribo/scribo/debug/logger.hh | 293 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/debug/logger.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 58685f6..50c49e7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. + + * scribo/debug/logger.hh: New. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce new anchors. * scribo/core/tag/anchor.hh: New anchors. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh new file mode 100644 index 0000000..d955f08 --- /dev/null +++ b/scribo/scribo/debug/logger.hh @@ -0,0 +1,293 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_LOGGER_HH +# define SCRIBO_CORE_LOGGER_HH + +# include <mln/core/concept/image.hh> +# include <mln/data/wrap.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/filename.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/ppm/save.hh> + +namespace scribo +{ + + namespace debug + { + + enum Level + { + None = 0, + Special, // Reserved + Results, + AuxiliaryResults, + All + }; + + + namespace internal + { + using namespace mln; + + class logger_ + { + public: + static logger_& instance(); + + bool is_enabled() const; + bool is_at_level(Level level) const; + + void set_level(Level level); + Level level() const; + + void set_filename_prefix(const char *name); + const char *filename_prefix() const; + + template <typename I> + void log_image(Level dbg_level, + const Image& ima, const char *name); + + private: // Methods + logger_(); + logger_(const logger_&); + + template <unsigned n, typename I> + void log_image_dispatch(const value::int_u<n>&, + const Image& ima, const char *name); + + template <unsigned n, typename I> + void + log_image_dispatch(const value::label<n>&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const mln_value(I)&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const value::rgb8&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const bool&, + const Image& ima, const char *name); + + template <typename I> + void log_image_rgb(const I& ima, const std::string& name); + + template <typename I> + void log_image_bool(const I& ima, const std::string& name); + + template <typename I> + void log_image_grayscale(const I& ima, const std::string& name); + + private: // Attributes + Level level_; + + }; + + } // end of namespace scribo::debug::internal + + + // Return a reference to the logger. + scribo::debug::internal::logger_& logger(); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + inline + logger_& + logger_::instance() + { + static logger_ log; + return log; + } + + + inline + logger_::logger_() + : level_(None) + { + // Magick::InitializeMagick(0); + } + + + inline + logger_::logger_(const logger_&) + { + abort(); + } + + + inline + bool + logger_::is_enabled() const + { + return level_ != None; + } + + + inline + bool + logger_::is_at_level(Level level) const + { + return level_ >= level; + } + + + inline + void + logger_::set_filename_prefix(const char *name) + { + mln::debug::internal::filename_prefix = name; + } + + + inline + const char * + logger_::filename_prefix() const + { + return mln::debug::internal::filename_prefix.c_str(); + } + + + inline + void logger_::set_level(Level level) + { + level_ = level; + } + + + inline + Level logger_::level() const + { + return level_; + } + + + template <typename I> + void + logger_::log_image(Level dbg_level, + const Image& ima, const char *name) + { +# ifndef SCRIBO_NDEBUG + if (level_ < dbg_level) + return; + + std::cerr << "Logger - Saving image " << name << std::endl; + mln_assertion(exact(ima).is_valid()); + + typedef mln_value(I) V; + log_image_dispatch(V(), ima, name); +# endif // ! SCRIBO_NDEBUG + } + + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::int_u<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::label<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + + template <typename I> + void + logger_::log_image_dispatch(const value::rgb8&, const Image& ima, const char *name) + { + log_image_rgb(exact(ima), name); + } + + template <typename I> + void + logger_::log_image_dispatch(const bool&, const Image& ima, const char *name) + { + log_image_bool(exact(ima), name); + } + + + // template <typename I> + // void + // logger_::log_image_generic(const I& ima, const std::string& name) + // { + // io::magick::save(ima, mln::debug::filename(name + ".png")); + // } + + template <typename I> + void + logger_::log_image_rgb(const I& ima, const std::string& name) + { + io::ppm::save(ima, mln::debug::filename(name + ".ppm")); + } + + + template <typename I> + void + logger_::log_image_bool(const I& ima, const std::string& name) + { + io::pbm::save(ima, mln::debug::filename(name + ".pbm")); + } + + + template <typename I> + void + logger_::log_image_grayscale(const I& ima, const std::string& name) + { + io::pgm::save(data::wrap(value::int_u8(), ima), + mln::debug::filename(name + ".pgm")); + } + + } // end of namespace scribo::debug::internal + + + inline + scribo::debug::internal::logger_& + logger() + { + return scribo::debug::internal::logger_::instance(); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::debug + +} // end of namespace scribo + +#endif // ! SCRIBO_CORE_LOGGER_HH -- 1.5.6.5

13 years, 9 months

last-svn-commit-799-g3f06d28 Introduce a logger class.

by Guillaume Lazzara

* scribo/debug/logger.hh: New. --- scribo/ChangeLog | 6 + scribo/scribo/debug/logger.hh | 293 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/debug/logger.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 58685f6..50c49e7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce a logger class. + + * scribo/debug/logger.hh: New. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce new anchors. * scribo/core/tag/anchor.hh: New anchors. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh new file mode 100644 index 0000000..d955f08 --- /dev/null +++ b/scribo/scribo/debug/logger.hh @@ -0,0 +1,293 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_LOGGER_HH +# define SCRIBO_CORE_LOGGER_HH + +# include <mln/core/concept/image.hh> +# include <mln/data/wrap.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/filename.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/ppm/save.hh> + +namespace scribo +{ + + namespace debug + { + + enum Level + { + None = 0, + Special, // Reserved + Results, + AuxiliaryResults, + All + }; + + + namespace internal + { + using namespace mln; + + class logger_ + { + public: + static logger_& instance(); + + bool is_enabled() const; + bool is_at_level(Level level) const; + + void set_level(Level level); + Level level() const; + + void set_filename_prefix(const char *name); + const char *filename_prefix() const; + + template <typename I> + void log_image(Level dbg_level, + const Image& ima, const char *name); + + private: // Methods + logger_(); + logger_(const logger_&); + + template <unsigned n, typename I> + void log_image_dispatch(const value::int_u<n>&, + const Image& ima, const char *name); + + template <unsigned n, typename I> + void + log_image_dispatch(const value::label<n>&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const mln_value(I)&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const value::rgb8&, + const Image& ima, const char *name); + + template <typename I> + void log_image_dispatch(const bool&, + const Image& ima, const char *name); + + template <typename I> + void log_image_rgb(const I& ima, const std::string& name); + + template <typename I> + void log_image_bool(const I& ima, const std::string& name); + + template <typename I> + void log_image_grayscale(const I& ima, const std::string& name); + + private: // Attributes + Level level_; + + }; + + } // end of namespace scribo::debug::internal + + + // Return a reference to the logger. + scribo::debug::internal::logger_& logger(); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + inline + logger_& + logger_::instance() + { + static logger_ log; + return log; + } + + + inline + logger_::logger_() + : level_(None) + { + // Magick::InitializeMagick(0); + } + + + inline + logger_::logger_(const logger_&) + { + abort(); + } + + + inline + bool + logger_::is_enabled() const + { + return level_ != None; + } + + + inline + bool + logger_::is_at_level(Level level) const + { + return level_ >= level; + } + + + inline + void + logger_::set_filename_prefix(const char *name) + { + mln::debug::internal::filename_prefix = name; + } + + + inline + const char * + logger_::filename_prefix() const + { + return mln::debug::internal::filename_prefix.c_str(); + } + + + inline + void logger_::set_level(Level level) + { + level_ = level; + } + + + inline + Level logger_::level() const + { + return level_; + } + + + template <typename I> + void + logger_::log_image(Level dbg_level, + const Image& ima, const char *name) + { +# ifndef SCRIBO_NDEBUG + if (level_ < dbg_level) + return; + + std::cerr << "Logger - Saving image " << name << std::endl; + mln_assertion(exact(ima).is_valid()); + + typedef mln_value(I) V; + log_image_dispatch(V(), ima, name); +# endif // ! SCRIBO_NDEBUG + } + + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::int_u<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + template <unsigned n, typename I> + void + logger_::log_image_dispatch(const value::label<n>&, const Image& ima, const char *name) + { + log_image_grayscale(exact(ima), name); + } + + + template <typename I> + void + logger_::log_image_dispatch(const value::rgb8&, const Image& ima, const char *name) + { + log_image_rgb(exact(ima), name); + } + + template <typename I> + void + logger_::log_image_dispatch(const bool&, const Image& ima, const char *name) + { + log_image_bool(exact(ima), name); + } + + + // template <typename I> + // void + // logger_::log_image_generic(const I& ima, const std::string& name) + // { + // io::magick::save(ima, mln::debug::filename(name + ".png")); + // } + + template <typename I> + void + logger_::log_image_rgb(const I& ima, const std::string& name) + { + io::ppm::save(ima, mln::debug::filename(name + ".ppm")); + } + + + template <typename I> + void + logger_::log_image_bool(const I& ima, const std::string& name) + { + io::pbm::save(ima, mln::debug::filename(name + ".pbm")); + } + + + template <typename I> + void + logger_::log_image_grayscale(const I& ima, const std::string& name) + { + io::pgm::save(data::wrap(value::int_u8(), ima), + mln::debug::filename(name + ".pgm")); + } + + } // end of namespace scribo::debug::internal + + + inline + scribo::debug::internal::logger_& + logger() + { + return scribo::debug::internal::logger_::instance(); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::debug + +} // end of namespace scribo + +#endif // ! SCRIBO_CORE_LOGGER_HH -- 1.5.6.5

13 years, 9 months

last-svn-commit-799-g257be9e Introduce new anchors.

by Guillaume Lazzara

* scribo/core/tag/anchor.hh: New anchors. * scribo/filter/internal/alignment_angle.hh, * scribo/primitive/link/internal/compute_anchor.hh: Make use of that new anchors. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/tag/anchor.hh | 6 ++++-- scribo/scribo/filter/internal/alignment_angle.hh | 2 ++ .../primitive/link/internal/compute_anchor.hh | 16 ++++++++++++++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f0bff06..d28a95b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce new anchors. + + * scribo/core/tag/anchor.hh: New anchors. + + * scribo/filter/internal/alignment_angle.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Make use of + that new anchors. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename document serializer base class. * scribo/core/internal/doc_xml_serializer.hh: Rename as... diff --git a/scribo/scribo/core/tag/anchor.hh b/scribo/scribo/core/tag/anchor.hh index bb6780c..7ce8ddc 100644 --- a/scribo/scribo/core/tag/anchor.hh +++ b/scribo/scribo/core/tag/anchor.hh @@ -37,11 +37,13 @@ namespace scribo { MassCenter = 0, Top, + StrictTopCenter, Bottom, + StrictBottomCenter, Center, - ActualLeft, + StrictLeft, Left, - ActualRight, + StrictRight, Right, TopLeft, TopStrictLeft, diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index 33855a8..035dec7 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.hh @@ -109,6 +109,7 @@ namespace scribo break; // Top + case anchor::StrictTopCenter: case anchor::TopStrictLeft: case anchor::Top: { @@ -122,6 +123,7 @@ namespace scribo break; // Bottom + case anchor::StrictBottomCenter: case anchor::BottomStrictRight: case anchor::Bottom: { diff --git a/scribo/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh index c1a9106..9afc33f 100644 --- a/scribo/scribo/primitive/link/internal/compute_anchor.hh +++ b/scribo/scribo/primitive/link/internal/compute_anchor.hh @@ -111,6 +111,12 @@ namespace scribo break; + // Bounding box Strict top center + case anchor::StrictTopCenter: + sp.row() = components(current_object).bbox().pmin().row(); + break; + + // Bounding box top left case anchor::TopStrictLeft: sp.col() = components(current_object).bbox().pmin().col(); @@ -138,13 +144,19 @@ namespace scribo break; + // Bounding box strict bottom center. + case anchor::StrictBottomCenter: + sp.row() = components(current_object).bbox().pmax().row(); + break; + + // Bounding box center case anchor::Center: return components(current_object).bbox().pcenter(); // Bounding box actual left center - case anchor::ActualLeft: + case anchor::StrictLeft: return P(components(current_object).bbox().pcenter().row(), components(current_object).bbox().pmin().col()); @@ -161,7 +173,7 @@ namespace scribo // Bounding box actual right center - case anchor::ActualRight: + case anchor::StrictRight: return P(components(current_object).bbox().pcenter().row(), components(current_object).bbox().pmax().col()); -- 1.5.6.5

13 years, 9 months

last-svn-commit-798-g5b25a55 Introduce new anchors.

by Guillaume Lazzara

* scribo/core/tag/anchor.hh: New anchors. * scribo/filter/internal/alignment_angle.hh, * scribo/primitive/link/internal/compute_anchor.hh: Make use of that new anchors. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/tag/anchor.hh | 6 ++++-- scribo/scribo/filter/internal/alignment_angle.hh | 2 ++ .../primitive/link/internal/compute_anchor.hh | 16 ++++++++++++++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1de58fe..58685f6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce new anchors. + + * scribo/core/tag/anchor.hh: New anchors. + + * scribo/filter/internal/alignment_angle.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Make use of + that new anchors. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename document serializer base class. * scribo/core/internal/doc_xml_serializer.hh: Rename as... diff --git a/scribo/scribo/core/tag/anchor.hh b/scribo/scribo/core/tag/anchor.hh index bb6780c..7ce8ddc 100644 --- a/scribo/scribo/core/tag/anchor.hh +++ b/scribo/scribo/core/tag/anchor.hh @@ -37,11 +37,13 @@ namespace scribo { MassCenter = 0, Top, + StrictTopCenter, Bottom, + StrictBottomCenter, Center, - ActualLeft, + StrictLeft, Left, - ActualRight, + StrictRight, Right, TopLeft, TopStrictLeft, diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index 33855a8..035dec7 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.hh @@ -109,6 +109,7 @@ namespace scribo break; // Top + case anchor::StrictTopCenter: case anchor::TopStrictLeft: case anchor::Top: { @@ -122,6 +123,7 @@ namespace scribo break; // Bottom + case anchor::StrictBottomCenter: case anchor::BottomStrictRight: case anchor::Bottom: { diff --git a/scribo/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh index c1a9106..9afc33f 100644 --- a/scribo/scribo/primitive/link/internal/compute_anchor.hh +++ b/scribo/scribo/primitive/link/internal/compute_anchor.hh @@ -111,6 +111,12 @@ namespace scribo break; + // Bounding box Strict top center + case anchor::StrictTopCenter: + sp.row() = components(current_object).bbox().pmin().row(); + break; + + // Bounding box top left case anchor::TopStrictLeft: sp.col() = components(current_object).bbox().pmin().col(); @@ -138,13 +144,19 @@ namespace scribo break; + // Bounding box strict bottom center. + case anchor::StrictBottomCenter: + sp.row() = components(current_object).bbox().pmax().row(); + break; + + // Bounding box center case anchor::Center: return components(current_object).bbox().pcenter(); // Bounding box actual left center - case anchor::ActualLeft: + case anchor::StrictLeft: return P(components(current_object).bbox().pcenter().row(), components(current_object).bbox().pmin().col()); @@ -161,7 +173,7 @@ namespace scribo // Bounding box actual right center - case anchor::ActualRight: + case anchor::StrictRight: return P(components(current_object).bbox().pcenter().row(), components(current_object).bbox().pmax().col()); -- 1.5.6.5

13 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2011