Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-593-gaae4f34 Update default value in an example

by Guillaume Lazzara

--- scribo/src/primitive/extract/lines_pattern.cc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index d2ad562..cb56b36 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -39,7 +39,8 @@ const char *args_desc[][2] = { { "input.pbm", "A binary image." }, { "length", " Minimum line length. (Common value : 51)" }, - { "delta", " Distance between the object pixel and the background pixel (Common value : 5)" }, + { "delta", " Distance between the object pixel and the background pixel" + "(Common value : 4)" }, {0, 0} }; @@ -63,6 +64,7 @@ int main(int argc, char *argv[]) h_lines = scribo::primitive::extract::lines_h_pattern(input, atoi(argv[2]), atoi(argv[3])); + image2d<bool> v_lines = scribo::primitive::extract::lines_v_pattern(input, atoi(argv[2]), -- 1.5.6.5

14 years, 2 months

last-svn-commit-643-g33a1752 scribo/core/document.hh: Introduce new document structure.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 + scribo/scribo/core/document.hh | 162 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/core/document.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 446ff89..9d47519 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/core/document.hh: Introduce new document structure. + 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/viewer/Makefile.am: Remove deprecated dependencies. diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh new file mode 100644 index 0000000..93d9348 --- /dev/null +++ b/scribo/scribo/core/document.hh @@ -0,0 +1,162 @@ +// Copyright (C) 2010 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_DOCUMENT_HH +# define SCRIBO_CORE_DOCUMENT_HH + +/// \file +/// +/// \brief Describes document content. + +# include <mln/core/image/image2d.hh> +# include <mln/value/rgb8.hh> +# include <mln/io/magick/load.hh> + +# include <scribo/core/component_set.hh> +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + template <typename L> + struct document + { + public: + + document(); + document(const char *filename); + + const char * filename() const; + + bool is_valid() const; + + const line_set<L>& text() const; + void set_text(const line_set<L>& line); + + const component_set<L>& elements() const; + void set_elements(const component_set<L>& elements); + + const mln::image2d<value::rgb8>& image() const; + + private: + void open(); + + const char *filename_; + mln::image2d<mln::value::rgb8> image_; + + line_set<L> lines_; + component_set<L> elements_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + document<L>::document() + { + } + + + template <typename L> + document<L>::document(const char *filename) + : filename_(filename) + { + open(); + } + + + template <typename L> + const char * + document<L>::filename() const + { + return filename_; + } + + + template <typename L> + void + document<L>::open() + { + mln::io::magick::load(image_, filename_); + } + + + template <typename L> + bool + document<L>::is_valid() const + { + return image_.is_valid(); + } + + + template <typename L> + const line_set<L>& + document<L>::text() const + { + return lines_; + } + + + template <typename L> + void + document<L>::set_text(const line_set<L>& line) + { + lines_ = line; + } + + + template <typename L> + const component_set<L>& + document<L>::elements() const + { + return elements_; + } + + + template <typename L> + void + document<L>::set_elements(const component_set<L>& elements) + { + elements_ = elements; + } + + + template <typename L> + const mln::image2d<value::rgb8>& + document<L>::image() const + { + return image_; + } + + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace scribo + + +#endif // ! SCRIBO_CORE_DOCUMENT_HH -- 1.5.6.5

14 years, 2 months

last-svn-commit-579-gd6c1dbb arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile time.

by Guillaume Lazzara

--- scribo/sandbox/ChangeLog | 5 +++++ .../sandbox/arthur/xml_transform/xml_transform.pro | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index c1d5540..eb97ae9 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,10 @@ 2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile + time. + +2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing const references to function arguments. * arthur/xml_transform/common.cc, diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.pro b/scribo/sandbox/arthur/xml_transform/xml_transform.pro index 608ce64..4a2ed2e 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.pro +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.pro @@ -7,6 +7,7 @@ TARGET = DEPENDPATH += . INCLUDEPATH += . QMAKE_CXXFLAGS += -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/milena -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/ +DEFINES += NDEBUG QT += xml LIBS += `Magick++-config --libs` HEADERS += common.hh image_crop.hh loader.hh xml_transform.hh -- 1.5.6.5

14 years, 2 months

last-svn-commit-578-gaccfaf1 Add missing const references to function arguments.

by Guillaume Lazzara

* arthur/xml_transform/common.cc, * arthur/xml_transform/common.hh, * arthur/xml_transform/image_crop.cc, * arthur/xml_transform/image_crop.hh, * arthur/xml_transform/loader.cc, * arthur/xml_transform/loader.hh, * arthur/xml_transform/main.cc, * arthur/xml_transform/xml_transform.cc, * arthur/xml_transform/xml_transform.hh: Here. --- scribo/sandbox/ChangeLog | 14 ++++++++++++ scribo/sandbox/arthur/xml_transform/common.cc | 4 +- scribo/sandbox/arthur/xml_transform/common.hh | 4 +- scribo/sandbox/arthur/xml_transform/image_crop.cc | 23 ++++++++++++------- scribo/sandbox/arthur/xml_transform/image_crop.hh | 12 ++++++++++ scribo/sandbox/arthur/xml_transform/loader.cc | 12 +++++----- scribo/sandbox/arthur/xml_transform/loader.hh | 23 ++++++++++--------- scribo/sandbox/arthur/xml_transform/main.cc | 2 + .../sandbox/arthur/xml_transform/xml_transform.cc | 2 +- .../sandbox/arthur/xml_transform/xml_transform.hh | 3 +- 10 files changed, 67 insertions(+), 32 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 78c55d6..c1d5540 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,17 @@ +2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing const references to function arguments. + + * arthur/xml_transform/common.cc, + * arthur/xml_transform/common.hh, + * arthur/xml_transform/image_crop.cc, + * arthur/xml_transform/image_crop.hh, + * arthur/xml_transform/loader.cc, + * arthur/xml_transform/loader.hh, + * arthur/xml_transform/main.cc, + * arthur/xml_transform/xml_transform.cc, + * arthur/xml_transform/xml_transform.hh: Here. + 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> Open Document bug warning. diff --git a/scribo/sandbox/arthur/xml_transform/common.cc b/scribo/sandbox/arthur/xml_transform/common.cc index 05117b2..d1f3a6c 100644 --- a/scribo/sandbox/arthur/xml_transform/common.cc +++ b/scribo/sandbox/arthur/xml_transform/common.cc @@ -1,13 +1,13 @@ # include "common.hh" -QString Common::get_file_name(QString image) +QString Common::get_file_name(const QString& image) { QString tmp = image.mid(image.lastIndexOf("/") + 1); tmp.chop(tmp.size() - tmp.lastIndexOf(".")); return tmp; } -QString Common::get_file_ext(QString image) +QString Common::get_file_ext(const QString& image) { return image.right(image.size() - image.lastIndexOf(".")); } diff --git a/scribo/sandbox/arthur/xml_transform/common.hh b/scribo/sandbox/arthur/xml_transform/common.hh index f72218f..21b984a 100644 --- a/scribo/sandbox/arthur/xml_transform/common.hh +++ b/scribo/sandbox/arthur/xml_transform/common.hh @@ -9,8 +9,8 @@ class Common : public QObject public: Common() {} ~Common() {} - static QString get_file_name(QString image); - static QString get_file_ext(QString image); + static QString get_file_name(const QString& image); + static QString get_file_ext(const QString& image); }; #endif // ! COMMON_HH diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/sandbox/arthur/xml_transform/image_crop.cc index 50fadd8..702d49f 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.cc +++ b/scribo/sandbox/arthur/xml_transform/image_crop.cc @@ -37,10 +37,11 @@ #include <mln/io/magick/load.hh> #include <mln/io/ppm/all.hh> -ImageCrop::ImageCrop(QString xml, QString img, QString output) : - xml_(xml), - image_(img), - output_dir_(output) +ImageCrop::ImageCrop(const QString& xml, const QString& img, + const QString& output) + : xml_(xml), + image_(img), + output_dir_(output) { } @@ -48,8 +49,9 @@ ImageCrop::~ImageCrop() { } + /* Save image to PNG format in output_dir/img. */ -void ImageCrop::save_image(QString out) +void ImageCrop::save_image(const QString& out) { using namespace mln; @@ -72,8 +74,10 @@ QString ImageCrop::img_to_base64() return file_content.toBase64(); } -/* Decode the base 64 string str and save into output_dir_/img/img_name. */ -bool ImageCrop::img_from_base64(QString str, QString img) + +/* Decode the base 64 string str and save into + * output_dir_/img/img_name. */ +bool ImageCrop::img_from_base64(const QString& str, const QString& img) { QByteArray ba; @@ -84,7 +88,8 @@ bool ImageCrop::img_from_base64(QString str, QString img) return ima.save(output_dir_ + img); } -/* Read all regions of the XML file and save all base 64 data into output_dir/img */ +/* Read all regions of the XML file and save all base 64 data into + * output_dir/img */ void ImageCrop::from_base64() { QFile f_in(xml_); @@ -125,7 +130,7 @@ void ImageCrop::from_base64() /* Tranfsorm the input XML file associated with images into a single XML output containing datas if images in base 64. */ -void ImageCrop::to_base64(QString out_file, bool no_crop) +void ImageCrop::to_base64(const QString& out_file, bool no_crop) { QFile file(xml_); file.open(QIODevice::ReadOnly); diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.hh b/scribo/sandbox/arthur/xml_transform/image_crop.hh index ee5ca56..598143b 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.hh +++ b/scribo/sandbox/arthur/xml_transform/image_crop.hh @@ -36,6 +36,7 @@ class ImageCrop : public QObject Q_OBJECT public: +<<<<<<< HEAD ImageCrop(QString, QString, QString); ~ImageCrop(); @@ -45,6 +46,17 @@ class ImageCrop : public QObject QString img_to_base64(); bool img_from_base64(QString, QString); void to_base64(QString, bool); +======= + ImageCrop(const QString&, const QString&, const QString&); + ~ImageCrop(); + + void save_image(const QString&); + bool crop_regions(bool temp = false); + + QString img_to_base64(); + bool img_from_base64(const QString&, const QString&); + void to_base64(const QString&, bool); +>>>>>>> 6f0918c... Add missing const references to function arguments. void from_base64(); diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index d4778a9..f9316f2 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -33,7 +33,7 @@ Loader::~Loader() { } -QDomDocument* Loader::xml_to_dom(QString xml_file) +QDomDocument* Loader::xml_to_dom(const QString& xml_file) { QFile file(xml_file); @@ -68,7 +68,7 @@ bool Loader::set_output(QString& output) } -void Loader::add_html_templates(bool base64, QString output) +void Loader::add_html_templates(bool base64, const QString& output) { QFile gen("templates/html/html_generator.sh"); gen.copy(output + "html_generator.sh"); @@ -88,7 +88,7 @@ void Loader::add_html_templates(bool base64, QString output) } } -void Loader::add_pdf_templates(bool crop, bool base64, QString output) +void Loader::add_pdf_templates(bool crop, bool base64, const QString& output) { if (base64) { @@ -126,7 +126,7 @@ void Loader::add_pdf_templates(bool crop, bool base64, QString output) } } -void Loader::add_svg_templates(QString output) +void Loader::add_svg_templates(const QString& output) { QFile regions("templates/pdf/regions_svg.xsl"); regions.copy(output + "regions.xsl"); @@ -141,7 +141,7 @@ void Loader::add_svg_templates(QString output) xsl.copy(output + "main.xsl"); } -void Loader::add_open_templates(QString output) +void Loader::add_open_templates(const QString& output) { QFile css("templates/opendoc/css.css"); css.copy(output + "css.css"); @@ -153,7 +153,7 @@ void Loader::add_open_templates(QString output) xsl.copy(output + "xsl.xsl"); } -bool Loader::xml_output(QString xml_file, bool html, QString output) +bool Loader::xml_output(const QString& xml_file, bool html, const QString& output) { QFile file(xml_file); diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/sandbox/arthur/xml_transform/loader.hh index a5c3637..a66af2d 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.hh +++ b/scribo/sandbox/arthur/xml_transform/loader.hh @@ -23,11 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef LOADER_HH -# define LOADER_HH +#ifndef LOADER_HH +# define LOADER_HH # include <QtCore> -#include <QDomDocument> +# include <QDomDocument> class Loader : public QObject { @@ -37,14 +37,15 @@ class Loader : public QObject Loader(); ~Loader(); - // void merge(QString in, QString other, QString output = "output.xml"); - bool xml_output(QString xml_file, bool html, QString output); - QDomDocument* xml_to_dom(QString xml_file); + // void merge(const QString& in, const QString& other, const + // QString& output = "output.xml"); + bool xml_output(const QString& xml_file, bool html, const QString& output); + QDomDocument* xml_to_dom(const QString& xml_file); bool set_output(QString& output); - void add_pdf_templates(bool crop, bool base64, QString output); - void add_svg_templates(QString output); - void add_open_templates(QString output); - void add_html_templates(bool base64, QString output); + void add_pdf_templates(bool crop, bool base64, const QString& output); + void add_svg_templates(const QString& output); + void add_open_templates(const QString& output); + void add_html_templates(bool base64, const QString& output); }; -#endif /* !LOADER_HH */ +#endif /* !LOADER_HH */ diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 687f53c..0dfb84e 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -2,10 +2,12 @@ #include <string> #include <string> #include <cstdlib> +#include <Magick++.h> #include "xml_transform.hh" int main(int argc, char **argv) { + Magick::InitializeMagick(argv[0]); std::string man; man = "xml_transform\n" diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index be5a137..be5c1e4 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -29,7 +29,7 @@ # include "common.hh" # include <iostream> -XmlTransform::XmlTransform(QString xml_file, QString image_file, QString output, QString file) : +XmlTransform::XmlTransform(const QString& xml_file, const QString& image_file, const QString& output, const QString& file) : xml_file_(xml_file), image_(image_file), loader_(new Loader()), diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index ee06907..fa22c07 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -37,7 +37,8 @@ class XmlTransform : public QObject Q_OBJECT public: - XmlTransform(QString xml_file, QString image_file, QString output, QString file = QString::Null()); + XmlTransform(const QString& xml_file, const QString& image_file, + const QString& output, const QString& file = QString::Null()); ~XmlTransform(); QString out() { return output_dir_; } -- 1.5.6.5

14 years, 2 months

last-svn-commit-575-g9723ab6 Fix man error.

by Arthur Crepin-Leblond

* arthur/xml_transform/README * arthur/xml_transform/main.cc --- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/README | 2 +- scribo/sandbox/arthur/xml_transform/main.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index dcff59e..4583666 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Fix man error. + + * arthur/xml_transform/README + * arthur/xml_transform/main.cc + 2010-08-05 Arthur Crepin-Leblond <crepin@ptaouchnok.lrde.epita.fr@> Output change in xml_tranform. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 1733535..33c4dd3 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -19,7 +19,7 @@ OpenDocument output: Base 64 operations: --to-base64 input.xml image output.xml Creates a container XML file. It will contain regions which are cropped and converted in base 64. - --to-base64-no-crop input.xml mage output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped + --to-base64-no-crop input.xml image output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped --from-base64 input.xml output_dir Decodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir. Requirements: diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 2270d2e..d35e80d 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -40,7 +40,7 @@ int main(int argc, char **argv) "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" "\t\t\tCreates a container XML file. It will contain regions which are cropped and converted in base 64.\n" - "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04image\033[00m \033[04moutput.xml\033[00m" + "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" "\t\tSame as --to-base64 but only the full picture will be converted, regions are not cropped\n" "\t\033[01m--from-base64\033[00m \033[04minput.xml\033[00m \033[04moutput_dir\033[00m" -- 1.5.6.5

14 years, 2 months

last-svn-commit-576-gcecfdd1 Open Document bug warning.

by Arthur Crepin-Leblond

* arthur/xml_transform/README * arthur/xml_transform/main.cc * arthur/xml_transform/TODO: New. --- scribo/sandbox/ChangeLog | 8 ++++++++ scribo/sandbox/arthur/xml_transform/README | 24 +++++++++++++----------- scribo/sandbox/arthur/xml_transform/main.cc | 10 ++++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 4583666..78c55d6 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Open Document bug warning. + + * arthur/xml_transform/README + * arthur/xml_transform/main.cc + * arthur/xml_transform/TODO: New. + +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Fix man error. * arthur/xml_transform/README diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 33c4dd3..c594992 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -3,34 +3,36 @@ OPTIONS: HTML output: --html input.xml image output.html Creates HTML file, images are embedded inside in base 64 format. - --html-base64 input.xml output.html Same as --html but input is a XML file with images encoded in base 64 inside. - --html-full input.xml image output_dir Creates HTML file without converting images in base 64. Images + HTML file are placed in output_dir. + --html-base64 input.xml output.html Same as --html but input is a XML file with images encoded in base 64 inside. + --html-full input.xml image output_dir Creates HTML file without converting images in base 64. Images + HTML file are placed in output_dir. PDF output: --pdf input.xml image output.pdf Creates PDF file, images are embedded inside in base 64 format. - --pdf-base64 input.xml output.pdf Same as --pdf but input is a XML file with images encoded in base 64 inside. + --pdf-base64 input.xml output.pdf Same as --pdf but input is a XML file with images encoded in base 64 inside. SVG output (experimental, may not work with all files): - --svg input.xml image output.svg Creates SVG file, images are embedded inside in base 64 format. - --svg-base64 input.xml output.svg Same as --svg but input is a XML file with images encoded in base 64 inside. + --svg input.xml image output.svg Creates SVG file, images are embedded inside in base 64 format. + --svg-base64 input.xml output.svg Same as --svg but input is a XML file with images encoded in base 64 inside. OpenDocument output: - --oo-doc input.xml image output.odt Creates Open Document Writer (odt) file. + --oo-doc input.xml image output.odt Creates Open Document Writer (odt) file. + This is experimental, Open Office will warn you and ask you to repair the file which is corrupted, click on repair. Base 64 operations: - --to-base64 input.xml image output.xml Creates a container XML file. It will contain regions which are cropped and converted in base 64. - --to-base64-no-crop input.xml image output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped - --from-base64 input.xml output_dir Decodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir. + --to-base64 input.xml image output.xmlc Creates a container XML file. It will contain regions which are cropped and converted in base 64. + --to-base64-no-crop input.xml image output.xmlc Same as --to-base64 but only the full picture will be converted, regions are not cropped + --from-base64 input.xml output_dir Decodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir. Requirements: PDF : fop >= 0.95 HTML : xsltproc SVG : trunk version of fop -OpenDocument : ooconvert (included) +OpenDocument : ooconvert (included) and OpenOffice >= 3.xx + BUILD: -Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then +Change the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then mkdir _build cd _build diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index d35e80d..687f53c 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -34,13 +34,14 @@ int main(int argc, char **argv) "OpenDocument output:\n" "\t\033[01m--oo-doc\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.odt\033[00m" - "\t\t\tCreates Open Document Writer (odt) file.\n\n" + "\t\t\tCreates Open Document Writer (odt) file.\n" + "\tThis is experimental, Open Office will warn you and ask you to repair the file which is corrupted, click on repair.\n\n" "Base 64 operations:\n" - "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xmlc\033[00m" "\t\t\tCreates a container XML file. It will contain regions which are cropped and converted in base 64.\n" - "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xmlc\033[00m" "\t\tSame as --to-base64 but only the full picture will be converted, regions are not cropped\n" "\t\033[01m--from-base64\033[00m \033[04minput.xml\033[00m \033[04moutput_dir\033[00m" @@ -50,7 +51,8 @@ int main(int argc, char **argv) "PDF : fop >= 0.95\n" "HTML : xsltproc\n" "SVG : trunk version of fop\n" - "OpenDocument : ooconvert (included)"; + "OpenDocument : ooconvert (included) and OpenOffice >= 3.xx"; + if (argc > 4) { std::string html = "--html"; -- 1.5.6.5

14 years, 2 months

last-svn-commit-577-gcb91a95 Changelog: Cleanup.

by Guillaume Lazzara

--- scribo/ChangeLog | 117 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 61 insertions(+), 56 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4fa6c77..49dc324 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,7 +2,8 @@ Add arrows shortcuts. - * demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. + * demo/viewer/browser_widget.cc: prev/next binded to + Ctrl+Left/Right. 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> @@ -17,92 +18,96 @@ 2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> - Fix bug in Qt interface. + Fix bugs in Qt interface. - * scribo/demo/viewer/key_widget.cc - * scribo/demo/viewer/viewer.cc + * demo/viewer/key_widget.cc, + * demo/viewer/viewer.cc: Here. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> - Fix Segfault bug in Qt interface. + Fix a segfault in Qt interface. - * demo/viewer/viewer.cc: Clean vectors when load new picture. + * demo/viewer/viewer.cc: Clean vectors when loading a new picture. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Small changes in xml_transform. - * scribo/sandbox/arthur/xml_transform/README + * sandbox/arthur/xml_transform/README + + * sandbox/arthur/xml_transform/image_crop.cc: Delete + verbose mode. - * scribo/sandbox/arthur/xml_transform/image_crop.cc: Delete verbose mode. - * scribo/sandbox/arthur/xml_transform/main.cc: Small fix. + * sandbox/arthur/xml_transform/main.cc: Small fix. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Files headers change + base64 data hide in xml tree. - * scribo/demo/viewer/README, - * scribo/demo/viewer/browser_widget.cc, - * scribo/demo/viewer/browser_widget.hh, - * scribo/demo/viewer/common.hh, - * scribo/demo/viewer/help_dialog.cc, - * scribo/demo/viewer/help_dialog.hh, - * scribo/demo/viewer/image_region.cc, - * scribo/demo/viewer/image_region.hh, - * scribo/demo/viewer/image_scene.cc, - * scribo/demo/viewer/image_scene.hh, - * scribo/demo/viewer/image_view.cc, - * scribo/demo/viewer/image_view.hh, - * scribo/demo/viewer/image_widget.cc, - * scribo/demo/viewer/image_widget.hh, - * scribo/demo/viewer/key_widget.cc, - * scribo/demo/viewer/key_widget.hh, - * scribo/demo/viewer/main.cc, - * scribo/demo/viewer/viewer.cc, - * scribo/demo/viewer/viewer.hh, - * scribo/demo/viewer/viewer.hxx, - * scribo/demo/viewer/xml_widget.cc: Change header (add LRDE copyright) - - * scribo/demo/viewer/xml_widget.hh: Hide data in base 64 to improve loading speed. + * demo/viewer/README, + * demo/viewer/browser_widget.cc, + * demo/viewer/browser_widget.hh, + * demo/viewer/common.hh, + * demo/viewer/help_dialog.cc, + * demo/viewer/help_dialog.hh, + * demo/viewer/image_region.cc, + * demo/viewer/image_region.hh, + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh, + * demo/viewer/image_view.cc, + * demo/viewer/image_view.hh, + * demo/viewer/image_widget.cc, + * demo/viewer/image_widget.hh, + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh, + * demo/viewer/main.cc, + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh, + * demo/viewer/viewer.hxx, + * demo/viewer/xml_widget.cc: Change header (add LRDE copyright) + + * demo/viewer/xml_widget.hh: Hide data in base 64 to improve + loading speed. 2010-07-20 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Text selectable in Qt interface. - * scribo/demo/viewer/viewer.cc + * demo/viewer/viewer.cc 2010-07-20 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Some changes in XML interface. - * scribo/demo/viewer/property_widget.cc, - * scribo/demo/viewer/property_widget.hh, - * scribo/demo/viewer/domitem.cc, - * scribo/demo/viewer/domitem.hh, - * scribo/demo/viewer/dommodel.cc, - * scribo/demo/viewer/dommodel.hh: Delete. + * demo/viewer/property_widget.cc, + * demo/viewer/property_widget.hh, + * demo/viewer/domitem.cc, + * demo/viewer/domitem.hh, + * demo/viewer/dommodel.cc, + * demo/viewer/dommodel.hh: Delete. - * scribo/demo/viewer/Makefile.am - - * scribo/demo/viewer/browser_widget.cc: Fix, xmlc extension instead of xmle. + * demo/viewer/Makefile.am: Remove dependencies. - * scribo/demo/viewer/key_widget.cc, - * scribo/demo/viewer/step_widget.cc, - * scribo/demo/viewer/step_widget.hh, - * scribo/demo/viewer/image_scene.cc, - * scribo/demo/viewer/image_scene.hh, - * scribo/demo/viewer/help_dialog.cc, - * scribo/demo/viewer/image_region.cc, - * scribo/demo/viewer/image_region.hh, - * scribo/demo/viewer/image_region.hxx: Small changes. + * demo/viewer/browser_widget.cc: Fix, xmlc extension instead of + xmle. - * scribo/demo/viewer/viewer.cc, - * scribo/demo/viewer/viewer.hh: Add base 64 cropped pictures support, text viewer - and change XML parsing. + * demo/viewer/key_widget.cc, + * demo/viewer/step_widget.cc, + * demo/viewer/step_widget.hh, + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh, + * demo/viewer/help_dialog.cc, + * demo/viewer/image_region.cc, + * demo/viewer/image_region.hh, + * demo/viewer/image_region.hxx: Small changes. - * scribo/demo/viewer/xml_widget.cc, - * scribo/demo/viewer/xml_widget.hh: Change widget, tree and attributes are together. + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add base 64 cropped pictures support, + text viewer and change XML parsing. + * demo/viewer/xml_widget.cc, + * demo/viewer/xml_widget.hh: Change widget, tree and attributes + are together. 2010-07-16 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> -- 1.5.6.5

14 years, 2 months

last-svn-commit-573-g1f5268f Add shortcuts in Qt interface.

by Arthur Crepin-Leblond

* demo/viewer/browser_widget.cc: Change arrows icon. * demo/viewer/help_dialog.cc: Add more informations. * demo/viewer/key_widget.cc, * demo/viewer/key_widget.hh: Add setAll(bool). * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Add shortcuts. --- scribo/ChangeLog | 11 ++++ scribo/demo/viewer/browser_widget.cc | 5 +- scribo/demo/viewer/help_dialog.cc | 13 ++++-- scribo/demo/viewer/key_widget.cc | 15 ++++++- scribo/demo/viewer/key_widget.hh | 3 + scribo/demo/viewer/viewer.cc | 85 +++++++++++++++++++++++----------- scribo/demo/viewer/viewer.hh | 1 + 7 files changed, 99 insertions(+), 34 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1417b40..f2160fa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Add shortcuts in Qt interface. + + * demo/viewer/browser_widget.cc: Change arrows icon. + * demo/viewer/help_dialog.cc: Add more informations. + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh: Add setAll(bool). + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add shortcuts. + 2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix bug in Qt interface. diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index b9ccbec..dd0bc1c 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.cc @@ -33,8 +33,9 @@ BrowserWidget::BrowserWidget(QDirModel* files, QString dir) { QToolButton* next= new QToolButton(); QToolButton* prev= new QToolButton(); - next->setArrowType(Qt::RightArrow); - prev->setArrowType(Qt::LeftArrow); + + prev->setIcon(style()->standardIcon(QStyle::SP_ArrowLeft)); + next->setIcon(style()->standardIcon(QStyle::SP_ArrowRight)); QLabel* title = new QLabel(tr("Images")); title->setAlignment(Qt::AlignHCenter); diff --git a/scribo/demo/viewer/help_dialog.cc b/scribo/demo/viewer/help_dialog.cc index 932d66f..836413a 100644 --- a/scribo/demo/viewer/help_dialog.cc +++ b/scribo/demo/viewer/help_dialog.cc @@ -40,10 +40,15 @@ HelpDialog::HelpDialog() "Document layout viewer:\n" "\n" "Usage:\n" - " - Choose an image file in the file browser\n" - " - If the document layout is present\n" - " (XML file with the same name),\n" - " select regions to display their properties.\n" + " - Choose an image file in the file browser,\n" + "if XML file(s) whose prefix name is the same as\n" + "the image name (i.e.image _name(_ .*)?.xml) is present\n" + "then you can choose the one you want in the step\n" + "chooser to display it on the scene.\n" + "- To load a base 64 encoded XML file,\n" + "its extension has to be .xmlc otherwise \n" + "the program won't recognize it !\n" + " - Select regions to display their properties.\n" " - Use the mouse or keyboard to move and zoom\n" " (Arrows, PageUp, PageDown, Home, End).\n" "\n"); diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 228ad67..f567992 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -39,9 +39,10 @@ KeyWidget::KeyWidget(const region::KeyMap& key_map) items_->setHeaderHidden(true); text_->setCheckState(0, Qt::Checked); + text_->setExpanded(true); + regions_->setCheckState(0, Qt::Checked); regions_->setExpanded(true); - text_->setExpanded(true); for (int i = 0; i < 3; ++i) add_item_(key_map.at(i).first, key_map.at(i).second, @@ -70,6 +71,18 @@ void KeyWidget::update_all() update(regions_->child(i)); } +void KeyWidget::setAll(bool b) +{ + Qt::CheckState state; + if (b) + state = Qt::Checked; + else + state = Qt::Unchecked; + + text_->setCheckState(0, state); + regions_->setCheckState(0, state); +} + void KeyWidget::setAllCheck(QTreeWidgetItem* parent) { for (int i = 0; i < parent->childCount(); ++i) diff --git a/scribo/demo/viewer/key_widget.hh b/scribo/demo/viewer/key_widget.hh index 113835d..d261ec6 100644 --- a/scribo/demo/viewer/key_widget.hh +++ b/scribo/demo/viewer/key_widget.hh @@ -45,6 +45,9 @@ public: signals: void updated(int key, bool checked); +public slots: + void setAll(bool b); + private slots: void change_mode(bool b); void update(QTreeWidgetItem* item); diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 38ca8b1..41434ba 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -87,74 +87,94 @@ Viewer::Viewer(int &argc, char** argv) win_->statusBar(); QMenu* file_menu = win_->menuBar()->addMenu(tr("File")); - QAction* quit_action = new QAction(tr("Quit"), file_menu); + QMenu* option_menu = win_->menuBar()->addMenu(tr("Options")); + QMenu* help_menu = win_->menuBar()->addMenu(tr("Help")); + + QAction* quit_action = create_action("Quit", file_menu, + "Exit the program.", "Ctrl+q"); connect(quit_action, SIGNAL(triggered()), app_, SLOT(quit())); - quit_action->setStatusTip(tr("Exit the program.")); file_menu->addAction(quit_action); - QMenu* option_menu = win_->menuBar()->addMenu(tr("Options")); - outline_action_ = new QAction(tr("Draw outline"), option_menu); - outline_action_->setStatusTip(tr("Draw region outlines.")); + outline_action_ = create_action("Draw outline", option_menu, + "Draw region outlines.", "Ctrl+o"); outline_action_->setCheckable(true); outline_action_->setChecked(true); connect(outline_action_, SIGNAL(toggled(bool)), this, SIGNAL(setOutline(bool))); option_menu->addAction(outline_action_); - precise_action_ = new QAction(tr("Precise outline"), option_menu); - precise_action_->setStatusTip(tr("1px outline relative to the image " - "(1px relative to the view if off).")); + + precise_action_ = create_action("Precise outline", option_menu, + "1px outline relative to the image " + "(1px relative to the view if off).", + "Ctrl+p"); precise_action_->setCheckable(true); precise_action_->setChecked(false); connect(precise_action_, SIGNAL(toggled(bool)), this, SIGNAL(setPrecise(bool))); option_menu->addAction(precise_action_); - fill_action_ = new QAction(tr("Fill regions"), option_menu); - fill_action_->setStatusTip(tr("Color the inside of regions.")); + + fill_action_ = create_action("Fill regions", option_menu, + "Color the inside of regions.", "Ctrl+f"); fill_action_->setCheckable(true); fill_action_->setChecked(true); connect(fill_action_, SIGNAL(toggled(bool)), this, SIGNAL(setFill(bool))); option_menu->addAction(fill_action_); - QAction* cache_action = new QAction(tr("Disable cache"), file_menu); - cache_action->setStatusTip(tr("Disable the image cache (useful for" - " large images).")); + QAction* cache_action = create_action("Disable cache", option_menu, + "Disable the image cache (useful for" + " large images).", "Ctrl+c"); cache_action->setCheckable(true); cache_action->setChecked(false); connect(cache_action, SIGNAL(toggled(bool)), this, SLOT(useCache(bool))); option_menu->addAction(cache_action); - QAction* extended_action = new QAction(tr("Extended mode"), file_menu); - extended_action->setStatusTip(tr("If enabled, some features not supported by ICDAR" - " are added such as text regions or text lines")); + + QAction* extended_action = create_action("Extended mode", option_menu, + "If enabled, some features " + "not supported by ICDAR" + " are added such as text regions" + "or text lines", "Ctrl+e"); extended_action->setCheckable(true); extended_action->setChecked(false); connect(extended_action, SIGNAL(toggled(bool)), this, SLOT(useExtended(bool))); option_menu->addAction(extended_action); - QAction* show_image_action = new QAction(tr("Show pictures"), file_menu); - //show_image_action->setStatusTip(tr("")); - + QAction* show_image_action = create_action("Show pictures", option_menu, + "Display pictures on the scene or not", + "Ctrl+i"); show_image_action->setCheckable(true); show_image_action->setChecked(true); connect(show_image_action, SIGNAL(toggled(bool)), this, SLOT(useImage(bool))); option_menu->addAction(show_image_action); - QAction* show_text_action = new QAction(tr("Show text"), file_menu); - show_text_action->setStatusTip(tr("Show detected text inside boxes.")); + QAction* show_text_action = create_action("Show text", option_menu, + "Show detected text inside boxes.", + "Ctrl+t"); show_text_action->setCheckable(true); show_text_action->setChecked(true); connect(show_text_action, SIGNAL(toggled(bool)), this, SLOT(useText(bool))); option_menu->addAction(show_text_action); - QMenu* help_menu = win_->menuBar()->addMenu(tr("Help")); - QAction* about_action = new QAction(tr("About"), help_menu); - about_action->setStatusTip(tr("About this program.")); + key_wgt_ = new KeyWidget(key_map_); + QAction *show_region_action = create_action("Show regions", option_menu, + "Display regions that are present in" + " the XML file.", + "Ctrl+r"); + show_region_action->setCheckable(true); + show_region_action->setChecked(true); + connect(show_region_action, SIGNAL(toggled(bool)), + key_wgt_, SLOT(setAll(bool))); + option_menu->addAction(show_region_action); + + QAction* about_action = create_action("About", help_menu, + "About this program", + "Ctrl+h"); connect(about_action, SIGNAL(triggered()), this, SLOT(help())); help_menu->addAction(about_action); @@ -167,7 +187,6 @@ Viewer::Viewer(int &argc, char** argv) XmlWidget* xml_wgt = new XmlWidget(); BrowserWidget* browser_wgt = new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); - key_wgt_ = new KeyWidget(key_map_); ImageWidget* image_wgt = new ImageWidget(scene_); scene_->setBackgroundBrush(scene_->palette().window()); @@ -276,6 +295,7 @@ Viewer::add_text(QDomNode line, QDomNode region) QGraphicsTextItem* text_item = scene_->addText(text, font); text_item->setPos(x_min, y_min); text_item->setTextInteractionFlags(Qt::TextSelectableByMouse); + text_item->setZValue(5); text_vector_ << text_item; if (!text_) scene_->removeItem(text_item); @@ -441,8 +461,8 @@ Viewer::load_xml(QString filename) } } - if ((extended_mode_ || text_) && - region.toElement().tagName().contains("text_region")) + // if ((extended_mode_ || text_) && + if (region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); while (!para.isNull() && !para.toElement().tagName().contains("paragraph")) @@ -656,3 +676,14 @@ Viewer::change_base(bool b) { base64_ = b; } + + +QAction +*Viewer::create_action(QString name, QMenu *menu, QString status, QString shortcut) +{ + QAction* action = new QAction(name, menu); + action->setStatusTip(status); + action->setShortcut(QKeySequence(shortcut)); + + return (action); +} diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index b1f406d..30e01bb 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -77,6 +77,7 @@ private: QPixmap load_base64(QString xml); void add_region(QDomNode father, QString attr_id); void add_text(QDomNode line, QDomNode region); + QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); QApplication* app_; QMainWindow* win_; -- 1.5.6.5

14 years, 2 months

last-svn-commit-574-g432df10 Add arrows shortcuts.

by Arthur Crepin-Leblond

* demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. --- scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/browser_widget.cc | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f2160fa..4fa6c77 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Add arrows shortcuts. + + * demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. + +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Add shortcuts in Qt interface. * demo/viewer/browser_widget.cc: Change arrows icon. diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index dd0bc1c..7e01789 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.cc @@ -36,6 +36,8 @@ BrowserWidget::BrowserWidget(QDirModel* files, QString dir) prev->setIcon(style()->standardIcon(QStyle::SP_ArrowLeft)); next->setIcon(style()->standardIcon(QStyle::SP_ArrowRight)); + next->setShortcut(QKeySequence("Ctrl+right")); + prev->setShortcut(QKeySequence("Ctrl+left")); QLabel* title = new QLabel(tr("Images")); title->setAlignment(Qt::AlignHCenter); -- 1.5.6.5

14 years, 2 months

branch next-build-test updated: last-svn-commit-686-gc127a16

by lazzara＠lrde.epita.fr

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 next-build-test has been updated discards 211abc2e1821e7345265ed7ec6795c27700a54e6 (commit) discards d5495b68b9ad242824bd38670fc6e1fd96198ea7 (commit) discards ccbaf9ec3ce9dd056c23da445652b06e119f60d3 (commit) discards cf721d5f7cb5e77df5f8a65cc0d249ce1e4e5bb9 (commit) discards 5fc9c32351bd3eef4749095a1948eeb2735c379c (commit) discards 557ac2f43b73eb2fc3a49d1d34975559873fabee (commit) discards 236e8722e83acffc95360eba6b190b90519ef23d (commit) discards 0ce764d574dff94e89d7c5d1f1d0e9c010a84707 (commit) discards 8f3101526bd99273d1b71d467b044a07a8479d70 (commit) discards 63c3277770ffaa3b4e398d55abda8c5d20dc9457 (commit) discards b410ac89fa92e3e6d6c2cdcc75587a67fdb10263 (commit) discards 47b8275a4f3b1be6df5871c5c08d1cf6e68d5091 (commit) discards b36c24db0da84a8b3e0e87c4910cb0be0db822b6 (commit) discards 75906d495a3eca7b428867a3396be42c7efb5f48 (commit) discards 0731c7c8842df57d9c10cdb5cbe1e513a9caeaac (commit) discards 1ab4203ac8e4982f64558331f51393bffc10f3be (commit) discards d6086ba7e1531d4c877f750f693e790a3188d344 (commit) discards 33bbebf81a5b0ffc63d171b8b5c780b43b4cc9fe (commit) discards aa2b96f53b7311fa53fd5eca8199bad7dd23b7a1 (commit) discards 9056104a5c29eedbcf4dbb61edd85c01a6bdd6a2 (commit) discards 7ae09a27d933808721f325e3686ae2c40c80aff1 (commit) discards 77cb9729a132a85874e768fa331508fe5568546c (commit) discards 7b6381a4a19ec2b5789238f7da60b487dd0dde9c (commit) discards b7fe0b0c71d5a1a45d7fef7b2bd9785e85e6b14e (commit) discards b584d0d7a6807a8324c919ebe33095f0db7d1c97 (commit) discards 47dbda4b5be9c7bff0e0491cfe2b6fecbc70a4eb (commit) discards c30e01cfb3bbd3174bb4328449c6d88fd5c8547e (commit) discards a37cf92314d64617c4a27d59536c456f69137335 (commit) discards 4e3b22c81a3169cef27f1f8f224d462b450e736f (commit) discards c2ce47f4db882942f24e48016fd52eb8d0917709 (commit) discards 15f90779214f7e5b6915ee6e9e36eaadc8bd8a76 (commit) discards 929109d05d0b991eba30da1333344365412319d1 (commit) discards f6cd71cf65ee28fa78ef553bbd90cc63991e32e8 (commit) discards dc8a597c5afa6f79539de694e7e55ac8e6dfc9e8 (commit) discards a6d10b92e81b48239ae309c615b6c6647c7013ec (commit) discards bb1443023ff76a8904b4b9e10a52eda83b1479a1 (commit) discards 8de09d407ab3f6d979449b8e1b9927d2715667ae (commit) discards f3beb04e24ab07b4f4c866bf6a79f64db452d51d (commit) discards 05e90bbf726cd40d9fc95409a753347e3d4e8370 (commit) discards ae08c966fba3c72d37f46783fb48f8104a288aa9 (commit) discards 4b787b3fc120885fe8cb03932b5d5ab728b810f0 (commit) discards f046b9f5b9cd5c17d22c41202ad88469d323cc27 (commit) discards 986d2c9a133de075f3353f80cdb1266fd29d73fd (commit) discards f049b3b3af34104b1bd33f40600385df3dbf2858 (commit) discards e41a013fc3f8c3529028b1963a6cac210ddf2c93 (commit) discards 938b829b7419f657ba9b18cc5e575bd5524df3c2 (commit) discards 5a6d399a31eca1992e5977f9e39f2aaab6b15fef (commit) discards 5cc2327568f70594a6c04da24f0d7b7af7087f83 (commit) discards a10c9ac30448e8cf462b8b07681ba464e0839438 (commit) discards 30811306ba6977c37ab717c74f38122f1891e1a6 (commit) discards 68c4e75427f934853c4aaec279f0bd2527c57ff5 (commit) discards e707239de083f61986384bba64d6ba8c19eb12be (commit) discards 398af6cbcd6d487a1ecd705091d990ebab397e4a (commit) discards 6f0918c286aa96174c1334d5ed4684c69160e0e3 (commit) discards dc310b67a1f07c96543d58aacbe03e94430f59e5 (commit) discards 153406c4dcded413b6f3afa1f6e6dd719a71e3ac (commit) discards af079edcf2601e63611e43584cddc61bd135a376 (commit) discards f0997baa7a5dccd6881f2a0b26d867f02ed01a2a (commit) discards 811f9920b329f8f17f30faa32a92055193129468 (commit) discards 32f92e4ec7bc4b803c9cd07dadb0659f740ee52c (commit) via c127a164c2c633a92b28520826598874cc977703 (commit) via 7e3b4a70417c6764b8d6edc1a714474addcead6f (commit) via 04db12cde070ee0fca4e34d00b963b3b7b33a8dc (commit) via 738511d2e88dfc90f4800acede308c43866ed405 (commit) via 24d74ffb28a6caa19aedd832c0a7f954ddf4c8a9 (commit) via f09fec4f86ab4717fd61969b2c0a23b07584017d (commit) via 75486e11b5bbb2cea5199cefa619f98cd0cb8267 (commit) via 99f6f2ae7730170f002d10345a068005bf231e30 (commit) via 270711a0cdbf050d4532c736a478c77669ebe0fd (commit) via c03272f934234a8574232923c11f932ae9cd2e9d (commit) via 9bd5d46fd58c6ae2ea96375911e1672a8dd7660f (commit) via afdb77c5d38cd67f62457dcc619ae1b035f7507a (commit) via a2b46dc2207a578041af7758853ae17c901b268a (commit) via 9873b787912e73d48d6a7f7ad17903874c90d0d2 (commit) via 92e2d041eea0312cb441a805c73606207494fd74 (commit) via 4c97de45e12e180253707428ca407975b836f599 (commit) via 0b29bba800f78bd36453bfb0248be2fc6fcfe4a7 (commit) via bc7c47971d1ae90a2df99732a2139c1b685b8472 (commit) via 0da3ec219b6d3223a2871f1872d7e7120ba4db22 (commit) via 9aa2edee69af7d9da7139b0231abbe43c4f32aee (commit) via 0ad1284da77831e3361661042b01a5fc96502ef9 (commit) via 5d58ddce6e23c83cb22ad4ef6c11c4cc893b9b29 (commit) via ffb11d37b76293c473cfa7993ade0bfed18426db (commit) via 0fb69c9224e2803a6c919b332d3265fe15d6bd78 (commit) via 0a82e15ff731073934fdb3cc82a92b52fcb1da1b (commit) via 07d3bc0718629fcdb128167f83f2fe31609218cb (commit) via 52af6ecc19bfc3ef22af4f3be66d036059a49bf6 (commit) via 61b2c3733a150025a75b6d4d978de7a60d8ce767 (commit) via a04c2ef9e9630c40f7256f119a96f6c617255a48 (commit) via 187ea0363976c7c5a1302cdc4d1ea58ebdbbe60c (commit) via 667167f7843b90a29a785f9b63ece3623df5184d (commit) via f14899873413a945c40134c925388958072a781e (commit) via f50243275bcbd10b5803c6a58270562703333e5a (commit) via 222955acc954ecb48650036b7f1052bd47d215f4 (commit) via eec4ffe46dd3eafc91c4376011efb8fd51aaeb7d (commit) via 964a8b8a76715886c2843ec7ba976a579df7d819 (commit) via bd9472a7dca698e83cf0eaf348271113907195f8 (commit) via 33f563714a2786565e9a1e1bf96396923a88d27c (commit) via 33a1752af0558f4f57966386573deed86cc333d3 (commit) via 3ad6a4d6b4e31a806d8f3ddcb41871567d92af0a (commit) via aae4f34afcdb72921bda2492e42768db66874812 (commit) via 38f31bc053777696828f595905ceda775da86b87 (commit) via 85d4bb7233887b5387a7e10fad883a38f5b14b3a (commit) via d44aa817d631482b3906f68a53a8f1a1bcc491b2 (commit) via 64fb4bc92d81eaf61eba1c09d58e4fc7364a68fd (commit) via e35598a3d1fb3b028de14805a0669c0de5fca476 (commit) via e6ba8b92d3de0a9b6f433972d143c1fda9cc0f4d (commit) via 5f5569ab7b57bc71e465f6e57194030f30a25640 (commit) via 65981fdfded696c335e50d7a7d13a3d903e86b3d (commit) via d33f5803ccf53ef6232f76b42e40e327ba965f5a (commit) via 91a43aed292b0ea99eec6cf88ccf220c6f33aae6 (commit) via 87a2f38e04bb320cd200ed1efb70e1bfb61259e3 (commit) via 39901400dfce5d0a09083a15ed483a92a08a3f1d (commit) via fcf3c1596e55f776e3b30b4cea4f20120f2652b3 (commit) via d6c1dbb9aa147162ffa272c129f266d46c5e3c5d (commit) via accfaf184de2160fb73424fef0277d97223bd310 (commit) via cb91a95d6d7213db994b2ab590c6da2d2ee86a04 (commit) via cecfdd1b70ac9a2d38b11af6f16ccfc6f82ade4c (commit) via 9723ab688050807af0f5d7356d0030967b764456 (commit) via 432df10acf22236a3a6bcb1f7e991f596524f891 (commit) via 1f5268f36f0fd1ce6163a30aa6d700f92c47b655 (commit) via e91a1885ccb4f41c4ab23136a7c40fae8a1ff3fd (commit) via 0d8813e68ce7b27f4e0af6ee0a6004d0564b5945 (commit) via 7c25953a8c1e0d82f2c31696ae94c1bc616281e1 (commit) via bc407e203f38df5a984d5ba5463907394b335f7e (commit) via 83d0183b7c6e7850ff42b1143978de4a8498171b (commit) via 7924629f9a5ed75553a8fa6cee857bf59b634c0f (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (211abc2e1821e7345265ed7ec6795c27700a54e6) \ N -- N -- N (c127a164c2c633a92b28520826598874cc977703) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- c127a16 configure.ac: Use tar-ustar to allow filenames with more than 99 characters. 7e3b4a7 Distribute more files with Scribo. 04db12c Merge branch 'next' into next-build-test 738511d Improve image cropping in xml_transform. 24d74ff mln/io/pnm/save.hh: Add a fixme related to an ICE with GCC 4.1.1. f09fec4 Fix QImage conversions. 75486e1 mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions 99f6f2a Fix disabled unit tests in Milena. 270711a tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test. c03272f Add a new test for accu::stat:deviation. 9bd5d46 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. afdb77c Remove a useless from_to overload. a2b46dc Regen .mk files in Scribo. 9873b78 Compilation fixes. 92e2d04 scribo/core/document.hh: Add new methods. 4c97de4 scribo/io/xml/save.hh: Add conditions before saving elements and text. 0b29bba scribo/core/line_set.hh (is_valid()): New method. bc7c479 Regen mk files in Milena. 0da3ec2 Introduce world::rgb::invert. 9aa2ede Improve dispatch in arith::revert routine. 0ad1284 mln/data/paste_without_localization.hh: Remove duplicate declarations. 5d58ddc mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from ffb11d3 scribo/primitive/group/from_double_link_any.hh: New. 0fb69c9 scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New. 0a82e15 Improve text_in_picture_neg. 07d3bc0 Do not negate Sauvola's output. 52af6ec scribo/core/component_set.hh: Combine separator images. 61b2c37 First draft of text_in_picture_neg a04c2ef Add merge::components routine. 187ea03 Introduce text_in_picture toolchain. 667167f src/content_in_doc.cc: New example extracting document content. f148998 scribo/toolchain/text_in_doc.hh: Make use of non visible separators information. f502432 scribo/io/xml/save.hh: Make use of document structure. 222955a scribo/primitive/extract/elements.hh: New routine. eec4ffe scribo/primitive/extract/separators_nonvisible.hh: New routine. 964a8b8 mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. bd9472a mln/fun/v2v/rgb8_to_rgbn.hh: Import rgb8 to rgbn conversion function from Yann's sandbox. 33f5637 scribo/core/macros.hh: Remove deprecated macro. 33a1752 scribo/core/document.hh: Introduce new document structure. 3ad6a4d Merge branch 'exp/green' into next-build-test aae4f34 Update default value in an example 38f31bc Add conversions from int_u to float and double. 85d4bb7 mln/convert/from_to.hh: Make use of value::cast for conversions between built-in types. d44aa81 mln/data/paste_without_localization.hh: Add a missing dispatch overload. 64fb4bc mln/io/plot/save.hh: Remove an inline keyword. e35598a Add missing MLN_WO_GLOBAL_VARS conditions. e6ba8b9 demo/viewer/Makefile.am: Remove deprecated dependencies. 5f5569a Include scribo.mk instead of tests.mk. 65981fd scribo/canvas/integral_browsing.hh: Cleanup comments. d33f580 src/binarization/sauvola_ms.cc: Add missing includes. 91a43ae Set default window size to 101 in Sauvola examples. 87a2f38 Improve debug management and outputs for Sauvola. 3990140 Improve debug management and outputs for Sauvola. fcf3c15 mln/accu/stat/deviation.hh: Set first template parameter of accu::stat:sum to mln_sum(T). d6c1dbb arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile time. accfaf1 Add missing const references to function arguments. cb91a95 Changelog: Cleanup. cecfdd1 Open Document bug warning. 9723ab6 Fix man error. 432df10 Add arrows shortcuts. 1f5268f Add shortcuts in Qt interface. e91a188 Output change in xml_tranform. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 11 + configure.ac | 3 +- milena/ChangeLog | 29 +- milena/Makefile.am | 1 + milena/mln/accu/stat/deviation.hh | 8 +- milena/mln/io/magick/load.hh | 17 +- milena/mln/io/magick/save.hh | 30 +- milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 + scribo/ChangeLog | 15 +- scribo/sandbox/ChangeLog | 30 +- scribo/sandbox/arthur/xml_transform/README | 2 - scribo/sandbox/arthur/xml_transform/image_crop.cc | 84 ++-- scribo/sandbox/arthur/xml_transform/image_crop.hh | 12 +- scribo/sandbox/arthur/xml_transform/main.cc | 119 +++-- .../xml_transform/templates/html/html_generator.sh | 3 - .../templates/html/{xsl.xsl => main.xsl} | 46 ++- .../html/{xsl_base64.xsl => main_base64.xsl} | 111 +++-- .../arthur/xml_transform/templates/ooconvert | 517 ++++++++++++++++++++ .../templates/opendoc/opendoc_generator.sh | 24 - .../arthur/xml_transform/templates/opendoc/xsl.xsl | 33 ++- .../arthur/xml_transform/templates/pdf/main.xsl | 22 +- .../arthur/xml_transform/templates/pdf/main64.xsl | 62 --- .../xml_transform/templates/pdf/pdf_generator.sh | 3 - .../pdf/{regions_base64.xsl => regions.xsl} | 0 .../xml_transform/templates/pdf/regions_png.xsl | 59 --- .../xml_transform/templates/pdf/svg_generator.sh | 3 - .../xml_transform/templates/{pdf => svg}/line.xsl | 0 .../templates/{pdf/main_crop.xsl => svg/main.xsl} | 0 .../{pdf/regions_svg.xsl => svg/regions.xsl} | 0 .../xml_transform/templates/xml_transform.sh | 134 +++++ .../sandbox/arthur/xml_transform/xml_transform.cc | 76 +-- .../sandbox/arthur/xml_transform/xml_transform.hh | 2 + .../sandbox/arthur/xml_transform/xml_transform.pro | 6 +- scribo/sandbox/green/mln/accu/stat/histo2d.hh | 3 +- scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 1 - scribo/sandbox/green/mln/display/display_histo.hh | 5 +- scribo/sandbox/green/mln/display/project_histo.hh | 2 + .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 2 +- scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 4 +- .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 1 - scribo/src/Makefile.am | 7 + scribo/src/debug/Makefile.am | 2 - scribo/src/debug/center_pixel_stats.cc | 52 -- scribo/tests/Makefile.am | 1 + swilena/ChangeLog | 7 + swilena/python/Makefile.am | 11 +- 47 files changed, 1091 insertions(+), 475 deletions(-) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl.xsl => main.xsl} (89%) rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl_base64.xsl => main_base64.xsl} (75%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/ooconvert delete mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/pdf/{regions_base64.xsl => regions.xsl} (100%) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{pdf => svg}/line.xsl (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/main_crop.xsl => svg/main.xsl} (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/regions_svg.xsl => svg/regions.xsl} (100%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh delete mode 100644 scribo/src/debug/center_pixel_stats.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches