- Olena-patches

last-svn-commit-574-gf0997ba Add arrows shortcuts.
by Arthur Crepin-Leblond 16 Nov '10

16 Nov '10

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

1 0

last-svn-commit-575-gaf079ed Fix man error.
by Arthur Crepin-Leblond 16 Nov '10

16 Nov '10

* arthur/xml_transform/README * arthur/xml_transform/main.cc --- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/README | 6 +++--- scribo/sandbox/arthur/xml_transform/main.cc | 13 +++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 7f2e9a1..1a84b5f 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Fix man error. + + * arthur/xml_transform/README + * arthur/xml_transform/main.cc + 2010-08-05 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> Output change in xml_tranform. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 9ac4973..cb04495 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -21,9 +21,9 @@ OpenDocument output: --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). Base 64 operations: - --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. - --to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64. - --from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files. + --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. For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh Requirements: diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 34a1b6e..9c2b5ce 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -24,10 +24,15 @@ int main(int argc, char **argv) "OpenDocument output:\n" "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\n\n" "Base 64 operations:\n" - "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n" - "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n" - "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n\n" - "For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\t\tCreates a container XML file. It will contain regions which are cropped and converted in base 64.\n" + + "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\tSame as --to-base64 but only the full picture will be converted, regions are not cropped\n" + + "\t\033[01m--from-base64\033[00m \033[04minput.xml\033[00m \033[04moutput_dir\033[00m" + "\t\t\tDecodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir.\n\n" + "Requirements:\n" "PDF : fop >= 0.95\n" "HTML : xsltproc\n" -- 1.5.6.5

1 0

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

16 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 | 33 +++++++++++++-------------- scribo/sandbox/arthur/xml_transform/main.cc | 11 +++++--- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 1a84b5f..052bd6d 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 cb04495..5c22a15 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -2,39 +2,38 @@ xml_transform OPTIONS: HTML output: - --html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files. - --html-base64 <xml> <out_dir> : HTML output from a container XML file. + --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. PDF output: - --pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files. - --pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text. - --pdf-base64 <xml> <out_dir> : PDF output from a container XML file. - --pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file. + --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. -SVG output: - --svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded. - -Base 64 operations: - --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. +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. OpenDocument output: - --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). + --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. For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh Requirements: PDF : fop >= 0.95 HTML : xsltproc SVG : trunk version of fop -OpenDocument : ooconvert +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 9c2b5ce..8489376 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -22,12 +22,15 @@ int main(int argc, char **argv) "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n\n" "OpenDocument output:\n" - "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\n\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" + "\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" @@ -37,7 +40,7 @@ int main(int argc, char **argv) "PDF : fop >= 0.95\n" "HTML : xsltproc\n" "SVG : trunk version of fop\n" - "OpenDocument : ooconvert"; + "OpenDocument : ooconvert (included) and OpenOffice >= 3.xx"; if (argc > 4) { -- 1.5.6.5

1 0

last-svn-commit-577-gdc310b6 Changelog: Cleanup.
by Guillaume Lazzara 16 Nov '10

16 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-548-g28614aa Distribute Scribo.
by Roland Levillain 16 Nov '10

16 Nov '10

* configure.ac: Remove tags `<<lrde' and `dnl>>' around Scribo-related bits. * Makefile.am: Likewise. (LRDE_NODIST_FILES): Remove $(distdir)/scribo. --- ChangeLog | 9 +++++++++ Makefile.am | 7 ++----- configure.ac | 4 ---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17f0c42..6935872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute Scribo. + + * configure.ac: Remove tags `<<lrde' and `dnl>>' around + Scribo-related bits. + * Makefile.am: Likewise. + (LRDE_NODIST_FILES): Remove $(distdir)/scribo. + 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> Handle Tesseract 2.x and 3.x in configuration. diff --git a/Makefile.am b/Makefile.am index 87987f1..f89da9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -23,11 +23,9 @@ if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA -#<<lrde if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO -#>> # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = pretty-check tests @@ -87,8 +85,7 @@ LRDE_NODIST_FILES = \ $(distdir)/milena/tests/linear/gaussian.cc \ $(distdir)/milena/tests/linear/gaussian/filter.cc \ $(distdir)/milena/tests/registration/registration.cc \ - $(distdir)/milena/tests/value/stack.cc \ - $(distdir)/scribo + $(distdir)/milena/tests/value/stack.cc ## FIXME: Running `build-aux/build_unit_test.sh' just to update ## `milena/tests/unit_test/unit-tests.mk' is overkill: diff --git a/configure.ac b/configure.ac index 88c8d15..33dc99e 100644 --- a/configure.ac +++ b/configure.ac @@ -165,9 +165,7 @@ AC_ARG_ENABLE([all], [if test "x$enable_all" != xno; then enable_trimesh=yes enable_swilena=yes -dnl<<lrde enable_scribo=yes -dnl>> enable_apps=yes enable_tools=yes fi]) @@ -304,7 +302,6 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) -dnl<<lrde ## -------- ## ## Scribo. ## ## -------- ## @@ -363,7 +360,6 @@ if test "$GXX" = yes || test "$ICPC" = yes; then # FIXME: We might want to use -ggdb when g++ is used. test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0" fi -dnl>> ## --------------- ## ## Configuration. ## -- 1.5.6.5

1 0

last-svn-commit-549-g9735516 Re-enable 'table' directory in SUBDIRS.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* src/Makefile.am, * tests/Makefile.am (SUBDIRS): Add table. * src/table/Makefile.am, * tests/table/Makefile.am: Disable tests. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 3 +-- scribo/src/table/Makefile.am | 24 ++++++++++++++---------- scribo/tests/Makefile.am | 7 ++----- scribo/tests/table/Makefile.am | 12 +++++++----- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ee5d3d9..e1cefe4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Re-enable 'table' directory in SUBDIRS. + + * src/Makefile.am, + * tests/Makefile.am (SUBDIRS): Add table. + + * src/table/Makefile.am, + * tests/table/Makefile.am: Disable tests. + 2010-10-28 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index c99a791..4222554 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -26,11 +26,10 @@ SUBDIRS = \ misc \ postprocessing \ preprocessing \ + table \ text \ toolchain -# Disabled for the moment: -# table bin_PROGRAMS = diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..50ea8fd 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -16,14 +16,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - erase \ - extract \ - rebuild_opening \ - rebuild_rank +bin_PROGRAMS = - -erase_SOURCES = erase.cc -extract_SOURCES = extract.cc -rebuild_opening_SOURCES = rebuild_opening.cc -rebuild_rank_SOURCES = rebuild_rank.cc +# Disabled: +#---------- +# +#bin_PROGRAMS = \ +# erase \ +# extract \ +# rebuild_opening \ +# rebuild_rank +# +#erase_SOURCES = erase.cc +#extract_SOURCES = extract.cc +#rebuild_opening_SOURCES = rebuild_opening.cc +#rebuild_rank_SOURCES = rebuild_rank.cc diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index d16453c..dccf920 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -23,14 +23,11 @@ SUBDIRS = \ filter \ preprocessing \ primitive \ + table \ text \ toolchain \ unit_test -# Disabled directories: -# -# table - # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += unit_test diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 3427e6b..d7564e1 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -16,11 +16,13 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = \ - extract_lines_with_rank \ - repair_lines +check_PROGRAMS = -extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc -repair_lines_SOURCES = repair_lines.cc +# check_PROGRAMS = \ +# extract_lines_with_rank \ +# repair_lines + +# extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc +# repair_lines_SOURCES = repair_lines.cc TESTS = $(check_PROGRAMS) -- 1.5.6.5

1 0

last-svn-commit-550-g5ced6bd tests/Makefile.am (EXTRA_DIST): Add new files.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e1cefe4..4a980d7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Re-enable 'table' directory in SUBDIRS. * src/Makefile.am, diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index dccf920..a1332ae 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,6 +17,15 @@ include $(srcdir)/tests.mk +EXTRA_DIST = \ + table_to_be_repaired.pbm \ + table_to_be_repaired2.pbm \ + table_to_be_repaired3.pbm \ + text_to_group.pbm \ + text_to_group.pgm \ + text_to_group_and_clean.pbm \ + wildly.pbm + SUBDIRS = \ binarization \ core \ -- 1.5.6.5

1 0

last-svn-commit-551-g4f559a7 tests/Makefile.am (EXTRA_DIST): Fix path to files.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4a980d7..3359f5d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Fix path to files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a1332ae..c3ca209 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,14 +17,14 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - table_to_be_repaired.pbm \ - table_to_be_repaired2.pbm \ - table_to_be_repaired3.pbm \ - text_to_group.pbm \ - text_to_group.pgm \ - text_to_group_and_clean.pbm \ - wildly.pbm +EXTRA_DIST = \ + img/table_to_be_repaired.pbm \ + img/table_to_be_repaired2.pbm \ + img/table_to_be_repaired3.pbm \ + img/text_to_group.pbm \ + img/text_to_group.pgm \ + img/text_to_group_and_clean.pbm \ + img/wildly.pbm SUBDIRS = \ binarization \ -- 1.5.6.5

1 0

last-svn-commit-552-g656656d Install Scribo headers in include/scribo.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* Makefile.am: Update call to generate_dist_headers.sh. * headers.mk: Regen. --- scribo/ChangeLog | 8 ++++++++ scribo/Makefile.am | 4 ++-- scribo/headers.mk | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3359f5d..3978884 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Install Scribo headers in include/scribo. + + * Makefile.am: Update call to generate_dist_headers.sh. + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/Makefile.am (EXTRA_DIST): Fix path to files. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index b18366b..741cca4 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -29,7 +29,7 @@ REGEN_SUBDIRS += tests regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # @@ -38,6 +38,6 @@ regen-am: $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers include $(srcdir)/headers.mk diff --git a/scribo/headers.mk b/scribo/headers.mk index f421f92..30256bb 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -1,6 +1,6 @@ ## Generated by `generate_dist_headers.sh', do not edit by hand. -scribodir = $(includedir)/scribo -nobase_scribo_HEADERS = \ + +nobase_include_HEADERS = \ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ @@ -201,5 +201,5 @@ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh #<<lrde -nobase_scribo_HEADERS += +nobase_include_HEADERS += #>> -- 1.5.6.5

1 0

last-svn-commit-553-ga51486d Make use of autotroll in demo/review.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* demo/review/Makefile.am: Make use of autotroll. * demo/review/src/mainwindow.cc: Remove useless includes. * demo/review/src/mainwindow.hh: Update include. * demo/review/review.pro: Remove since useless. --- scribo/ChangeLog | 12 +++++++++ scribo/demo/review/Makefile.am | 45 ++++++++++++++++++++++++++++----- scribo/demo/review/review.pro | 16 ------------ scribo/demo/review/src/mainwindow.cc | 7 +---- scribo/demo/review/src/mainwindow.hh | 2 +- 5 files changed, 53 insertions(+), 29 deletions(-) delete mode 100644 scribo/demo/review/review.pro diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3978884..8285b94 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of autotroll in demo/review. + + * demo/review/Makefile.am: Make use of autotroll. + + * demo/review/src/mainwindow.cc: Remove useless includes. + + * demo/review/src/mainwindow.hh: Update include. + + * demo/review/review.pro: Remove since useless. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Install Scribo headers in include/scribo. * Makefile.am: Update call to generate_dist_headers.sh. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index b51084e..cd793db 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,11 +1,42 @@ -## Process this file through Automake to create Makefile.in. +# 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/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/build-aux/autotroll.mk -.PHONY : demo +bin_PROGRAMS = scribo-review +scribo_review_SOURCES = $(BUILT_SOURCES) \ + src/main.cc \ + src/mainwindow.cc -Makefile.demo: - qmake-qt4 $(srcdir)/demo/demo.pro -o Makefile.demo +scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ + -DNDEBUG \ + -I$(srcdir) \ + -I$(builddir)/ui +scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 +scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) +scribo_review_LDADD = $(QT_LIBS) $(LDADD) -demo: Makefile.demo - make -f Makefile.demo all +BUILT_SOURCES = src/mainwindow.moc.cc \ + ui/mainwindow.ui.h + +noinst_HEADERS = src/mainwindow.hh + + + +EXTRA_DIST = \ + README \ + review.qrc diff --git a/scribo/demo/review/review.pro b/scribo/demo/review/review.pro deleted file mode 100644 index 3ee66e9..0000000 --- a/scribo/demo/review/review.pro +++ /dev/null @@ -1,16 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Jun 1 10:28:31 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src ui -INCLUDEPATH += . src ../../../ ../../../milena -DEFINES += NDEBUG - -# Input -HEADERS += src/mainwindow.hh -FORMS += ui/mainwindow.ui -SOURCES += src/main.cc src/mainwindow.cc - -RESOURCES = review.qrc diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc index f2d10a2..2f09ad7 100644 --- a/scribo/demo/review/src/mainwindow.cc +++ b/scribo/demo/review/src/mainwindow.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,10 +27,6 @@ #include <QtCore> #include <QtGui> -#include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> -#include <mln/io/pbm/all.hh> - #include <src/mainwindow.hh> diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh index cb32e30..5f92d5a 100644 --- a/scribo/demo/review/src/mainwindow.hh +++ b/scribo/demo/review/src/mainwindow.hh @@ -31,7 +31,7 @@ # include <QProcess> # include <QtGui/QWidget> # include <QProgressDialog> -# include <ui_mainwindow.h> +# include <mainwindow.ui.h> namespace scribo { -- 1.5.6.5

1 0