May 2011 - Olena-patches

last-svn-commit-866-gfcbcf9b Stats correction. Line in line inclusion correction
by Julien Marquegnies 06 May '11

06 May '11

--- scribo/scribo/core/stats.hh | 2 +- scribo/scribo/text/merging.hh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scribo/scribo/core/stats.hh b/scribo/scribo/core/stats.hh index 095735c..ea00da9 100644 --- a/scribo/scribo/core/stats.hh +++ b/scribo/scribo/core/stats.hh @@ -269,7 +269,7 @@ private: const T left_distance = data_[i] - data_[i - 1]; const T right_distance = data_[i + 1] - data_[i]; - if (not ((left_distance <= 2 || left_distance < right_distance) + if (not ((left_distance <= 1 || left_distance < right_distance) && left_distance <= std)) ++cluster_index; diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 453c6c3..c94f9f5 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -739,9 +739,12 @@ namespace scribo // is horizontally close to the line's bbox and // vertically aligned // Obviously no separators between the two lines - if (dx < l_ted_cw && dy < 0 - && not (l_info.holder().components().has_separators() - && between_separators(l_info, mc_info))) + if ((l_info.card() <= 5 || + (std::abs(l_info.baseline() - mc_info.baseline()) < 5 + && std::abs(l_info.meanline() - mc_info.meanline()) < 5)) + && dx < l_ted_cw && dy < 0 + && not (l_info.holder().components().has_separators() + && between_separators(l_info, mc_info))) l = do_union(lines, l, mc, parent); // } -- 1.5.6.5

1 0

last-svn-commit-841-g3c34377 Stats correction. Line in line inclusion correction
by Julien Marquegnies 06 May '11

06 May '11

--- scribo/scribo/core/stats.hh | 2 +- scribo/scribo/text/merging.hh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scribo/scribo/core/stats.hh b/scribo/scribo/core/stats.hh index 88ecd68..43cc3d6 100644 --- a/scribo/scribo/core/stats.hh +++ b/scribo/scribo/core/stats.hh @@ -269,7 +269,7 @@ private: const T left_distance = data_[i] - data_[i - 1]; const T right_distance = data_[i + 1] - data_[i]; - if (not ((left_distance <= 2 || left_distance < right_distance) + if (not ((left_distance <= 1 || left_distance < right_distance) && left_distance <= std)) ++cluster_index; diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 453c6c3..c94f9f5 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -739,9 +739,12 @@ namespace scribo // is horizontally close to the line's bbox and // vertically aligned // Obviously no separators between the two lines - if (dx < l_ted_cw && dy < 0 - && not (l_info.holder().components().has_separators() - && between_separators(l_info, mc_info))) + if ((l_info.card() <= 5 || + (std::abs(l_info.baseline() - mc_info.baseline()) < 5 + && std::abs(l_info.meanline() - mc_info.meanline()) < 5)) + && dx < l_ted_cw && dy < 0 + && not (l_info.holder().components().has_separators() + && between_separators(l_info, mc_info))) l = do_union(lines, l, mc, parent); // } -- 1.5.6.5

1 0

branch safe-groups deleted: last-svn-commit-852-g397d9ad
by lazzara＠lrde.epita.fr 06 May '11

06 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch safe-groups has been deleted was 397d9adad2d9d3854bb9f6b43fd3b0530af973e3 ----------------------------------------------------------------------- 397d9adad2d9d3854bb9f6b43fd3b0530af973e3 tests/unit_test/unit-tests.mk: Regen. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch unstable/scribo updated: last-svn-commit-865-g32b4b85
by lazzara＠lrde.epita.fr 06 May '11

06 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 32b4b85ab922c2384553543763a7eb4989023f6f (commit) via 1027cb2a0b17123395cfaac47aac7301faff1e5b (commit) via 21452e4577778474ff58544ca2d41833148691a6 (commit) via a1722e4c5ae3c46b52e44e7d80bd335796ec1c02 (commit) via 41f36757c18b5c65faf00f188d38f7421046fa17 (commit) via 3d9e9edeb70267dedd79a8f3a5a3486b6e9b07e3 (commit) via d90f5122886ca55eb7083eedd11a1f8a471ab8ff (commit) via bc3f2b6ab7ddc3c695fb35b3eda1b7d1e2e17eeb (commit) via 9b5c9ab38c21004353be12bdda08cb8c4e82e97a (commit) via 62776ae24fd3295a5087dc2750a3bc238efcc2c4 (commit) via ae863e48a8f38f2b2fc7b852758309fa04ce9baf (commit) via 034236fbdeca14742b93f53c37774b7f2dcf09bb (commit) via d466ef31108daf9ddd9ae300c3d1fae96e233126 (commit) from 397d9adad2d9d3854bb9f6b43fd3b0530af973e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 32b4b85 Load and save color information. 1027cb2 scribo/text/paragraphs.hh: Remove unused argument. 21452e4 Fix namespace ambiguities. a1722e4 Improve PDF output. 41f3675 configure.ac: Configure scribo/tests/util. 3d9e9ed Add hexadecimal color conversion routines. d90f512 Explicitly set vertical or horizontal attribute for separators in XML output. bc3f2b6 Make use of opacity in PDF output. 9b5c9ab mln/io/magick/save.hh: Add support for opacity. 62776ae Small fixes in Scribo. ae863e4 Make paragraph extraction work with this branch. 034236f Correction on line spacing d466ef3 Paragraphs extraction ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 3 + milena/ChangeLog | 4 + milena/mln/io/magick/save.hh | 155 +++- scribo/ChangeLog | 108 ++ scribo/demo/xml2doc/image_crop.cc | 75 +- scribo/demo/xml2doc/templates/pdf/line.xsl | 390 ++++---- scribo/demo/xml2doc/templates/pdf/regions.xsl | 17 +- .../binarization/internal/first_pass_functor.hh | 6 +- scribo/scribo/binarization/sauvola_ms.hh | 24 +- scribo/scribo/canvas/integral_browsing.hh | 10 +- scribo/scribo/convert/to_base64.hh | 4 +- scribo/scribo/core/document.hh | 4 +- scribo/scribo/core/line_info.hh | 184 ++++- scribo/scribo/core/stats.hh | 321 ++++++ scribo/scribo/core/tag/component.hh | 16 +- scribo/scribo/io/img/internal/debug_img_visitor.hh | 3 +- scribo/scribo/io/img/internal/full_img_visitor.hh | 3 +- .../scribo/io/img/internal/non_text_img_visitor.hh | 3 +- scribo/scribo/io/img/save.hh | 7 + .../scribo/io/xml/internal/compute_text_colour.hh | 108 ++ .../io/xml/internal/extended_page_xml_visitor.hh | 58 +- scribo/scribo/io/xml/internal/full_xml_visitor.hh | 56 +- scribo/scribo/io/xml/internal/page_xml_visitor.hh | 3 +- scribo/scribo/io/xml/load.hh | 26 +- scribo/scribo/preprocessing/denoise_bg.hh | 5 +- scribo/scribo/primitive/extract/alignments.hh | 2 +- scribo/scribo/text/look_like_text_lines.hh | 16 + scribo/scribo/text/merging.hh | 307 +++++-- scribo/scribo/text/paragraphs.hh | 1046 ++++++++++++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 178 ++-- scribo/scribo/util/color_to_hex.hh | 78 ++ scribo/scribo/util/hex_to_color.hh | 145 +++ scribo/src/binarization/sauvola_ms_fg.cc | 6 +- scribo/tests/Makefile.am | 3 +- scribo/tests/util/Makefile.am | 26 + scribo/tests/util/color_to_hex.cc | 28 + scribo/tests/util/hex_to_color.cc | 32 + 38 files changed, 2948 insertions(+), 516 deletions(-) create mode 100644 scribo/scribo/core/stats.hh create mode 100644 scribo/scribo/io/xml/internal/compute_text_colour.hh create mode 100644 scribo/scribo/text/paragraphs.hh create mode 100644 scribo/scribo/util/color_to_hex.hh create mode 100644 scribo/scribo/util/hex_to_color.hh create mode 100644 scribo/tests/util/Makefile.am create mode 100644 scribo/tests/util/color_to_hex.cc create mode 100644 scribo/tests/util/hex_to_color.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-860-g3d9e9ed Add hexadecimal color conversion routines.
by Guillaume Lazzara 06 May '11

06 May '11

* tests/Makefile.am: Add subdir. * scribo/util/color_to_hex.hh, * scribo/util/hex_to_color.hh, * tests/util/Makefile.am, * tests/util/color_to_hex.cc, * tests/util/hex_to_color.cc: New. --- scribo/ChangeLog | 12 ++ .../serializable.hh => util/color_to_hex.hh} | 54 +++++--- scribo/scribo/util/hex_to_color.hh | 145 ++++++++++++++++++++ scribo/tests/Makefile.am | 3 +- scribo/tests/{convert => util}/Makefile.am | 11 +- .../util/color_to_hex.cc} | 18 +-- .../ocr_options.hh => tests/util/hex_to_color.cc} | 30 ++--- 7 files changed, 217 insertions(+), 56 deletions(-) copy scribo/scribo/{core/concept/serializable.hh => util/color_to_hex.hh} (64%) create mode 100644 scribo/scribo/util/hex_to_color.hh copy scribo/tests/{convert => util}/Makefile.am (85%) copy scribo/{demo/viewer/option_widget.cc => tests/util/color_to_hex.cc} (70%) copy scribo/{demo/viewer/ocr_options.hh => tests/util/hex_to_color.cc} (60%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e857752..e30b230 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + Add hexadecimal color conversion routines. + + * tests/Makefile.am: Add subdir. + + * scribo/util/color_to_hex.hh, + * scribo/util/hex_to_color.hh, + * tests/util/Makefile.am, + * tests/util/color_to_hex.cc, + * tests/util/hex_to_color.cc: New. + +2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + Explicitly set vertical or horizontal attribute for separators in XML output. diff --git a/scribo/scribo/core/concept/serializable.hh b/scribo/scribo/util/color_to_hex.hh similarity index 64% copy from scribo/scribo/core/concept/serializable.hh copy to scribo/scribo/util/color_to_hex.hh index 6e661a6..e0ee33f 100644 --- a/scribo/scribo/core/concept/serializable.hh +++ b/scribo/scribo/util/color_to_hex.hh @@ -23,42 +23,56 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_CORE_CONCEPT_SERIALIZABLE_HH -# define SCRIBO_CORE_CONCEPT_SERIALIZABLE_HH +#ifndef SCRIBO_UTIL_COLOR_TO_HEX_HH +# define SCRIBO_UTIL_COLOR_TO_HEX_HH /// \file /// -/// Concept for serializer visitors. +/// Convert hexadecimal encoded colors to value::rgb8. -# include <mln/core/concept/object.hh> -# include <scribo/core/concept/serialize_visitor.hh> + +#include <cstdio> +#include <iostream> +#include <string.h> +#include <mln/value/rgb8.hh> namespace scribo { - /// \brief Link functor concept. - template <typename E> - class Serializable : public mln::Object<E> + namespace util { - public: - template <typename E2> - void accept(const SerializeVisitor<E2>& visitor) const; - }; + using namespace mln; + + std::string color_to_hex(const value::rgb8& v); # ifndef MLN_INCLUDE_ONLY - template <typename E> - template <typename E2> - void - Serializable<E>::accept(const SerializeVisitor<E2>& visitor) const - { - exact(visitor).visit(exact(*this)); - } + std::string color_to_hex(const value::rgb8& v) + { + std::string result = "#"; + + char buf[3]; + + int c = v.red(); + sprintf(buf, "%.2X", c); + result.append(buf); + + c = v.green(); + sprintf(buf, "%.2X", c); + result.append(buf); + + c = v.blue(); + sprintf(buf, "%.2X", c); + result.append(buf); + + return result; + } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace scribo::util } // end of namespace scribo -#endif // SCRIBO_CORE_CONCEPT_SERIALIZABLE_HH +#endif // ! SCRIBO_UTIL_COLOR_TO_HEX_HH diff --git a/scribo/scribo/util/hex_to_color.hh b/scribo/scribo/util/hex_to_color.hh new file mode 100644 index 0000000..d1368e2 --- /dev/null +++ b/scribo/scribo/util/hex_to_color.hh @@ -0,0 +1,145 @@ +// 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_UTIL_HEX_TO_COLOR_HH +# define SCRIBO_UTIL_HEX_TO_COLOR_HH + +/// \file +/// +/// Convert hexadecimal encoded colors to value::rgb8. + +#include <iostream> +#include <string> +#include <vector> +#include <mln/value/rgb8.hh> +#include <mln/value/int_u8.hh> + +namespace scribo +{ + + namespace util + { + using namespace mln; + + // \brief Convert hexadecimal encoded colors to value::rgb8. + value::rgb8 hex_to_color(const std::string& hex); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + value::int_u8 convert_from_hex(const std::string& hex) + { + value::int_u8 value = 0; + int a = 0; + int b = hex.length() - 1; + + for (; b >= 0; a++, b--) + { + if (hex[b] >= '0' && hex[b] <= '9') + { + value += (hex[b] - '0') * (1 << (a * 4)); + } + else + { + switch (hex[b]) + { + case 'A': + case 'a': + value += 10 * (1 << (a * 4)); + break; + case 'B': + case 'b': + value += 11 * (1 << (a * 4)); + break; + case 'C': + case 'c': + value += 12 * (1 << (a * 4)); + break; + case 'D': + case 'd': + value += 13 * (1 << (a * 4)); + break; + case 'E': + case 'e': + value += 14 * (1 << (a * 4)); + break; + case 'F': + case 'f': + value += 15 * (1 << (a * 4)); + break; + default: + std::cerr << "Error, invalid character '" + << hex[a] << "' in hex number" << std::endl; + break; + } + } + } + + return value; + } + + } // end of namespace scribo::util::internal + + + + value::rgb8 hex_to_color(const std::string& hex) + { + trace::entering("scribo::util::hex_to_color"); + + mln_precondition(!hex.empty()); + + std::string red, green, blue; + + if (hex[0] == '#') + { + red = hex.substr(1, 2); + green = hex.substr(3, 2); + blue = hex.substr(5, 2); + } + else + { + red = hex.substr(0, 2); + green = hex.substr(2, 2); + blue = hex.substr(4, 2); + } + + value::rgb8 v(internal::convert_from_hex(red), + internal::convert_from_hex(green), + internal::convert_from_hex(blue)); + + trace::exiting("scribo::util::hex_to_color"); + return v; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::util + +} // end of namespace scribo + +#endif // ! SCRIBO_UTIL_HEX_TO_COLOR_HH diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 706338f..e2e7e66 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -43,7 +43,8 @@ SUBDIRS = \ table \ text \ toolchain \ - unit_test + unit_test \ + util # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk diff --git a/scribo/tests/convert/Makefile.am b/scribo/tests/util/Makefile.am similarity index 85% copy from scribo/tests/convert/Makefile.am copy to scribo/tests/util/Makefile.am index c4c912c..8d132aa 100644 --- a/scribo/tests/convert/Makefile.am +++ b/scribo/tests/util/Makefile.am @@ -13,15 +13,14 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = \ - base64 +check_PROGRAMS = \ + color_to_hex \ + hex_to_color -base64_SOURCES = base64.cc +color_to_hex_SOURCES = color_to_hex.cc +hex_to_color_SOURCES = hex_to_color.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/demo/viewer/option_widget.cc b/scribo/tests/util/color_to_hex.cc similarity index 70% copy from scribo/demo/viewer/option_widget.cc copy to scribo/tests/util/color_to_hex.cc index 4557749..8e76b07 100644 --- a/scribo/demo/viewer/option_widget.cc +++ b/scribo/tests/util/color_to_hex.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -14,17 +14,15 @@ // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -# include "option_widget.hh" +// \file -OptionWidget::OptionWidget(QWidget * parent) - : QWidget(parent) -{ -} +#include <scribo/util/color_to_hex.hh> -void OptionWidget::save_config() +int main() { -} + using namespace mln; -void OptionWidget::load_config() -{ + std::string hex = scribo::util::color_to_hex(value::rgb8(173, 255, 47)); + + mln_assertion(hex == "#ADFF2F"); } diff --git a/scribo/demo/viewer/ocr_options.hh b/scribo/tests/util/hex_to_color.cc similarity index 60% copy from scribo/demo/viewer/ocr_options.hh copy to scribo/tests/util/hex_to_color.cc index 67ab4ef..65ea79e 100644 --- a/scribo/demo/viewer/ocr_options.hh +++ b/scribo/tests/util/hex_to_color.cc @@ -14,27 +14,19 @@ // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -#ifndef SCRIBO_DEMO_VIEWER_OCR_OPTIONS_HH -# define SCRIBO_DEMO_VIEWER_OCR_OPTIONS_HH +// \file -# include <QtGui> -# include <ocr_options.ui.h> -# include "option_widget.hh" +#include <scribo/util/hex_to_color.hh> -class ocr_options : public OptionWidget, private Ui::OcrOptions +int main() { - Q_OBJECT; + using namespace mln; -public: - ocr_options(QWidget *parent = 0); - ~ocr_options(); + value::rgb8 v1 = scribo::util::hex_to_color("#ADFF2F"); + value::rgb8 v2 = scribo::util::hex_to_color("ADFF2F"); + value::rgb8 v3 = scribo::util::hex_to_color("aDfF2F"); - void load_config(); - void save_config(); - -private: - int find_index(const QString& lang); - -}; - -#endif // ! SCRIBO_DEMO_VIEWER_OCR_OPTIONS_HH + mln_assertion(v1 == v2); + mln_assertion(v2 == v3); + mln_assertion(v1 == value::rgb8(173, 255, 47)); +} -- 1.5.6.5

1 0

last-svn-commit-865-g32b4b85 Load and save color information.
by Guillaume Lazzara 06 May '11

06 May '11

* scribo/io/xml/internal/compute_text_colour.hh: New. * scribo/io/xml/internal/extended_page_xml_visitor.hh, * scribo/io/xml/internal/full_xml_visitor.hh, * scribo/io/xml/load.hh: Load and save color as hex format. --- scribo/ChangeLog | 26 ++++-- .../scribo/io/xml/internal/compute_text_colour.hh | 108 ++++++++++++++++++++ .../io/xml/internal/extended_page_xml_visitor.hh | 11 ++- scribo/scribo/io/xml/internal/full_xml_visitor.hh | 11 ++- scribo/scribo/io/xml/load.hh | 26 +---- 5 files changed, 148 insertions(+), 34 deletions(-) create mode 100644 scribo/scribo/io/xml/internal/compute_text_colour.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2fb884b..f4dcf15 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,8 +1,18 @@ -2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Load and save color information. + + * scribo/io/xml/internal/compute_text_colour.hh: New. + + * scribo/io/xml/internal/extended_page_xml_visitor.hh, + * scribo/io/xml/internal/full_xml_visitor.hh, + * scribo/io/xml/load.hh: Load and save color as hex format. + +2011-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * scribo/text/paragraphs.hh: Remove unused argument. -2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix namespace ambiguities. @@ -12,7 +22,7 @@ * scribo/convert/to_base64.hh, * scribo/preprocessing/denoise_bg.hh: Here. -2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Improve PDF output. @@ -23,7 +33,7 @@ * demo/xml2doc/templates/pdf/regions.xsl: Fix image localization. -2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Add hexadecimal color conversion routines. @@ -35,7 +45,7 @@ * tests/util/color_to_hex.cc, * tests/util/hex_to_color.cc: New. -2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Explicitly set vertical or horizontal attribute for separators in XML output. @@ -53,7 +63,7 @@ * scribo/io/xml/internal/page_xml_visitor.hh: Update enum declaration and handle new cases. -2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Make use of opacity in PDF output. @@ -62,7 +72,7 @@ * scribo/io/xml/internal/extended_page_xml_visitor.hh: Add bbox information in region tag. -2011-05-04 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-04 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes in Scribo. @@ -81,7 +91,7 @@ * src/binarization/sauvola_ms_fg.cc: Fix argument use. -2011-05-04 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> +2011-05-04 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Make paragraph extraction work with this branch. diff --git a/scribo/scribo/io/xml/internal/compute_text_colour.hh b/scribo/scribo/io/xml/internal/compute_text_colour.hh new file mode 100644 index 0000000..1caf358 --- /dev/null +++ b/scribo/scribo/io/xml/internal/compute_text_colour.hh @@ -0,0 +1,108 @@ +// 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_IO_XML_INTERNAL_COMPUTE_TEXT_COLOUR_HH +# define SCRIBO_IO_XML_INTERNAL_COMPUTE_TEXT_COLOUR_HH + +/// \file +/// +/// Find the color name of a given color. + +# include <mln/value/rgb8.hh> +# include <mln/make/vec.hh> +# include <mln/norm/l2.hh> + + +namespace scribo +{ + + namespace io + { + + namespace xml + { + + namespace internal + { + + const char * + compute_txt_text_colour(const value::rgb8& v); + + + struct color_t + { + const algebra::vec<3, value::int_u8> v; + const char *name; + float res; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + const char * + compute_txt_text_colour(const value::rgb8& v) + { + static color_t colors[] = { + { mln::make::vec(0, 0, 0), "Black", 0 }, + { mln::make::vec(255, 0, 0), "Red", 0 }, + { mln::make::vec(255, 255, 255), "White", 0 }, + { mln::make::vec(0, 255, 0), "Green", 0 }, + { mln::make::vec(0, 0, 255), "Blue", 0 }, + { mln::make::vec(255, 255, 0), "Yellow", 0 }, + { mln::make::vec(255, 165, 0), "Orange", 0 }, + { mln::make::vec(255, 192, 203), "Pink", 0 }, + { mln::make::vec(192, 192, 192), "Grey", 0 }, + { mln::make::vec(64, 224, 208), "Turquoise", 0 }, + { mln::make::vec(75, 0, 130), "Indigo", 0 }, + { mln::make::vec(238, 130, 238), "Violet", 0 }, + { mln::make::vec(0, 255, 255), "Cyan", 0 }, + { mln::make::vec(255, 0, 255), "Magenta", 0 }, + { mln::make::vec(0, 0, 0), 0, 0 } // Invalid + }; + + unsigned closest = 0; + for (unsigned i = 0; colors[i].name; ++i) + { + colors[i].res = norm::l2_distance(colors[i].v, v.to_equiv()); + if (colors[closest].res > colors[i].res) + closest = i; + } + + return colors[closest].name; + } + +#endif // MLN_INCLUDE_ONLY + + } // end of namespace scribo::io::xml::internal + + } // end of namespace scribo::io::xml + + } // end of namespace scribo::io + +} // end of namespace scribo + + +#endif // ! SCRIBO_IO_XML_INTERNAL_COMPUTE_TEXT_COLOUR_HH diff --git a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh index 83e5b0b..869795b 100644 --- a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh @@ -50,7 +50,9 @@ # include <scribo/io/xml/internal/print_box_coords.hh> # include <scribo/io/xml/internal/print_image_coords.hh> # include <scribo/io/xml/internal/print_page_preambule.hh> +# include <scribo/io/xml/internal/compute_text_colour.hh> +# include <scribo/util/color_to_hex.hh> namespace scribo { @@ -122,7 +124,8 @@ namespace scribo if (doc.has_elements()) { // Prepare element edges - elt_edge = morpho::elementary::gradient_internal(doc.elements().labeled_image(), c4()); + elt_edge = morpho::elementary::gradient_internal( + extend(doc.elements().labeled_image(), 0), c4()).unmorph_(); doc.elements().accept(*this); } @@ -264,11 +267,12 @@ namespace scribo << "\" txt_text_type=\"" << lines(fid).type() << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(parset(p).color()) << "\" kerning=\"" << lines(fid).char_space(); // EXTENSIONS - Not officially supported // FIXME: add boldness? - output << "\" color=\"" << parset(p).color() + output << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) << "\" color_reliability=\"" << parset(p).color_reliability() << "\" baseline=\"" << lines(fid).baseline() << "\" meanline=\"" << lines(fid).meanline() @@ -309,7 +313,7 @@ namespace scribo output << "id=\"" << line.id() << "\" boldness=\"" << line.boldness() << "\" boldness_reliability=\"" << line.boldness_reliability() - << "\" color=\"" << line.color() + << "\" color=\"" << scribo::util::color_to_hex(line.color()) << "\" color_reliability=\"" << line.color_reliability() << "\" txt_orientation=\"" << line.orientation() << "\" txt_reading_orientation=\"" << line.reading_orientation() @@ -317,6 +321,7 @@ namespace scribo << "\" txt_text_type=\"" << line.type() << "\" txt_reverse_video=\"" << (line.reverse_video() ? "true" : "false") << "\" txt_indented=\"" << (line.indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(line.color()) << "\" kerning=\"" << line.char_space() << "\" baseline=\"" << line.baseline() << "\" meanline=\"" << line.meanline() diff --git a/scribo/scribo/io/xml/internal/full_xml_visitor.hh b/scribo/scribo/io/xml/internal/full_xml_visitor.hh index b920ca8..6b59e60 100644 --- a/scribo/scribo/io/xml/internal/full_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/full_xml_visitor.hh @@ -46,6 +46,9 @@ # include <scribo/io/xml/internal/save_image_to_xml.hh> # include <scribo/io/xml/internal/print_box_coords.hh> # include <scribo/io/xml/internal/print_page_preambule.hh> +# include <scribo/io/xml/internal/compute_text_colour.hh> + +# include <scribo/util/color_to_hex.hh> namespace scribo { @@ -103,6 +106,8 @@ namespace scribo full_xml_visitor::full_xml_visitor(std::ofstream& out) : output(out) { + output << std::setiosflags(std::ios::fixed); + output.precision(26); } @@ -448,6 +453,7 @@ namespace scribo << "\" txt_text_type=\"" << lines(fid).type() << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(parset(p).color()) << "\" kerning=\"" << lines(fid).char_space(); // EXTENSIONS - Not officially supported @@ -457,7 +463,7 @@ namespace scribo << "\" d_height=\"" << lines(fid).d_height() << "\" a_height=\"" << lines(fid).a_height() << "\" char_width=\"" << lines(fid).char_width() - << "\" color=\"" << parset(p).color() + << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) << "\" color_reliability=\"" << parset(p).color_reliability(); // End of EXTENSIONS output << "\">" @@ -493,7 +499,7 @@ namespace scribo output << "id=\"" << line.id() << "\" boldness=\"" << line.boldness() << "\" boldness_reliability=\"" << line.boldness_reliability() - << "\" color=\"" << line.color() + << "\" color=\"" << scribo::util::color_to_hex(line.color()) << "\" color_reliability=\"" << line.color_reliability() << "\" txt_orientation=\"" << line.orientation() << "\" txt_reading_orientation=\"" << line.reading_orientation() @@ -501,6 +507,7 @@ namespace scribo << "\" txt_text_type=\"" << line.type() << "\" txt_reverse_video=\"" << (line.reverse_video() ? "true" : "false") << "\" txt_indented=\"" << (line.indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(line.color()) << "\" kerning=\"" << line.char_space() << "\" baseline=\"" << line.baseline() << "\" meanline=\"" << line.meanline() diff --git a/scribo/scribo/io/xml/load.hh b/scribo/scribo/io/xml/load.hh index 8d89085..4e90b20 100644 --- a/scribo/scribo/io/xml/load.hh +++ b/scribo/scribo/io/xml/load.hh @@ -50,6 +50,8 @@ # include <scribo/core/line_set.hh> # include <scribo/core/line_info.hh> +# include <scribo/util/hex_to_color.hh> + namespace scribo { @@ -153,24 +155,6 @@ namespace scribo }; - namespace internal - { - - value::rgb8 parse_color(const QString& color_str) - { - QString color = color_str; - color.chop(1); - color = color.remove(0, 1); - QStringList rgb = color.split(','); - - return - value::rgb8(rgb.at(0).toInt(), - rgb.at(1).toInt(), - rgb.at(2).toInt()); - } - - } - template <typename L> class xml_handler : public QXmlDefaultHandler { @@ -228,7 +212,7 @@ namespace scribo { component_features_data comp_features; comp_features.valid = true; - comp_features.color = internal::parse_color(atts.value("color")); + comp_features.color = scribo::util::hex_to_color(atts.value("color")); comp_features.boldness = atts.value("boldness").toFloat(); comp_set_data->infos_.last().update_features(comp_features); @@ -277,7 +261,7 @@ namespace scribo // qDebug() << "TextRegion"; current_paragraph = paragraph_info<L>(llinks); - current_paragraph.set_color_(internal::parse_color(atts.value("color"))); + current_paragraph.set_color_(scribo::util::hex_to_color(atts.value("color"))); current_paragraph.set_color_reliability_(atts.value("color_reliability").toFloat()); } break; @@ -324,7 +308,7 @@ namespace scribo line_data->boldness_ = atts.value("boldness").toFloat(); line_data->boldness_reliability_ = atts.value("boldness_reliability").toFloat(); - line_data->color_ = internal::parse_color(atts.value("color")); + line_data->color_ = scribo::util::hex_to_color(atts.value("color")); line_data->color_reliability_ = atts.value("color_reliability").toFloat(); -- 1.5.6.5

1 0

last-svn-commit-864-g1027cb2 scribo/text/paragraphs.hh: Remove unused argument.
by Guillaume Lazzara 06 May '11

06 May '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/text/paragraphs.hh | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b7e0f5a..2fb884b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + * scribo/text/paragraphs.hh: Remove unused argument. + +2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + Fix namespace ambiguities. * scribo/binarization/internal/first_pass_functor.hh, diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 94e5751..6c9285b 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -64,8 +64,7 @@ namespace scribo void paragraph_links(const line_links<L>& left, const line_links<L>& right, line_links<L>& output, - const line_set<L>& lines, - const image2d<bool>& input) + const line_set<L>& lines) { output = left.duplicate(); @@ -1039,7 +1038,7 @@ namespace scribo // std::cout << "Finalizing merging" << std::endl; // finalize_line_merging(left, right, lines); std::cout << "Extracting paragraphs" << std::endl; - filter::paragraph_links(left, right, output, lines, input); + filter::paragraph_links(left, right, output, lines); paragraph_set<L> par_set = make::paragraph(output); return par_set; -- 1.5.6.5

1 0

last-svn-commit-863-g21452e4 Fix namespace ambiguities.
by Guillaume Lazzara 06 May '11

06 May '11

* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_ms.hh, * scribo/canvas/integral_browsing.hh, * scribo/convert/to_base64.hh, * scribo/preprocessing/denoise_bg.hh: Here. --- scribo/ChangeLog | 10 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 ++-- scribo/scribo/binarization/sauvola_ms.hh | 24 ++++++++++---------- scribo/scribo/canvas/integral_browsing.hh | 10 ++++---- scribo/scribo/convert/to_base64.hh | 4 +- scribo/scribo/preprocessing/denoise_bg.hh | 5 ++- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d3a1780..b7e0f5a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + Fix namespace ambiguities. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/canvas/integral_browsing.hh, + * scribo/convert/to_base64.hh, + * scribo/preprocessing/denoise_bg.hh: Here. + +2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + Improve PDF output. * demo/xml2doc/image_crop.cc: Cleanup temporary files. diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index fb52be5..0b1a7ac 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.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. // @@ -64,7 +64,7 @@ namespace scribo image2d<value::int_u8> t_sub; unsigned n_nbhs; - util::array<int> dp; + mln::util::array<int> dp; double K_; diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index e8eb2c2..c1a3414 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.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. // @@ -138,7 +138,7 @@ namespace scribo unsigned lambda_min, unsigned lambda_max, unsigned s, unsigned q, unsigned i, unsigned w, - const image2d<util::couple<double,double> >& integral_sum_sum_2, + const image2d<mln::util::couple<double,double> >& integral_sum_sum_2, double K) { typedef image2d<int_u8> I; @@ -188,7 +188,7 @@ namespace scribo // 2nd pass { - util::array<mln_value_(I) *> ptr(ratio); + mln::util::array<mln_value_(I) *> ptr(ratio); unsigned nrows = geom::nrows(e_2); mln_box_runend_piter_(I) sp(sub.domain()); // Backward. @@ -272,7 +272,7 @@ namespace scribo template <typename I, typename J, typename K> mln_ch_value(I, bool) multi_scale_binarization(const I& in, const J& e2, - const util::array<K>& t_ima, + const mln::util::array<K>& t_ima, unsigned s) { mln_ch_value(I,bool) out; @@ -758,10 +758,10 @@ namespace scribo // Compute domains of subsampled images and make sure they can be // divided by 2. template <typename I> - util::array<util::couple<mln_domain(I), unsigned> > + mln::util::array<mln::util::couple<mln_domain(I), unsigned> > compute_sub_domains(const I& ima, unsigned n_scales, unsigned s) { - util::array<util::couple<unsigned, unsigned> > n(n_scales + 2); + mln::util::array<mln::util::couple<unsigned, unsigned> > n(n_scales + 2); n(1) = mln::make::couple(ima.nrows(), ima.ncols()); n(2) = mln::make::couple(sub(n(1).first(), s), @@ -771,7 +771,7 @@ namespace scribo sub(n(i - 1).second(), 2)); - util::array<util::couple<mln_domain(I), unsigned> > out(n.size()); + mln::util::array<mln::util::couple<mln_domain(I), unsigned> > out(n.size()); out(0) = mln::make::couple(mln::make::box2d(1,1), 1u); out(1) = mln::make::couple(mln::make::box2d(ima.nrows(), ima.ncols()), 2u); @@ -833,7 +833,7 @@ namespace scribo unsigned lambda_max_2 = lambda_min_2 * q; - util::array t_ima; + mln::util::array t_ima; // Make sure t_ima indexes start from 2. { @@ -842,7 +842,7 @@ namespace scribo t_ima.append(dummy); } - util::array sub_ima; + mln::util::array sub_ima; // Make sure sub_ima indexes start from 2. { @@ -851,7 +851,7 @@ namespace scribo sub_ima.append(dummy); } - util::array<util::couple<box2d, unsigned> > + mln::util::array<mln::util::couple<box2d, unsigned> > sub_domains = internal::compute_sub_domains(input_1, nb_subscale, s); border::adjust(input_1, sub_domains(1).second()); @@ -859,7 +859,7 @@ namespace scribo // Resize input and compute integral images. - typedef image2d<util::couple<double,double> > integral_t; + typedef image2d<mln::util::couple<double,double> > integral_t; integral_t integral_sum_sum_2; // Subsampling from scale 1 to 2. diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 286dc53..0ec3d83 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.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. // @@ -40,7 +40,7 @@ namespace scribo template <typename F> - void integral_browsing(const image2d<util::couple<double, double> >& ima, + void integral_browsing(const image2d<mln::util::couple<double, double> >& ima, unsigned step, unsigned w, unsigned h, F& functor); @@ -75,13 +75,13 @@ namespace scribo template <typename F> - void integral_browsing(const image2d<util::couple<double, double> >& ima, + void integral_browsing(const image2d<mln::util::couple<double, double> >& ima, unsigned step, unsigned w, unsigned h, unsigned s, F& functor) { - typedef util::couple<double, double> V; + typedef mln::util::couple<double, double> V; typedef const V* Ptr; Ptr a_ima, b_ima, c_ima, d_ima; diff --git a/scribo/scribo/convert/to_base64.hh b/scribo/scribo/convert/to_base64.hh index 8df3ed2..81dda1f 100644 --- a/scribo/scribo/convert/to_base64.hh +++ b/scribo/scribo/convert/to_base64.hh @@ -81,7 +81,7 @@ namespace scribo template <typename I> void - to_base64(const Image& input, util::array<unsigned char>& output); + to_base64(const Image& input, mln::util::array<unsigned char>& output); # ifndef MLN_INCLUDE_ONLY @@ -116,7 +116,7 @@ namespace scribo template <typename I> void - to_base64(const Image& input_, util::array<unsigned char>& output) + to_base64(const Image& input_, mln::util::array<unsigned char>& output) { trace::entering("scribo::convert::to_base64"); diff --git a/scribo/scribo/preprocessing/denoise_bg.hh b/scribo/scribo/preprocessing/denoise_bg.hh index 8ad2d45..eda3803 100644 --- a/scribo/scribo/preprocessing/denoise_bg.hh +++ b/scribo/scribo/preprocessing/denoise_bg.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -131,7 +132,7 @@ namespace scribo unsigned nlabels; image2d<unsigned> lbl = labeling::background(input, nbh, nlabels); - util::array<unsigned> + mln::util::array<unsigned> result = labeling::compute(accu::meta::math::count(), lbl, nlabels); mln::fun::i2v::array<bool> f(nlabels + 1, false); -- 1.5.6.5

1 0

last-svn-commit-862-ga1722e4 Improve PDF output.
by Guillaume Lazzara 06 May '11

06 May '11

* demo/xml2doc/image_crop.cc: Cleanup temporary files. * demo/xml2doc/templates/pdf/line.xsl: Use paragraph information. Take color into account. * demo/xml2doc/templates/pdf/regions.xsl: Fix image localization. --- scribo/ChangeLog | 11 + scribo/demo/xml2doc/image_crop.cc | 6 +- scribo/demo/xml2doc/templates/pdf/line.xsl | 390 +++++++++++++------------ scribo/demo/xml2doc/templates/pdf/regions.xsl | 14 +- 4 files changed, 215 insertions(+), 206 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e30b230..d3a1780 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2011-05-06 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + + Improve PDF output. + + * demo/xml2doc/image_crop.cc: Cleanup temporary files. + + * demo/xml2doc/templates/pdf/line.xsl: Use paragraph + information. Take color into account. + + * demo/xml2doc/templates/pdf/regions.xsl: Fix image localization. + 2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> Add hexadecimal color conversion routines. diff --git a/scribo/demo/xml2doc/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc index 72fd2b4..4221ee7 100644 --- a/scribo/demo/xml2doc/image_crop.cc +++ b/scribo/demo/xml2doc/image_crop.cc @@ -40,11 +40,15 @@ ImageCrop::ImageCrop(const QString& xml, const QString& img, image_(img), output_dir_(output) { - mln::io::magick::load(ima_, image_.toStdString()); + if (!image_.isEmpty()) + mln::io::magick::load(ima_, image_.toStdString()); } ImageCrop::~ImageCrop() { + // Cleanup temporary files. + foreach (QString value, region_map_) + QFile::remove(value); } diff --git a/scribo/demo/xml2doc/templates/pdf/line.xsl b/scribo/demo/xml2doc/templates/pdf/line.xsl index 7056da0..4dda6c6 100644 --- a/scribo/demo/xml2doc/templates/pdf/line.xsl +++ b/scribo/demo/xml2doc/templates/pdf/line.xsl @@ -3,201 +3,205 @@  - - <xsl:template match="pcGts/page/text_region/line"> - -  - <xsl:variable name="x_height"> - <xsl:value-of select="@x_height" /> - </xsl:variable> - -  - <xsl:variable name="a_height"> - <xsl:value-of select="@a_height" /> - </xsl:variable> - - -  - <xsl:variable name="d_height_abs"> - <xsl:choose> - <xsl:when test="@d_height < 0"> - <xsl:value-of select="-@d_height" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@d_height" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  + + <xsl:template match="pcGts/page/text_region"> + +  + <xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" /> + <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" /> + +  + <xsl:variable name="colour"> + <xsl:choose> + <xsl:when test="@color != ''"> + <xsl:value-of select="translate(@color, $smallcase, $uppercase)" /> + </xsl:when> + <xsl:otherwise> + black + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + + <xsl:for-each select="line"> + +  + <xsl:variable name="x_height"> + <xsl:value-of select="@x_height" /> + </xsl:variable> + +  + <xsl:variable name="a_height"> + <xsl:value-of select="@a_height" /> + </xsl:variable> + + +  + <xsl:variable name="d_height_abs"> + <xsl:choose> + <xsl:when test="@d_height < 0"> + <xsl:value-of select="-@d_height" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@d_height" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  - <xsl:variable name="a"> - <xsl:choose> - <xsl:when test="($a_height - $x_height) < $d_height_abs"> - <xsl:value-of select="$x_height + $d_height_abs" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$a_height" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - <xsl:variable name="d"> - <xsl:choose> - <xsl:when test="($a_height - $x_height) > $d_height_abs"> - <xsl:value-of select="$a_height - $x_height" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$d_height_abs" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - <xsl:variable name="y1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="ymax"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 3"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="x1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="xmax"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 3"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> -  - -  - <xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" /> - <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" /> - -  - <xsl:variable name="colour"> - <xsl:choose> - <xsl:when test="@txt_colour != ''"> - <xsl:value-of select="translate(@txt_colour, $smallcase, $uppercase)" /> - </xsl:when> - <xsl:otherwise> - black - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - - <fo:block-container position="absolute" border-width="5mm"> - - <xsl:attribute name="left"> - <xsl:value-of select="$x1" />px - </xsl:attribute> - <xsl:attribute name="top"> - <xsl:value-of select="$y1" />px - </xsl:attribute> - - <xsl:attribute name="right"> - <xsl:value-of select="$xmax" />px - </xsl:attribute> - <xsl:attribute name="bottom"> - <xsl:value-of select="$ymax" />px - </xsl:attribute> - - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax - $x1" />px - </xsl:attribute> - - <xsl:attribute name="color"> - <xsl:value-of select="$colour" /> - </xsl:attribute> - -  - -  - -  - <fo:table table-layout="fixed"> - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax -$x1" />px - </xsl:attribute> - - <fo:table-column column-number="1"> - <xsl:attribute name="column-width"> - <xsl:value-of select="$xmax -$x1" />px - </xsl:attribute> - </fo:table-column> - - <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> - - <fo:table-row> - - <fo:table-cell> - - <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> - - <xsl:attribute name="font-size"> - <xsl:choose> - <xsl:when test="($a + $d) > 50"> - <xsl:value-of select="0.82 * ($a + $d)" />px - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0.95 * ($a + $d)" />px - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:value-of select="@text"/> - </fo:block> - - </fo:table-cell> - - </fo:table-row> - - </fo:table-body> - - </fo:table> - - - </fo:block-container> + <xsl:variable name="d"> + <xsl:choose> + <xsl:when test="($a_height - $x_height) > $d_height_abs"> + <xsl:value-of select="$a_height - $x_height" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$d_height_abs" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + <xsl:variable name="y1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="ymax"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="ascending" data-type="number"/> + <xsl:if test="position() = 3"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="x1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="xmax"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="ascending" data-type="number"/> + <xsl:if test="position() = 3"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> +  + + <fo:block-container position="absolute" border-width="5mm"> + + <xsl:attribute name="left"> + <xsl:value-of select="$x1" />px + </xsl:attribute> + <xsl:attribute name="top"> + <xsl:value-of select="$y1" />px + </xsl:attribute> + + <xsl:attribute name="right"> + <xsl:value-of select="$xmax" />px + </xsl:attribute> + <xsl:attribute name="bottom"> + <xsl:value-of select="$ymax" />px + </xsl:attribute> + + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax - $x1" />px + </xsl:attribute> + + <xsl:attribute name="color"> + <xsl:value-of select="$colour" /> + </xsl:attribute> + +  + +  + +  + <fo:table table-layout="fixed"> + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + + <fo:table-column column-number="1"> + <xsl:attribute name="column-width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + </fo:table-column> + + <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> + + <fo:table-row> + + <fo:table-cell> + + <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> + + <xsl:attribute name="font-size"> + <xsl:choose> + <xsl:when test="($a + $d) > 50"> + <xsl:value-of select="0.82 * ($a + $d)" />px + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="0.95 * ($a + $d)" />px + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + + <xsl:value-of select="@text"/> + </fo:block> + + </fo:table-cell> + + </fo:table-row> + + </fo:table-body> + + </fo:table> + + + </fo:block-container> + + </xsl:for-each> </xsl:template> diff --git a/scribo/demo/xml2doc/templates/pdf/regions.xsl b/scribo/demo/xml2doc/templates/pdf/regions.xsl index f236a1f..7772cbf 100644 --- a/scribo/demo/xml2doc/templates/pdf/regions.xsl +++ b/scribo/demo/xml2doc/templates/pdf/regions.xsl @@ -18,21 +18,11 @@  <xsl:variable name="y1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> + <xsl:value-of select="@y_min" /> </xsl:variable> <xsl:variable name="x1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> + <xsl:value-of select="@x_min" /> </xsl:variable>  -- 1.5.6.5

1 0

last-svn-commit-861-g41f3675 configure.ac: Configure scribo/tests/util.
by Guillaume Lazzara 05 May '11

05 May '11

--- ChangeLog | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31d498c..852ea6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-05 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + + * configure.ac: Configure scribo/tests/util. + 2011-04-05 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Configure scribo/tests/estim. diff --git a/configure.ac b/configure.ac index 189d905..fdbddd9 100644 --- a/configure.ac +++ b/configure.ac @@ -348,6 +348,8 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/estim/Makefile scribo/tests/filter/Makefile + scribo/tests/io/Makefile + scribo/tests/io/xml/Makefile scribo/tests/preprocessing/Makefile scribo/tests/primitive/Makefile scribo/tests/primitive/extract/Makefile @@ -357,6 +359,7 @@ AC_CONFIG_FILES([ scribo/tests/toolchain/Makefile scribo/tests/toolchain/nepomuk/Makefile scribo/tests/unit_test/Makefile + scribo/tests/util/Makefile ]) # Flags for Scribo -- 1.5.6.5

1 0