November 2010 - Olena-patches

last-svn-commit-687-g3369290 Add a fastest implementation in io::magick.
by Guillaume Lazzara 19 Nov '10

19 Nov '10

* mln/io/magick/load.hh, * mln/io/magick/save.hh: Use pointers to access image data. --- milena/ChangeLog | 7 ++++++ milena/mln/io/magick/load.hh | 50 ++++++++++++++++++++++++++---------------- milena/mln/io/magick/save.hh | 24 ++++++++++++++++---- 3 files changed, 57 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 10d8482..f853179 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a fastest implementation in io::magick. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Use pointers to access image data. + 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> Handle properly non 8-bit Magick::Quantum's. diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 60e857e..2acd668 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -155,33 +155,45 @@ namespace mln mln_concrete(I) result(box<mln_site(I)>(pmin, pmax)); initialize(ima, result); + def::coord + minrow = geom::min_row(ima), + mincol = geom::min_col(ima), + maxrow = geom::max_row(ima), + maxcol = geom::max_col(ima); + Magick::Pixels view(magick_ima); // Note that `ncols' is passed before `nrows'. Magick::PixelPacket* pixels = view.get(0, 0, ima.ncols(), ima.nrows()); - mln_piter(I) p(ima.domain()); - for_all(p) - { - /* Each channel of a Magick++ image is coded on a - Magick::Quantum value, which can be an 8-, 16- or 32-bit - integer. Load the most significant bits of each channel - into a component of an mln::value::rgb8 value (i.e., into - an mln::value::int_u8 value). */ - value::rgb8 c(pixels->red >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::red_t)), - pixels->green >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::green_t)), - pixels->blue >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::blue_t))); - mln_value(I) res; - if (!impl::do_it(c, res)) + mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); + + unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + + for (def::coord row = minrow; row <= maxrow; + ++row, ptr_ima += row_offset) + for (def::coord col = mincol; col <= maxcol; ++col) + { + + /* Each channel of a Magick++ image is coded on a + Magick::Quantum value, which can be an 8-, 16- or 32-bit + integer. Load the most significant bits of each channel + into a component of an mln::value::rgb8 value (i.e., into + an mln::value::int_u8 value). */ + value::rgb8 c(pixels->red >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::red_t)), + pixels->green >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::green_t)), + pixels->blue >> 8 * (sizeof(Magick::Quantum) + - sizeof(value::rgb8::blue_t))); + mln_value(I) res; + if (!impl::do_it(c, res)) { std::cerr << "while trying to load `" << filename << "'" << std::endl; abort(); } - ima(p) = res; - ++pixels; - } + *ptr_ima++ = res; + ++pixels; + } trace::exiting("mln::io::magick::load"); } diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 7a91ee0..7282414 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -150,18 +150,32 @@ namespace mln const I& ima = exact(ima_); + def::coord + minrow = geom::min_row(ima), + mincol = geom::min_col(ima), + maxrow = geom::max_row(ima), + maxcol = geom::max_col(ima), + ncols = geom::ncols(ima), + nrows = geom::nrows(ima); + + Magick::Image magick_ima; // In the construction of a Geometry object, the width (i.e. // `ncols') comes first, then the height (i.e. `nrows') // follows. - magick_ima.size(Magick::Geometry(ima.ncols(), ima.nrows())); + magick_ima.size(Magick::Geometry(ncols, nrows)); Magick::Pixels view(magick_ima); // As above, `ncols' is passed before `nrows'. - Magick::PixelPacket* pixels = view.get(0, 0, ima.ncols(), ima.nrows()); - mln_piter(I) p(ima.domain()); - for_all(p) - *pixels++ = impl::get_color(ima(p)); + Magick::PixelPacket* pixels = view.get(0, 0, ncols, nrows); + const mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); + + unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + + for (def::coord row = minrow; row <= maxrow; + ++row, ptr_ima += row_offset) + for (def::coord col = mincol; col <= maxcol; ++col) + *pixels++ = impl::get_color(*ptr_ima++); view.sync(); magick_ima.write(filename); -- 1.5.6.5

1 0

