March 2013 - Olena-patches

[Olena] #147: Write a script to automatically generate file skeletons for Olena
by Olena 29 Aug '13

29 Aug '13

#147: Write a script to automatically generate file skeletons for Olena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Component: Milena | Version: 1.0 Keywords: generator | -----------------------+---------------------------------------------------- A Ruby script would be nice, but the language doesn't really matter. -- Ticket URL: <https://trac.lrde.org/olena/ticket/147> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 4

[Olena] #190: Handle Trimesh's dependencies on third-party packages.
by Olena Trac 29 Aug '13

29 Aug '13

#190: Handle Trimesh's dependencies on third-party packages. --------------------------------+------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Keywords: Autoconf configure | --------------------------------+------------------------------------------- * OpenGL/Mesa (for Trimesh) * We should check for the presence of `GL/gl.h`, `GL/glu.h` and `libXmu.{a,so}` to enable OpenGL conditionally. * Note: on Debian, Mesa users have to install these packages: * `mesa-common-dev` (for `GL/gl.h`) * `libglu1-mesa-dev` (for `GL/glu.h`) * `libxmu-dev` (for `libXmu.{a,so}`). -- Ticket URL: <https://trac.lrde.org/olena/ticket/190> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[Olena] #238: Have Swilena be compatible with (also) Python 2.6 (and greater)
by Olena Trac 29 Aug '13

29 Aug '13

#238: Have Swilena be compatible with (also) Python 2.6 (and greater) -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Swilena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Swilena does not work with Python 2.6 (and probably greater versions). Swig seems to generates wrappers correctly, and they compile fine, but tests fail at run time. There may have been changes in Python's API between versions 2.5 and 2.6 (perhaps iterators?). Investigate. -- Ticket URL: <https://trac.lrde.org/olena/ticket/238> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #160: Revamp complexes
by Olena 29 Aug '13

29 Aug '13

#160: Revamp complexes ----------------------------+----------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: cleanup rename | ----------------------------+----------------------------------------------- * Move complexes from `mln/core/` to `mln/topo/`. * The '''dynamic''' access(es) to the set of ''n''-faces of a complex (e.g., `mln::complex::nfaces(unsigned)`) has (have) a linear complexity! We should get rid of that. We could create an index at the creation of the complex, mapping dynamic dimension numbers to the corresponding (static) mixin/data. Ask Roland for details. -- Ticket URL: <https://trac.lrde.org/olena/ticket/160> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 12

[Olena] #227: List of dependencies out of date in the wiki
by Olena Trac 29 Aug '13

29 Aug '13

#227: List of dependencies out of date in the wiki --------------------------+------------------------------------------------- Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: Dependencies | --------------------------+------------------------------------------------- In the download page, [http://www.lrde.epita.fr/cgi- bin/twiki/view/Olena/Download], the list of dependencies is out of date. Especially for the git repository version, additional dependencies are needed to build the documentation. It should be clarified in the wiki or the building procedure should be improved. ****************** A non exhaustive(?) list of dependencies: autogen automake1.7 autoconf make g++ libboost-dev texlive-latex-base texlive-extra-utils pgf HeVeA latex2html doxygen imagemagick dot2tex -- Ticket URL: <https://trac.lrde.org/olena/ticket/227> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[Olena] #232: Update contributors' list on Olena's Web site
by Olena Trac 25 Jul '13

25 Jul '13

#232: Update contributors' list on Olena's Web site ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.1 Component: Web | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- This page : https://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Contributors should be updated with the latest version (e.g., from branch `next`) of this file : source:AUTHORS Better: write a script to automate the conversion, so as to simplify the process of updating this page down to a copy-and-paste operation. -- Ticket URL: <https://trac.lrde.org/olena/ticket/232> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

olena-2.0-220-gab03443 common.mk: Fix include paths order.
by Guillaume Lazzara 09 Apr '13

09 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/common.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2b21225..c9d045a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * common.mk: Fix include paths order. + 2012-11-27 Guillaume Lazzara <z(a)lrde.epita.fr> Save full size region debug image. diff --git a/scribo/common.mk b/scribo/common.mk index 874f313..1c5c57d 100644 --- a/scribo/common.mk +++ b/scribo/common.mk @@ -24,5 +24,5 @@ AM_DEFAULT_SOURCE_EXT = .cc # Add paths to Scribo's headers. AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ \ - -I$(top_srcdir)/milena -I$(top_builddir)/milena \ - -I$(top_srcdir)/scribo -I$(top_builddir)/scribo + -I$(abs_top_srcdir)/scribo -I$(abs_top_builddir)/scribo \ + -I$(abs_top_srcdir)/milena -I$(abs_top_builddir)/milena -- 1.7.2.5

3 3

branch table-graph updated: olena-2.0-413-gf10be63
by git＠lrde.epita.fr 28 Mar '13

28 Mar '13

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 table-graph has been updated via f10be63c9871cbdd456e78291fdea6b3a64d4fc3 (commit) via ff30bf3cb0ef8af796d43204c7302587bc1231d0 (commit) via c430b36be19705f3e4499e0f3aded9306914e4f5 (commit) via 9265a9460ed39fa0b12b7bb5a67502dc8161cc6a (commit) from d527a6539a5718adce53ba4b979cd1e38359c6db (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- f10be63 Small stylistic change in the implementation of adjacency matrices. ff30bf3 First version of alignment computation for table recognition. c430b36 Misc. changes in the table recognition application. 9265a94 Improve the handling of outputs in the table recognition application. ----------------------------------------------------------------------- Summary of changes: milena/mln/util/adjacency_matrix.hh | 6 +- scribo/src/contest/table-2013/src/new.cc | 219 ++++++++++++++++++++++++++---- 2 files changed, 196 insertions(+), 29 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-413-gf10be63 Small stylistic change in the implementation of adjacency matrices.
by Roland Levillain 28 Mar '13

28 Mar '13

* milena/mln/util/adjacency_matrix.hh (internal::adjacency_matrix_impl_selector<V, Q>::are_adjacent): Here. --- milena/mln/util/adjacency_matrix.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/milena/mln/util/adjacency_matrix.hh b/milena/mln/util/adjacency_matrix.hh index b5bfb4e..f9f5312 100644 --- a/milena/mln/util/adjacency_matrix.hh +++ b/milena/mln/util/adjacency_matrix.hh @@ -227,9 +227,9 @@ namespace mln mln_precondition(e1 < adj_.nrows()); mln_precondition(e2 < adj_.nrows()); - if (e1 > e2) - return opt::at(adj_, e2, e1); - return opt::at(adj_, e1, e2); + return e1 > e2 + ? opt::at(adj_, e2, e1) + : opt::at(adj_, e1, e2); } template <typename V, typename Q> -- 1.7.2.5

1 0

olena-2.0-412-gff30bf3 First version of alignment computation for table recognition.
by Roland Levillain 28 Mar '13

28 Mar '13

