Olena-patches January 2011

olena-patches@lrde.epita.fr

5 participants
87 discussions

last-svn-commit-733-g7d5ee46 configure.ac: Make Boost dependency optional.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fe2371..686b84a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> Add generic symbolic links to the latest snapshot. diff --git a/configure.ac b/configure.ac index 639313f..d22f65f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -192,6 +192,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Boost. # # ------- # +# Check if Boost is available, if not just print a warning, otherwise +# look for boost:tuple. +BOOST_REQUIRE(1.3, [AC_DEFINE([HAVE_BOOST], [0])]) BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -- 1.5.6.5

13 years, 3 months

branch next-build-test updated: last-svn-commit-732-g3e47b89

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 via 3e47b89684c5cb35acd14d8ac6204f90fb25cb21 (commit) via f1b327c0307447aad6722472917d50e1f3b3dd63 (commit) via b4e03ea694768d488bbad11c39796db686a524cc (commit) via 3fd738a40ced2abc4971ce9d6f0382204ce3ac9d (commit) via 010a91f1a74c00d7b23919a0c36024eee23aa804 (commit) from b297ea84524a02e39d2ab5d8f2a693478c7d2334 (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 ----------------------------------------------------------------- 3e47b89 Do not distribute files generated by Qt. f1b327c NEWS: Add content. b4e03ea Fix examples. 3fd738a Add missing distributed files. 010a91f Add generic symbolic links to the latest snapshot. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++++ lrde-upload.sh | 6 ++++- scribo/ChangeLog | 34 +++++++++++++++++++++++++++++ scribo/Makefile.am | 7 ++++- scribo/NEWS | 12 ++++++--- scribo/demo/review/Makefile.am | 13 +++++------ scribo/demo/review/{ui => }/mainwindow.ui | 0 scribo/demo/review/src/mainwindow.cc | 2 +- scribo/demo/review/src/mainwindow.hh | 5 ++- scribo/demo/viewer/Makefile.am | 8 ++++-- scribo/demo/xml2doc/Makefile.am | 18 ++++++++------ scribo/src/binarization/sauvola.cc | 6 +++- scribo/src/binarization/sauvola_ms.cc | 2 +- 13 files changed, 88 insertions(+), 31 deletions(-) rename scribo/demo/review/{ui => }/mainwindow.ui (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

last-svn-commit-732-g3e47b89 Do not distribute files generated by Qt.

by Guillaume Lazzara

* demo/review/ui/mainwindow.ui: Move... * demo/review/mainwindow.ui: ... here. * demo/review/src/mainwindow.cc, * demo/review/src/mainwindow.hh: Fix includes. * demo/review/Makefile.am, * demo/viewer/Makefile.am, * demo/xml2doc/Makefile.am: Do not distribute generated files. --- scribo/ChangeLog | 14 ++++++++++++++ scribo/demo/review/Makefile.am | 13 ++++++------- scribo/demo/review/{ui => }/mainwindow.ui | 0 scribo/demo/review/src/mainwindow.cc | 2 +- scribo/demo/review/src/mainwindow.hh | 5 +++-- scribo/demo/viewer/Makefile.am | 5 +++-- scribo/demo/xml2doc/Makefile.am | 18 ++++++++++-------- 7 files changed, 37 insertions(+), 20 deletions(-) rename scribo/demo/review/{ui => }/mainwindow.ui (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2e7ed8c..4423f0b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,19 @@ 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not distribute files generated by Qt. + + * demo/review/ui/mainwindow.ui: Move... + * demo/review/mainwindow.ui: ... here. + + * demo/review/src/mainwindow.cc, + * demo/review/src/mainwindow.hh: Fix includes. + + * demo/review/Makefile.am, + * demo/viewer/Makefile.am, + * demo/xml2doc/Makefile.am: Do not distribute generated files. + +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * NEWS: Add content. 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index 30291ab..d451f88 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -20,18 +20,17 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-review BUILT_SOURCES = src/mainwindow.moc.cc \ - ui/mainwindow.ui.h + mainwindow.ui.h scribo_review_SOURCES = src/main.cc \ - src/mainwindow.cc \ - $(BUILT_SOURCES) + src/mainwindow.cc + +nodist_scribo_review_SOURCES = $(BUILT_SOURCES) scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ -DNDEBUG \ - -I$(srcdir) \ - -I$(builddir)/ui \ - -I$(srcdir)/ui + -I$(srcdir) scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) scribo_review_LDADD = $(QT_LIBS) $(LDADD) @@ -54,4 +53,4 @@ EXTRA_DIST = \ icons/view-refresh.png \ icons/x-office-spreadsheet.png\ review.qrc \ - ui/mainwindow.ui + mainwindow.ui diff --git a/scribo/demo/review/ui/mainwindow.ui b/scribo/demo/review/mainwindow.ui similarity index 100% rename from scribo/demo/review/ui/mainwindow.ui rename to scribo/demo/review/mainwindow.ui diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc index 2f09ad7..0a4ee65 100644 --- a/scribo/demo/review/src/mainwindow.cc +++ b/scribo/demo/review/src/mainwindow.cc @@ -27,7 +27,7 @@ #include <QtCore> #include <QtGui> -#include <src/mainwindow.hh> +#include "src/mainwindow.hh" const char * modes[][4] = { diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh index 5f92d5a..60257f8 100644 --- a/scribo/demo/review/src/mainwindow.hh +++ b/scribo/demo/review/src/mainwindow.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,7 +32,7 @@ # include <QProcess> # include <QtGui/QWidget> # include <QProgressDialog> -# include <mainwindow.ui.h> +# include "mainwindow.ui.h" namespace scribo { diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index e73caab..5033d9b 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -19,8 +19,7 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-viewer -scribo_viewer_SOURCES = $(BUILT_SOURCES) \ - viewer.cc \ +scribo_viewer_SOURCES = viewer.cc \ main.cc \ image_widget.cc \ xml_widget.cc \ @@ -40,6 +39,8 @@ scribo_viewer_SOURCES = $(BUILT_SOURCES) \ option_widget.cc \ config.cc +nodist_scribo_viewer_SOURCES = $(BUILT_SOURCES) + scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) \ -I$(top_srcdir)/milena \ -I$(top_srcdir)/scribo \ diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index 946b208..ca8c578 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -15,15 +16,16 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. include $(top_srcdir)/build-aux/autotroll.mk +include $(top_srcdir)/scribo/scribo.mk +utilexec_PROGRAMS = scribo-xml2doc +scribo_xml2doc_SOURCES = common.cc \ + image_crop.cc \ + loader.cc \ + main.cc \ + xml_transform.cc -bin_PROGRAMS = scribo-xml2doc -scribo_xml2doc_SOURCES = $(BUILT_SOURCES) \ - common.cc \ - image_crop.cc \ - loader.cc \ - main.cc \ - xml_transform.cc +nodist_scribo_xml2doc_SOURCES = $(BUILT_SOURCES) scribo_xml2doc_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -- 1.5.6.5

13 years, 3 months

last-svn-commit-731-gf1b327c NEWS: Add content.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/NEWS | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index da1944c..2e7ed8c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * NEWS: Add content. + +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix examples. * src/binarization/sauvola.cc: Initialize ImageMagick. diff --git a/scribo/NEWS b/scribo/NEWS index 66e9caf..8d9d9ac 100644 --- a/scribo/NEWS +++ b/scribo/NEWS @@ -5,9 +5,10 @@ of a set of functions and data structures and allows to build dedicated page segmentation toolchains. - * New page segmentation toolchain. Process a document image - and produce an XML file (PAGE format) containing text and - other objects information. + * New command line tool providing access document analysis + toolchains. It includes Page segmentation and text + extraction in document image, and text detection in + pictures. * New tool to rebuild a document from an XML file to PDF, HTML, SVG and Open Document. This tool preserves the layout @@ -21,7 +22,10 @@ * New graphical tool to compute and display page segmentation results. - * Include support for PAGE XML outputs. + * Include support for PAGE XML outputs. Page segmentation + results are stored in this format which includes text and + objects information. + -- 1.5.6.5

13 years, 3 months

last-svn-commit-730-gb4e03ea Fix examples.

by Guillaume Lazzara

* src/binarization/sauvola.cc: Initialize ImageMagick. * src/binarization/sauvola_ms.cc: Fix maximum argument count. --- scribo/ChangeLog | 8 ++++++++ scribo/src/binarization/sauvola.cc | 6 ++++-- scribo/src/binarization/sauvola_ms.cc | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 085c480..da1944c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix examples. + + * src/binarization/sauvola.cc: Initialize ImageMagick. + + * src/binarization/sauvola_ms.cc: Fix maximum argument count. + +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing distributed files. * Makefile.am: Add EXTRA_DIST. diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index 3969524..0273071 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,6 +54,8 @@ int main(int argc, char *argv[]) "input.* output.pbm <w> <k>", args_desc); + Magick::InitializeMagick(*argv); + trace::entering("main"); unsigned w; diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 0b001f2..541b9e5 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -38,7 +38,7 @@ bool check_args(int argc, char * argv[]) { - if (argc < 3 || argc > 6) + if (argc < 3 || argc > 7) return false; if (argc >= 5) -- 1.5.6.5

13 years, 3 months

last-svn-commit-729-g3fd738a Add missing distributed files.

by Guillaume Lazzara

* Makefile.am: Add EXTRA_DIST. * demo/viewer/Makefile.am: Add a missing distributed header. --- scribo/ChangeLog | 8 ++++++++ scribo/Makefile.am | 7 +++++-- scribo/demo/viewer/Makefile.am | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 766291a..085c480 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing distributed files. + + * Makefile.am: Add EXTRA_DIST. + + * demo/viewer/Makefile.am: Add a missing distributed header. + 2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/review/Makefile.am: Add srcdir as include path. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 741cca4..b9a590a 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -41,3 +41,6 @@ $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh scribo headers.mk nodist-headers include $(srcdir)/headers.mk + + +EXTRA_DIST = nodist-headers \ No newline at end of file diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 8692915..e73caab 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -94,7 +94,8 @@ noinst_HEADERS = viewer.hh \ general_options.hh \ preferences_dialog.hh \ option_widget.hh \ - config.hh + config.hh \ + defs.hh # Generated files -- 1.5.6.5

13 years, 3 months

last-svn-commit-728-g010a91f Add generic symbolic links to the latest snapshot.

by Guillaume Lazzara

* lrde-upload.sh: Here. --- ChangeLog | 6 ++++++ lrde-upload.sh | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b565a26..4fe2371 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add generic symbolic links to the latest snapshot. + + * lrde-upload.sh: Here. + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> Honor `--without-qt' in configure. diff --git a/lrde-upload.sh b/lrde-upload.sh index 05a687e..c491891 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -71,14 +71,18 @@ mkdir -p $DEST find $DEST -maxdepth 1 -type f -mtime +1 -name 'olena-*-snapshot-*' \ -exec rm -f {} \; +# Delete old symbolic links. +rm -f $DEST/olena-$VERSION-$suffix.tar.gz $DEST/olena-$VERSION-$suffix.tar.bz2 + # Upload the `.tar.gz' tarball. cp -f olena-$VERSION.tar.gz $DEST/olena-$REV.tar.gz.tmp mv -f $DEST/olena-$REV.tar.gz.tmp $DEST/olena-$REV.tar.gz +ln -s $DEST/olena-$REV.tar.gz $DEST/olena-$VERSION-$suffix.tar.gz # Upload the `.tar.bz2' tarball. cp -f olena-$VERSION.tar.bz2 $DEST/olena-$REV.tar.bz2.tmp mv -f $DEST/olena-$REV.tar.bz2.tmp $DEST/olena-$REV.tar.bz2 - +ln -s $DEST/olena-$REV.tar.bz2 $DEST/olena-$VERSION-$suffix.tar.bz2 # Upload a copy of the reference manual and other documentation. mkdir -p $DEST_DOC -- 1.5.6.5

13 years, 3 months

branch next-build-test updated: last-svn-commit-727-gb297ea8

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 via b297ea84524a02e39d2ab5d8f2a693478c7d2334 (commit) via 2b085ee13461fccff41cb3d068348c1034af3c75 (commit) from 5eee987669ff37153cb1de4faf3e56e39a93b102 (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 ----------------------------------------------------------------- b297ea8 demo/review/Makefile.am: Add srcdir as include path. 2b085ee Introduce "export as" functionality. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 21 ++++++ scribo/demo/review/Makefile.am | 11 ++-- scribo/demo/viewer/Makefile.am | 4 +- scribo/demo/viewer/browser_widget.cc | 6 ++ scribo/demo/viewer/browser_widget.hh | 2 + scribo/demo/viewer/demodir.hh.in | 2 +- scribo/demo/viewer/runner.cc | 115 +++++++++++++++++++++++++++++----- scribo/demo/viewer/runner.hh | 16 ++++- scribo/demo/viewer/step_widget.cc | 10 ++- scribo/demo/viewer/step_widget.hh | 3 + scribo/demo/viewer/viewer.cc | 53 +++++++++++++--- scribo/demo/viewer/viewer.hh | 6 ++ 12 files changed, 211 insertions(+), 38 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

last-svn-commit-727-gb297ea8 demo/review/Makefile.am: Add srcdir as include path.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/review/Makefile.am | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d163b69..766291a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/review/Makefile.am: Add srcdir as include path. + +2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce "export as" functionality. * demo/viewer/Makefile.am, diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index 0aafc90..30291ab 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -19,20 +19,19 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-review -scribo_review_SOURCES = src/main.cc \ - src/mainwindow.cc - BUILT_SOURCES = src/mainwindow.moc.cc \ ui/mainwindow.ui.h -# Make sure generated files are not distributed. -nodist_scribo_review_SOURCES = $(BUILT_SOURCES) +scribo_review_SOURCES = src/main.cc \ + src/mainwindow.cc \ + $(BUILT_SOURCES) scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ -DNDEBUG \ -I$(srcdir) \ - -I$(builddir)/ui + -I$(builddir)/ui \ + -I$(srcdir)/ui scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) scribo_review_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5

13 years, 3 months

last-svn-commit-726-g2b085ee Introduce "export as" functionality.

by Guillaume Lazzara

* demo/viewer/Makefile.am, * demo/viewer/demodir.hh.in: Update demodir replacement. * demo/viewer/browser_widget.cc, * demo/viewer/browser_widget.hh: Add a new method. * demo/viewer/runner.cc, * demo/viewer/runner.hh, * demo/viewer/step_widget.cc, * demo/viewer/step_widget.hh, * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Introduce "export as" functionality. --- scribo/ChangeLog | 17 +++++ scribo/demo/viewer/Makefile.am | 4 +- scribo/demo/viewer/browser_widget.cc | 6 ++ scribo/demo/viewer/browser_widget.hh | 2 + scribo/demo/viewer/demodir.hh.in | 2 +- scribo/demo/viewer/runner.cc | 115 +++++++++++++++++++++++++++++----- scribo/demo/viewer/runner.hh | 16 ++++- scribo/demo/viewer/step_widget.cc | 10 ++- scribo/demo/viewer/step_widget.hh | 3 + scribo/demo/viewer/viewer.cc | 53 +++++++++++++--- scribo/demo/viewer/viewer.hh | 6 ++ 11 files changed, 202 insertions(+), 32 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9185148..d163b69 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,20 @@ +2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce "export as" functionality. + + * demo/viewer/Makefile.am, + * demo/viewer/demodir.hh.in: Update demodir replacement. + + * demo/viewer/browser_widget.cc, + * demo/viewer/browser_widget.hh: Add a new method. + + * demo/viewer/runner.cc, + * demo/viewer/runner.hh, + * demo/viewer/step_widget.cc, + * demo/viewer/step_widget.hh, + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Introduce "export as" functionality. + 2011-01-03 Guillaume Lazzara <z(a)lrde.epita.fr> Add new files in EXTRA_DIST. diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index d5fffbf..8692915 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -99,8 +99,8 @@ noinst_HEADERS = viewer.hh \ # Generated files do_subst = sed \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@abs_demodir[@]|$(abs_top_builddir)/scribo/demo|g' demodir.hh: $(srcdir)/demodir.hh.in Makefile rm -f $@ $@.tmp diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index 5a67d1e..17e1c61 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.cc @@ -130,3 +130,9 @@ BrowserWidget::change_pos(bool next) BrowserWidget::~BrowserWidget() { } + +QString +BrowserWidget::current() const +{ + return files_->filePath(view_->currentIndex()); +} diff --git a/scribo/demo/viewer/browser_widget.hh b/scribo/demo/viewer/browser_widget.hh index bbed1ac..9567c11 100644 --- a/scribo/demo/viewer/browser_widget.hh +++ b/scribo/demo/viewer/browser_widget.hh @@ -28,6 +28,8 @@ public: BrowserWidget(QDirModel* files, QString dir = QString()); ~BrowserWidget(); + QString current() const; + public slots: void activate(const QModelIndex& index, bool b = false); void path_return_pressed(); diff --git a/scribo/demo/viewer/demodir.hh.in b/scribo/demo/viewer/demodir.hh.in index 59149b9..e8a4a23 100644 --- a/scribo/demo/viewer/demodir.hh.in +++ b/scribo/demo/viewer/demodir.hh.in @@ -29,7 +29,7 @@ # define SCRIBO_PREFIX_BINDIR "@bindir@" -# define SCRIBO_LOCAL_DEMODIR "@abs_srcdir@" +# define SCRIBO_LOCAL_DEMODIR "@abs_demodir@" #endif // !SCRIBO_DEMO_DEMODIR_HH diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index 1d0f4bb..085ef39 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -20,15 +20,36 @@ #include <mln/value/rgb8.hh> #include <mln/io/magick/load.hh> +#include "demodir.hh" + #include "process.hh" #include "preprocess.hh" #include "config.hh" #include "defs.hh" + using namespace mln; using namespace scribo::toolchain::internal; +static +QString get_pathto(const QString& file, + const QString localdirsuffix = QString()) +{ + QFile f(SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix + "/" + file); + if (f.exists()) + return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix; + + f.setFileName(SCRIBO_PREFIX_BINDIR "/" + file); + if (f.exists()) + return SCRIBO_PREFIX_BINDIR; + + qDebug() << "FATAL ERROR: Can't locate file: " + file; + + return ""; +} + + runner::runner(QObject *parent) : QThread(parent) { @@ -36,26 +57,47 @@ runner::runner(QObject *parent) } -void runner::start(const QString& filename) +void runner::run() { - filename_ = filename; - QThread::start(); + switch(mode_) + { + default: + case Demat: + { + image2d<value::rgb8> ima; + io::magick::load(ima, args_.at(0).toUtf8().constData()); + + image2d<bool> bin_ima = preprocess(ima); + process(ima, bin_ima); + } + break; + + case Export: + export_as(); + break; + } + + emit finished(); + qDebug() << "Done."; } -void runner::run() +void runner::stop() { - QThread::setTerminationEnabled(); + terminate(); +} - image2d<value::rgb8> ima; - io::magick::load(ima, filename_.toUtf8().constData()); - image2d<bool> bin_ima = preprocess(ima); - process(ima, bin_ima); - emit finished(); - qDebug() << "Done."; +// Demat related stuff + +void runner::start_demat(const QString& filename) +{ + args_ << filename; + mode_ = Demat; + + QThread::start(); } @@ -95,7 +137,7 @@ void runner::process(const image2d<value::rgb8>& original_ima, { emit new_step("Page segmentation"); - ::process f(filename_.toUtf8().constData()); + ::process f(args_.at(0).toUtf8().constData()); connect(&f, SIGNAL(progress()), this, SIGNAL(progress())); connect(&f, SIGNAL(new_progress_label(const QString&)), @@ -117,7 +159,7 @@ void runner::process(const image2d<value::rgb8>& original_ima, f.save_doc_as_xml = true; - QFileInfo file(filename_); + QFileInfo file(args_.at(0)); QString output_dir = QDir::tempPath(); if (conf->general_save_xml_enabled()) { @@ -133,7 +175,6 @@ void runner::process(const image2d<value::rgb8>& original_ima, output_dir = QDir::tempPath(); } f.output_file = (output_dir + "/" + file.baseName() + "_gui.xml").toUtf8().constData(); - qDebug() << "Saving to " << f.output_file.c_str(); emit new_progress_max_value(f.nsteps()); @@ -144,7 +185,49 @@ void runner::process(const image2d<value::rgb8>& original_ima, } -void runner::stop() + +// Export related stuff + +void runner::start_export(const QString& imgfile, + const QString& xmlfile, const QString& outfile) { - terminate(); + args_ << imgfile << xmlfile << outfile; + mode_ = Export; + + QThread::start(); +} + + +void runner::export_as() +{ + emit new_step("Exporting document..."); + emit new_progress_max_value(2); + + // Checking output format + QFileInfo f(args_.at(2)); + + QString pathto_xml2doc = get_pathto("scribo-xml2doc", "xml2doc"); + + if (pathto_xml2doc.isEmpty()) + { + QMessageBox::critical(0, "Fatal error", "Cannot export! Cannot find scribo-xml2doc program!"); + return; + } + + emit progress(); + + int rvalue = 0; + if (f.suffix() == "pdf") + rvalue = system(QString("%1/scribo-xml2doc --pdf %2 %3 %4") + .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) + .arg(args_.at(2)).toAscii().constData()); + else if (f.suffix() == "html" || f.suffix() == "htm") + rvalue = system(QString("%1/scribo-xml2doc --html %2 %3 %4") + .arg(pathto_xml2doc).arg(args_.at(1)).arg(args_.at(0)) + .arg(args_.at(2)).toAscii().constData()); + else + QMessageBox::critical(0, "Fatal error", "Cannot export! Invalid output format!"); + + if (rvalue != 0) + QMessageBox::critical(0, "Fatal error", "Cannot export! Return value is not 0!"); } diff --git a/scribo/demo/viewer/runner.hh b/scribo/demo/viewer/runner.hh index ed243ea..176dcd8 100644 --- a/scribo/demo/viewer/runner.hh +++ b/scribo/demo/viewer/runner.hh @@ -24,6 +24,12 @@ using namespace mln; +enum RunMode +{ + Demat, + Export +}; + class runner : public QThread { Q_OBJECT; @@ -31,7 +37,9 @@ class runner : public QThread public: runner(QObject *parent = 0); - void start(const QString& filename); + void start_demat(const QString& filename); + void start_export(const QString& imgfile, + const QString& xmlfile, const QString& outfile); public slots: void stop(); @@ -48,13 +56,17 @@ private: // members image2d<bool> preprocess(const image2d<value::rgb8>& ima); void process(const image2d<value::rgb8>& original_ima, const image2d<bool>& processed_ima); + + void export_as(); + virtual void run(); template <typename V> unsigned find_best_scale(const mln::image2d<V>& ima); private: // attributes - QString filename_; + QStringList args_; + RunMode mode_; }; diff --git a/scribo/demo/viewer/step_widget.cc b/scribo/demo/viewer/step_widget.cc index 342b654..9d26971 100644 --- a/scribo/demo/viewer/step_widget.cc +++ b/scribo/demo/viewer/step_widget.cc @@ -38,6 +38,7 @@ StepWidget::StepWidget() connect(this, SIGNAL(activated(QListWidgetItem*)), this, SLOT(activate(QListWidgetItem*))); + } StepWidget::~StepWidget() @@ -62,6 +63,8 @@ void StepWidget::activate(QListWidgetItem* item) } else qDebug() << "Step not found!"; + + emit step_selected(view_->count()); } @@ -158,9 +161,10 @@ QListWidgetItem* StepWidget::add_element(const QString& element) return item; } - - - +QString StepWidget::current() const +{ + return map_.value(step_); +} diff --git a/scribo/demo/viewer/step_widget.hh b/scribo/demo/viewer/step_widget.hh index b323167..f648ede 100644 --- a/scribo/demo/viewer/step_widget.hh +++ b/scribo/demo/viewer/step_widget.hh @@ -32,11 +32,14 @@ public: ~StepWidget(); QListWidgetItem* add_element(const QString& element); + QString current() const; + signals: void load_image(QString, bool); void load_xml(QString); void activated(QListWidgetItem*); void change_base(bool); + void step_selected(bool); public slots: void fill_steps(QString file, bool step = false, bool container = false); diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index dd0fbe4..a633a2c 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -99,6 +99,16 @@ Viewer::Viewer(int &argc, char** argv) file_menu->addSeparator(); + export_action_ = create_action("Export as...", file_menu, + "Export as...", "Shift+Ctrl+S"); + connect(export_action_, SIGNAL(triggered()), + this, SLOT(export_as())); + file_menu->addAction(export_action_); + export_action_->setEnabled(false); + + file_menu->addSeparator(); + + QAction* quit_action = create_action("Quit", file_menu, "Exit the program.", "Ctrl+q"); connect(quit_action, SIGNAL(triggered()), @@ -210,15 +220,17 @@ Viewer::Viewer(int &argc, char** argv) step_widget_ = new StepWidget(); XmlWidget* xml_wgt = new XmlWidget(); - BrowserWidget* browser_wgt = - new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); + browser_wgt_ = new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); ImageWidget* image_wgt = new ImageWidget(scene_); + connect(step_widget_, SIGNAL(step_selected(bool)), + export_action_, SLOT(setEnabled(bool))); + scene_->setBackgroundBrush(scene_->palette().window()); v_splitter->addWidget(step_widget_); v_splitter->addWidget(key_wgt_); - v_splitter->addWidget(browser_wgt); + v_splitter->addWidget(browser_wgt_); v_splitter2->addWidget(image_wgt); v_splitter2->addWidget(xml_wgt); @@ -240,7 +252,7 @@ Viewer::Viewer(int &argc, char** argv) h_sizes << 200 << 900; h_splitter->setSizes(h_sizes); - connect(browser_wgt, SIGNAL(activated(QString, bool, bool)), + connect(browser_wgt_, SIGNAL(activated(QString, bool, bool)), step_widget_, SLOT(fill_steps(QString, bool, bool))); connect(step_widget_, SIGNAL(change_base(bool)), @@ -753,10 +765,8 @@ Viewer::run_process() { if (!current_image_.isEmpty()) { - pdialog_.setValue(0); - pdialog_.setLabelText(""); - pdialog_.show(); - runner_.start(current_image_); + reset_progress_dialog(); + runner_.start_demat(current_image_); } } @@ -779,3 +789,30 @@ Viewer::on_xml_saved(const QString& filename) QListWidgetItem *item = step_widget_->insert_new_entry(filename); step_widget_->activate(item); } + + +void +Viewer::export_as() +{ + QFileInfo f(browser_wgt_->current()); + QString output_suggestion = f.baseName() + ".pdf"; + QString output = QFileDialog::getSaveFileName(0, "Export document as...", output_suggestion, tr("PDF (*.pdf);; HTML (*.html *.htm)")); + + if (!output.isEmpty()) + { + reset_progress_dialog(); + runner_.start_export(browser_wgt_->current(), step_widget_->current(), output); + qDebug() << "Saving to " << output << " - " << browser_wgt_->current() << " - " << step_widget_->current(); + } + + qDebug() << "Toggled"; +} + + +void +Viewer::reset_progress_dialog() +{ + pdialog_.setValue(0); + pdialog_.setLabelText(""); + pdialog_.show(); +} diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index 93fc840..f491c33 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -27,6 +27,8 @@ class DomModel; class KeyWidget; class ImageRegion; class StepWidget; +class BrowserWidget; + class Viewer : public QObject @@ -58,6 +60,7 @@ private slots: void run_process(); void run_progress(); void on_xml_saved(const QString& filename); + void export_as(); signals: void updated(); @@ -77,10 +80,12 @@ private: 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); + void reset_progress_dialog(); QApplication* app_; QMainWindow* win_; StepWidget* step_widget_; + BrowserWidget* browser_wgt_; QGraphicsPixmapItem* image_; @@ -91,6 +96,7 @@ private: QAction* outline_action_; QAction* fill_action_; QAction* precise_action_; + QAction *export_action_; KeyWidget* key_wgt_; -- 1.5.6.5

13 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches January 2011