last-svn-commit-654-g61b2c37 First draft of text_in_picture_neg
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- scribo/src/Makefile.am | 10 ++ scribo/src/text_in_picture_neg.cc | 195 +++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 0 deletions(-) create mode 100644 scribo/src/text_in_picture_neg.cc diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index cd7618c..9efa0da 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -70,6 +70,16 @@ if HAVE_MAGICKXX -lpthread \ $(MAGICKXX_LDFLAGS) + + utilexec_PROGRAMS += text_in_picture_neg + text_in_picture_neg_SOURCES = text_in_picture_neg.cc + text_in_picture_neg_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) + text_in_picture_neg_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) + + if HAVE_TESSERACT utilexec_PROGRAMS += text_recognition_in_picture diff --git a/scribo/src/text_in_picture_neg.cc b/scribo/src/text_in_picture_neg.cc new file mode 100644 index 0000000..e3078c6 --- /dev/null +++ b/scribo/src/text_in_picture_neg.cc @@ -0,0 +1,195 @@ +// 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. + +#include <libgen.h> +#include <iostream> + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/labeling/colorize.hh> + +#include <mln/data/stretch.hh> + +#include <mln/io/pbm/all.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/magick/all.hh> + +#include <mln/math/min.hh> + +#include <mln/logical/not.hh> + +#include <mln/literal/colors.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/label_16.hh> + +#include <mln/fun/v2v/rgb_to_int_u.hh> + +#include <mln/data/wrap.hh> + +#include <mln/draw/box.hh> + +#include <mln/geom/translate.hh> + +#include <mln/subsampling/antialiased.hh> + +#include <scribo/draw/bounding_boxes.hh> +#include <scribo/draw/groups_bboxes.hh> + +#include <scribo/binarization/sauvola_ms.hh> +#include <scribo/binarization/sauvola.hh> + +#include <scribo/primitive/extract/components.hh> + +#include <scribo/primitive/link/merge_double_link.hh> +#include <scribo/primitive/link/with_single_left_link.hh> +#include <scribo/primitive/link/with_single_right_link.hh> + +#include <scribo/primitive/group/apply.hh> +#include <scribo/primitive/group/from_double_link.hh> +#include <scribo/primitive/group/from_single_link.hh> + +#include <scribo/primitive/regroup/from_single_left_link.hh> +// #include <scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh> + +#include <scribo/filter/object_groups_with_holes.hh> + +#include <scribo/filter/object_links_bbox_h_ratio.hh> +#include <scribo/filter/object_links_bbox_overlap.hh> + +#include <scribo/filter/common/objects_photo.hh> + +#include <scribo/filter/object_groups_small.hh> +#include <scribo/filter/object_groups_v_thickness.hh> + +#include <scribo/debug/highlight_text_area.hh> +#include <scribo/debug/text_areas_image.hh> + +#include <scribo/debug/decision_image.hh> +#include <scribo/debug/save_bboxes_image.hh> +#include <scribo/debug/save_linked_bboxes_image.hh> + +#include <scribo/debug/usage.hh> + +#include <scribo/preprocessing/split_bg_fg.hh> + +#include <scribo/make/debug_filename.hh> + +#include <scribo/toolchain/text_in_picture.hh> + +#include <scribo/primitive/merge/components.hh> + +#include <mln/util/timer.hh> +#include <mln/core/var.hh> + +const char *args_desc[][2] = +{ + { "input.*", "A color image." }, + { "ouput.ppm", "A color image where the text is highlighted." }, + { "debug_output_dir", "Directory were debug images will be saved" }, + { "lambda", "Lambda value used for foreground extraction" }, + {0, 0} +}; + + + +int main(int argc, char* argv[]) +{ + using namespace scribo; + using namespace scribo::primitive; + using namespace mln; + + if (argc < 3 || argc > 8) + return scribo::debug::usage(argv, + "Find text in a photo.\n\n" + "Common usage: ./text_in_photo_fast input.*" + " output.ppm 1 1", + "input.ppm output.ppm <bg/fg enabled>" + " <sauvola_ms enabled> " + "[debug_output_dir] [max_dim_size] [lambda]", + args_desc); + + char *out_base_dir = 0; + if (argc > 5) + out_base_dir = argv[5]; + + trace::entering("main"); + + image2d<value::rgb8> input_rgb; + io::magick::load(input_rgb, argv[1]); + + unsigned max_dim_size = 0; + if (argc >= 7) + max_dim_size = atoi(argv[6]); + + + unsigned lambda = 0; + if (argc == 8) + lambda = atoi(argv[7]); + + bool bg_removal = false; + if (argc > 3 && atoi(argv[3]) != 0) + bg_removal = true; + + bool multi_scale_bin = false; + if (argc > 4 && atoi(argv[4]) != 0) + multi_scale_bin = true; + + + typedef image2d<value::label_16> L; + component_set<L> + comps = toolchain::text_in_picture(input_rgb, bg_removal, multi_scale_bin, + false, + max_dim_size, lambda, out_base_dir); + + + typedef image2d<value::label_16> L; + component_set<L> + comps_neg = toolchain::text_in_picture(input_rgb, bg_removal, multi_scale_bin, + true, + max_dim_size, lambda, out_base_dir); + + + component_set<L> merged_comps = primitive::merge::components(comps, comps_neg); + + + + io::ppm::save(mln::labeling::colorize(value::rgb8(), + merged_comps.labeled_image(), + merged_comps.nelements()), + argv[2]); + + if (out_base_dir) + { + io::ppm::save(scribo::debug::highlight_text_area(input_rgb, merged_comps), + std::string(out_base_dir) + "_input_with_bboxes.ppm"); + io::ppm::save(scribo::debug::text_areas_image(input_rgb, merged_comps), + std::string(out_base_dir) + "_out_text.ppm"); + } + + std::cout << "# objects = " << merged_comps.nelements() << std::endl; + +} -- 1.5.6.5

1 0

last-svn-commit-653-ga04c2ef Add merge::components routine.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- scribo/scribo/primitive/merge/components.hh | 121 +++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/primitive/merge/components.hh diff --git a/scribo/scribo/primitive/merge/components.hh b/scribo/scribo/primitive/merge/components.hh new file mode 100644 index 0000000..7570d2e --- /dev/null +++ b/scribo/scribo/primitive/merge/components.hh @@ -0,0 +1,121 @@ +// 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. + +/// \file +/// +/// + +#ifndef SCRIBO_PRIMITIVE_MERGE_COMPONENTS_HH +# define SCRIBO_PRIMITIVE_MERGE_COMPONENTS_HH + +# include <mln/core/image/vmorph/fun_image.hh> + + +namespace scribo +{ + + namespace primitive + { + + namespace merge + { + + using namespace mln; + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename V> + struct rebase_label : mln::Function_v2v<rebase_label<V> > + { + typedef V result; + + rebase_label() + : base_label_(0) + {} + + rebase_label(const V& base_label) + : base_label_(base_label) + {} + + V operator()(const V& v) const + { + if (v) + return unsigned(base_label_) + unsigned(v); + return literal::zero; + } + + + V base_label_; + }; + + + } // end of namespace scribo::primitive::merge + + + template <typename L> + component_set<L> + components(const component_set<L>& lhs, const component_set<L>& rhs) + { + trace::entering("scribo::primitive::merge::components"); + + const L& lhs_lbl = lhs.labeled_image(); + const L& rhs_lbl = rhs.labeled_image(); + + typedef mln_value(L) V; + + + V nlabels = unsigned(lhs.nelements()) + unsigned(rhs.nelements()); + + // Merge labeled images. + // + // Rebase labeling in the second image, according to the + // number of labels in the first one. + // + L lbl_merge = duplicate(lhs_lbl); + + internal::rebase_label<V> f(lhs.nelements()); + fun_image<internal::rebase_label<V>, L> fima(f, rhs_lbl); + data::fill((lbl_merge | (pw::value(lbl_merge) == pw::cst(0))).rw(), fima); + + component_set<L> output(lbl_merge, nlabels); + + trace::exiting("scribo::primitive::merge::components"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::primitive::merge + + } // end of namespace scribo::primitive + +} // end of namespace scribo + + +#endif // ! SCRIBO_PRIMITIVE_MERGE_COMPONENTS_HH -- 1.5.6.5

1 0