* scribo/src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 165 ++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 962bf22..8949e15 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -21,6 +21,8 @@ #include <mln/value/all.hh> +#include <mln/util/adjacency_matrix.hh> + // INCLUDE TESSERACT #include <tesseract/baseapi.h> @@ -337,6 +339,68 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, } } + +// Alignment predicates. + +// Maximum alignment threshold at normal resoution (72 dpi) +const float align_eps = 1.5; + +inline +bool +left_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmin().col() - b2.pmin().col()) + < align_eps * scale_factor; +} + +inline +bool +vcenter_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pcenter().col() - b2.pcenter().col()) + < align_eps * scale_factor; +} + +inline +bool +right_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmax().col() - b2.pmax().col()) + < align_eps * scale_factor; +} + + +inline +bool +top_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmin().row() - b2.pmin().row()) + < align_eps * scale_factor; +} + +inline +bool +hcenter_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pcenter().row() - b2.pcenter().row()) + < align_eps * scale_factor; +} + +inline +bool +bottom_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmax().row() - b2.pmax().row()) + < align_eps * scale_factor; +} + + /******************************** MAIN ****************************************/ int main(int argc, char** argv) { @@ -638,6 +702,106 @@ int main(int argc, char** argv) } } + /* FIXME: We could factor a lot by grouping these matrices and + arrays into a structure and giving them a number. */ + // Compute alignments. + typedef util::adjacency_matrix<unsigned> align_matrix; + align_matrix left_aligned_groups(groups.nelements()); + align_matrix vcenter_aligned_groups(groups.nelements()); + align_matrix right_aligned_groups(groups.nelements()); + align_matrix top_aligned_groups(groups.nelements()); + align_matrix hcenter_aligned_groups(groups.nelements()); + align_matrix bottom_aligned_groups(groups.nelements()); + // We rely on the fact that group (text boxes) are numbered in the + // raster order to determine whether an alignment has been set + // between two groups. + std::vector<bool> group_has_left_alignment(groups.nelements(), false); + std::vector<bool> group_has_vcenter_alignment(groups.nelements(), false); + std::vector<bool> group_has_right_alignment(groups.nelements(), false); + std::vector<bool> group_has_top_alignment(groups.nelements(), false); + std::vector<bool> group_has_hcenter_alignment(groups.nelements(), false); + std::vector<bool> group_has_bottom_alignment(groups.nelements(), false); + for (unsigned i = 1; i < groups.nelements(); ++i) + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + + if (!group_has_left_alignment[i] + && left_aligned(b1, b2, scale_factor)) + { + left_aligned_groups.add(i, j); + group_has_left_alignment[i] = true; + } + if (!group_has_vcenter_alignment[i] + && vcenter_aligned(b1, b2, scale_factor)) + { + vcenter_aligned_groups.add(i, j); + group_has_vcenter_alignment[i] = true; + } + if (!group_has_right_alignment[i] + && right_aligned(b1, b2, scale_factor)) + { + right_aligned_groups.add(i, j); + group_has_right_alignment[i] = true; + } + if (!group_has_top_alignment[i] && + top_aligned(b1, b2, scale_factor)) + { + top_aligned_groups.add(i, j); + group_has_top_alignment[i] = true; + } + if (!group_has_hcenter_alignment[i] && + hcenter_aligned(b1, b2, scale_factor)) + { + hcenter_aligned_groups.add(i, j); + group_has_hcenter_alignment[i] = true; + } + if (!group_has_bottom_alignment[i] && + bottom_aligned(b1, b2, scale_factor)) + { + bottom_aligned_groups.add(i, j); + group_has_bottom_alignment[i] = true; + } + } + // Visualization: alignments. + image2d<value::rgb8> alignments = + data::convert(value::rgb8(), bin_merged); + for (unsigned i = 1; i < groups.nelements(); ++i) + draw::box(alignments, groups(i).bbox(), literal::medium_gray); + for (unsigned i = 1; i < groups.nelements(); ++i) + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + + if (left_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pcenter().row(), b1.pmin().col()), + point2d(b2.pcenter().row(), b2.pmin().col()), + literal::red); + if (vcenter_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, b1.pcenter(), b2.pcenter(), literal::orange); + if (right_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pcenter().row(), b1.pmax().col()), + point2d(b2.pcenter().row(), b2.pmax().col()), + literal::green); + + if (top_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pmin().row(), b1.pcenter().col()), + point2d(b2.pmin().row(), b2.pcenter().col()), + literal::cyan); + if (hcenter_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, b1.pcenter(), b2.pcenter(), literal::yellow); + if (top_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pmax().row(), b1.pcenter().col()), + point2d(b2.pmax().row(), b2.pcenter().col()), + literal::magenta); + } + // Write images and close XML unsigned number = 0; write_image(bin, prefix, "bin", page, number); @@ -651,5 +815,6 @@ int main(int argc, char** argv) write_image(ima_groups, prefix, "groups", page, number); write_image(ima_valid, prefix, "valid", page, number); write_image(ima_cols_rows, prefix, "cols_rows", page, number); + write_image(alignments, prefix, "alignments", page, number); } } -- 1.7.2.5

1 0