last-svn-commit-652-g187ea03 Introduce text_in_picture toolchain.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- scribo/scribo/toolchain/text_in_picture.hh | 523 ++++++++++++++++++++++++++++ 1 files changed, 523 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/toolchain/text_in_picture.hh diff --git a/scribo/scribo/toolchain/text_in_picture.hh b/scribo/scribo/toolchain/text_in_picture.hh new file mode 100644 index 0000000..7d83577 --- /dev/null +++ b/scribo/scribo/toolchain/text_in_picture.hh @@ -0,0 +1,523 @@ +// Copyright (C) 2009, 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_TOOLCHAIN_TEXT_IN_PICTURE_HH +# define SCRIBO_TOOLCHAIN_TEXT_IN_PICTURE_HH + + +/// \file +/// +/// Localize text in a picture. + + + + +#include <src/afp/components.hh> +#include <src/afp/link.hh> +#include <src/afp/regroup.hh> + + +# include <mln/util/timer.hh> + + +namespace scribo +{ + + namespace toolchain + { + + using namespace mln; + + + template <typename I> + component_set<mln_ch_value(I, value::label_16)> + text_in_picture(const Image<I>& input_rgb_orig, + bool bg_removal, bool multi_scale_bin, + bool negate = false, + unsigned max_dim_size = 0, unsigned lambda = 0, + const char *debug_outdir = 0); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename I> + unsigned get_factor(const I& ima, unsigned max_dim_size) + { + unsigned + nrows = ima.nrows(), + ncols = ima.ncols(), + max_dim = std::max(nrows, ncols), + factor = max_dim / max_dim_size; + + return factor ? factor : 1; + } + + + struct config + { + config() + { + max_dim_size = 1024; + + sauvola_s = 2u; // 3? + sauvola_min_w = 51u; + + // Group Filtering + bbox_h_ratio = 1.60f; + bbox_overlap = 0.80f; + small_groups = 3; + v_thickness = 8; + regroup_dmax = 30; + group_min_holes = 3; + } + + // Image resizing factor + unsigned max_dim_size; + + // Sauvola ms + unsigned sauvola_s; + unsigned sauvola_min_w; + + // Group Filtering + float bbox_h_ratio; + float bbox_overlap; + unsigned small_groups; + unsigned v_thickness; + unsigned regroup_dmax; + unsigned group_min_holes; + }; + + + } // end of namespace scribo::toolchain::internal + + + template <typename I> + component_set<mln_ch_value(I, value::label_16)> + text_in_picture(const Image<I>& input_rgb_orig_, + bool bg_removal, bool multi_scale_bin, bool negate = false, + unsigned max_dim_size = 0, unsigned lambda = 0, + const char *debug_outdir = 0) + { + trace::entering("scribo::toolchain::text_in_picture"); + + const I& input_rgb_orig = exact(input_rgb_orig_); + mln_precondition(input.is_valid()); + + using namespace scribo; + using namespace scribo::primitive; + using namespace mln; + + + // Global config variable. + internal::config conf; + + + bool debug = false; + if (debug_outdir) + { + scribo::make::internal::debug_filename_prefix = debug_outdir; + debug = true; + } + + if (max_dim_size != 0) + conf.max_dim_size = max_dim_size; + + unsigned factor = internal::get_factor(input_rgb_orig, conf.max_dim_size); + + std::cout << "Reduction Factor : " << factor << std::endl; + + std::cout << "Original domain: " << input_rgb_orig.domain() << std::endl; + + mln_concrete(I) + input_rgb = mln::subsampling::antialiased(input_rgb_orig, factor); + + std::cout << "Resized domain: " << input_rgb.domain() << std::endl; + + if (lambda == 0) + lambda = 1.2 * (input_rgb.nrows() + input_rgb.ncols()); + + std::cout << "Using lambda = " << lambda << std::endl; + + mln_ch_value(I,value::int_u8) intensity_ima; + mln::util::timer timer_, global_t_; + float t_; + + global_t_.start(); + + if (bg_removal) + { + // Extract foreground + timer_.start(); + std::cout << "** Using split_bg_fg" << std::endl; + mln_ch_value(I,value::rgb8) + fg = preprocessing::split_bg_fg(input_rgb, lambda, 32).second(); + intensity_ima = data::transform(fg, mln::fun::v2v::rgb_to_int_u<8>()); + t_ = timer_; + std::cout << "Foreground extracted. " << t_ << std::endl; + + if (debug) + { + io::ppm::save(fg, scribo::make::debug_filename("foreground.ppm")); + } + } + else + { + timer_.start(); + std::cout << "** Using data::transform(intensity)" << std::endl; + intensity_ima = data::transform(input_rgb, + mln::fun::v2v::rgb_to_int_u<8>()); + t_ = timer_; + std::cout << "Intensity image " << t_ << std::endl; + } + + + // Binarize foreground to use it in the processing chain. + timer_.restart(); + mln_ch_value(I,bool) input; + unsigned w = std::min(intensity_ima.nrows() / 3, intensity_ima.ncols() / 3); + if (! w % 2) + ++w; + w = std::min(w, conf.sauvola_min_w); + if (multi_scale_bin) + { + std::cout << "** Using sauvola_ms with w_1 = " << w << std::endl; + input = scribo::binarization::sauvola_ms(intensity_ima, w, conf.sauvola_s); + } + else + { + std::cout << "** Using sauvola with w_1 = " << w << std::endl; + input = scribo::binarization::sauvola(intensity_ima, w); + } + + if (debug) + { + io::pbm::save(input, + scribo::make::debug_filename("binarization.pbm")); + } + + + // Yeah, looks strange, but we need to negate by default to + // process dark objects on light background. + if (!negate) + logical::not_inplace(input); + + t_ = timer_; + std::cout << "Foreground binarized. " << t_ << std::endl; + + + + typedef mln_ch_value(I,value::label_16) L; + + /// Finding components. + timer_.restart(); + + typedef component_set<L> Obj; + Obj filtered_components; + + { + mln::util::array<std::pair<box2d, std::pair<point2d, unsigned> > > attribs; + + value::label_16 ncomponents; + L components = extract_components(input, ncomponents, attribs); + + filtered_components = Obj(components, ncomponents, attribs); + } + + t_ = timer_; + std::cout << "Object extracted " << t_ << " - " << filtered_components.nelements() << " components" << std::endl; + +// if (debug) +// io::pgm::save(data::stretch(value::int_u8(), filtered_components), "ref_components.pgm"); + + + /// linking potential components + timer_.restart(); + mln::util::couple<object_links<L>, object_links<L> > + links = link::left_right(filtered_components); + + object_links<L>& left_link = links.first(); + object_links<L>& right_link = links.second(); + +// object_links<L> left_link +// = primitive::link::with_single_left_link(filtered_components, 30); +// t_ = timer_; +// std::cout << "Left Link done " << t_ << std::endl; + +// timer_.restart(); +// object_links<L> right_link +// = primitive::link::with_single_right_link(filtered_components, 30); + t_ = timer_; + std::cout << "Link done " << t_ << std::endl; + + + +#ifndef NOUT + if (debug) + { + std::cerr << "BEFORE - ncomponents = " << filtered_components.nelements() << std::endl; + scribo::debug::save_linked_bboxes_image(input, + left_link, right_link, + literal::red, literal::cyan, + literal::yellow, + literal::green, + anchor::MassCenter, + scribo::make::debug_filename("links.ppm")); + } +#endif + + + + // Validating left and right links. + timer_.restart(); + object_links<L> + merged_links = link::merge_double_link(left_link, right_link); + t_ = timer_; + std::cout << "Right/Left Validation. " << t_ << std::endl; + + + // Remove links if bboxes have too different sizes. + timer_.restart(); + object_links<L> + hratio_filtered_links = filter::object_links_bbox_h_ratio(merged_links, + conf.bbox_h_ratio); + + + + +#ifndef NOUT + if (debug) + { + mln_ch_value(I,value::rgb8) + hratio_decision_image = scribo::debug::decision_image(input, + merged_links, + hratio_filtered_links, + anchor::MassCenter); + io::ppm::save(hratio_decision_image, + scribo::make::debug_filename("hratio_links_decision_image.ppm")); + } +#endif + + + + + //Remove links if bboxes overlap too much. + object_links<L> overlap_filtered_links + = filter::object_links_bbox_overlap(hratio_filtered_links, + conf.bbox_overlap); + + + + +#ifndef NOUT + if (debug) + { + mln_ch_value(I,value::rgb8) overlap_decision_image + = scribo::debug::decision_image(input, + hratio_filtered_links, + overlap_filtered_links, + anchor::MassCenter); + io::ppm::save(overlap_decision_image, + scribo::make::debug_filename("overlap_links_decision_image.ppm")); + } +#endif + + + t_ = timer_; + std::cout << "Components links filtered. " << t_ << std::endl; + + timer_.restart(); + object_groups<L> + groups = group::from_single_link(overlap_filtered_links); + + + +// Apply grouping in a temporary image (for debug purpose). +#ifndef NOUT + component_set<L> + raw_group_image = group::apply(groups); +#endif // !NOUT + + t_ = timer_; + std::cout << "Components grouped. " << t_ << std::endl; + +#ifndef NOUT + + if (debug) + { + mln_ch_value(I,value::rgb8) + decision_image = data::convert(value::rgb8(), input); + + scribo::draw::bounding_boxes(decision_image, + filtered_components, literal::green); + scribo::draw::bounding_boxes(decision_image, + raw_group_image, literal::blue); + + io::ppm::save(decision_image, + scribo::make::debug_filename("group_and_object_image.ppm")); + + decision_image = data::convert(value::rgb8(), input); + scribo::draw::bounding_boxes(decision_image, + raw_group_image, literal::blue); + io::ppm::save(decision_image, + scribo::make::debug_filename("group_image.ppm")); + } +#endif // !NOUT + + + std::cout << "Filtering groups..." << std::endl; + + mln::util::timer g_timer; + + timer_.restart(); + // Remove components part of groups with strictly less than 3 components. + + g_timer.start(); + object_groups<L> filtered_small_groups; + std::cout << "** Using group too small" << std::endl; + filtered_small_groups = filter::object_groups_small(groups, + conf.small_groups); + t_ = g_timer; + std::cout << "Small groups removed " << t_ << std::endl; + + + + component_set<L> debug_image; + mln_ch_value(I,value::rgb8) decision_image; + if (debug) + { + decision_image = data::convert(value::rgb8(), input); + + scribo::draw::groups_bboxes(decision_image, groups, literal::red); + scribo::draw::groups_bboxes(decision_image, filtered_small_groups, + literal::green); + + + io::ppm::save(decision_image, + scribo::make::debug_filename("small_groups_filter.ppm")); + } + + + + // Remove components part of groups having a mean thickness lower than 8. + g_timer.restart(); + object_groups<L> filtered_thin_groups; + std::cout << "** Using group too thin" << std::endl; + filtered_thin_groups + = filter::object_groups_v_thickness(filtered_small_groups, + conf.v_thickness); + t_ = g_timer; + std::cout << "Groups too thin " << t_ << std::endl; + + + if (debug) + { + decision_image = data::convert(value::rgb8(), input); + + scribo::draw::groups_bboxes(decision_image, filtered_small_groups, + literal::red); + scribo::draw::groups_bboxes(decision_image, filtered_thin_groups, + literal::green); + + io::ppm::save(decision_image, + scribo::make::debug_filename("thin_groups_filter.ppm")); + } + + + + /// Apply grouping in the object image. + g_timer.restart(); + + + filtered_thin_groups = regroup::from_single_left_link(filtered_thin_groups, + conf.regroup_dmax); + + + t_ = g_timer; + std::cout << "Link and group again " << t_ << std::endl; + + timer_.stop(); + + timer_.resume(); + + g_timer.restart(); + + + /// Filter grouped objects not having enough background components. + std::cout << "** Using objects_with_two_holes" << std::endl; + + groups = scribo::filter::object_groups_with_holes(filtered_thin_groups, + conf.group_min_holes); + + t_ = g_timer; + std::cout << "Objects_with_holes " << t_ << std::endl; + + t_ = timer_; + std::cout << "Objects groups filtered. " << t_ << std::endl; + + + t_ = global_t_; + std::cout << "*** Result computed " << t_ << std::endl; + + if (debug) + { + decision_image = data::convert(value::rgb8(), input); + + scribo::draw::groups_bboxes(decision_image, filtered_thin_groups, + literal::red); + scribo::draw::groups_bboxes(decision_image, groups, literal::green); + + io::ppm::save(decision_image, scribo::make::debug_filename("group_with_holes_filter.ppm")); + } + + + timer_.restart(); + std::cout << "Saving result..." << std::endl; + + component_set<L> comps = primitive::group::apply(groups); + + t_ = timer_; + std::cout << "Output saved " << t_ << std::endl; + + std::cout << "# objects = " << comps.nelements() << std::endl; + + trace::exiting("scribo::toolchain::text_in_picture"); + return comps; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::toolchain + +} // end of namespace scribo + + +#endif // SCRIBO_TOOLCHAIN_TEXT_IN_PICTURE_HH + -- 1.5.6.5

1 0

last-svn-commit-643-g33a1752 scribo/core/document.hh: Introduce new document structure.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- 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

1 0

last-svn-commit-593-gaae4f34 Update default value in an example
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- 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

1 0

last-svn-commit-579-gd6c1dbb arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile time.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- 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

1 0

last-svn-commit-578-gaccfaf1 Add missing const references to function arguments.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* 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

1 0

last-svn-commit-577-gcb91a95 Changelog: Cleanup.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- 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

1 0

last-svn-commit-576-gcecfdd1 Open Document bug warning.
by Arthur Crepin-Leblond 18 Nov '10

18 Nov '10

* 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

1 0