- Olena-patches

olena-2.0-322-ga73499b configure.ac: Configure scribo/tests/layout directory.
by Guillaume Lazzara 07 Mar '13

07 Mar '13

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e3c184..e83290b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure scribo/tests/layout directory. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Do not configure scribo/demo/review anymore. 2013-02-28 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 75e9037..646ecd4 100644 --- a/configure.ac +++ b/configure.ac @@ -376,6 +376,7 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/estim/Makefile scribo/tests/filter/Makefile + scribo/tests/layout/Makefile scribo/tests/preprocessing/Makefile scribo/tests/primitive/Makefile scribo/tests/primitive/extract/Makefile -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-320-ge5c4946
by git＠lrde.epita.fr 07 Mar '13

07 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 unstable/scribo has been updated via e5c4946ac2cc04f9d06ec2b959cef592d76b68dd (commit) via 4ceffd14a660391922d2e9409d18bea93bc4824d (commit) from ea3b8de392f302d30afc3affb6306a97234d5a9d (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 ----------------------------------------------------------------- e5c4946 configure.ac: Do not configure scribo/demo/review anymore. 4ceffd1 Remove deprecated programs. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 1 - scribo/ChangeLog | 139 +++++ scribo/demo/Makefile.am | 4 - scribo/demo/demat/demat.pro | 42 -- scribo/demo/demat/demat.qrc | 4 - scribo/demo/demat/src/doc_type.hh | 51 -- scribo/demo/demat/src/main.cc | 31 - scribo/demo/demat/src/main_window.cc | 266 -------- scribo/demo/demat/src/main_window.hh | 96 --- scribo/demo/demat/src/mln_widgets.cc | 11 - scribo/demo/demat/src/preprocessing_task.hh | 62 -- scribo/demo/demat/src/process_args.hh | 47 -- scribo/demo/demat/src/runner.cc | 327 ---------- scribo/demo/demat/src/runner.hh | 94 --- scribo/demo/demat/ui/main_window.ui | 381 ------------ scribo/demo/review/Makefile.am | 56 -- scribo/demo/review/icons/document-open.png | Bin 1550 -> 0 bytes scribo/demo/review/icons/edit-find.png | Bin 1636 -> 0 bytes scribo/demo/review/icons/format-indent-more.png | Bin 766 -> 0 bytes scribo/demo/review/icons/go-next.png | Bin 1219 -> 0 bytes scribo/demo/review/icons/image-x-generic.png | Bin 1163 -> 0 bytes scribo/demo/review/icons/list-add.png | Bin 601 -> 0 bytes scribo/demo/review/icons/ocr.png | Bin 14929 -> 0 bytes scribo/demo/review/icons/text-x-generic.png | Bin 744 -> 0 bytes scribo/demo/review/icons/view-refresh.png | Bin 2024 -> 0 bytes scribo/demo/review/icons/x-office-spreadsheet.png | Bin 1518 -> 0 bytes scribo/demo/review/mainwindow.ui | 340 ---------- scribo/demo/review/review.qrc | 13 - scribo/demo/review/src/main.cc | 49 -- scribo/demo/review/src/mainwindow.cc | 569 ----------------- scribo/demo/review/src/mainwindow.hh | 139 ----- scribo/demo/shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 0 bytes scribo/demo/shared/icons/accept-icon.png | Bin 4858 -> 0 bytes scribo/demo/shared/icons/close.gif | Bin 340 -> 0 bytes scribo/demo/shared/icons/crop-icon.png | Bin 228 -> 0 bytes scribo/demo/shared/icons/image-add-icon.png | Bin 2917 -> 0 bytes scribo/demo/shared/icons/image-edit-icon.png | Bin 2305 -> 0 bytes scribo/demo/shared/icons/image-multi-icon.png | Bin 2033 -> 0 bytes scribo/demo/shared/icons/image-next-icon.png | Bin 3008 -> 0 bytes scribo/demo/shared/icons/image-remove-icon.png | Bin 3127 -> 0 bytes scribo/demo/shared/icons/next-icon.png | Bin 4611 -> 0 bytes scribo/demo/shared/icons/olena_smaller.jpg | Bin 8028 -> 0 bytes scribo/demo/shared/icons/page-down-icon.png | Bin 3450 -> 0 bytes scribo/demo/shared/icons/page-search-icon.png | Bin 3101 -> 0 bytes scribo/demo/shared/icons/rotate_ccw.png | Bin 4200 -> 0 bytes scribo/demo/shared/icons/rotate_cw.png | Bin 4161 -> 0 bytes scribo/demo/shared/icons/search-add-icon.png | Bin 4274 -> 0 bytes scribo/demo/shared/icons/search-remove-icon.png | Bin 4196 -> 0 bytes scribo/demo/shared/shared.qrc | 21 - scribo/demo/shared/src/bak/crop_item.cc | 332 ---------- scribo/demo/shared/src/bak/crop_item.hh | 100 --- scribo/demo/shared/src/bak/image_viewer.cc | 242 ------- scribo/demo/shared/src/bak/image_viewer.hh | 116 ---- scribo/demo/shared/src/bak/types.hh | 50 -- scribo/demo/shared/src/browse_widget.cc | 72 --- scribo/demo/shared/src/browse_widget.hh | 78 --- scribo/demo/shared/src/crop_item.cc | 396 ------------ scribo/demo/shared/src/crop_item.hh | 119 ---- scribo/demo/shared/src/image_viewer.cc | 410 ------------ scribo/demo/shared/src/image_viewer.hh | 148 ----- scribo/demo/shared/src/image_viewer.hxx | 31 - .../shared/src/internal.bak/interactive_scene.cc | 286 --------- .../shared/src/internal.bak/interactive_scene.hh | 108 ---- .../shared/src/internal.bak/selection_rectangle.cc | 241 ------- .../shared/src/internal.bak/selection_rectangle.hh | 91 --- .../demo/shared/src/internal/interactive_scene.cc | 94 --- .../demo/shared/src/internal/interactive_scene.hh | 85 --- .../shared/src/internal/selection_rectangle.cc | 241 ------- .../shared/src/internal/selection_rectangle.hh | 91 --- scribo/demo/shared/src/to_mln_image.hh | 77 --- scribo/demo/shared/src/types.hh | 50 -- scribo/demo/shared/ui/browse_widget.ui | 106 ---- scribo/demo/shared/ui/crop_widget.ui | 34 - scribo/demo/shared/ui/image_viewer.ui | 296 --------- scribo/demo/shared/ui/interactive_scene.cc | 143 ----- scribo/demo/shared/ui/interactive_scene.hh | 87 --- scribo/demo/shared/ui/rotate_widget.ui | 34 - scribo/demo/tip/gui.pro | 19 - scribo/demo/tip/gui.qrc | 9 - scribo/demo/tip/icons/next.png | Bin 3337 -> 0 bytes scribo/demo/tip/icons/ok.png | Bin 3953 -> 0 bytes scribo/demo/tip/icons/photos.png | Bin 3750 -> 0 bytes scribo/demo/tip/icons/prev.png | Bin 3334 -> 0 bytes scribo/demo/tip/icons/remove.png | Bin 3704 -> 0 bytes scribo/demo/tip/src/custom_delegate.cc | 105 ---- scribo/demo/tip/src/custom_delegate.hh | 81 --- scribo/demo/tip/src/launch_dialog.cc | 94 --- scribo/demo/tip/src/launch_dialog.hh | 63 -- scribo/demo/tip/src/main.cc | 46 -- scribo/demo/tip/src/main_window.cc | 526 ---------------- scribo/demo/tip/src/main_window.hh | 119 ---- scribo/demo/tip/ui/launch_dialog.ui | 117 ---- scribo/demo/tip/ui/main_window.ui | 656 -------------------- scribo/demo/wizard/images/dematerialization.png | Bin 76309 -> 0 bytes scribo/demo/wizard/src/crop_page.cc | 48 -- scribo/demo/wizard/src/crop_page.hh | 60 -- scribo/demo/wizard/src/crop_widget.cc | 37 -- scribo/demo/wizard/src/crop_widget.hh | 62 -- scribo/demo/wizard/src/doc_type.hh | 51 -- scribo/demo/wizard/src/doc_type_page.cc | 48 -- scribo/demo/wizard/src/doc_type_page.hh | 61 -- scribo/demo/wizard/src/doc_type_widget.cc | 38 -- scribo/demo/wizard/src/doc_type_widget.hh | 64 -- scribo/demo/wizard/src/load_page.cc | 71 --- scribo/demo/wizard/src/load_page.hh | 67 -- scribo/demo/wizard/src/load_widget.cc | 56 -- scribo/demo/wizard/src/load_widget.hh | 64 -- scribo/demo/wizard/src/main.cc | 28 - scribo/demo/wizard/src/main_window.cc | 144 ----- scribo/demo/wizard/src/main_window.hh | 72 --- scribo/demo/wizard/src/mln_widgets.cc | 7 - scribo/demo/wizard/src/preprocessing_page.cc | 61 -- scribo/demo/wizard/src/preprocessing_page.hh | 66 -- scribo/demo/wizard/src/preprocessing_task.hh | 61 -- scribo/demo/wizard/src/preprocessing_widget.cc | 93 --- scribo/demo/wizard/src/preprocessing_widget.hh | 65 -- scribo/demo/wizard/src/process_page.cc | 68 -- scribo/demo/wizard/src/process_page.hh | 64 -- scribo/demo/wizard/src/process_widget.cc | 80 --- scribo/demo/wizard/src/process_widget.hh | 71 --- scribo/demo/wizard/src/result_page.cc | 43 -- scribo/demo/wizard/src/result_page.hh | 60 -- scribo/demo/wizard/src/result_widget.cc | 43 -- scribo/demo/wizard/src/result_widget.hh | 58 -- scribo/demo/wizard/src/rotate_page.cc | 45 -- scribo/demo/wizard/src/rotate_page.hh | 60 -- scribo/demo/wizard/src/rotate_widget.cc | 38 -- scribo/demo/wizard/src/rotate_widget.hh | 62 -- scribo/demo/wizard/src/runner.cc | 296 --------- scribo/demo/wizard/src/runner.hh | 84 --- scribo/demo/wizard/src/test.cc | 16 - scribo/demo/wizard/ui/doc_type_widget.ui | 115 ---- scribo/demo/wizard/ui/load_widget.ui | 110 ---- scribo/demo/wizard/ui/main_window.ui | 216 ------- scribo/demo/wizard/ui/preprocessing_widget.ui | 223 ------- scribo/demo/wizard/wizard.pro | 71 --- scribo/demo/wizard/wizard.qrc | 5 - 138 files changed, 143 insertions(+), 11749 deletions(-) delete mode 100644 scribo/demo/demat/demat.pro delete mode 100644 scribo/demo/demat/demat.qrc delete mode 100644 scribo/demo/demat/src/doc_type.hh delete mode 100644 scribo/demo/demat/src/main.cc delete mode 100644 scribo/demo/demat/src/main_window.cc delete mode 100644 scribo/demo/demat/src/main_window.hh delete mode 100644 scribo/demo/demat/src/mln_widgets.cc delete mode 100644 scribo/demo/demat/src/preprocessing_task.hh delete mode 100644 scribo/demo/demat/src/process_args.hh delete mode 100644 scribo/demo/demat/src/runner.cc delete mode 100644 scribo/demo/demat/src/runner.hh delete mode 100644 scribo/demo/demat/ui/main_window.ui delete mode 100644 scribo/demo/review/Makefile.am delete mode 100644 scribo/demo/review/icons/document-open.png delete mode 100644 scribo/demo/review/icons/edit-find.png delete mode 100644 scribo/demo/review/icons/format-indent-more.png delete mode 100644 scribo/demo/review/icons/go-next.png delete mode 100644 scribo/demo/review/icons/image-x-generic.png delete mode 100644 scribo/demo/review/icons/list-add.png delete mode 100644 scribo/demo/review/icons/ocr.png delete mode 100644 scribo/demo/review/icons/text-x-generic.png delete mode 100644 scribo/demo/review/icons/view-refresh.png delete mode 100644 scribo/demo/review/icons/x-office-spreadsheet.png delete mode 100644 scribo/demo/review/mainwindow.ui delete mode 100644 scribo/demo/review/review.qrc delete mode 100644 scribo/demo/review/src/main.cc delete mode 100644 scribo/demo/review/src/mainwindow.cc delete mode 100644 scribo/demo/review/src/mainwindow.hh delete mode 100644 scribo/demo/shared/icons/Symbols-Delete-icon.png delete mode 100644 scribo/demo/shared/icons/accept-icon.png delete mode 100644 scribo/demo/shared/icons/close.gif delete mode 100644 scribo/demo/shared/icons/crop-icon.png delete mode 100644 scribo/demo/shared/icons/image-add-icon.png delete mode 100644 scribo/demo/shared/icons/image-edit-icon.png delete mode 100644 scribo/demo/shared/icons/image-multi-icon.png delete mode 100644 scribo/demo/shared/icons/image-next-icon.png delete mode 100644 scribo/demo/shared/icons/image-remove-icon.png delete mode 100644 scribo/demo/shared/icons/next-icon.png delete mode 100644 scribo/demo/shared/icons/olena_smaller.jpg delete mode 100644 scribo/demo/shared/icons/page-down-icon.png delete mode 100644 scribo/demo/shared/icons/page-search-icon.png delete mode 100644 scribo/demo/shared/icons/rotate_ccw.png delete mode 100644 scribo/demo/shared/icons/rotate_cw.png delete mode 100644 scribo/demo/shared/icons/search-add-icon.png delete mode 100644 scribo/demo/shared/icons/search-remove-icon.png delete mode 100644 scribo/demo/shared/shared.qrc delete mode 100644 scribo/demo/shared/src/bak/crop_item.cc delete mode 100644 scribo/demo/shared/src/bak/crop_item.hh delete mode 100644 scribo/demo/shared/src/bak/image_viewer.cc delete mode 100644 scribo/demo/shared/src/bak/image_viewer.hh delete mode 100644 scribo/demo/shared/src/bak/types.hh delete mode 100644 scribo/demo/shared/src/browse_widget.cc delete mode 100644 scribo/demo/shared/src/browse_widget.hh delete mode 100644 scribo/demo/shared/src/crop_item.cc delete mode 100644 scribo/demo/shared/src/crop_item.hh delete mode 100644 scribo/demo/shared/src/image_viewer.cc delete mode 100644 scribo/demo/shared/src/image_viewer.hh delete mode 100644 scribo/demo/shared/src/image_viewer.hxx delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/to_mln_image.hh delete mode 100644 scribo/demo/shared/src/types.hh delete mode 100644 scribo/demo/shared/ui/browse_widget.ui delete mode 100644 scribo/demo/shared/ui/crop_widget.ui delete mode 100644 scribo/demo/shared/ui/image_viewer.ui delete mode 100644 scribo/demo/shared/ui/interactive_scene.cc delete mode 100644 scribo/demo/shared/ui/interactive_scene.hh delete mode 100644 scribo/demo/shared/ui/rotate_widget.ui delete mode 100644 scribo/demo/tip/gui.pro delete mode 100644 scribo/demo/tip/gui.qrc delete mode 100644 scribo/demo/tip/icons/next.png delete mode 100644 scribo/demo/tip/icons/ok.png delete mode 100644 scribo/demo/tip/icons/photos.png delete mode 100644 scribo/demo/tip/icons/prev.png delete mode 100644 scribo/demo/tip/icons/remove.png delete mode 100644 scribo/demo/tip/src/custom_delegate.cc delete mode 100644 scribo/demo/tip/src/custom_delegate.hh delete mode 100644 scribo/demo/tip/src/launch_dialog.cc delete mode 100644 scribo/demo/tip/src/launch_dialog.hh delete mode 100644 scribo/demo/tip/src/main.cc delete mode 100644 scribo/demo/tip/src/main_window.cc delete mode 100644 scribo/demo/tip/src/main_window.hh delete mode 100644 scribo/demo/tip/ui/launch_dialog.ui delete mode 100644 scribo/demo/tip/ui/main_window.ui delete mode 100644 scribo/demo/wizard/images/dematerialization.png delete mode 100644 scribo/demo/wizard/src/crop_page.cc delete mode 100644 scribo/demo/wizard/src/crop_page.hh delete mode 100644 scribo/demo/wizard/src/crop_widget.cc delete mode 100644 scribo/demo/wizard/src/crop_widget.hh delete mode 100644 scribo/demo/wizard/src/doc_type.hh delete mode 100644 scribo/demo/wizard/src/doc_type_page.cc delete mode 100644 scribo/demo/wizard/src/doc_type_page.hh delete mode 100644 scribo/demo/wizard/src/doc_type_widget.cc delete mode 100644 scribo/demo/wizard/src/doc_type_widget.hh delete mode 100644 scribo/demo/wizard/src/load_page.cc delete mode 100644 scribo/demo/wizard/src/load_page.hh delete mode 100644 scribo/demo/wizard/src/load_widget.cc delete mode 100644 scribo/demo/wizard/src/load_widget.hh delete mode 100644 scribo/demo/wizard/src/main.cc delete mode 100644 scribo/demo/wizard/src/main_window.cc delete mode 100644 scribo/demo/wizard/src/main_window.hh delete mode 100644 scribo/demo/wizard/src/mln_widgets.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_task.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.hh delete mode 100644 scribo/demo/wizard/src/process_page.cc delete mode 100644 scribo/demo/wizard/src/process_page.hh delete mode 100644 scribo/demo/wizard/src/process_widget.cc delete mode 100644 scribo/demo/wizard/src/process_widget.hh delete mode 100644 scribo/demo/wizard/src/result_page.cc delete mode 100644 scribo/demo/wizard/src/result_page.hh delete mode 100644 scribo/demo/wizard/src/result_widget.cc delete mode 100644 scribo/demo/wizard/src/result_widget.hh delete mode 100644 scribo/demo/wizard/src/rotate_page.cc delete mode 100644 scribo/demo/wizard/src/rotate_page.hh delete mode 100644 scribo/demo/wizard/src/rotate_widget.cc delete mode 100644 scribo/demo/wizard/src/rotate_widget.hh delete mode 100644 scribo/demo/wizard/src/runner.cc delete mode 100644 scribo/demo/wizard/src/runner.hh delete mode 100644 scribo/demo/wizard/src/test.cc delete mode 100644 scribo/demo/wizard/ui/doc_type_widget.ui delete mode 100644 scribo/demo/wizard/ui/load_widget.ui delete mode 100644 scribo/demo/wizard/ui/main_window.ui delete mode 100644 scribo/demo/wizard/ui/preprocessing_widget.ui delete mode 100644 scribo/demo/wizard/wizard.pro delete mode 100644 scribo/demo/wizard/wizard.qrc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch unstable/scribo updated: olena-2.0-318-gea3b8de
by git＠lrde.epita.fr 07 Mar '13

07 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 unstable/scribo has been updated via ea3b8de392f302d30afc3affb6306a97234d5a9d (commit) via 9630fe29b41febb6b57ecafdba8eac4151983ed8 (commit) from 3c0fa701a3b712e2a0a3f0461d1f949f7486ad3f (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 ----------------------------------------------------------------- ea3b8de Fix compilation related problems in viewer. 9630fe2 scribo/binarization/internal/sauvola_ms_functor.hh: Handle global variables correctly. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 14 ++++++++++++++ scribo/demo/viewer/image_view.cc | 15 ++++++++------- scribo/demo/viewer/main.cc | 7 ++++--- .../binarization/internal/sauvola_ms_functor.hh | 16 +++++++++++++--- 4 files changed, 39 insertions(+), 13 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-318-gea3b8de Fix compilation related problems in viewer.
by Guillaume Lazzara 07 Mar '13

07 Mar '13

* demo/viewer/image_view.cc: Fix a warning; * demo/viewer/main.cc: Include sauvola_ms.hh to compile related global variables. --- scribo/ChangeLog | 9 +++++++++ scribo/demo/viewer/image_view.cc | 15 ++++++++------- scribo/demo/viewer/main.cc | 7 ++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 20b7c94..18a73c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation related problems in viewer. + + * demo/viewer/image_view.cc: Fix a warning; + + * demo/viewer/main.cc: Include sauvola_ms.hh to compile related + global variables. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/internal/sauvola_ms_functor.hh: Handle global variables correctly. diff --git a/scribo/demo/viewer/image_view.cc b/scribo/demo/viewer/image_view.cc index bb34eb7..9190227 100644 --- a/scribo/demo/viewer/image_view.cc +++ b/scribo/demo/viewer/image_view.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -34,13 +35,13 @@ ImageView::wheelEvent(QWheelEvent* event) else sc = 1 / (1 - degrees / 100); - QPointF center = mapToScene(width() / 2, height() / 2); - QPointF mouse = mapToScene(event->pos()); + // QPointF center = mapToScene(width() / 2, height() / 2); + // QPointF mouse = mapToScene(event->pos()); - qreal dx = (mouse.x() - center.x()); - qreal dy = (mouse.y() - center.y()); - QPointF newCenter = QPointF (mouse.x() - dx / sc, - mouse.y() - dy / sc); + // qreal dx = (mouse.x() - center.x()); + // qreal dy = (mouse.y() - center.y()); + // QPointF newCenter = QPointF (mouse.x() - dx / sc, + // mouse.y() - dy / sc); scale(sc, sc); scaleUpdate(); } diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index 0c50c7b..d14e36d 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -23,9 +23,10 @@ #include <mln/labeling/colorize.hh> #include <mln/math/pi.hh> #include <mln/io/magick/load.hh> -#include <scribo/make/debug_filename.hh> #include <mln/debug/filename.hh> #include <mln/literal/colors.hh> +#include <scribo/make/debug_filename.hh> +#include <scribo/binarization/sauvola_ms.hh> int main(int argc, char** argv) { -- 1.7.2.5

1 0

olena-2.0-317-g9630fe2 scribo/binarization/internal/sauvola_ms_functor.hh: Handle global variables correctly.
by Guillaume Lazzara 07 Mar '13

07 Mar '13

--- scribo/ChangeLog | 5 +++++ .../binarization/internal/sauvola_ms_functor.hh | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1b58c52..20b7c94 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/internal/sauvola_ms_functor.hh: Handle + global variables correctly. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove scribo/sandbox. * sandbox/ChangeLog, diff --git a/scribo/scribo/binarization/internal/sauvola_ms_functor.hh b/scribo/scribo/binarization/internal/sauvola_ms_functor.hh index 020caa9..84a205c 100644 --- a/scribo/scribo/binarization/internal/sauvola_ms_functor.hh +++ b/scribo/scribo/binarization/internal/sauvola_ms_functor.hh @@ -54,9 +54,9 @@ namespace scribo namespace internal { - double k2 = SCRIBO_DEFAULT_SAUVOLA_K; - double k3 = SCRIBO_DEFAULT_SAUVOLA_K; - double k4 = SCRIBO_DEFAULT_SAUVOLA_K; + extern double k2; + extern double k3; + extern double k4; using namespace mln; @@ -104,6 +104,16 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + +# ifndef MLN_WO_GLOBAL_VARS + + double k2 = SCRIBO_DEFAULT_SAUVOLA_K; + double k3 = SCRIBO_DEFAULT_SAUVOLA_K; + double k4 = SCRIBO_DEFAULT_SAUVOLA_K; + +# endif // ! MLN_WO_GLOBAL_VARS + + inline unsigned my_find_root(image2d<unsigned>& parent, unsigned x) { -- 1.7.2.5

1 0

olena-2.0-320-ge5c4946 configure.ac: Do not configure scribo/demo/review anymore.
by Guillaume Lazzara 07 Mar '13

07 Mar '13

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c4413..4e3c184 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Do not configure scribo/demo/review anymore. + 2013-02-28 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Check for libpoppler dependency and configure diff --git a/configure.ac b/configure.ac index 17b0d0e..75e9037 100644 --- a/configure.ac +++ b/configure.ac @@ -342,7 +342,6 @@ AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes]) AC_CONFIG_FILES([ scribo/Makefile scribo/demo/Makefile - scribo/demo/review/Makefile scribo/demo/viewer/Makefile scribo/demo/xml2doc/Makefile scribo/src/Makefile -- 1.7.2.5

1 0

olena-2.0-319-g4ceffd1 Remove deprecated programs.
by Guillaume Lazzara 07 Mar '13

07 Mar '13

* demo/demat/demat.pro, * demo/demat/demat.qrc, * demo/demat/src/doc_type.hh, * demo/demat/src/main.cc, * demo/demat/src/main_window.cc, * demo/demat/src/main_window.hh, * demo/demat/src/mln_widgets.cc, * demo/demat/src/preprocessing_task.hh, * demo/demat/src/process_args.hh, * demo/demat/src/runner.cc, * demo/demat/src/runner.hh, * demo/demat/ui/main_window.ui, * demo/review/Makefile.am, * demo/review/icons/document-open.png, * demo/review/icons/edit-find.png, * demo/review/icons/format-indent-more.png, * demo/review/icons/go-next.png, * demo/review/icons/image-x-generic.png, * demo/review/icons/list-add.png, * demo/review/icons/ocr.png, * demo/review/icons/text-x-generic.png, * demo/review/icons/view-refresh.png, * demo/review/icons/x-office-spreadsheet.png, * demo/review/mainwindow.ui, * demo/review/review.qrc, * demo/review/src/main.cc, * demo/review/src/mainwindow.cc, * demo/review/src/mainwindow.hh, * demo/shared/icons/Symbols-Delete-icon.png, * demo/shared/icons/accept-icon.png, * demo/shared/icons/close.gif, * demo/shared/icons/crop-icon.png, * demo/shared/icons/image-add-icon.png, * demo/shared/icons/image-edit-icon.png, * demo/shared/icons/image-multi-icon.png, * demo/shared/icons/image-next-icon.png, * demo/shared/icons/image-remove-icon.png, * demo/shared/icons/next-icon.png, * demo/shared/icons/olena_smaller.jpg, * demo/shared/icons/page-down-icon.png, * demo/shared/icons/page-search-icon.png, * demo/shared/icons/rotate_ccw.png, * demo/shared/icons/rotate_cw.png, * demo/shared/icons/search-add-icon.png, * demo/shared/icons/search-remove-icon.png, * demo/shared/shared.qrc, * demo/shared/src/bak/crop_item.cc, * demo/shared/src/bak/crop_item.hh, * demo/shared/src/bak/image_viewer.cc, * demo/shared/src/bak/image_viewer.hh, * demo/shared/src/bak/types.hh, * demo/shared/src/browse_widget.cc, * demo/shared/src/browse_widget.hh, * demo/shared/src/crop_item.cc, * demo/shared/src/crop_item.hh, * demo/shared/src/image_viewer.cc, * demo/shared/src/image_viewer.hh, * demo/shared/src/image_viewer.hxx, * demo/shared/src/internal.bak/interactive_scene.cc, * demo/shared/src/internal.bak/interactive_scene.hh, * demo/shared/src/internal.bak/selection_rectangle.cc, * demo/shared/src/internal.bak/selection_rectangle.hh, * demo/shared/src/internal/interactive_scene.cc, * demo/shared/src/internal/interactive_scene.hh, * demo/shared/src/internal/selection_rectangle.cc, * demo/shared/src/internal/selection_rectangle.hh, * demo/shared/src/to_mln_image.hh, * demo/shared/src/types.hh, * demo/shared/ui/browse_widget.ui, * demo/shared/ui/crop_widget.ui, * demo/shared/ui/image_viewer.ui, * demo/shared/ui/interactive_scene.cc, * demo/shared/ui/interactive_scene.hh, * demo/shared/ui/rotate_widget.ui, * demo/tip/gui.pro, * demo/tip/gui.qrc, * demo/tip/icons/next.png, * demo/tip/icons/ok.png, * demo/tip/icons/photos.png, * demo/tip/icons/prev.png, * demo/tip/icons/remove.png, * demo/tip/src/custom_delegate.cc, * demo/tip/src/custom_delegate.hh, * demo/tip/src/launch_dialog.cc, * demo/tip/src/launch_dialog.hh, * demo/tip/src/main.cc, * demo/tip/src/main_window.cc, * demo/tip/src/main_window.hh, * demo/tip/ui/launch_dialog.ui, * demo/tip/ui/main_window.ui, * demo/wizard/images/dematerialization.png, * demo/wizard/src/crop_page.cc, * demo/wizard/src/crop_page.hh, * demo/wizard/src/crop_widget.cc, * demo/wizard/src/crop_widget.hh, * demo/wizard/src/doc_type.hh, * demo/wizard/src/doc_type_page.cc, * demo/wizard/src/doc_type_page.hh, * demo/wizard/src/doc_type_widget.cc, * demo/wizard/src/doc_type_widget.hh, * demo/wizard/src/load_page.cc, * demo/wizard/src/load_page.hh, * demo/wizard/src/load_widget.cc, * demo/wizard/src/load_widget.hh, * demo/wizard/src/main.cc, * demo/wizard/src/main_window.cc, * demo/wizard/src/main_window.hh, * demo/wizard/src/mln_widgets.cc, * demo/wizard/src/preprocessing_page.cc, * demo/wizard/src/preprocessing_page.hh, * demo/wizard/src/preprocessing_task.hh, * demo/wizard/src/preprocessing_widget.cc, * demo/wizard/src/preprocessing_widget.hh, * demo/wizard/src/process_page.cc, * demo/wizard/src/process_page.hh, * demo/wizard/src/process_widget.cc, * demo/wizard/src/process_widget.hh, * demo/wizard/src/result_page.cc, * demo/wizard/src/result_page.hh, * demo/wizard/src/result_widget.cc, * demo/wizard/src/result_widget.hh, * demo/wizard/src/rotate_page.cc, * demo/wizard/src/rotate_page.hh, * demo/wizard/src/rotate_widget.cc, * demo/wizard/src/rotate_widget.hh, * demo/wizard/src/runner.cc, * demo/wizard/src/runner.hh, * demo/wizard/src/test.cc, * demo/wizard/ui/doc_type_widget.ui, * demo/wizard/ui/load_widget.ui, * demo/wizard/ui/main_window.ui, * demo/wizard/ui/preprocessing_widget.ui, * demo/wizard/wizard.pro, * demo/wizard/wizard.qrc: Remove. --- scribo/ChangeLog | 139 +++++ scribo/demo/Makefile.am | 4 - scribo/demo/demat/demat.pro | 42 -- scribo/demo/demat/demat.qrc | 4 - scribo/demo/demat/src/doc_type.hh | 51 -- scribo/demo/demat/src/main.cc | 31 - scribo/demo/demat/src/main_window.cc | 266 -------- scribo/demo/demat/src/main_window.hh | 96 --- scribo/demo/demat/src/mln_widgets.cc | 11 - scribo/demo/demat/src/preprocessing_task.hh | 62 -- scribo/demo/demat/src/process_args.hh | 47 -- scribo/demo/demat/src/runner.cc | 327 ---------- scribo/demo/demat/src/runner.hh | 94 --- scribo/demo/demat/ui/main_window.ui | 381 ------------ scribo/demo/review/Makefile.am | 56 -- scribo/demo/review/icons/document-open.png | Bin 1550 -> 0 bytes scribo/demo/review/icons/edit-find.png | Bin 1636 -> 0 bytes scribo/demo/review/icons/format-indent-more.png | Bin 766 -> 0 bytes scribo/demo/review/icons/go-next.png | Bin 1219 -> 0 bytes scribo/demo/review/icons/image-x-generic.png | Bin 1163 -> 0 bytes scribo/demo/review/icons/list-add.png | Bin 601 -> 0 bytes scribo/demo/review/icons/ocr.png | Bin 14929 -> 0 bytes scribo/demo/review/icons/text-x-generic.png | Bin 744 -> 0 bytes scribo/demo/review/icons/view-refresh.png | Bin 2024 -> 0 bytes scribo/demo/review/icons/x-office-spreadsheet.png | Bin 1518 -> 0 bytes scribo/demo/review/mainwindow.ui | 340 ---------- scribo/demo/review/review.qrc | 13 - scribo/demo/review/src/main.cc | 49 -- scribo/demo/review/src/mainwindow.cc | 569 ----------------- scribo/demo/review/src/mainwindow.hh | 139 ----- scribo/demo/shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 0 bytes scribo/demo/shared/icons/accept-icon.png | Bin 4858 -> 0 bytes scribo/demo/shared/icons/close.gif | Bin 340 -> 0 bytes scribo/demo/shared/icons/crop-icon.png | Bin 228 -> 0 bytes scribo/demo/shared/icons/image-add-icon.png | Bin 2917 -> 0 bytes scribo/demo/shared/icons/image-edit-icon.png | Bin 2305 -> 0 bytes scribo/demo/shared/icons/image-multi-icon.png | Bin 2033 -> 0 bytes scribo/demo/shared/icons/image-next-icon.png | Bin 3008 -> 0 bytes scribo/demo/shared/icons/image-remove-icon.png | Bin 3127 -> 0 bytes scribo/demo/shared/icons/next-icon.png | Bin 4611 -> 0 bytes scribo/demo/shared/icons/olena_smaller.jpg | Bin 8028 -> 0 bytes scribo/demo/shared/icons/page-down-icon.png | Bin 3450 -> 0 bytes scribo/demo/shared/icons/page-search-icon.png | Bin 3101 -> 0 bytes scribo/demo/shared/icons/rotate_ccw.png | Bin 4200 -> 0 bytes scribo/demo/shared/icons/rotate_cw.png | Bin 4161 -> 0 bytes scribo/demo/shared/icons/search-add-icon.png | Bin 4274 -> 0 bytes scribo/demo/shared/icons/search-remove-icon.png | Bin 4196 -> 0 bytes scribo/demo/shared/shared.qrc | 21 - scribo/demo/shared/src/bak/crop_item.cc | 332 ---------- scribo/demo/shared/src/bak/crop_item.hh | 100 --- scribo/demo/shared/src/bak/image_viewer.cc | 242 ------- scribo/demo/shared/src/bak/image_viewer.hh | 116 ---- scribo/demo/shared/src/bak/types.hh | 50 -- scribo/demo/shared/src/browse_widget.cc | 72 --- scribo/demo/shared/src/browse_widget.hh | 78 --- scribo/demo/shared/src/crop_item.cc | 396 ------------ scribo/demo/shared/src/crop_item.hh | 119 ---- scribo/demo/shared/src/image_viewer.cc | 410 ------------ scribo/demo/shared/src/image_viewer.hh | 148 ----- scribo/demo/shared/src/image_viewer.hxx | 31 - .../shared/src/internal.bak/interactive_scene.cc | 286 --------- .../shared/src/internal.bak/interactive_scene.hh | 108 ---- .../shared/src/internal.bak/selection_rectangle.cc | 241 ------- .../shared/src/internal.bak/selection_rectangle.hh | 91 --- .../demo/shared/src/internal/interactive_scene.cc | 94 --- .../demo/shared/src/internal/interactive_scene.hh | 85 --- .../shared/src/internal/selection_rectangle.cc | 241 ------- .../shared/src/internal/selection_rectangle.hh | 91 --- scribo/demo/shared/src/to_mln_image.hh | 77 --- scribo/demo/shared/src/types.hh | 50 -- scribo/demo/shared/ui/browse_widget.ui | 106 ---- scribo/demo/shared/ui/crop_widget.ui | 34 - scribo/demo/shared/ui/image_viewer.ui | 296 --------- scribo/demo/shared/ui/interactive_scene.cc | 143 ----- scribo/demo/shared/ui/interactive_scene.hh | 87 --- scribo/demo/shared/ui/rotate_widget.ui | 34 - scribo/demo/tip/gui.pro | 19 - scribo/demo/tip/gui.qrc | 9 - scribo/demo/tip/icons/next.png | Bin 3337 -> 0 bytes scribo/demo/tip/icons/ok.png | Bin 3953 -> 0 bytes scribo/demo/tip/icons/photos.png | Bin 3750 -> 0 bytes scribo/demo/tip/icons/prev.png | Bin 3334 -> 0 bytes scribo/demo/tip/icons/remove.png | Bin 3704 -> 0 bytes scribo/demo/tip/src/custom_delegate.cc | 105 ---- scribo/demo/tip/src/custom_delegate.hh | 81 --- scribo/demo/tip/src/launch_dialog.cc | 94 --- scribo/demo/tip/src/launch_dialog.hh | 63 -- scribo/demo/tip/src/main.cc | 46 -- scribo/demo/tip/src/main_window.cc | 526 ---------------- scribo/demo/tip/src/main_window.hh | 119 ---- scribo/demo/tip/ui/launch_dialog.ui | 117 ---- scribo/demo/tip/ui/main_window.ui | 656 -------------------- scribo/demo/wizard/images/dematerialization.png | Bin 76309 -> 0 bytes scribo/demo/wizard/src/crop_page.cc | 48 -- scribo/demo/wizard/src/crop_page.hh | 60 -- scribo/demo/wizard/src/crop_widget.cc | 37 -- scribo/demo/wizard/src/crop_widget.hh | 62 -- scribo/demo/wizard/src/doc_type.hh | 51 -- scribo/demo/wizard/src/doc_type_page.cc | 48 -- scribo/demo/wizard/src/doc_type_page.hh | 61 -- scribo/demo/wizard/src/doc_type_widget.cc | 38 -- scribo/demo/wizard/src/doc_type_widget.hh | 64 -- scribo/demo/wizard/src/load_page.cc | 71 --- scribo/demo/wizard/src/load_page.hh | 67 -- scribo/demo/wizard/src/load_widget.cc | 56 -- scribo/demo/wizard/src/load_widget.hh | 64 -- scribo/demo/wizard/src/main.cc | 28 - scribo/demo/wizard/src/main_window.cc | 144 ----- scribo/demo/wizard/src/main_window.hh | 72 --- scribo/demo/wizard/src/mln_widgets.cc | 7 - scribo/demo/wizard/src/preprocessing_page.cc | 61 -- scribo/demo/wizard/src/preprocessing_page.hh | 66 -- scribo/demo/wizard/src/preprocessing_task.hh | 61 -- scribo/demo/wizard/src/preprocessing_widget.cc | 93 --- scribo/demo/wizard/src/preprocessing_widget.hh | 65 -- scribo/demo/wizard/src/process_page.cc | 68 -- scribo/demo/wizard/src/process_page.hh | 64 -- scribo/demo/wizard/src/process_widget.cc | 80 --- scribo/demo/wizard/src/process_widget.hh | 71 --- scribo/demo/wizard/src/result_page.cc | 43 -- scribo/demo/wizard/src/result_page.hh | 60 -- scribo/demo/wizard/src/result_widget.cc | 43 -- scribo/demo/wizard/src/result_widget.hh | 58 -- scribo/demo/wizard/src/rotate_page.cc | 45 -- scribo/demo/wizard/src/rotate_page.hh | 60 -- scribo/demo/wizard/src/rotate_widget.cc | 38 -- scribo/demo/wizard/src/rotate_widget.hh | 62 -- scribo/demo/wizard/src/runner.cc | 296 --------- scribo/demo/wizard/src/runner.hh | 84 --- scribo/demo/wizard/src/test.cc | 16 - scribo/demo/wizard/ui/doc_type_widget.ui | 115 ---- scribo/demo/wizard/ui/load_widget.ui | 110 ---- scribo/demo/wizard/ui/main_window.ui | 216 ------- scribo/demo/wizard/ui/preprocessing_widget.ui | 223 ------- scribo/demo/wizard/wizard.pro | 71 --- scribo/demo/wizard/wizard.qrc | 5 - 136 files changed, 139 insertions(+), 11748 deletions(-) delete mode 100644 scribo/demo/demat/demat.pro delete mode 100644 scribo/demo/demat/demat.qrc delete mode 100644 scribo/demo/demat/src/doc_type.hh delete mode 100644 scribo/demo/demat/src/main.cc delete mode 100644 scribo/demo/demat/src/main_window.cc delete mode 100644 scribo/demo/demat/src/main_window.hh delete mode 100644 scribo/demo/demat/src/mln_widgets.cc delete mode 100644 scribo/demo/demat/src/preprocessing_task.hh delete mode 100644 scribo/demo/demat/src/process_args.hh delete mode 100644 scribo/demo/demat/src/runner.cc delete mode 100644 scribo/demo/demat/src/runner.hh delete mode 100644 scribo/demo/demat/ui/main_window.ui delete mode 100644 scribo/demo/review/Makefile.am delete mode 100644 scribo/demo/review/icons/document-open.png delete mode 100644 scribo/demo/review/icons/edit-find.png delete mode 100644 scribo/demo/review/icons/format-indent-more.png delete mode 100644 scribo/demo/review/icons/go-next.png delete mode 100644 scribo/demo/review/icons/image-x-generic.png delete mode 100644 scribo/demo/review/icons/list-add.png delete mode 100644 scribo/demo/review/icons/ocr.png delete mode 100644 scribo/demo/review/icons/text-x-generic.png delete mode 100644 scribo/demo/review/icons/view-refresh.png delete mode 100644 scribo/demo/review/icons/x-office-spreadsheet.png delete mode 100644 scribo/demo/review/mainwindow.ui delete mode 100644 scribo/demo/review/review.qrc delete mode 100644 scribo/demo/review/src/main.cc delete mode 100644 scribo/demo/review/src/mainwindow.cc delete mode 100644 scribo/demo/review/src/mainwindow.hh delete mode 100644 scribo/demo/shared/icons/Symbols-Delete-icon.png delete mode 100644 scribo/demo/shared/icons/accept-icon.png delete mode 100644 scribo/demo/shared/icons/close.gif delete mode 100644 scribo/demo/shared/icons/crop-icon.png delete mode 100644 scribo/demo/shared/icons/image-add-icon.png delete mode 100644 scribo/demo/shared/icons/image-edit-icon.png delete mode 100644 scribo/demo/shared/icons/image-multi-icon.png delete mode 100644 scribo/demo/shared/icons/image-next-icon.png delete mode 100644 scribo/demo/shared/icons/image-remove-icon.png delete mode 100644 scribo/demo/shared/icons/next-icon.png delete mode 100644 scribo/demo/shared/icons/olena_smaller.jpg delete mode 100644 scribo/demo/shared/icons/page-down-icon.png delete mode 100644 scribo/demo/shared/icons/page-search-icon.png delete mode 100644 scribo/demo/shared/icons/rotate_ccw.png delete mode 100644 scribo/demo/shared/icons/rotate_cw.png delete mode 100644 scribo/demo/shared/icons/search-add-icon.png delete mode 100644 scribo/demo/shared/icons/search-remove-icon.png delete mode 100644 scribo/demo/shared/shared.qrc delete mode 100644 scribo/demo/shared/src/bak/crop_item.cc delete mode 100644 scribo/demo/shared/src/bak/crop_item.hh delete mode 100644 scribo/demo/shared/src/bak/image_viewer.cc delete mode 100644 scribo/demo/shared/src/bak/image_viewer.hh delete mode 100644 scribo/demo/shared/src/bak/types.hh delete mode 100644 scribo/demo/shared/src/browse_widget.cc delete mode 100644 scribo/demo/shared/src/browse_widget.hh delete mode 100644 scribo/demo/shared/src/crop_item.cc delete mode 100644 scribo/demo/shared/src/crop_item.hh delete mode 100644 scribo/demo/shared/src/image_viewer.cc delete mode 100644 scribo/demo/shared/src/image_viewer.hh delete mode 100644 scribo/demo/shared/src/image_viewer.hxx delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/to_mln_image.hh delete mode 100644 scribo/demo/shared/src/types.hh delete mode 100644 scribo/demo/shared/ui/browse_widget.ui delete mode 100644 scribo/demo/shared/ui/crop_widget.ui delete mode 100644 scribo/demo/shared/ui/image_viewer.ui delete mode 100644 scribo/demo/shared/ui/interactive_scene.cc delete mode 100644 scribo/demo/shared/ui/interactive_scene.hh delete mode 100644 scribo/demo/shared/ui/rotate_widget.ui delete mode 100644 scribo/demo/tip/gui.pro delete mode 100644 scribo/demo/tip/gui.qrc delete mode 100644 scribo/demo/tip/icons/next.png delete mode 100644 scribo/demo/tip/icons/ok.png delete mode 100644 scribo/demo/tip/icons/photos.png delete mode 100644 scribo/demo/tip/icons/prev.png delete mode 100644 scribo/demo/tip/icons/remove.png delete mode 100644 scribo/demo/tip/src/custom_delegate.cc delete mode 100644 scribo/demo/tip/src/custom_delegate.hh delete mode 100644 scribo/demo/tip/src/launch_dialog.cc delete mode 100644 scribo/demo/tip/src/launch_dialog.hh delete mode 100644 scribo/demo/tip/src/main.cc delete mode 100644 scribo/demo/tip/src/main_window.cc delete mode 100644 scribo/demo/tip/src/main_window.hh delete mode 100644 scribo/demo/tip/ui/launch_dialog.ui delete mode 100644 scribo/demo/tip/ui/main_window.ui delete mode 100644 scribo/demo/wizard/images/dematerialization.png delete mode 100644 scribo/demo/wizard/src/crop_page.cc delete mode 100644 scribo/demo/wizard/src/crop_page.hh delete mode 100644 scribo/demo/wizard/src/crop_widget.cc delete mode 100644 scribo/demo/wizard/src/crop_widget.hh delete mode 100644 scribo/demo/wizard/src/doc_type.hh delete mode 100644 scribo/demo/wizard/src/doc_type_page.cc delete mode 100644 scribo/demo/wizard/src/doc_type_page.hh delete mode 100644 scribo/demo/wizard/src/doc_type_widget.cc delete mode 100644 scribo/demo/wizard/src/doc_type_widget.hh delete mode 100644 scribo/demo/wizard/src/load_page.cc delete mode 100644 scribo/demo/wizard/src/load_page.hh delete mode 100644 scribo/demo/wizard/src/load_widget.cc delete mode 100644 scribo/demo/wizard/src/load_widget.hh delete mode 100644 scribo/demo/wizard/src/main.cc delete mode 100644 scribo/demo/wizard/src/main_window.cc delete mode 100644 scribo/demo/wizard/src/main_window.hh delete mode 100644 scribo/demo/wizard/src/mln_widgets.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_task.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.hh delete mode 100644 scribo/demo/wizard/src/process_page.cc delete mode 100644 scribo/demo/wizard/src/process_page.hh delete mode 100644 scribo/demo/wizard/src/process_widget.cc delete mode 100644 scribo/demo/wizard/src/process_widget.hh delete mode 100644 scribo/demo/wizard/src/result_page.cc delete mode 100644 scribo/demo/wizard/src/result_page.hh delete mode 100644 scribo/demo/wizard/src/result_widget.cc delete mode 100644 scribo/demo/wizard/src/result_widget.hh delete mode 100644 scribo/demo/wizard/src/rotate_page.cc delete mode 100644 scribo/demo/wizard/src/rotate_page.hh delete mode 100644 scribo/demo/wizard/src/rotate_widget.cc delete mode 100644 scribo/demo/wizard/src/rotate_widget.hh delete mode 100644 scribo/demo/wizard/src/runner.cc delete mode 100644 scribo/demo/wizard/src/runner.hh delete mode 100644 scribo/demo/wizard/src/test.cc delete mode 100644 scribo/demo/wizard/ui/doc_type_widget.ui delete mode 100644 scribo/demo/wizard/ui/load_widget.ui delete mode 100644 scribo/demo/wizard/ui/main_window.ui delete mode 100644 scribo/demo/wizard/ui/preprocessing_widget.ui delete mode 100644 scribo/demo/wizard/wizard.pro delete mode 100644 scribo/demo/wizard/wizard.qrc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 18a73c0..66341a3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,144 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove deprecated programs. + + * demo/demat/demat.pro, + * demo/demat/demat.qrc, + * demo/demat/src/doc_type.hh, + * demo/demat/src/main.cc, + * demo/demat/src/main_window.cc, + * demo/demat/src/main_window.hh, + * demo/demat/src/mln_widgets.cc, + * demo/demat/src/preprocessing_task.hh, + * demo/demat/src/process_args.hh, + * demo/demat/src/runner.cc, + * demo/demat/src/runner.hh, + * demo/demat/ui/main_window.ui, + * demo/review/Makefile.am, + * demo/review/icons/document-open.png, + * demo/review/icons/edit-find.png, + * demo/review/icons/format-indent-more.png, + * demo/review/icons/go-next.png, + * demo/review/icons/image-x-generic.png, + * demo/review/icons/list-add.png, + * demo/review/icons/ocr.png, + * demo/review/icons/text-x-generic.png, + * demo/review/icons/view-refresh.png, + * demo/review/icons/x-office-spreadsheet.png, + * demo/review/mainwindow.ui, + * demo/review/review.qrc, + * demo/review/src/main.cc, + * demo/review/src/mainwindow.cc, + * demo/review/src/mainwindow.hh, + * demo/shared/icons/Symbols-Delete-icon.png, + * demo/shared/icons/accept-icon.png, + * demo/shared/icons/close.gif, + * demo/shared/icons/crop-icon.png, + * demo/shared/icons/image-add-icon.png, + * demo/shared/icons/image-edit-icon.png, + * demo/shared/icons/image-multi-icon.png, + * demo/shared/icons/image-next-icon.png, + * demo/shared/icons/image-remove-icon.png, + * demo/shared/icons/next-icon.png, + * demo/shared/icons/olena_smaller.jpg, + * demo/shared/icons/page-down-icon.png, + * demo/shared/icons/page-search-icon.png, + * demo/shared/icons/rotate_ccw.png, + * demo/shared/icons/rotate_cw.png, + * demo/shared/icons/search-add-icon.png, + * demo/shared/icons/search-remove-icon.png, + * demo/shared/shared.qrc, + * demo/shared/src/bak/crop_item.cc, + * demo/shared/src/bak/crop_item.hh, + * demo/shared/src/bak/image_viewer.cc, + * demo/shared/src/bak/image_viewer.hh, + * demo/shared/src/bak/types.hh, + * demo/shared/src/browse_widget.cc, + * demo/shared/src/browse_widget.hh, + * demo/shared/src/crop_item.cc, + * demo/shared/src/crop_item.hh, + * demo/shared/src/image_viewer.cc, + * demo/shared/src/image_viewer.hh, + * demo/shared/src/image_viewer.hxx, + * demo/shared/src/internal.bak/interactive_scene.cc, + * demo/shared/src/internal.bak/interactive_scene.hh, + * demo/shared/src/internal.bak/selection_rectangle.cc, + * demo/shared/src/internal.bak/selection_rectangle.hh, + * demo/shared/src/internal/interactive_scene.cc, + * demo/shared/src/internal/interactive_scene.hh, + * demo/shared/src/internal/selection_rectangle.cc, + * demo/shared/src/internal/selection_rectangle.hh, + * demo/shared/src/to_mln_image.hh, + * demo/shared/src/types.hh, + * demo/shared/ui/browse_widget.ui, + * demo/shared/ui/crop_widget.ui, + * demo/shared/ui/image_viewer.ui, + * demo/shared/ui/interactive_scene.cc, + * demo/shared/ui/interactive_scene.hh, + * demo/shared/ui/rotate_widget.ui, + * demo/tip/gui.pro, + * demo/tip/gui.qrc, + * demo/tip/icons/next.png, + * demo/tip/icons/ok.png, + * demo/tip/icons/photos.png, + * demo/tip/icons/prev.png, + * demo/tip/icons/remove.png, + * demo/tip/src/custom_delegate.cc, + * demo/tip/src/custom_delegate.hh, + * demo/tip/src/launch_dialog.cc, + * demo/tip/src/launch_dialog.hh, + * demo/tip/src/main.cc, + * demo/tip/src/main_window.cc, + * demo/tip/src/main_window.hh, + * demo/tip/ui/launch_dialog.ui, + * demo/tip/ui/main_window.ui, + * demo/wizard/images/dematerialization.png, + * demo/wizard/src/crop_page.cc, + * demo/wizard/src/crop_page.hh, + * demo/wizard/src/crop_widget.cc, + * demo/wizard/src/crop_widget.hh, + * demo/wizard/src/doc_type.hh, + * demo/wizard/src/doc_type_page.cc, + * demo/wizard/src/doc_type_page.hh, + * demo/wizard/src/doc_type_widget.cc, + * demo/wizard/src/doc_type_widget.hh, + * demo/wizard/src/load_page.cc, + * demo/wizard/src/load_page.hh, + * demo/wizard/src/load_widget.cc, + * demo/wizard/src/load_widget.hh, + * demo/wizard/src/main.cc, + * demo/wizard/src/main_window.cc, + * demo/wizard/src/main_window.hh, + * demo/wizard/src/mln_widgets.cc, + * demo/wizard/src/preprocessing_page.cc, + * demo/wizard/src/preprocessing_page.hh, + * demo/wizard/src/preprocessing_task.hh, + * demo/wizard/src/preprocessing_widget.cc, + * demo/wizard/src/preprocessing_widget.hh, + * demo/wizard/src/process_page.cc, + * demo/wizard/src/process_page.hh, + * demo/wizard/src/process_widget.cc, + * demo/wizard/src/process_widget.hh, + * demo/wizard/src/result_page.cc, + * demo/wizard/src/result_page.hh, + * demo/wizard/src/result_widget.cc, + * demo/wizard/src/result_widget.hh, + * demo/wizard/src/rotate_page.cc, + * demo/wizard/src/rotate_page.hh, + * demo/wizard/src/rotate_widget.cc, + * demo/wizard/src/rotate_widget.hh, + * demo/wizard/src/runner.cc, + * demo/wizard/src/runner.hh, + * demo/wizard/src/test.cc, + * demo/wizard/ui/doc_type_widget.ui, + * demo/wizard/ui/load_widget.ui, + * demo/wizard/ui/main_window.ui, + * demo/wizard/ui/preprocessing_widget.ui, + * demo/wizard/wizard.pro, + * demo/wizard/wizard.qrc: Remove. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation related problems in viewer. * demo/viewer/image_view.cc: Fix a warning; diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index b5825c9..104f93e 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -19,9 +19,6 @@ SUBDIRS = if HAVE_QT -SUBDIRS += review - - if HAVE_MAGICKXX @@ -35,7 +32,6 @@ endif HAVE_MAGICKXX - # FIXME: Add more dependencies (fop, xsltproc) if HAVE_MAGICKXX diff --git a/scribo/demo/demat/demat.pro b/scribo/demo/demat/demat.pro deleted file mode 100644 index ef07aef..0000000 --- a/scribo/demo/demat/demat.pro +++ /dev/null @@ -1,42 +0,0 @@ -# -*- c++ -*- -###################################################################### -# Automatically generated by qmake (2.01a) Tue Feb 9 12:02:10 2010 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src -INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN)/scribo - -QMAKE_CXXFLAGS += -g -O0 - -LIBS +=/usr/lib/libMagick++.so - -# `Magick++-config --ldflags --libs` - -DEFINES += NDEBUG MLN_WO_GLOBAL_VARS - -# Input - HEADERS += \ - ../shared/src/crop_item.hh \ - ../shared/src/image_viewer.hh \ - ../shared/src/internal/interactive_scene.hh \ - ../shared/src/browse_widget.hh \ - src/main_window.hh \ - src/runner.hh - -SOURCES += \ - ../shared/src/crop_item.cc \ - ../shared/src/image_viewer.cc \ - ../shared/src/internal/interactive_scene.cc \ - ../shared/src/browse_widget.cc \ - src/main_window.cc \ - src/main.cc \ - src/runner.cc - -FORMS += \ - ../shared/ui/image_viewer.ui \ - ui/main_window.ui - - -RESOURCES += ../shared/shared.qrc demat.qrc diff --git a/scribo/demo/demat/demat.qrc b/scribo/demo/demat/demat.qrc deleted file mode 100644 index 68031c7..0000000 --- a/scribo/demo/demat/demat.qrc +++ /dev/null @@ -1,4 +0,0 @@ -<RCC> - <qresource prefix="images" > - </qresource> -</RCC> diff --git a/scribo/demo/demat/src/doc_type.hh b/scribo/demo/demat/src/doc_type.hh deleted file mode 100644 index 320cd19..0000000 --- a/scribo/demo/demat/src/doc_type.hh +++ /dev/null @@ -1,51 +0,0 @@ -// 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_DEMO_SHARED_SRC_DOC_TYPE_HH -# define SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_HH - - -namespace scribo -{ - - namespace demo - { - - enum Doc_Type - { - Text_Doc, - Picture, - Mixed_Doc, - - Invalid_Doc - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // !SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_HH diff --git a/scribo/demo/demat/src/main.cc b/scribo/demo/demat/src/main.cc deleted file mode 100644 index 231cd9d..0000000 --- a/scribo/demo/demat/src/main.cc +++ /dev/null @@ -1,31 +0,0 @@ -#undef MLN_WO_GLOBAL_VARS -#include <mln/core/image/image2d.hh> -#include <mln/trace/all.hh> - -#include <QtGui> -#include <src/main_window.hh> -#include <src/preprocessing_task.hh> - -namespace scribo { namespace demo {extern QString basedir_; } } - -int main(int argc, char* argv[]) -{ - QApplication app(argc, argv); - - qRegisterMetaType<preprocessing_task_set_t>("preprocessing_task_set_t"); - - if (argc == 2) - { - scribo::demo::basedir_ = argv[1]; - } - else - { - qDebug() << "Usage: " << argv[0] << " <path_to_scribo/src>"; - return 1; - } - - scribo::demo::demat::main_window win; - win.show(); - - return app.exec(); -} diff --git a/scribo/demo/demat/src/main_window.cc b/scribo/demo/demat/src/main_window.cc deleted file mode 100644 index 5d3a54b..0000000 --- a/scribo/demo/demat/src/main_window.cc +++ /dev/null @@ -1,266 +0,0 @@ -// 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 <src/main_window.hh> - -#include <src/doc_type.hh> -#include <src/preprocessing_task.hh> -#include <src/process_args.hh> - -#include <mln/data/convert.hh> -#include <mln/convert/to_qimage_nocopy.hh> -#include <mln/core/routine/duplicate.hh> -#include <mln/make/box2d.hh> -#include <mln/data/paste.hh> -#include <mln/io/magick/load.hh> - -namespace scribo -{ - - namespace demo - { - - namespace demat - { - - main_window::main_window() - { - setupUi(this); - - text_->hide(); - - connect(action_Open, SIGNAL(activated()), - this, SLOT(open_file_slot())); - - connect(run_btn, SIGNAL(clicked()), this, SLOT(run())); - - - // Connections to/from task runner. - connect(&runner_, SIGNAL(new_progress_label(const QString&)), - this, SLOT(update_progress_label_slot(const QString&))); - - connect(&runner_, SIGNAL(progress(unsigned)), - this, SLOT(progress_slot(unsigned))); - connect(&runner_, SIGNAL(finished()), - this, SLOT(process_finished_slot())); - - // Connections for dock windows. - connect(advanced_dock_, SIGNAL(visibilityChanged(bool)), - actionAdvanced_options, SLOT(setChecked(bool))); - connect(options_dock_, SIGNAL(visibilityChanged(bool)), - actionOptions, SLOT(setChecked(bool))); - - connect(actionAdvanced_options, SIGNAL(triggered(bool)), - advanced_dock_, SLOT(setVisible(bool))); - connect(actionOptions, SIGNAL(triggered(bool)), - options_dock_, SLOT(setVisible(bool))); - - progress_ = new QProgressDialog(); - progress_->setLabelText("Processing..."); - progress_->setCancelButton(0); - progress_->setAutoClose(true); - - action_Reload->setEnabled(false); - run_btn->setEnabled(false); - - // Setup crop tool. - viewer_->set_selection_enabled(true); - connect(viewer_, SIGNAL(ready_for_crop()), this, SLOT(crop_slot())); - } - - - void main_window::open_file_slot() - { - QFileDialog dialog; - QStringList filters; - filters << tr("Image (*.ppm *.pbm *.pgm *.png *.jpg)"); - dialog.setNameFilters(filters); - - dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setLabelText(QFileDialog::LookIn, - tr("Choose an existing file")); - - if (dialog.exec() && current_image_ != dialog.selectedFiles().at(0)) - { - current_image_ = dialog.selectedFiles().at(0); - load(); - } - - } - - - void main_window::load() - { - text_->hide(); - - mln::io::magick::load(input_, current_image_.toStdString()); - - input_dsp_ = QPixmap::fromImage(mln::convert::to_qimage_nocopy(input_)); - - viewer_->draw_image(input_dsp_); - - action_Reload->setEnabled(true); - run_btn->setEnabled(true); - } - - - void main_window::run() - { - preprocessing_task_set_t tasks = get_tasks(); - - prepare_progress_bar(tasks.size()); - - process_args args; // Nothing for now. - - runner_.start(current_image_, get_crop_image(), Text_Doc, tasks, args); - setEnabled(false); - } - - - preprocessing_task_set_t main_window::get_tasks() - { - preprocessing_task_set_t tasks; - - if (removeBg->isChecked()) - tasks.insert(RemoveBg); - - if (unskew->isChecked()) - tasks.insert(Unskew); - - if (removeNoise->isChecked()) - tasks.insert(RemoveNoise); - - if (improveContrast->isChecked()) - tasks.insert(ImproveContrast); - - if (reduceSize->isChecked()) - tasks.insert(ReduceSize); - - if (binarizationCBox->currentIndex() == 0) - tasks.insert(BinarizationSimple); - else if (binarizationCBox->currentIndex() == 1) - tasks.insert(BinarizationSauvola); - else if (binarizationCBox->currentIndex() == 2) - tasks.insert(BinarizationSauvolaMs); - else if (binarizationCBox->currentIndex() == 3) - tasks.insert(BinarizationSauvolaMsSplit); - - return tasks; - } - - - void main_window::prepare_progress_bar(unsigned max) - { - progress_->show(); - progress_->setValue(0); - progress_->setMaximum(max + 3); - } - - - void main_window::progress_slot(unsigned i) - { - progress_->setValue(progress_->value() + i); - } - - - void main_window::update_progress_label_slot(const QString& msg) - { - progress_->setLabelText(msg); - } - - - void main_window::process_finished_slot() - { - text_->clear(); - - QFile file("/tmp/out.txt"); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) - return; - - QTextStream in(&file); - in.setCodec("UTF-8"); - while (!in.atEnd()) - { - QString line = in.readLine(); - line = line.section(' ', 4); - text_->append(line); - } - - - text_->show(); - setEnabled(true); - } - - - void main_window::on_action_Reload_triggered(bool) - { - load(); - } - - - mln::image2d<mln::value::rgb8> - main_window::get_crop_image() const - { - mln::box2d b = input_.domain(); - QRectF selection = viewer_->selection(); - - mln::box2d sbox = mln::make::box2d(selection.topLeft().y(), - selection.topLeft().x(), - selection.bottomRight().y(), - selection.bottomRight().x()); - - sbox.crop_wrt(b); - - if (sbox.is_valid()) - { - // Update underlying data. - mln::image2d<mln::value::rgb8> output(sbox); - mln::data::fill(output, input_); - return output; - } - - // No crop performed. - return input_; - } - - - void main_window::crop_slot() - { - mln::image2d<mln::value::rgb8> tmp = get_crop_image(); - if (tmp.buffer() != input_.buffer()) // A crop has been performed. - { - input_ = tmp; - - // Update display - viewer_->draw_image(input_); - } - } - - - } // end of namespace scribo::demo::demat - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/demat/src/main_window.hh b/scribo/demo/demat/src/main_window.hh deleted file mode 100644 index dc23ccb..0000000 --- a/scribo/demo/demat/src/main_window.hh +++ /dev/null @@ -1,96 +0,0 @@ -// 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_DEMO_DEMAT_SRC_MAIN_WINDOW_HH -# define SCRIBO_DEMO_DEMAT_SRC_MAIN_WINDOW_HH - -# include <QtGui/QMainWindow> -# include <ui_main_window.h> -# include <src/doc_type.hh> -# include <src/preprocessing_task.hh> -# include <src/runner.hh> - -# include <mln/core/image/image2d.hh> -# include <mln/core/image/dmorph/image_if.hh> -# include <mln/pw/all.hh> -# include <mln/value/rgb8.hh> - - -namespace scribo -{ - - namespace demo - { - - namespace demat - { - - - class main_window : public QMainWindow, private Ui::MainWindow - { - Q_OBJECT; - - public: - main_window(); - - private slots: - void run(); - void open_file_slot(); - void progress_slot(unsigned i); - void update_progress_label_slot(const QString&); - void process_finished_slot(); - - void crop_slot(); - - void on_action_Reload_triggered(bool b); - - private: // members - void load(); - - void prepare_progress_bar(unsigned max); - Doc_Type get_doc_type(); - preprocessing_task_set_t get_tasks(); - mln::image2d<mln::value::rgb8> get_crop_image() const; - - private: // attributes - QPixmap input_dsp_; - - QString current_image_; - - QProgressDialog* progress_; - runner runner_; - - mln::image2d<mln::value::rgb8> input_; - }; - - - } // end of namespace scribo::demo::demat - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_DEMAT_SRC_MAIN_WINDOW_HH diff --git a/scribo/demo/demat/src/mln_widgets.cc b/scribo/demo/demat/src/mln_widgets.cc deleted file mode 100644 index 079fc7f..0000000 --- a/scribo/demo/demat/src/mln_widgets.cc +++ /dev/null @@ -1,11 +0,0 @@ -#undef MLN_INCLUDE_ONLY - -// Windows -#include <src/main_window.cc> - -// Widgets -#include <shared/src/image_viewer.cc> - -// Misc -#include <src/main.cc> -#include <src/runner.cc> diff --git a/scribo/demo/demat/src/preprocessing_task.hh b/scribo/demo/demat/src/preprocessing_task.hh deleted file mode 100644 index 5c287c4..0000000 --- a/scribo/demo/demat/src/preprocessing_task.hh +++ /dev/null @@ -1,62 +0,0 @@ -// 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_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH -# define SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH - -# include <QSet> - - -namespace scribo -{ - - namespace demo - { - - enum Preprocessing_Task - { - RemoveBg = 0, - Unskew, - RemoveNoise, - ImproveContrast, - ReduceSize, - - BinarizationSimple, - BinarizationSauvola, - BinarizationSauvolaMs, - BinarizationSauvolaMsSplit, - - PREPROCESSING_TASK_COUNT // Invalid task. - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - -typedef QSet<scribo::demo::Preprocessing_Task> preprocessing_task_set_t; -Q_DECLARE_METATYPE(preprocessing_task_set_t); - -#endif // !SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH diff --git a/scribo/demo/demat/src/process_args.hh b/scribo/demo/demat/src/process_args.hh deleted file mode 100644 index 5ca72cf..0000000 --- a/scribo/demo/demat/src/process_args.hh +++ /dev/null @@ -1,47 +0,0 @@ -// 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_DEMO_SHARED_SRC_PROCESS_ARGS_HH -# define SCRIBO_DEMO_SHARED_SRC_PROCESS_ARGS_HH - - -namespace scribo -{ - - namespace demo - { - - struct process_args - { - unsigned scale; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // !SCRIBO_DEMO_SHARED_SRC_PROCESS_ARGS_HH diff --git a/scribo/demo/demat/src/runner.cc b/scribo/demo/demat/src/runner.cc deleted file mode 100644 index 0ab591c..0000000 --- a/scribo/demo/demat/src/runner.cc +++ /dev/null @@ -1,327 +0,0 @@ -#include <src/runner.hh> - -#include <shared/src/to_mln_image.hh> -#include <src/preprocessing_task.hh> -#include <src/doc_type.hh> - -#include <mln/convert/to_qimage.hh> -#include <mln/convert/to_qimage_nocopy.hh> -#include <mln/fun/v2v/rgb_to_int_u.hh> -#include <mln/value/int_u8.hh> -#include <mln/value/rgb8.hh> -#include <mln/data/convert.hh> -#include <mln/data/paste_without_localization.hh> -#include <mln/io/pbm/save.hh> -#include <mln/io/magick/load.hh> -#include <mln/subsampling/antialiased.hh> - -#include <scribo/preprocessing/split_bg_fg.hh> -#include <scribo/preprocessing/denoise.hh> -#include <scribo/preprocessing/homogeneous_contrast.hh> -#include <scribo/preprocessing/deskew.hh> -#include <scribo/binarization/sauvola.hh> -#include <scribo/binarization/sauvola_ms.hh> -#include <scribo/binarization/sauvola_ms_split.hh> -#include <scribo/binarization/global_threshold_auto.hh> - -#include <mln/logical/not.hh> - -namespace scribo -{ - - namespace demo - { - - QString basedir_ = ""; - - - runner::runner(QObject *parent) - : QThread(parent) - { - process_.moveToThread(this); - } - - - void runner::start(const QString& filename, - const mln::image2d<mln::value::rgb8>& input, - const Doc_Type& doc_type, - const preprocessing_task_set_t& tasks, - const process_args& args) - { - filename_ = filename; - doc_type_ = doc_type; - tasks_ = tasks; - args_ = args; - input_ = input; - - QThread::start(); - } - - - void runner::run() - { - // Notification of the number of tasks. - emit new_progress_max_value(tasks_.size() + 2); - - qDebug() << "progress steps : " << tasks_.size() + 2; - - image2d<value::rgb8> ima = load(); - - preprocess(ima); - - process(); - } - - - image2d<value::rgb8> runner::load() - { - emit new_progress_label("Loading image"); - - image2d<value::rgb8> output(input_.nrows(), input_.ncols(), - input_.border()); - data::paste_without_localization(input_, output); - -// io::magick::load(output, filename_.toStdString()); - - emit progress(1); - - return output; - } - - - void runner::preprocess(const image2d<value::rgb8>& ima) - { - - image2d<value::rgb8> tmp_color = duplicate(ima); - - - // - //========== - // Subsample - //========== - if (tasks_.contains(ReduceSize)) - { - emit new_progress_label("Subsampling input image"); - tmp_color = mln::subsampling::antialiased(tmp_color, - find_best_scale(tmp_color)); - emit progress(1); - } - - - //================== - // Remove background - //================== - if (tasks_.contains(RemoveBg)) - { - std::cout << "Foreground extraction" << std::endl; - emit new_progress_label("Foreground Extraction"); - - tmp_color = scribo::preprocessing::split_bg_fg(tmp_color, 10000, 32).second(); - - emit progress(1); - } - - - //============================================= - // Convert to grayscale image (always happens). - //============================================= - emit new_progress_label("Convert to gray-scale image"); - image2d<value::int_u8> - intensity_ima = data::transform(tmp_color, - mln::fun::v2v::rgb_to_int_u<8>()); - emit progress(1); - - - //======= - // Deskew - //======= - if (tasks_.contains(Unskew)) - { - std::cout << "Deskew" << std::endl; - emit new_progress_label("Deskew"); - - intensity_ima = scribo::preprocessing::deskew(intensity_ima); - - emit progress(1); - } - - - //============================= - // Improve contrast homogeneity - //============================= - if (tasks_.contains(ImproveContrast)) - { - std::cout << "Improve contrast homogeneity" << std::endl; - emit new_progress_label("Improve contrast homogeneity"); - - intensity_ima = arith::revert(preprocessing::homogeneous_contrast(intensity_ima, 75)); - - emit progress(1); - } - - - std::cout << intensity_ima.domain() << std::endl; - io::pgm::save(intensity_ima, "intensity_ima.pgm"); - - //============================== - // Binarization (always happens) - //============================== - image2d<bool> out_bool; - emit new_progress_label("Binarization"); - - if (tasks_.contains(BinarizationSauvola)) - { - // FIXME: sauvola should not negate the image. - std::cout << "Binarization Sauvola" << std::endl; - out_bool = binarization::sauvola(intensity_ima); - } - else if (tasks_.contains(BinarizationSauvolaMs)) - { - // FIXME: sauvola should not negate the image. - std::cout << "Binarization Sauvola_ms" << std::endl; - out_bool = binarization::sauvola_ms(intensity_ima, 51, 2); - } - else if (tasks_.contains(BinarizationSauvolaMsSplit)) - { - // FIXME: sauvola should not negate the image. - // FIXME: WARNING: work directly on the color image -> it is - // NOT deskewed nor contrast improved. - std::cout << "Binarization Sauvola_ms_split" << std::endl; - out_bool = binarization::sauvola_ms_split(tmp_color, 51, 2, 2); - } - else if (tasks_.contains(BinarizationSimple)) - { - std::cout << "Binarization Simple" << std::endl; - out_bool = scribo::binarization::global_threshold_auto(intensity_ima); - } - else - { - std::cout << "Binary image conversion" << std::endl; - out_bool = data::convert(bool(), intensity_ima); - } - - emit progress(1); - - - // FIXME: remove! - logical::not_inplace(out_bool); - - - //======== - // Denoise - //======== - if (tasks_.contains(RemoveNoise)) - { - std::cout << "Remove noise" << std::endl; - emit new_progress_label("Remove noise"); - - out_bool = preprocessing::denoise(out_bool, c8(), 2, 2); - - emit progress(1); - } - - - //========================= - // Save preprocessed image. - //========================= - io::pbm::save(out_bool, "/tmp/tmp.pbm"); - } - - - void runner::process() - { - QStringList args; - - - // FIXME: require binaries to ask for a filename for bboxes - // output files. - switch(doc_type_) - { - case Text_Doc: - emit new_progress_label("Finding text in document..."); - qDebug() << "Running pbm_text_in_doc"; - args << "/tmp/tmp.pbm" << "/tmp/out.txt"; - - // Denoise. - if (! tasks_.contains(RemoveNoise)) - args << "0"; - else - { - args << "1"; - emit progress(1); // Consider denoising as done even though it is performed later. - } - - args << "/tmp/"; - - qDebug() << "Running:" - << basedir_ + "/pbm_text_in_doc" - << args; - - if (process_.execute(basedir_ + "/pbm_text_in_doc", args)) - { - qDebug() << "Error while running pbm_text_in_doc."; - return; - } - break; - - case Picture: - emit new_progress_label("Finding text in picture..."); - qDebug() << "Running text_in_picture"; - args << "/tmp/tmp.pbm" << "/tmp/out.ppm" << "1" << "1" << "1"; - if (process_.execute(basedir_ + "/text_in_picture", args)) - { - qDebug() << "Error while running text_in_picture."; - return; - } - break; - - case Mixed_Doc: - qDebug() << "Running pbm_text_in_mixed_doc"; - if (process_.execute(basedir_ + "/pbm_text_in_mixed_doc", args)) - { - qDebug() << "Error while running pbm_text_in_mixed_doc."; - return; - } - break; - - default: - case Invalid_Doc: - qDebug() << "runner - Invalid doc type..."; - return; - } - - process_.waitForFinished(-1); - - emit progress(1); - - emit finished(); - qDebug() << "Done"; - } - - - void runner::stop() - { - process_.kill(); - terminate(); - } - - - template <typename V> - unsigned runner::find_best_scale(const image2d<V>& ima) - { - if (ima.nrows() > 2500 - && ima.nrows() < 5000 - && ima.ncols() > 2500 - && ima.ncols() < 5000) - return 2; - - if (ima.nrows() > 5000 - && ima.ncols() > 5000) - return 3; - - return 1; - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/demat/src/runner.hh b/scribo/demo/demat/src/runner.hh deleted file mode 100644 index be32e5a..0000000 --- a/scribo/demo/demat/src/runner.hh +++ /dev/null @@ -1,94 +0,0 @@ -// 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_DEMO_SHARED_SRC_RUNNER_HH -# define SCRIBO_DEMO_SHARED_SRC_RUNNER_HH - -# include <QtGui> -# include <QProcess> - -# include <src/preprocessing_task.hh> -# include <src/doc_type.hh> - -# include <mln/core/image/image2d.hh> -# include <mln/value/qt/rgb32.hh> - -#include <src/process_args.hh> - -namespace scribo -{ - - namespace demo - { - - - class runner : public QThread - { - Q_OBJECT; - - public: - runner(QObject *parent = 0); - - void start(const QString& filename, - const mln::image2d<mln::value::rgb8>& input, - const Doc_Type& doc_type, - const preprocessing_task_set_t& tasks, - const process_args& args); - - void stop(); - - signals: - void new_intermediate_result(const QImage& ima); - void new_progress_max_value(unsigned i); - void new_progress_label(const QString& msg); - void progress(unsigned i); - void finished(); - - private: // members - mln::image2d<mln::value::rgb8> load(); - void preprocess(const mln::image2d<mln::value::rgb8>& ima); - void process(); - virtual void run(); - - template <typename V> - unsigned find_best_scale(const mln::image2d<V>& ima); - - private: // attributes - QProcess process_; - Doc_Type doc_type_; - QSet<Preprocessing_Task> tasks_; - QString filename_; - process_args args_; - mln::image2d<mln::value::rgb8> input_; - }; - - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_RUNNER_HH diff --git a/scribo/demo/demat/ui/main_window.ui b/scribo/demo/demat/ui/main_window.ui deleted file mode 100644 index 349d43a..0000000 --- a/scribo/demo/demat/ui/main_window.ui +++ /dev/null @@ -1,381 +0,0 @@ -<ui version="4.0" > - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>666</width> - <height>647</height> - </rect> - </property> - <property name="windowTitle" > - <string>MainWindow</string> - </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QSplitter" name="splitter" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <widget class="scribo::demo::shared::image_viewer" name="viewer_" /> - <widget class="QTextEdit" name="text_" /> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="run_btn" > - <property name="text" > - <string>&Run</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>666</width> - <height>24</height> - </rect> - </property> - <widget class="QMenu" name="menu_File" > - <property name="title" > - <string>&File</string> - </property> - <addaction name="action_Open" /> - <addaction name="separator" /> - <addaction name="action_Reload" /> - <addaction name="separator" /> - <addaction name="action_Quit" /> - </widget> - <widget class="QMenu" name="menuWindow" > - <property name="title" > - <string>&Dialogs</string> - </property> - <addaction name="actionOptions" /> - <addaction name="actionAdvanced_options" /> - </widget> - <addaction name="menu_File" /> - <addaction name="menuWindow" /> - </widget> - <widget class="QStatusBar" name="statusbar" /> - <widget class="QDockWidget" name="options_dock_" > - <property name="font" > - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="floating" > - <bool>false</bool> - </property> - <property name="features" > - <set>QDockWidget::AllDockWidgetFeatures</set> - </property> - <property name="allowedAreas" > - <set>Qt::AllDockWidgetAreas</set> - </property> - <property name="windowTitle" > - <string>Options</string> - </property> - <attribute name="dockWidgetArea" > - <number>1</number> - </attribute> - <widget class="QWidget" name="dockWidgetContents" > - <layout class="QVBoxLayout" name="verticalLayout_7" > - <item> - <layout class="QVBoxLayout" name="verticalLayout_4" > - <item> - <widget class="QCheckBox" name="removeBg" > - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Remove background (slow)</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="unskew" > - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Unskew</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="removeNoise" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Remove noise</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="improveContrast" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Improve brightness/contrast</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_3" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - </widget> - <widget class="QDockWidget" name="advanced_dock_" > - <property name="font" > - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="windowTitle" > - <string>Advanced options</string> - </property> - <attribute name="dockWidgetArea" > - <number>1</number> - </attribute> - <widget class="QWidget" name="dockWidgetContents_3" > - <layout class="QVBoxLayout" name="verticalLayout_8" > - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <widget class="QCheckBox" name="reduceSize" > - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Run on subsampled image</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_6" > - <item> - <widget class="QLabel" name="binarizeLbl" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text" > - <string>Binarization method:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="binarizationCBox" > - <property name="font" > - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="currentIndex" > - <number>2</number> - </property> - <item> - <property name="text" > - <string>Global threshold</string> - </property> - </item> - <item> - <property name="text" > - <string>Local threshold</string> - </property> - </item> - <item> - <property name="text" > - <string>Local threshold multi-scale</string> - </property> - </item> - <item> - <property name="text" > - <string>Local threshold multi-scale (3-channels)</string> - </property> - </item> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </widget> - <action name="action_Open" > - <property name="text" > - <string>&Open</string> - </property> - <property name="shortcut" > - <string>Ctrl+O</string> - </property> - </action> - <action name="action_Quit" > - <property name="text" > - <string>&Quit</string> - </property> - </action> - <action name="actionDocument_Type" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="checked" > - <bool>true</bool> - </property> - <property name="text" > - <string>Document Type</string> - </property> - </action> - <action name="actionOptions" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="checked" > - <bool>true</bool> - </property> - <property name="text" > - <string>Options</string> - </property> - </action> - <action name="actionAdvanced_options" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="checked" > - <bool>true</bool> - </property> - <property name="text" > - <string>Advanced options</string> - </property> - </action> - <action name="action_Reload" > - <property name="text" > - <string>&Reload</string> - </property> - <property name="shortcut" > - <string>F5, Ctrl+R</string> - </property> - </action> - </widget> - <customwidgets> - <customwidget> - <class>scribo::demo::shared::image_viewer</class> - <extends>QGraphicsView</extends> - <header location="global" >shared/src/image_viewer.hh</header> - </customwidget> - </customwidgets> - <resources/> - <connections> - <connection> - <sender>action_Quit</sender> - <signal>activated()</signal> - <receiver>MainWindow</receiver> - <slot>close()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>332</x> - <y>298</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am deleted file mode 100644 index ec4a971..0000000 --- a/scribo/demo/review/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2009, 2010, 2011 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)/build-aux/autotroll.mk - -noinst_PROGRAMS = scribo-review - -BUILT_SOURCES = src/mainwindow.moc.cc \ - mainwindow.ui.h - -scribo_review_SOURCES = src/main.cc \ - src/mainwindow.cc - -nodist_scribo_review_SOURCES = $(BUILT_SOURCES) - - -scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ - -DNDEBUG \ - -I$(srcdir) -scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 -scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) -scribo_review_LDADD = $(QT_LIBS) $(LDADD) - - -noinst_HEADERS = src/mainwindow.hh - - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - icons/document-open.png \ - icons/edit-find.png \ - icons/format-indent-more.png \ - icons/go-next.png \ - icons/image-x-generic.png \ - icons/list-add.png \ - icons/ocr.png \ - icons/text-x-generic.png \ - icons/view-refresh.png \ - icons/x-office-spreadsheet.png\ - review.qrc \ - mainwindow.ui diff --git a/scribo/demo/review/icons/document-open.png b/scribo/demo/review/icons/document-open.png deleted file mode 100644 index f35f258..0000000 Binary files a/scribo/demo/review/icons/document-open.png and /dev/null differ diff --git a/scribo/demo/review/icons/edit-find.png b/scribo/demo/review/icons/edit-find.png deleted file mode 100644 index 5594785..0000000 Binary files a/scribo/demo/review/icons/edit-find.png and /dev/null differ diff --git a/scribo/demo/review/icons/format-indent-more.png b/scribo/demo/review/icons/format-indent-more.png deleted file mode 100644 index 6a18867..0000000 Binary files a/scribo/demo/review/icons/format-indent-more.png and /dev/null differ diff --git a/scribo/demo/review/icons/go-next.png b/scribo/demo/review/icons/go-next.png deleted file mode 100644 index a68e2db..0000000 Binary files a/scribo/demo/review/icons/go-next.png and /dev/null differ diff --git a/scribo/demo/review/icons/image-x-generic.png b/scribo/demo/review/icons/image-x-generic.png deleted file mode 100644 index 6f118cd..0000000 Binary files a/scribo/demo/review/icons/image-x-generic.png and /dev/null differ diff --git a/scribo/demo/review/icons/list-add.png b/scribo/demo/review/icons/list-add.png deleted file mode 100644 index 2acdd8f..0000000 Binary files a/scribo/demo/review/icons/list-add.png and /dev/null differ diff --git a/scribo/demo/review/icons/ocr.png b/scribo/demo/review/icons/ocr.png deleted file mode 100644 index 2523172..0000000 Binary files a/scribo/demo/review/icons/ocr.png and /dev/null differ diff --git a/scribo/demo/review/icons/text-x-generic.png b/scribo/demo/review/icons/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/scribo/demo/review/icons/text-x-generic.png and /dev/null differ diff --git a/scribo/demo/review/icons/view-refresh.png b/scribo/demo/review/icons/view-refresh.png deleted file mode 100644 index 606ea9e..0000000 Binary files a/scribo/demo/review/icons/view-refresh.png and /dev/null differ diff --git a/scribo/demo/review/icons/x-office-spreadsheet.png b/scribo/demo/review/icons/x-office-spreadsheet.png deleted file mode 100644 index c0ccb7a..0000000 Binary files a/scribo/demo/review/icons/x-office-spreadsheet.png and /dev/null differ diff --git a/scribo/demo/review/mainwindow.ui b/scribo/demo/review/mainwindow.ui deleted file mode 100644 index cb85804..0000000 --- a/scribo/demo/review/mainwindow.ui +++ /dev/null @@ -1,340 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>658</width> - <height>459</height> - </rect> - </property> - <property name="windowTitle"> - <string>Scribo Demo - v0.1</string> - </property> - <property name="dockOptions"> - <set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks</set> - </property> - <property name="unifiedTitleAndToolBarOnMac"> - <bool>false</bool> - </property> - <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <property name="margin"> - <number>0</number> - </property> - <item> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <property name="margin"> - <number>5</number> - </property> - <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLineEdit" name="filepath"/> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="browseBtn"> - <property name="text"> - <string>&Browse</string> - </property> - <property name="icon"> - <iconset resource="../demo.qrc"> - <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset> - </property> - <property name="shortcut"> - <string>Ctrl+B</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QPushButton" name="displayBtn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Refresh</string> - </property> - <property name="icon"> - <iconset resource="../demo.qrc"> - <normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QPushButton" name="runBtn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Run</string> - </property> - <property name="icon"> - <iconset resource="../demo.qrc"> - <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset> - </property> - </widget> - </item> - <item row="0" column="4"> - <widget class="QCheckBox" name="autoRun"> - <property name="text"> - <string>Auto Run</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="5"> - <widget class="QCheckBox" name="useCache"> - <property name="text"> - <string>Enable cache</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="spacing"> - <number>-1</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="zoomLabel"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Zoom:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomIn"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>+</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomOut"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>-</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomFixed"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Fixed width</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomOriginal"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Original size</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="autoDemo"> - <property name="text"> - <string>Auto demo</string> - </property> - <property name="shortcut"> - <string>Ctrl+D</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="timeoutDelay"> - <property name="maximumSize"> - <size> - <width>30</width> - <height>16777215</height> - </size> - </property> - <property name="inputMask"> - <string/> - </property> - <property name="text"> - <string>5</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>s.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QTabWidget" name="tabWidget_2"> - <property name="currentIndex"> - <number>0</number> - </property> - <widget class="QWidget" name="tab_3"> - <attribute name="title"> - <string>Reference Image</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QGraphicsView" name="imageRef"/> - </item> - </layout> - </widget> - </widget> - </item> - <item> - <widget class="QTabWidget" name="tabWidget"> - <property name="currentIndex"> - <number>0</number> - </property> - <widget class="QWidget" name="tab"> - <attribute name="title"> - <string>Result Image</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QGraphicsView" name="imageResult"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2"> - <property name="font"> - <font> - <kerning>true</kerning> - </font> - </property> - <attribute name="title"> - <string>Text</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <property name="spacing"> - <number>0</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QTextBrowser" name="textBrowser"> - <property name="html"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Test</span></p></body></html></string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>658</width> - <height>22</height> - </rect> - </property> - </widget> - <widget class="QStatusBar" name="statusbar"/> - </widget> - <resources> - <include location="../demo.qrc"/> - </resources> - <connections> - <connection> - <sender>filepath</sender> - <signal>returnPressed()</signal> - <receiver>displayBtn</receiver> - <slot>click()</slot> - <hints> - <hint type="sourcelabel"> - <x>213</x> - <y>62</y> - </hint> - <hint type="destinationlabel"> - <x>564</x> - <y>64</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/scribo/demo/review/review.qrc b/scribo/demo/review/review.qrc deleted file mode 100644 index 8492d35..0000000 --- a/scribo/demo/review/review.qrc +++ /dev/null @@ -1,13 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file>icons/go-next.png</file> - <file>icons/view-refresh.png</file> - <file>icons/format-indent-more.png</file> - <file>icons/document-open.png</file> - <file>icons/text-x-generic.png</file> - <file>icons/x-office-spreadsheet.png</file> - <file>icons/image-x-generic.png</file> - <file>icons/edit-find.png</file> - <file>icons/list-add.png</file> - </qresource> -</RCC> diff --git a/scribo/demo/review/src/main.cc b/scribo/demo/review/src/main.cc deleted file mode 100644 index 2a6acaf..0000000 --- a/scribo/demo/review/src/main.cc +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2009 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 <QApplication> -#include <QtGui> - -#include <src/mainwindow.hh> - -int main(int argc, char *argv[]) -{ - if (argc < 2 || argc > 4) - { - qDebug() << "Usage: " - << argv[0] << " <path_to_scribo_src> [base_img_dir]"; - return 0; - } - - QApplication app(argc, argv); - - scribo::demo::MainWindow win(argv[1]); - - if (argc == 3) - win.set_base_img_dir(argv[2]); - - win.show(); - return app.exec(); -} diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc deleted file mode 100644 index 0a4ee65..0000000 --- a/scribo/demo/review/src/mainwindow.cc +++ /dev/null @@ -1,569 +0,0 @@ -// 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. - -#include <QtCore> -#include <QtGui> - -#include "src/mainwindow.hh" - - -const char * modes[][4] = { - { "Text in pictures", "pics", "text_in_picture", "image-x-generic.png" }, - { "Text in docs", "doc", "text_in_doc", "edit-find.png" }, - { (const char *)(1), 0, 0, 0}, // Separator - { "Handwritten text lines", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_lines", "text-x-generic.png" }, - { "Handwritten text words", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_words", "text-x-generic.png" }, - { (const char *)(1), 0, 0, 0}, // Separator - { "Horizontal and Vertical Lines", "hvl", "extract/primitive/find_discontinued_lines", "list-add.png" }, - { "Tables", "hvl", "table/extract", "x-office-spreadsheet.png" }, - { "Pre-processing", "pproc", "preprocess", "format-indent-more.png" }, - { "OCR", "ocr", "recognition", "edit-find.png" }, - { 0, 0, 0 } // Empty line, do NOT delete. -}; - - -// Allow to set up to 5 extra arguments to the binaries. -// -// A program will be launched as follow: -// -// ./my_program input.pbm output <arg1> <arg2> <arg3> <arg4> <arg5> -// -// Unused arguments are set to 0. -// Each line must be mapped to the related on in the previous -// array "modes". So DO preserve the order. -// -const char *args_list[][6] = { - { "1", "1", "1", "1", "1", 0 }, // Text in Pictures - { 0, 0, 0, 0, 0, 0 }, // Text in Docs - { (const char *)(1), 0, 0, 0, 0, 0 }, // Separator - { "/dev/null", 0, 0, 0, 0, 0 }, // Handwritten text lines - { "/dev/null", 0, 0, 0, 0, 0 }, // Handwritten text words - { (const char *)(1), 0, 0, 0, 0, 0 }, // Separator - { "51", 0, 0, 0, 0, 0 }, // Horizontal and Vertical lines - { "/dev/null", 0, 0, 0, 0, 0 }, // Tables - { 0, 0, 0, 0, 0, 0 }, // Pre-processing - { 0, 0, 0, 0, 0, 0 }, // OCR - // Not empty line needed. -}; - - - -namespace scribo -{ - - namespace demo - { - - MainWindow::MainWindow(const QString& exec_prefix, QWidget *parent) - : QMainWindow(parent), exec_prefix_(exec_prefix + "/"), context_(this) - { - setupUi(this); - - unsigned nmodes = 0; - for (unsigned i = 0; modes[i][0] != 0; ++i) - ++nmodes; - - cached_result_.resize(nmodes); - mainRefItem_ = 0; - mainResultItem_ = 0; - base_img_dir_ = QCoreApplication::applicationDirPath(); - - pdialog_.setRange(0,0); - pdialog_.setLabelText(tr("Please wait while computing...")); - pdialog_.setWindowModality(Qt::WindowModal); - - exec_.setReadChannel(QProcess::StandardOutput); - - qDebug() << "Cache located in " << QDir::tempPath(); - - connect(&pdialog_, SIGNAL(canceled()), this, SLOT(compute_canceled())); - - connect(&context_, SIGNAL(triggered(QAction *)), - this, SLOT(context_changed(QAction *))); - - connect(imageResult->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_vertical_sliders(int))); - connect(imageResult->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_horizontal_sliders(int))); - connect(imageRef->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_vertical_sliders(int))); - connect(imageRef->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_horizontal_sliders(int))); - connect(&timer_, SIGNAL(timeout()), this, SLOT(timer_timeout())); - - connect_compute_process(); - - context_.setExclusive(true); - - // No status bar. - setStatusBar(0); - - initToolBar(); - setup_scene(); - } - - MainWindow::~MainWindow() - { - for (int i = 0; i < cached_result_.size(); ++i) - foreach(QString value, cached_result_[i]) - { - QFile f(value); - f.remove(); - } - } - - - void MainWindow::set_base_img_dir(const QString& dir) - { - QDir d(dir); - base_img_dir_ = d.absolutePath(); - } - - - void MainWindow::initToolBar() - { - QToolBar *tbar = new QToolBar("Tools"); - tbar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - - for (unsigned i = 0; modes[i][0]; ++i) - { - if (modes[i][0] == (const char *)(1)) - { - tbar->addSeparator(); - continue; - } - - QAction *action = tbar->addAction(modes[i][0]); - context_.addAction(action); - action->setCheckable(true); - action->setData(i); - action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0 + i)); - action->setEnabled(QFile::exists(exec_prefix_ + modes[i][2])); - - if (modes[i][3] != 0) - action->setIcon(QIcon(QString(":/icons/") + modes[i][3])); - } - - addToolBar(Qt::TopToolBarArea, tbar); - context_.actions().first()->trigger(); - } - - - - void MainWindow::on_browseBtn_clicked(bool) - { - QString current_dir = current_mode() + "/"; - - QString - filename = QFileDialog::getOpenFileName(this, - tr("Open Image."), - base_img_dir_ + "/" + current_dir, - tr("Images (*.pbm *.pgm *.ppm *.jpg *.png *.tiff)")); - - prepare_for_run(filename); - } - - void MainWindow::prepare_for_run(const QString& filename) - { - if (!filename.isEmpty()) - { - filepath->setText(filename); - - update_pixmap(imageRef, filename); - update_pixmap(imageResult); - - if (autoRun->isChecked()) - on_runBtn_clicked(); - } - } - - void MainWindow::on_runBtn_clicked() - { - if (useCache->isChecked() - && cached_result_[mode_].contains(filepath->text())) - { - last_output_ = cached_result_[mode_][filepath->text()]; - exec_finished(0, QProcess::NormalExit); - return; - } - - wait_for_result(); - - QStringList args; - - QString input = filepath->text(); - - args << input; - QTemporaryFile f; - f.open(); - args << f.fileName(); - last_output_ = f.fileName(); - - for (unsigned i = 0; args_list[mode_][i]; ++i) - args << args_list[mode_][i]; - -// if (!is_in_ocr_mode()) -// { -// } - -// reset_progress_dialog(); - qDebug() << "Running " << exec_prefix_ + modes[mode_][2] - << " " << args; - - exec_.start(exec_prefix_ + modes[mode_][2], args); - } - - - void MainWindow::on_displayBtn_clicked(bool) - { - update_pixmap(imageRef, filepath->text()); - } - - - void MainWindow::on_filepath_textChanged() - { - bool b = !filepath->text().isEmpty(); - - runBtn->setEnabled(b); - displayBtn->setEnabled(b); - } - - - void MainWindow::on_zoomIn_clicked() - { - imageResult->scale(1.2, 1.2); - imageRef->scale(1.2, 1.2); - } - - void MainWindow::on_zoomOut_clicked() - { - imageResult->scale(1 / 1.2, 1 / 1.2); - imageRef->scale(1 / 1.2, 1 / 1.2); - } - - QGraphicsItem *& MainWindow::view_to_item(QGraphicsView *view) - { - if (view == imageResult) - return mainResultItem_; - else - return mainRefItem_; - } - - void MainWindow::update_pixmap(QGraphicsView* view, const QString& name) - { - if (name.isEmpty()) - { - update_status_message(""); - return; - } - - QGraphicsItem* item = view_to_item(view); - - QPixmap pixmap; - if (!pixmap.load(name)) - { - qDebug() << "Invalid file format!"; - update_status_message(tr("Invalid file format!")); - return; - } - - QFileInfo finfo(name); - if (item != mainResultItem_ && current_mode() != "hsc" - && current_mode() != "pproc" - && (current_mode() != "pics" || finfo.suffix() == "pbm") - && ! is_in_doc_mode()) - { - QImage image(pixmap.toImage()); - image.invertPixels(); - pixmap = QPixmap::fromImage(image); - } - - if (item != 0) - { - view->scene()->removeItem(item); - delete item; - } - item = view->scene()->addPixmap(pixmap); - view->scene()->setSceneRect(item->boundingRect()); - Q_ASSERT(item != 0); - if (pixmap.width() > view->maximumViewportSize().width()) - view->fitInView(item->boundingRect(), Qt::KeepAspectRatio); - view_to_item(view) = item; - - bool b = (mainResultItem_ != 0 || mainRefItem_ != 0); - zoomLabel->setEnabled(b); - zoomIn->setEnabled(b); - zoomOut->setEnabled(b); - zoomFixed->setEnabled(b); - zoomOriginal->setEnabled(b); - } - - - void MainWindow::exec_finished(int rvalue, QProcess::ExitStatus status) - { - pdialog_.hide(); - if (rvalue == 0) - { - if (status != QProcess::CrashExit) - { - if (useCache->isChecked()) - cached_result_[mode_][filepath->text()] = last_output_; - - setEnabled(true); - if (is_in_ocr_mode() || is_in_doc_mode()) - { - QFile f(last_output_); - f.open(QIODevice::ReadOnly); - textBrowser->setText(QString::fromUtf8(f.readAll().data())); -// textBrowser->setText(exec_.readAllStandardOutput()); - on_displayBtn_clicked(true); - tabWidget->setCurrentIndex(1); - } - else - update_pixmap(imageResult, last_output_); - } - // Else : canceled. - } - else - exec_error(tr("Error during last run.")); - - imageResult->setFocus(); - if (autoDemo->isChecked()) - timer_.start(timeoutDelay->text().toInt() * 1000); - } - - - void MainWindow::setup_scene() - { - QGraphicsScene *scene = new QGraphicsScene(); - imageResult->setScene(scene); - - scene = new QGraphicsScene(); - imageRef->setScene(scene); - - update_status_message(tr("1) Choose an algorithm.\n\ -2) Select an image.\n3) Run.")); - - imageResult->show(); - imageRef->show(); - } - - - void MainWindow::wait_for_result() - { - reset_progress_dialog(); - - pdialog_.show(); - setEnabled(false); - - if (!is_in_ocr_mode() && !is_in_ocr_mode()) - update_status_message(""); - } - - - void MainWindow::update_status_message(const QString& msg) - { - if (mainResultItem_ != 0) - { - imageResult->scene()->removeItem(mainResultItem_); - delete mainResultItem_; - } - mainResultItem_ = imageResult->scene()->addText(msg); - } - - - void MainWindow::exec_error(const QString& msg) - { - setEnabled(true); - QMessageBox::critical(0, tr("Error!"), - tr("The result cannot be computed!")); - update_status_message(msg); - qDebug() << exec_.readAllStandardOutput(); - } - - void MainWindow::exec_error(QProcess::ProcessError error) - { - if (error == QProcess::FailedToStart) - exec_error(tr("This program does not exist: ") - + exec_prefix_ + modes[mode_][2]); - else - exec_error(tr("The computation stopped.") - + exec_prefix_ + modes[mode_][2]); - } - - - void MainWindow::context_changed(QAction *action) - { - mode_ = action->data().toInt(); - filepath->clear(); - tabWidget->setTabEnabled(1, is_in_ocr_mode() || is_in_doc_mode()); - } - - - void MainWindow::compute_canceled() - { - setEnabled(true); - - exec_.disconnect(); - exec_.kill(); - connect_compute_process(); - - update_status_message("Computation canceled."); - } - - - bool MainWindow::is_in_ocr_mode() const - { - return current_mode() == "ocr"; - } - - bool MainWindow::is_in_pics_mode() const - { - return current_mode() == "pics"; - } - - bool MainWindow::is_in_doc_mode() const - { - return current_mode() == "doc"; - } - - - void MainWindow::resize_pixmaps(const QRectF& rect) - { - if (mainRefItem_ != 0) - imageRef->fitInView(rect, Qt::KeepAspectRatio); - if (mainResultItem_ != 0) - imageResult->fitInView(rect, Qt::KeepAspectRatio); - } - - void MainWindow::move_vertical_sliders(int value) - { - imageRef->verticalScrollBar()->setValue(value); - imageResult->verticalScrollBar()->setValue(value); - } - - void MainWindow::move_horizontal_sliders(int value) - { - imageRef->horizontalScrollBar()->setValue(value); - imageResult->horizontalScrollBar()->setValue(value); - } - - - void MainWindow::on_zoomFixed_clicked() - { - resize_pixmaps(mainRefItem_->boundingRect()); - } - - void MainWindow::on_zoomOriginal_clicked() - { - resize_pixmaps(imageResult->viewport()->geometry()); - } - - void MainWindow::on_autoDemo_clicked(bool checked) - { - if (checked) - timer_.start(100); - else - timer_.stop(); - } - - void MainWindow::resizeEvent(QResizeEvent * event) - { - if (mainRefItem_ != 0) - resize_pixmaps(mainRefItem_->boundingRect()); - event->ignore(); - } - - void MainWindow::keyPressEvent(QKeyEvent *event) - { - if (event->text() == QString("+")) - { - on_zoomIn_clicked(); - event->accept(); - } - else if (event->text() == QString("-")) - { - on_zoomOut_clicked(); - event->accept(); - } - else - event->ignore(); - } - - QString MainWindow::current_mode() const - { - return modes[mode_][1]; - } - - void MainWindow::timer_timeout() - { - update_auto_demo_dir(); - timer_.stop(); - prepare_for_run(demoDir_.absolutePath() + "/" - + demo_files_[demo_index_]); - demo_index_ = (demo_index_ + 1) % demo_files_.size(); - } - - void MainWindow::update_auto_demo_dir() - { - QString tmp_path = base_img_dir_ + "/" + current_mode(); - if (demoDir_.path() != tmp_path) - { - demoDir_.setPath(tmp_path); - demo_index_ = 0; - demo_files_ = demoDir_.entryList(QDir::NoDotAndDotDot | QDir::Files); - } - } - - - void MainWindow::update_process_status() - { - if (is_in_pics_mode() || is_in_doc_mode()) - pdialog_.setLabelText(tr(exec_.readAllStandardOutput())); - } - - - void MainWindow::reset_progress_dialog() - { - pdialog_.reset(); - pdialog_.setLabelText(tr("Please wait while computing...")); - } - - - void MainWindow::connect_compute_process() - { - connect(&exec_, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(exec_finished(int, QProcess::ExitStatus))); - connect(&exec_, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(exec_error(QProcess::ProcessError))); - connect(&exec_, SIGNAL(readyReadStandardOutput()), - this, SLOT(update_process_status())); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh deleted file mode 100644 index 60257f8..0000000 --- a/scribo/demo/review/src/mainwindow.hh +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (C) 2009, 2011 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_APPS_DEMO_SRC_MAINWINDOW_HH - -# include <QDir> -# include <QTimer> -# include <QStringList> -# include <QProcess> -# include <QtGui/QWidget> -# include <QProgressDialog> -# include "mainwindow.ui.h" - -namespace scribo -{ - - namespace demo - { - - class MainWindow : public QMainWindow, private Ui::MainWindow - { - Q_OBJECT - - - public: - MainWindow(const QString& exec_prefix, QWidget *parent = 0); - ~MainWindow(); - - void set_base_img_dir(const QString& dir); - - private slots: - void initToolBar(); - - void on_browseBtn_clicked(bool b); - void on_runBtn_clicked(); - void on_displayBtn_clicked(bool b); - void on_filepath_textChanged(); - void on_zoomIn_clicked(); - void on_zoomOut_clicked(); - void on_zoomFixed_clicked(); - void on_zoomOriginal_clicked(); - void on_autoDemo_clicked(bool checked); - - void exec_finished(int rvalue, QProcess::ExitStatus status); - void exec_error(QProcess::ProcessError error); - - void context_changed(QAction *action); - - void compute_canceled(); - - void resize_pixmaps(const QRectF& rect); - - void move_vertical_sliders(int value); - void move_horizontal_sliders(int value); - void timer_timeout(); - - void update_process_status(); - - private: // Members - void setup_scene(); - void update_pixmap(QGraphicsView* view, const QString& name = QString()); - - void exec_error(const QString& msg); - - void wait_for_result(); - - void update_status_message(const QString& msg); - - void prepare_for_run(const QString& filename); - - bool is_in_ocr_mode() const; - bool is_in_pics_mode() const; - bool is_in_doc_mode() const; - - QGraphicsItem *& view_to_item(QGraphicsView *view); - - void resizeEvent(QResizeEvent * event); - void keyPressEvent(QKeyEvent *event); - - QString current_mode() const; - - void update_auto_demo_dir(); - - void reset_progress_dialog(); - - void connect_compute_process(); - - private: // Attributes - QGraphicsItem *mainRefItem_; - QGraphicsItem *mainResultItem_; - QString exec_prefix_; - - QActionGroup context_; - int mode_; - QString last_output_; - QProcess exec_; - - QProgressDialog pdialog_; - - QString base_img_dir_; - - QVector<QHash<QString, QString> > cached_result_; - - /// Related to auto demo. - QTimer timer_; - QDir demoDir_; - unsigned demo_index_; - QStringList demo_files_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - -#endif // ! SCRIBO_APPS_DEMO_SRC_MAINWINDOW_HH diff --git a/scribo/demo/shared/icons/Symbols-Delete-icon.png b/scribo/demo/shared/icons/Symbols-Delete-icon.png deleted file mode 100644 index 3f37439..0000000 Binary files a/scribo/demo/shared/icons/Symbols-Delete-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/accept-icon.png b/scribo/demo/shared/icons/accept-icon.png deleted file mode 100644 index d929648..0000000 Binary files a/scribo/demo/shared/icons/accept-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/close.gif b/scribo/demo/shared/icons/close.gif deleted file mode 100644 index ffcb2e6..0000000 Binary files a/scribo/demo/shared/icons/close.gif and /dev/null differ diff --git a/scribo/demo/shared/icons/crop-icon.png b/scribo/demo/shared/icons/crop-icon.png deleted file mode 100644 index 2e6b290..0000000 Binary files a/scribo/demo/shared/icons/crop-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/image-add-icon.png b/scribo/demo/shared/icons/image-add-icon.png deleted file mode 100644 index 0e4d29c..0000000 Binary files a/scribo/demo/shared/icons/image-add-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/image-edit-icon.png b/scribo/demo/shared/icons/image-edit-icon.png deleted file mode 100644 index 098cfab..0000000 Binary files a/scribo/demo/shared/icons/image-edit-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/image-multi-icon.png b/scribo/demo/shared/icons/image-multi-icon.png deleted file mode 100644 index 60fb23f..0000000 Binary files a/scribo/demo/shared/icons/image-multi-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/image-next-icon.png b/scribo/demo/shared/icons/image-next-icon.png deleted file mode 100644 index e8bc7dd..0000000 Binary files a/scribo/demo/shared/icons/image-next-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/image-remove-icon.png b/scribo/demo/shared/icons/image-remove-icon.png deleted file mode 100644 index 9d2bd94..0000000 Binary files a/scribo/demo/shared/icons/image-remove-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/next-icon.png b/scribo/demo/shared/icons/next-icon.png deleted file mode 100644 index 2d97d3b..0000000 Binary files a/scribo/demo/shared/icons/next-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/olena_smaller.jpg b/scribo/demo/shared/icons/olena_smaller.jpg deleted file mode 100644 index c6b9110..0000000 Binary files a/scribo/demo/shared/icons/olena_smaller.jpg and /dev/null differ diff --git a/scribo/demo/shared/icons/page-down-icon.png b/scribo/demo/shared/icons/page-down-icon.png deleted file mode 100644 index 5418a40..0000000 Binary files a/scribo/demo/shared/icons/page-down-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/page-search-icon.png b/scribo/demo/shared/icons/page-search-icon.png deleted file mode 100644 index 85e1718..0000000 Binary files a/scribo/demo/shared/icons/page-search-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/rotate_ccw.png b/scribo/demo/shared/icons/rotate_ccw.png deleted file mode 100644 index 7adafed..0000000 Binary files a/scribo/demo/shared/icons/rotate_ccw.png and /dev/null differ diff --git a/scribo/demo/shared/icons/rotate_cw.png b/scribo/demo/shared/icons/rotate_cw.png deleted file mode 100644 index 90aee82..0000000 Binary files a/scribo/demo/shared/icons/rotate_cw.png and /dev/null differ diff --git a/scribo/demo/shared/icons/search-add-icon.png b/scribo/demo/shared/icons/search-add-icon.png deleted file mode 100644 index 06c3db2..0000000 Binary files a/scribo/demo/shared/icons/search-add-icon.png and /dev/null differ diff --git a/scribo/demo/shared/icons/search-remove-icon.png b/scribo/demo/shared/icons/search-remove-icon.png deleted file mode 100644 index e770c67..0000000 Binary files a/scribo/demo/shared/icons/search-remove-icon.png and /dev/null differ diff --git a/scribo/demo/shared/shared.qrc b/scribo/demo/shared/shared.qrc deleted file mode 100644 index 3e1fd85..0000000 --- a/scribo/demo/shared/shared.qrc +++ /dev/null @@ -1,21 +0,0 @@ -<RCC> - <qresource prefix="icons"> - <file>icons/olena_smaller.jpg</file> - <file>icons/close.gif</file> - <file>icons/image-next-icon.png</file> - <file>icons/page-down-icon.png</file> - <file>icons/page-search-icon.png</file> - <file>icons/crop-icon.png</file> - <file>icons/image-remove-icon.png</file> - <file>icons/search-add-icon.png</file> - <file>icons/search-remove-icon.png</file> - <file>icons/Symbols-Delete-icon.png</file> - <file>icons/next-icon.png</file> - <file>icons/accept-icon.png</file> - <file>icons/image-add-icon.png</file> - <file>icons/image-multi-icon.png</file> - <file>icons/image-edit-icon.png</file> - <file>icons/rotate_cw.png</file> - <file>icons/rotate_ccw.png</file> - </qresource> -</RCC> diff --git a/scribo/demo/shared/src/bak/crop_item.cc b/scribo/demo/shared/src/bak/crop_item.cc deleted file mode 100644 index 5f22878..0000000 --- a/scribo/demo/shared/src/bak/crop_item.cc +++ /dev/null @@ -1,332 +0,0 @@ -// 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 <shared/src/crop_item.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - crop_item::crop_item(QGraphicsItem *parent) - : QGraphicsItem(parent) - { - _mousePress = false; - _cropRect = QRectF(20, 20, 100, 70); - setAcceptHoverEvents(true); - - grabMouse(); - } - - QRectF crop_item::cropRect(void) const - { - return(_cropRect); - } - - - QRectF crop_item::boundingRect(void) const - { - return(parentItem()->boundingRect()); - } - - void crop_item::paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget) - { - Q_UNUSED(widget); - - painter->save(); - - QPainterPath cropPath; - cropPath.addRect(_cropRect); - - QPainterPath windowPath; - windowPath.addRect(option->rect); - windowPath = windowPath.subtracted(cropPath); - - // Draw Alpha-Black Background. - painter->fillPath(windowPath, QColor(0x33, 0x33, 0x33, 0xcc)); - - // Draw Crop Rect - painter->setPen(QPen(QColor(0xdd, 0xdd, 0xdd), 1)); - painter->drawPath(cropPath); - - int topRightX = _cropRect.x() + _cropRect.width(); - int bottomY = _cropRect.y() + _cropRect.height(); - - // Draw Grid if mouse is Pressed - if (_mousePress) { - qreal f = 1.0f / CROP_GRID_SIZE; - qreal hsize = _cropRect.height() * f; - qreal wsize = _cropRect.width() * f; - - QPainterPath gridPath; - for (uint i = 1; i < CROP_GRID_SIZE; ++i) { - qreal y = _cropRect.y() + i * hsize; - gridPath.moveTo(_cropRect.x(), y); - gridPath.lineTo(topRightX, y); - - for (uint j = 1; j < CROP_GRID_SIZE; ++j) { - qreal x = _cropRect.x() + j * wsize; - gridPath.moveTo(x, _cropRect.y()); - gridPath.lineTo(x, bottomY); - } - } - - // Draw Grid Path - painter->setPen(QPen(QColor(0x99, 0x99, 0x99, 0x80), 1)); - painter->drawPath(gridPath); - } - - QPainterPath borderPath; -// // Top-Left Corner -// borderPath.moveTo(_cropRect.x(), _cropRect.y()); -// borderPath.lineTo(_cropRect.x() + CROP_BORDER_LINE, _cropRect.y()); -// borderPath.moveTo(_cropRect.x(), _cropRect.y()); -// borderPath.lineTo(_cropRect.x(), _cropRect.y() + CROP_BORDER_LINE); - -// // Top-Right Corner -// borderPath.moveTo(topRightX - CROP_BORDER_LINE, _cropRect.y()); -// borderPath.lineTo(topRightX, _cropRect.y()); -// borderPath.moveTo(topRightX, _cropRect.y()); -// borderPath.lineTo(topRightX, _cropRect.y() + CROP_BORDER_LINE); - -// // Bottom-Left Corner -// borderPath.moveTo(_cropRect.x(), bottomY); -// borderPath.lineTo(_cropRect.x() + CROP_BORDER_LINE, bottomY); -// borderPath.moveTo(_cropRect.x(), bottomY - CROP_BORDER_LINE); -// borderPath.lineTo(_cropRect.x(), bottomY); - -// // Bottom-Left Corner -// borderPath.moveTo(topRightX, bottomY); -// borderPath.lineTo(topRightX - CROP_BORDER_LINE, bottomY); -// borderPath.moveTo(topRightX, bottomY - CROP_BORDER_LINE); -// borderPath.lineTo(topRightX, bottomY); - - // Draw Border Path - painter->setPen(QPen(QColor(0xee, 0xee, 0xee), 3)); - painter->drawPath(borderPath); - - painter->restore(); - } - - - void crop_item::mousePressEvent(QGraphicsSceneMouseEvent *event) - { - QGraphicsItem::mousePressEvent(event); - - _mousePress = true; - _cropResize = CropItemResizeNone; - if (event->buttons() & Qt::LeftButton) - { - int lthreshold = (CROP_BORDER_LINE >> 1); - int rthreshold = CROP_BORDER_LINE; - int size = CROP_BORDER_LINE << 1; - - int rightX = _cropRect.x() + _cropRect.width() - rthreshold; - int leftX = _cropRect.x() - lthreshold; - - int bottomY = _cropRect.y() + _cropRect.height() - rthreshold; - int topY = _cropRect.y() - lthreshold; - - QRectF bottomRightCorner(rightX, bottomY, size, size); - QRectF bottomLeftCorner(leftX, bottomY, size, size); - QRectF topRightCorner(rightX, topY, size, size); - QRectF topLeftCorner(leftX, topY, size, size); - - int sideHeight = _cropRect.height() - 2 * size; - int sideWidth = _cropRect.width() - 2 * size; - QRectF leftSide(leftX, topY + size, size, sideHeight); - QRectF rightSide(rightX, topY + size, size, sideHeight); - QRectF topSide(leftX + size, topY, sideWidth, size); - QRectF bottomSide(leftX + size, bottomY, sideWidth, size); - - if (bottomRightCorner.contains(event->pos())) - _cropResize = CropItemResizeBottomRight; - else if (bottomLeftCorner.contains(event->pos())) - _cropResize = CropItemResizeBottomLeft; - else if (topRightCorner.contains(event->pos())) - _cropResize = CropItemResizeTopRight; - else if (topLeftCorner.contains(event->pos())) - _cropResize = CropItemResizeTopLeft; - else if (leftSide.contains(event->pos())) - _cropResize = CropItemResizeLeft; - else if (rightSide.contains(event->pos())) - _cropResize = CropItemResizeRight; - else if (topSide.contains(event->pos())) - _cropResize = CropItemResizeTop; - else if (bottomSide.contains(event->pos())) - _cropResize = CropItemResizeBottom; - } - - update(); - } - - - void crop_item::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) - { - QGraphicsItem::mouseReleaseEvent(event); - - _cropResize = CropItemResizeNone; - _mousePress = false; - - update(); - } - - - void crop_item::updateCursor(QGraphicsSceneMouseEvent *event) - { - int lthreshold = (CROP_BORDER_LINE >> 1); - int rthreshold = CROP_BORDER_LINE; - int size = CROP_BORDER_LINE << 1; - - int rightX = _cropRect.x() + _cropRect.width() - rthreshold; - int leftX = _cropRect.x() - lthreshold; - - int bottomY = _cropRect.y() + _cropRect.height() - rthreshold; - int topY = _cropRect.y() - lthreshold; - - QRectF bottomRightCorner(rightX, bottomY, size, size); - QRectF bottomLeftCorner(leftX, bottomY, size, size); - QRectF topRightCorner(rightX, topY, size, size); - QRectF topLeftCorner(leftX, topY, size, size); - - int sideHeight = _cropRect.height() - 2 * size; - int sideWidth = _cropRect.width() - 2 * size; - QRectF leftSide(leftX, topY + size, size, sideHeight); - QRectF rightSide(rightX, topY + size, size, sideHeight); - QRectF topSide(leftX + size, topY, sideWidth, size); - QRectF bottomSide(leftX + size, bottomY, sideWidth, size); - - if (bottomRightCorner.contains(event->pos())) - setCursor(Qt::SizeFDiagCursor); - else if (bottomLeftCorner.contains(event->pos())) - setCursor(Qt::SizeBDiagCursor); - else if (topRightCorner.contains(event->pos())) - setCursor(Qt::SizeBDiagCursor); - else if (topLeftCorner.contains(event->pos())) - setCursor(Qt::SizeFDiagCursor); - else if (leftSide.contains(event->pos())) - setCursor(Qt::SizeHorCursor); - else if (rightSide.contains(event->pos())) - setCursor(Qt::SizeHorCursor); - else if (topSide.contains(event->pos())) - setCursor(Qt::SizeVerCursor); - else if (bottomSide.contains(event->pos())) - setCursor(Qt::SizeVerCursor); - } - - - void crop_item::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - { - updateCursor(event); - - QGraphicsItem::mouseMoveEvent(event); - - qreal minSize = 4 + (CROP_BORDER_LINE << 1); - - QPointF delta = event->pos() - event->lastPos(); - switch (_cropResize) - { - case CropItemResizeNone: - if (!_cropRect.contains(event->pos())) - return; - - setCursor(Qt::SizeAllCursor); - - if (!(event->buttons() & Qt::LeftButton)) - return; - - _cropRect.translate(delta); - break; - case CropItemResizeTopLeft: - delta.setY(qMin(_cropRect.height() - minSize, delta.y())); - delta.setX(qMin(_cropRect.width() - minSize, delta.x())); - _cropRect.setHeight(_cropRect.height() - delta.y()); - _cropRect.setWidth(_cropRect.width() - delta.x()); - _cropRect.translate(delta); - setCursor(Qt::SizeFDiagCursor); - break; - case CropItemResizeTopRight: - delta.setY(qMin(_cropRect.height() - minSize, delta.y())); - _cropRect.setWidth(_cropRect.width() + delta.x()); - _cropRect.setHeight(_cropRect.height() - delta.y()); - _cropRect.translate(0, delta.y()); - setCursor(Qt::SizeBDiagCursor); - break; - case CropItemResizeBottomLeft: - delta.setX(qMin(_cropRect.width() - minSize, delta.x())); - _cropRect.setHeight(_cropRect.height() + delta.y()); - _cropRect.setWidth(_cropRect.width() - delta.x()); - _cropRect.translate(delta.x(), 0); - setCursor(Qt::SizeBDiagCursor); - break; - case CropItemResizeBottomRight: - _cropRect.setWidth(_cropRect.width() + delta.x()); - _cropRect.setHeight(_cropRect.height() + delta.y()); - setCursor(Qt::SizeFDiagCursor); - break; - case CropItemResizeLeft: - delta.setX(qMin(_cropRect.width() - minSize, delta.x())); - _cropRect.setWidth(_cropRect.width() - delta.x()); - _cropRect.translate(delta.x(), 0); - setCursor(Qt::SizeHorCursor); - break; - case CropItemResizeRight: - _cropRect.setWidth(_cropRect.width() + delta.x()); - setCursor(Qt::SizeHorCursor); - break; - case CropItemResizeTop: - delta.setY(qMin(_cropRect.height() - minSize, delta.y())); - _cropRect.setHeight(_cropRect.height() - delta.y()); - _cropRect.translate(0, delta.y()); - setCursor(Qt::SizeVerCursor); - break; - case CropItemResizeBottom: - _cropRect.setHeight(_cropRect.height() + delta.y()); - setCursor(Qt::SizeVerCursor); - break; - } - - if (_cropRect.width() < minSize) - _cropRect.setWidth(minSize); - if (_cropRect.height() < minSize) - _cropRect.setHeight(minSize); - - update(); - } - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - diff --git a/scribo/demo/shared/src/bak/crop_item.hh b/scribo/demo/shared/src/bak/crop_item.hh deleted file mode 100644 index caf2032..0000000 --- a/scribo/demo/shared/src/bak/crop_item.hh +++ /dev/null @@ -1,100 +0,0 @@ -// 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. -// -// Based on the code located here: -// http://th30z.netsons.org/2010/01/qt4-image-crop-item/ - -#ifndef SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH -# define SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH - -#include <QStyleOptionGraphicsItem> -#include <QGraphicsSceneMouseEvent> -#include <QGraphicsScene> -#include <QGraphicsView> -#include <QGraphicsItem> -#include <QApplication> -#include <QPainter> -#include <QtGui> - -#define CROP_BORDER_LINE 10 -#define CROP_GRID_SIZE 3 - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - class crop_item : public QGraphicsItem - { - public: - crop_item(QGraphicsItem *parent); - QRectF cropRect (void) const; - - public: - QRectF boundingRect (void) const; - void paint (QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); - - protected: - void mousePressEvent (QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - void updateCursor(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - - private: - enum CropItemResize { - CropItemResizeNone, - - CropItemResizeTopLeft, - CropItemResizeTopRight, - CropItemResizeBottomLeft, - CropItemResizeBottomRight, - - CropItemResizeLeft, - CropItemResizeRight, - CropItemResizeTop, - CropItemResizeBottom - }; - - private: - CropItemResize _cropResize; - QRectF _cropRect; - bool _mousePress; - }; - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH diff --git a/scribo/demo/shared/src/bak/image_viewer.cc b/scribo/demo/shared/src/bak/image_viewer.cc deleted file mode 100644 index 89d63d2..0000000 --- a/scribo/demo/shared/src/bak/image_viewer.cc +++ /dev/null @@ -1,242 +0,0 @@ -// 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 <shared/src/image_viewer.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - image_viewer::image_viewer(QWidget *parent) - : QWidget(parent), item_(0) - { - setupUi(this); - - connect(image_->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_vertical_sliders(int))); - connect(image_->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_horizontal_sliders(int))); - - setup_scene(); - - slider->setMinimum(0); - visible_slider(false); - } - - - - image_viewer::~image_viewer() - { - - } - - unsigned image_viewer::current_slice() const - { - return slider->value(); - } - - internal::interactiveScene * image_viewer::scene() - { - return static_cast<internal::interactiveScene *>(image_->scene()); - } - - const internal::interactiveScene * image_viewer::scene() const - { - return static_cast<const internal::interactiveScene *>(image_->scene()); - } - - // Private members - - void image_viewer::setup_scene() - { - QGraphicsScene *scene = new internal::interactiveScene(); - image_->setScene(scene); - image_->show(); - } - - void image_viewer::draw_image(const mln::image2d<dsp_data_t>& ima) - { - QImage - qima = mln::convert::implementation::to_qimage_qt_rgb32_nocopy(ima); - QPixmap pixmap = QPixmap::fromImage(qima); - - if (item_ != 0) - { - image_->scene()->removeItem(item_); - delete item_; - } - - item_ = image_->scene()->addPixmap(pixmap); - image_->scene()->setSceneRect(item_->boundingRect()); - - if (pixmap.width() > image_->maximumViewportSize().width()) - image_->fitInView(item_->boundingRect(), Qt::KeepAspectRatio); - - zoomLabel->setEnabled(true); - zoomIn->setEnabled(true); - zoomOut->setEnabled(true); - zoomFixed->setEnabled(true); - zoomOriginal->setEnabled(true); - - item_->translate(ima.domain().pmin().col(), ima.domain().pmin().row()); - - image_->setSceneRect(item_->sceneBoundingRect()); - } - - - void image_viewer::resize_image(const QRectF& rect) - { - if (item_ != 0) - image_->fitInView(rect, Qt::KeepAspectRatio); - } - - void image_viewer::resizeEvent(QResizeEvent * event) - { - if (item_ != 0) - resize_image(item_->boundingRect()); - event->ignore(); - } - - - void image_viewer::keyPressEvent(QKeyEvent *event) - { - if (event->text() == QString("+")) - { - on_zoomIn_clicked(); - event->accept(); - } - else if (event->text() == QString("-")) - { - on_zoomOut_clicked(); - event->accept(); - } - else if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) - { - if (event->modifiers() == Qt::ControlModifier) - on_zoomFixed_clicked(); - else - on_zoomOriginal_clicked(); - event->accept(); - } - else - event->ignore(); - } - - - // Private slots - - void image_viewer::visible_slider(bool b) - { - slider->setVisible(b); - label_2->setVisible(b); - frame_nb->setVisible(b); - } - - void image_viewer::move_vertical_sliders(int value) - { - image_->verticalScrollBar()->setValue(value); - } - - - void image_viewer::move_horizontal_sliders(int value) - { - image_->horizontalScrollBar()->setValue(value); - } - - - void image_viewer::on_slider_valueChanged(int sli) - { - frame_nb->setText(QString("%1/%2").arg(sli).arg(slider->maximum())); - emit slider_valueChanged(sli); - } - - void image_viewer::update_image(const mln::image2d<dsp_data_t>& ima) - { - draw_image(ima); - } - - void image_viewer::on_zoomIn_clicked() - { - image_->scale(1.2, 1.2); - } - - void image_viewer::on_zoomOut_clicked() - { - image_->scale(1 / 1.2, 1 / 1.2); - } - - void image_viewer::on_zoomFixed_clicked() - { - if (item_ != 0) - resize_image(item_->boundingRect()); - } - - void image_viewer::on_zoomOriginal_clicked() - { - if (item_ != 0) - resize_image(image_->viewport()->geometry()); - } - - - void image_viewer::clear() - { - visible_slider(false); - if (item_ != 0 && item_->scene() == image_->scene()) - { - image_->scene()->removeItem(item_); - delete item_; - item_ = 0; - } - } - - - // Public slots - - void image_viewer::set_image_layer_count(unsigned nslis) - { - visible_slider(nslis > 1); - - slider->setMaximum(nslis - 1); - - unsigned sli = current_slice(); - if (current_slice() >= nslis) - sli = 0; - - slider->setSliderPosition(sli); - on_slider_valueChanged(sli); - } - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/shared/src/bak/image_viewer.hh b/scribo/demo/shared/src/bak/image_viewer.hh deleted file mode 100644 index f18ca3b..0000000 --- a/scribo/demo/shared/src/bak/image_viewer.hh +++ /dev/null @@ -1,116 +0,0 @@ -// 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_DEMO_SHARED_SRC_IMAGE_VIEWER_HH -# define SCRIBO_DEMO_SHARED_SRC_IMAGE_VIEWER_HH - -# include <QApplication> -# include <QtCore> -# include <QtGui> - -# include <ui_image_viewer.h> - -# include <mln/core/image/image2d.hh> -# include <mln/convert/to_qimage.hh> - -# include <shared/src/types.hh> -# include <shared/src/internal/interactive_scene.hh> - - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - class image_viewer - : public QWidget, private Ui::ImageViewer - { - Q_OBJECT; - - public: - image_viewer(QWidget *parent = 0); - ~image_viewer(); - - unsigned current_slice() const; - - internal::interactiveScene * scene(); - const internal::interactiveScene * scene() const; - - void clear(); - - private: // members - void setup_scene(); - - void draw_image(const mln::image2d<dsp_data_t>& ima); - - void resize_image(const QRectF& rect); - - void keyPressEvent(QKeyEvent *event); - void resizeEvent(QResizeEvent * event); -// void mouseMoveEvent(QMouseEvent *e); -// void mousePressEvent(QMouseEvent *e); -// void mouseReleasedEvent(QMouseEvent *e); - - private slots: - void visible_slider(bool b); - - void move_vertical_sliders(int value); - void move_horizontal_sliders(int value); - - void on_slider_valueChanged(int sli); - - void on_zoomIn_clicked(); - void on_zoomOut_clicked(); - void on_zoomFixed_clicked(); - void on_zoomOriginal_clicked(); - - - public slots: - void set_image_layer_count(unsigned nslis); - void update_image(const mln::image2d<dsp_data_t>& ima); - - - signals: - void slider_valueChanged(int sli); - - private: // attributes - QGraphicsItem *item_; - bool mouse_moving_; - QPoint p_start_; - }; - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_IMAGE_VIEWER_HH diff --git a/scribo/demo/shared/src/bak/types.hh b/scribo/demo/shared/src/bak/types.hh deleted file mode 100644 index 8edb54a..0000000 --- a/scribo/demo/shared/src/bak/types.hh +++ /dev/null @@ -1,50 +0,0 @@ -// 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_DEMO_SHARED_SRC_TYPES_HH -# define SCRIBO_DEMO_SHARED_SRC_TYPES_HH - - -# include <mln/value/qt/rgb32.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - typedef mln::value::qt::rgb32 dsp_data_t; - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // !SCRIBO_DEMO_SHARED_SRC_TYPES_HH diff --git a/scribo/demo/shared/src/browse_widget.cc b/scribo/demo/shared/src/browse_widget.cc deleted file mode 100644 index 67e553a..0000000 --- a/scribo/demo/shared/src/browse_widget.cc +++ /dev/null @@ -1,72 +0,0 @@ -#include <shared/src/browse_widget.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - - browse_widget::browse_widget(QWidget *parent) - : QWidget(parent) - { - setupUi(this); - - QStringList filters; - filters << tr("Any (*.*)"); - setDialogFilter(filters); - - setDialogFileMode(QFileDialog::ExistingFile); - setDialogTitle(tr("Choose an existing file")); - setDescription(tr("Choose a file:")); - } - - void browse_widget::setDescription(const QString& desc) - { - description_->setText(desc); - } - - QString browse_widget::path() const - { - return path_->text(); - } - - void browse_widget::reset() - { - path_->clear(); - } - - void browse_widget::setDialogTitle(const QString& title) - { - dialog_.setLabelText(QFileDialog::LookIn, title); - } - - void browse_widget::setDialogFileMode(const QFileDialog::FileMode& filemode) - { - dialog_.setFileMode(filemode); - } - - void browse_widget::setDialogFilter(const QStringList& filters) - { - dialog_.setNameFilters(filters); - } - - - void browse_widget::on_browseBtn__clicked() - { - if (dialog_.exec()) - { - path_->setText(dialog_.selectedFiles().at(0)); - emit path_updated(); - } - } - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/shared/src/browse_widget.hh b/scribo/demo/shared/src/browse_widget.hh deleted file mode 100644 index d30213c..0000000 --- a/scribo/demo/shared/src/browse_widget.hh +++ /dev/null @@ -1,78 +0,0 @@ -// 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_DEMO_SHARED_SRC_BROWSE_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_BROWSE_WIDGET_HH - -# include <QtGui> -# include <ui_browse_widget.h> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - - class browse_widget : public QWidget, protected Ui::BrowseWidget - { - Q_OBJECT; - - Q_PROPERTY(QString path READ path); - - public: - browse_widget(QWidget *parent = 0); - - void setDescription(const QString& desc); - void setDialogTitle(const QString& title); - void setDialogFileMode(const QFileDialog::FileMode& filemode); - void setDialogFilter(const QStringList& filters); - - QString path() const; - - void reset(); - - private slots: - void on_browseBtn__clicked(); - - signals: - void path_updated(); - - private: - QFileDialog dialog_; - }; - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_BROWSE_WIDGET_HH diff --git a/scribo/demo/shared/src/crop_item.cc b/scribo/demo/shared/src/crop_item.cc deleted file mode 100644 index 579eb65..0000000 --- a/scribo/demo/shared/src/crop_item.cc +++ /dev/null @@ -1,396 +0,0 @@ -// 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 <shared/src/crop_item.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - - crop_item::crop_item(QGraphicsItem *parent) - : QGraphicsItem(parent) - { - mousePress_ = false; - setAcceptHoverEvents(true); -// draw_rect_ = scene()->sceneRect(); - - reset(); - - grabMouse(); - } - - - // Mouse is pressed. The rectangle must be created and about to - // be enlarged. - crop_item::crop_item(const QPointF& p, QGraphicsItem *parent) - : QGraphicsItem(parent) - { - mousePress_ = true; - setAcceptHoverEvents(true); - -// draw_rect_ = scene()->sceneRect(); - - cropRect_ = QRectF(p, QSize(4, 4)); - cropResize_ = CropItemResizeBottomRight; - - grabMouse(); - } - - crop_item::~crop_item() - { - - } - - void crop_item::reset() - { - cropRect_ = QRect(); -// if (parentItem()) -// cropRect_ = parentItem()->boundingRect(); -// else -// cropRect_ = QRectF(20, 20, 100, 70); - } - - QRectF crop_item::cropRect() const - { - return mapToScene(cropRect_).boundingRect(); - } - - - QRectF crop_item::boundingRect() const - { - return scene()->sceneRect(); -// return draw_rect_; - } - - void crop_item::paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget) - { - Q_UNUSED(widget); - - painter->save(); - - QPainterPath cropPath; - cropPath.addRect(cropRect_); - - QPainterPath windowPath; - windowPath.addRect(option->rect); -// windowPath.addRect(draw_rect_); - windowPath = windowPath.subtracted(cropPath); - - // Draw Alpha-Black Background. - painter->fillPath(windowPath, QColor(0x33, 0x33, 0x33, 0xcc)); - - // Draw Crop Rect - // QColor(0xdd, 0xdd, 0xdd) - painter->setPen(QPen(Qt::magenta, 3)); - painter->drawPath(cropPath); - - int topRightX = cropRect_.x() + cropRect_.width(); - int bottomY = cropRect_.y() + cropRect_.height(); - - QPainterPath borderPath; - int corner_width = std::min(int(cropRect_.width() / 6.f), 80); - int corner_height = std::min(int(cropRect_.height() / 6.f), 80); - - // Top-Left Corner - painter->drawRect(QRectF(cropRect_.x(), cropRect_.y(), - corner_width, corner_height)); - - - // Top-Right Corner - painter->drawRect(QRectF(topRightX - corner_width, cropRect_.y(), - corner_width, corner_height)); - - // Bottom-Left Corner - painter->drawRect(QRectF(cropRect_.x(), bottomY - corner_height, - corner_width, corner_height)); - - // Bottom-Left Corner - painter->drawRect(QRectF(topRightX - corner_width, - bottomY - corner_height, - corner_width, corner_height)); - - // Draw Border Path - painter->setPen(QPen(QColor(0xee, 0xee, 0xee), 3)); - painter->drawPath(borderPath); - - painter->restore(); - } - - - void crop_item::mousePressEvent(QGraphicsSceneMouseEvent *event) - { - QGraphicsItem::mousePressEvent(event); - - mousePress_ = true; - cropResize_ = CropItemResizeNone; - if (event->buttons() & Qt::LeftButton) - { - if (!cropRect_.isValid()) - { - cropRect_ = QRectF(event->pos(), QSize(4, 4)); - cropResize_ = CropItemResizeBottomRight; - update(); - return; - } - - - int wsize = std::min(int(cropRect_.width() / 6.f), 80); - int hsize = std::min(int(cropRect_.height() / 6.f), 80); - - int rightX = cropRect_.x() + cropRect_.width() - wsize; - int leftX = cropRect_.x(); - - int bottomY = cropRect_.y() + cropRect_.height() - hsize; - int topY = cropRect_.y(); - - QRectF bottomRightCorner(rightX, bottomY, wsize, hsize); - QRectF bottomLeftCorner(leftX, bottomY, wsize, hsize); - QRectF topRightCorner(rightX, topY, wsize, hsize); - QRectF topLeftCorner(leftX, topY, wsize, hsize); - - int sideHeight = cropRect_.height() - 2 * hsize; - int sideWidth = cropRect_.width() - 2 * wsize; - QRectF leftSide(leftX, topY + hsize, wsize, sideHeight); - QRectF rightSide(rightX, topY + hsize, wsize, sideHeight); - QRectF topSide(leftX + wsize, topY, sideWidth, hsize); - QRectF bottomSide(leftX + wsize, bottomY, sideWidth, hsize); - - if (bottomRightCorner.contains(event->pos())) - cropResize_ = CropItemResizeBottomRight; - else if (bottomLeftCorner.contains(event->pos())) - cropResize_ = CropItemResizeBottomLeft; - else if (topRightCorner.contains(event->pos())) - cropResize_ = CropItemResizeTopRight; - else if (topLeftCorner.contains(event->pos())) - cropResize_ = CropItemResizeTopLeft; - else if (leftSide.contains(event->pos())) - cropResize_ = CropItemResizeLeft; - else if (rightSide.contains(event->pos())) - cropResize_ = CropItemResizeRight; - else if (topSide.contains(event->pos())) - cropResize_ = CropItemResizeTop; - else if (bottomSide.contains(event->pos())) - cropResize_ = CropItemResizeBottom; - } - - update(); - } - - - void crop_item::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) - { - QGraphicsItem::mouseReleaseEvent(event); - - cropResize_ = CropItemResizeNone; - mousePress_ = false; - - update(); - } - - -// void crop_item::updateCursor(QGraphicsSceneMouseEvent *event) -// { -// int lthreshold = (CROP_BORDER_LINE >> 1); -// int rthreshold = CROP_BORDER_LINE; -// int size = CROP_BORDER_LINE << 1; - -// int rightX = cropRect_.x() + cropRect_.width() - rthreshold; -// int leftX = cropRect_.x() - lthreshold; - -// int bottomY = cropRect_.y() + cropRect_.height() - rthreshold; -// int topY = cropRect_.y() - lthreshold; - -// QRectF bottomRightCorner(rightX, bottomY, size, size); -// QRectF bottomLeftCorner(leftX, bottomY, size, size); -// QRectF topRightCorner(rightX, topY, size, size); -// QRectF topLeftCorner(leftX, topY, size, size); - -// int sideHeight = cropRect_.height() - 2 * size; -// int sideWidth = cropRect_.width() - 2 * size; -// QRectF leftSide(leftX, topY + size, size, sideHeight); -// QRectF rightSide(rightX, topY + size, size, sideHeight); -// QRectF topSide(leftX + size, topY, sideWidth, size); -// QRectF bottomSide(leftX + size, bottomY, sideWidth, size); - -// if (bottomRightCorner.contains(event->pos())) -// setCursor(Qt::SizeFDiagCursor); -// else if (bottomLeftCorner.contains(event->pos())) -// setCursor(Qt::SizeBDiagCursor); -// else if (topRightCorner.contains(event->pos())) -// setCursor(Qt::SizeBDiagCursor); -// else if (topLeftCorner.contains(event->pos())) -// setCursor(Qt::SizeFDiagCursor); -// else if (leftSide.contains(event->pos())) -// setCursor(Qt::SizeHorCursor); -// else if (rightSide.contains(event->pos())) -// setCursor(Qt::SizeHorCursor); -// else if (topSide.contains(event->pos())) -// setCursor(Qt::SizeVerCursor); -// else if (bottomSide.contains(event->pos())) -// setCursor(Qt::SizeVerCursor); -// } - - - void crop_item::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - { -// updateCursor(event); - - QGraphicsItem::mouseMoveEvent(event); - - QPointF delta = event->pos() - event->lastPos(); - - if (cropResize_ == CropItemResizeNone) - { - if (//!cropRect_.contains(event->pos()) - (!(event->buttons() & Qt::LeftButton))) - return; - - // Moving existing rectangle - setCursor(Qt::SizeAllCursor); - cropRect_.translate(delta); - -// draw_rect_.translate(delta); - update(); - return; - } - - resize(delta); - } - - - void crop_item::resize(const QPointF& delta_) - { - qreal minSize = 4 + (CROP_BORDER_LINE << 1); - QPointF delta = delta_; - - QRectF tmp = cropRect_; - switch (cropResize_) - { - case CropItemResizeTopLeft: - delta.setY(qMin(cropRect_.height() - minSize, delta.y())); - delta.setX(qMin(cropRect_.width() - minSize, delta.x())); - cropRect_.setHeight(cropRect_.height() - delta.y()); - cropRect_.setWidth(cropRect_.width() - delta.x()); - cropRect_.translate(delta); - setCursor(Qt::SizeFDiagCursor); - break; - case CropItemResizeTopRight: - delta.setY(qMin(cropRect_.height() - minSize, delta.y())); - cropRect_.setWidth(cropRect_.width() + delta.x()); - cropRect_.setHeight(cropRect_.height() - delta.y()); - cropRect_.translate(0, delta.y()); - setCursor(Qt::SizeBDiagCursor); - break; - case CropItemResizeBottomLeft: - delta.setX(qMin(cropRect_.width() - minSize, delta.x())); - cropRect_.setHeight(cropRect_.height() + delta.y()); - cropRect_.setWidth(cropRect_.width() - delta.x()); - cropRect_.translate(delta.x(), 0); - setCursor(Qt::SizeBDiagCursor); - break; - - default: - case CropItemResizeBottomRight: - cropRect_.setWidth(cropRect_.width() + delta.x()); - cropRect_.setHeight(cropRect_.height() + delta.y()); - setCursor(Qt::SizeFDiagCursor); - break; - - case CropItemResizeLeft: - delta.setX(qMin(cropRect_.width() - minSize, delta.x())); - cropRect_.setWidth(cropRect_.width() - delta.x()); - cropRect_.translate(delta.x(), 0); - setCursor(Qt::SizeHorCursor); - break; - case CropItemResizeRight: - cropRect_.setWidth(cropRect_.width() + delta.x()); - setCursor(Qt::SizeHorCursor); - break; - case CropItemResizeTop: - delta.setY(qMin(cropRect_.height() - minSize, delta.y())); - cropRect_.setHeight(cropRect_.height() - delta.y()); - cropRect_.translate(0, delta.y()); - setCursor(Qt::SizeVerCursor); - break; - case CropItemResizeBottom: - cropRect_.setHeight(cropRect_.height() + delta.y()); - setCursor(Qt::SizeVerCursor); - break; - } - - if (cropRect_.width() < minSize) - cropRect_.setWidth(minSize); - if (cropRect_.height() < minSize) - cropRect_.setHeight(minSize); - - - // Updating bounding rect. -// if ((cropRect_.width() * cropRect_.height()) < (tmp.width() * tmp.height())) -// draw_rect_ = tmp; -// else -// draw_rect_ = cropRect_; - - update(); - } - - - void crop_item::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * event) - { - QGraphicsItem::mouseDoubleClickEvent(event); - - switch (cropResize_) - { - case CropItemResizeNone: - if (!cropRect_.contains(event->pos())) - return; - - setCursor(Qt::SizeAllCursor); - - if (!(event->buttons() & Qt::LeftButton)) - return; - - emit ready_for_crop(); - break; - - default: - break; - } - } - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - diff --git a/scribo/demo/shared/src/crop_item.hh b/scribo/demo/shared/src/crop_item.hh deleted file mode 100644 index 7978538..0000000 --- a/scribo/demo/shared/src/crop_item.hh +++ /dev/null @@ -1,119 +0,0 @@ -// 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. -// -// Based on the code located here: -// http://th30z.netsons.org/2010/01/qt4-image-crop-item/ - -#ifndef SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH -# define SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH - -#include <QStyleOptionGraphicsItem> -#include <QGraphicsSceneMouseEvent> -#include <QGraphicsScene> -#include <QGraphicsView> -#include <QGraphicsItem> -#include <QApplication> -#include <QPainter> -#include <QtGui> - -#define CROP_BORDER_LINE 10 -#define CROP_GRID_SIZE 3 - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - class crop_item : public QObject, public QGraphicsItem - { - Q_OBJECT; - - public: - crop_item(QGraphicsItem *parent); - - // Mouse is pressed. The rectangle must be created and about - // to be enlarged. - crop_item(const QPointF& p, QGraphicsItem *parent); - - virtual ~crop_item(); - - QRectF cropRect() const; - - QRectF boundingRect() const; - void paint (QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); - - void reset(); - - void resize(const QPointF& delta); - - protected: - void mousePressEvent (QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * event); - -// void updateCursor(QGraphicsSceneMouseEvent *event); - - signals: - void ready_for_crop(); - - private: - enum CropItemResize - { - CropItemResizeNone, - - CropItemResizeTopLeft, - CropItemResizeTopRight, - CropItemResizeBottomLeft, - CropItemResizeBottomRight, - - CropItemResizeLeft, - CropItemResizeRight, - CropItemResizeTop, - CropItemResizeBottom - }; - - private: - CropItemResize cropResize_; - QRectF cropRect_; - QRectF draw_rect_; - bool mousePress_; - }; - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_CROP_ITEM_HH diff --git a/scribo/demo/shared/src/image_viewer.cc b/scribo/demo/shared/src/image_viewer.cc deleted file mode 100644 index 416f822..0000000 --- a/scribo/demo/shared/src/image_viewer.cc +++ /dev/null @@ -1,410 +0,0 @@ -// 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 <shared/src/image_viewer.hh> -# include <shared/src/crop_item.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - image_viewer::image_viewer(QWidget *parent) - : QWidget(parent), image_(0), selection_(0), angle_(0), - zoom_fixed_(false) - { - setupUi(this); - - connect(viewer_->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_vertical_sliders(int))); - connect(viewer_->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(move_horizontal_sliders(int))); - - setup_scene(); - - slider->setMinimum(0); - visible_slider(false); - - set_selection_enabled(false); - set_rotation_enabled(false); - - // Set cache limit to 20Mb. - QPixmapCache::setCacheLimit(20480); - } - - - - image_viewer::~image_viewer() - { - - } - - unsigned image_viewer::current_slice() const - { - return slider->value(); - } - - internal::interactiveScene * image_viewer::scene() - { - return static_cast<internal::interactiveScene *>(viewer_->scene()); - } - - const internal::interactiveScene * image_viewer::scene() const - { - return static_cast<const internal::interactiveScene *>(viewer_->scene()); - } - - // Private members - - void image_viewer::setup_scene() - { - QGraphicsScene *scene = new internal::interactiveScene(); - viewer_->setScene(scene); - viewer_->show(); - } - - - void image_viewer::draw_image(const QPixmap& pixmap) - { - draw_image(pixmap, QPoint(0, 0)); - } - - - void image_viewer::draw_image(const QPixmap& pixmap, - const QPoint& origin) - { - bool restore_selection = false; - - if (image_ != 0) - { - viewer_->scene()->removeItem(image_); - delete image_; - - if (selection_) - { - selection_ = 0; - restore_selection = true; - } - } - - image_ = viewer_->scene()->addPixmap(pixmap); - image_->setCacheMode(QGraphicsItem::DeviceCoordinateCache, - QSize(100,100)); - viewer_->scene()->setSceneRect(image_->boundingRect()); - - if (pixmap.width() > viewer_->maximumViewportSize().width()) - viewer_->fitInView(image_->boundingRect(), Qt::KeepAspectRatio); - - enable_widgets(true); - - image_->translate(origin.x(), origin.y()); - - - viewer_->setSceneRect(image_->sceneBoundingRect()); - - // Restore selection mode if needed - setup_selection_tool(restore_selection); - } - - - void image_viewer::resize_image(const QRectF& rect) - { - if (image_ != 0) - viewer_->fitInView(rect, Qt::KeepAspectRatio); - } - - void image_viewer::resizeEvent(QResizeEvent * event) - { - if (zoom_fixed_) - on_zoomFixed_clicked(); - else - on_zoomOriginal_clicked(); - - event->ignore(); - } - - void image_viewer::keyPressEvent(QKeyEvent *event) - { - if (event->text() == QString("+")) - { - on_zoomIn_clicked(); - event->accept(); - } - else if (event->text() == QString("-")) - { - on_zoomOut_clicked(); - event->accept(); - } - else if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) - { - if (event->modifiers() == Qt::ControlModifier) - on_zoomFixed_clicked(); - else - on_zoomOriginal_clicked(); - event->accept(); - } - else - event->ignore(); - } - - - // Private slots - - void image_viewer::visible_slider(bool b) - { - slider->setVisible(b); - label_2->setVisible(b); - frame_nb->setVisible(b); - } - - void image_viewer::move_vertical_sliders(int value) - { - viewer_->verticalScrollBar()->setValue(value); - } - - - void image_viewer::move_horizontal_sliders(int value) - { - viewer_->horizontalScrollBar()->setValue(value); - } - - - void image_viewer::on_slider_valueChanged(int sli) - { - frame_nb->setText(QString("%1/%2").arg(sli).arg(slider->maximum())); - emit slider_valueChanged(sli); - } - - void image_viewer::update_image(const mln::image2d<dsp_data_t>& ima) - { - draw_image(ima); - } - - void image_viewer::on_rotate_cw_btn_clicked() - { - angle_ += 90 % 360; - image_->rotate(90); - viewer_->setSceneRect(image_->sceneBoundingRect()); - } - - void image_viewer::on_rotate_ccw_btn_clicked() - { - angle_ -= 90 % 360; - image_->rotate(-90); - viewer_->setSceneRect(image_->sceneBoundingRect()); - } - - void image_viewer::on_zoomIn_clicked() - { - viewer_->scale(1.2, 1.2); - } - - void image_viewer::on_zoomOut_clicked() - { - viewer_->scale(1 / 1.2, 1 / 1.2); - } - - void image_viewer::on_zoomFixed_clicked() - { - zoom_fixed_ = true; - if (image_ != 0) - resize_image(image_->boundingRect()); - } - - void image_viewer::on_zoomOriginal_clicked() - { - zoom_fixed_ = false; - if (image_ != 0) - resize_image(viewer_->viewport()->geometry()); - } - - - void image_viewer::new_mouse_selection_slot(const QPointF& p) - { - if (selection_) - { - if (selection_->cropRect().contains(p)) - return; - else - { - setup_selection_tool(false); - return; - } - } - - setup_selection_tool(false); // Remove previous selection. - setup_selection_tool(true, p); // Create new selection. - } - - - void image_viewer::new_mouse_released_slot(const QPointF&) - { - if (selection_ && !selection_->cropRect().isValid()) // CAS POURRI!! - setup_selection_tool(false); - } - - - void image_viewer::clear() - { - visible_slider(false); - if (image_ != 0 && image_->scene() == viewer_->scene()) - { - viewer_->scene()->removeItem(image_); - delete image_; - image_ = 0; - } - } - - void image_viewer::setup_selection_tool(bool b, const QPointF& p) - { - if (b) - { - if (viewer_->scene() && selection_ == 0) - { - if (!p.isNull()) - selection_ = new crop_item(p, image_); - else - selection_ = new crop_item(image_); - - // Enable cropping on double click. - connect(selection_, SIGNAL(ready_for_crop()), - this, SIGNAL(ready_for_crop())); - } - } - else - { - delete selection_; - selection_ = 0; - } - } - - - void image_viewer::set_selection_enabled(bool b) - { - if (b) - { - connect(viewer_->scene(), SIGNAL(mouse_pressed(const QPointF&)), - this, SLOT(new_mouse_selection_slot(const QPointF&))); - connect(viewer_->scene(), SIGNAL(mouse_released(const QPointF&)), - this, SLOT(new_mouse_released_slot(const QPointF&))); - } - else - { - disconnect(viewer_->scene(), SIGNAL(mouse_pressed(const QPointF&)), - this, SLOT(new_mouse_selection_slot(const QPointF&))); - disconnect(viewer_->scene(), SIGNAL(mouse_released(const QPointF&)), - this, SLOT(new_mouse_released_slot(const QPointF&))); - } - } - - - void image_viewer::set_rotation_enabled(bool b) - { - angle_ = 0; - rotate_lbl->setVisible(b); - rotate_cw_btn->setVisible(b); - rotate_ccw_btn->setVisible(b); - vline->setVisible(b); - } - - - bool image_viewer::has_selection() const - { - return selection_; - } - - - QRectF image_viewer::selection() const - { - static QRectF invalid_selection; - - if (has_selection()) - return selection_->cropRect(); - - return invalid_selection; - } - - - bool image_viewer::has_rotation() const - { - return rotate_lbl->isVisible(); - } - - - qreal image_viewer::rotation() const - { - mln_assertion(has_rotation()); - - return angle_; - } - - - QPixmap image_viewer::image() const - { - return image_->pixmap(); - } - - // Public slots - - void image_viewer::set_image_layer_count(unsigned nslis) - { - visible_slider(nslis > 1); - - slider->setMaximum(nslis - 1); - - unsigned sli = current_slice(); - if (current_slice() >= nslis) - sli = 0; - - slider->setSliderPosition(sli); - on_slider_valueChanged(sli); - } - - - void image_viewer::enable_widgets(bool b) - { - zoomLabel->setEnabled(b); - zoomIn->setEnabled(b); - zoomOut->setEnabled(b); - zoomFixed->setEnabled(b); - zoomOriginal->setEnabled(b); - - rotate_ccw_btn->setEnabled(b); - rotate_cw_btn->setEnabled(b); - rotate_lbl->setEnabled(b); - } - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/shared/src/image_viewer.hh b/scribo/demo/shared/src/image_viewer.hh deleted file mode 100644 index 539e17d..0000000 --- a/scribo/demo/shared/src/image_viewer.hh +++ /dev/null @@ -1,148 +0,0 @@ -// 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_DEMO_SHARED_SRC_IMAGE_VIEWER_HH -# define SCRIBO_DEMO_SHARED_SRC_IMAGE_VIEWER_HH - -# include <QApplication> -# include <QtCore> -# include <QtGui> - -# include <ui_image_viewer.h> - -# include <mln/core/image/image2d.hh> -# include <mln/convert/to_qimage_nocopy.hh> - -# include <shared/src/types.hh> -# include <shared/src/internal/interactive_scene.hh> - - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - // Forward declaration. - class crop_item; - - class image_viewer - : public QWidget, private Ui::ImageViewer - { - Q_OBJECT; - - public: - image_viewer(QWidget *parent = 0); - ~image_viewer(); - - template <typename V> - void draw_image(const mln::image2d<V>& ima); - void draw_image(const QPixmap& pixmap); - void draw_image(const QPixmap& pixmap, const QPoint& origin); - - unsigned current_slice() const; - - internal::interactiveScene * scene(); - const internal::interactiveScene * scene() const; - - void clear(); - - void set_selection_enabled(bool b); -// void set_mouse_selection_enabled(bool b); - void set_rotation_enabled(bool b); - - - bool has_selection() const; - QRectF selection() const; - - bool has_rotation() const; - qreal rotation() const; - - QPixmap image() const; - - private: // members - void setup_scene(); - - void resize_image(const QRectF& rect); - - void keyPressEvent(QKeyEvent *event); - void resizeEvent(QResizeEvent * event); - - void enable_widgets(bool b); - - private slots: - void visible_slider(bool b); - - void move_vertical_sliders(int value); - void move_horizontal_sliders(int value); - - void setup_selection_tool(bool b, const QPointF& p = QPointF()); - - void on_slider_valueChanged(int sli); - - void on_rotate_cw_btn_clicked(); - void on_rotate_ccw_btn_clicked(); - - void on_zoomIn_clicked(); - void on_zoomOut_clicked(); - void on_zoomFixed_clicked(); - void on_zoomOriginal_clicked(); - - void new_mouse_selection_slot(const QPointF&); - void new_mouse_released_slot(const QPointF& p); -// void selection_mouse_moved_slot(const QPointF& p); - - public slots: - void set_image_layer_count(unsigned nslis); - void update_image(const mln::image2d<dsp_data_t>& ima); - - signals: - void slider_valueChanged(int sli); - void ready_for_crop(); - - private: // attributes - QGraphicsPixmapItem* image_; - crop_item* selection_; - bool mouse_moving_; - QPoint p_start_; - qreal angle_; - - bool zoom_fixed_; - }; - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -# include <shared/src/image_viewer.hxx> - -#endif // ! SCRIBO_DEMO_SHARED_SRC_IMAGE_VIEWER_HH diff --git a/scribo/demo/shared/src/image_viewer.hxx b/scribo/demo/shared/src/image_viewer.hxx deleted file mode 100644 index c7008a7..0000000 --- a/scribo/demo/shared/src/image_viewer.hxx +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef SCRIBO_DEMO_SHARED_SRC_IMAGE_VIEWER_HH -# error "This file cannot be included directly." -#endif - - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - - template <typename V> - void image_viewer::draw_image(const mln::image2d<V>& ima) - { - QImage - qima = mln::convert::to_qimage_nocopy(ima); - QPixmap pixmap = QPixmap::fromImage(qima); - - draw_image(pixmap, QPoint(ima.domain().pmin().col(), - ima.domain().pmin().row())); - } - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/shared/src/internal.bak/interactive_scene.cc b/scribo/demo/shared/src/internal.bak/interactive_scene.cc deleted file mode 100644 index b839f6b..0000000 --- a/scribo/demo/shared/src/internal.bak/interactive_scene.cc +++ /dev/null @@ -1,286 +0,0 @@ -// 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 <shared/src/internal/interactive_scene.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - - struct test : public QGraphicsItem - { - test() - { - setZValue(0); - setCursor(Qt::OpenHandCursor); - - } - - void mousePressEvent(QGraphicsSceneMouseEvent *event) - { - setCursor(Qt::ClosedHandCursor); - } - - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) - { - setCursor(Qt::OpenHandCursor); - } - - void mouseReleaseEvent(QGraphicsSceneMouseEvent *) - { - setCursor(Qt::OpenHandCursor); - } - - void paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget) - { - painter->setPen(Qt::NoPen); - painter->setBrush(Qt::darkGray); - painter->drawEllipse(-12, -12, 30, 30); - painter->setPen(QPen(Qt::black, 1)); - painter->setBrush(QBrush(Qt::red)); - painter->drawEllipse(-15, -15, 30, 30); - - painter->setBrush(QColor(0, 0, 0, 127)); - painter->drawRect(scene()->sceneRect()); - - } - - QRectF boundingRect() const - { - return QRectF(-15.5, -15.5, 34, 34); - } - - }; - - - - interactiveScene::interactiveScene(QObject * parent) - : QGraphicsScene(parent), mode_(Drawing), - mouse_moved_(false), mouse_pressed_(false), - selectionTracking_(false) - { - rect_.setZValue(1); - - QPen pen; - pen.setColor(QColor(Qt::black)); - pen.setStyle(Qt::SolidLine); - pen.setWidth(1); - - rect_.setPen(pen); - - setSceneRect(QRectF(-150, -150, 300, 300)); - - addItem(new test()); - } - - - void interactiveScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) - { - if (mouse_pressed_) - { - // If selection is enabled. - if (selectionTracking_) - { - switch(mode_) - { - // Moving an existing selection. - case Moving: - { - QPointF p = e->scenePos() - e->lastScenePos(); - rect_.translate(p.x(), p.y()); - e->accept(); - break; - } - - // A new selection must be extended. - case Drawing: - { - rect_.setRect(QRectF(e->buttonDownScenePos(Qt::LeftButton), - e->scenePos())); - e->accept(); - break; - } - - - // Extending an existing selection - case Extending: - { - rect_.update_size(rect_corner_, e->scenePos()); - break; - } - - default: - qDebug() << "interactiveScene::mouseMoveEvent - Invalid mode"; - } - - emit mouse_pressed(e->scenePos()); - mouse_moved_ = true; - } - } - else - super_::mouseMoveEvent(e); - - emit mouse_moved(e->scenePos()); - } - - void interactiveScene::mousePressEvent(QGraphicsSceneMouseEvent *e) - { - mouse_moved_ = false; - mouse_pressed_ = true; - pressed_point_ = e->scenePos(); - - emit mouse_pressed(e->scenePos()); - - // If selection is enabled. - if (selectionTracking_) - { - // About to move an existing rectangle. - QGraphicsItem *item = itemAt(e->scenePos()); - if (item == &rect_) - { - mode_ = Moving; - super_::mousePressEvent(e); - } - else if (item != 0) - { - mode_ = Extending; - rect_corner_ = item; - super_::mousePressEvent(e); - } - // Draw a new rectangle - else - { - mode_ = Drawing; - rect_.resetTransform(); - rect_.setRect(QRectF(e->scenePos(), e->scenePos())); - if (rect_.scene() != this) - addItem(&rect_); - e->accept(); - } - } - } - - void interactiveScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) - { - mouse_pressed_ = false; - - switch(mode_) - { - - case Drawing: - { - if (selectionTracking_ && mouse_moved_) - emit new_selection(rect_.boundingRect()); - else - { - // A mouse click is performed outside the selection - // rectangle. - // Clear selection if exists. - if (mode_ != Moving && rect_.scene() == this) - { - rect_.setRect(sceneRect()); - removeItem(&rect_); - emit selection_cleared(); - } - } - break; - } - - case Moving: - { - if (mouse_moved_) - { - QPointF p = e->scenePos() - pressed_point_; - - - // FIXME: the bounding rectangle size is increasing by - // 0.5 pixels for an unknown reason... - rect_.setRect(rect_.boundingRect().translated(p.x(), p.y())); - rect_.resetTransform(); - } - break; - } - - - case Extending: - { - break; - } - - default: - qDebug() << "interactiveScene::mouseReleaseEvent - invalid mode"; - - } - - - if (!mouse_moved_) - emit mouse_click(e->scenePos()); - - emit mouse_released(e->scenePos()); - - e->accept(); - } - - - void interactiveScene::setSelectionTracking(bool b) - { - selectionTracking_ = b; - } - - bool interactiveScene::has_selection() const - { - return rect_.scene() == this; - } - - QRectF interactiveScene::selection() const - { - return rect_.boundingRect(); - } - - void interactiveScene::clear_selection() - { - if (rect_.scene() == this) - removeItem(&rect_); - } - - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/shared/src/internal.bak/interactive_scene.hh b/scribo/demo/shared/src/internal.bak/interactive_scene.hh deleted file mode 100644 index 5888152..0000000 --- a/scribo/demo/shared/src/internal.bak/interactive_scene.hh +++ /dev/null @@ -1,108 +0,0 @@ -// 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_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH -# define SCRIBO_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH - -# include <QtGui/QGraphicsScene> -# include <QtGui/QGraphicsSceneMouseEvent> -# include <QtGui/QGraphicsLineItem> -# include <QtCore/QPoint> -# include <QtCore/QDebug> - -# include <shared/src/internal/selection_rectangle.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - enum Mode - { - Moving, - Drawing, - Extending - }; - - class interactiveScene : public QGraphicsScene - { - Q_OBJECT; - - typedef QGraphicsScene super_; - - public: - - interactiveScene(QObject * parent = 0); - - void mouseMoveEvent(QGraphicsSceneMouseEvent *e); - void mousePressEvent(QGraphicsSceneMouseEvent *e); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); - - void setSelectionTracking(bool b); - - bool has_selection() const; - QRectF selection() const; - void clear_selection(); - - signals: - void mouse_click(const QPointF& p); - void mouse_moved(const QPointF& p); - void mouse_pressed(const QPointF& p); - void mouse_released(const QPointF& p); - - void new_selection(const QRectF& rect); - void selection_cleared(); - - private: - selection_rectangle rect_; - - QGraphicsItem* rect_corner_; - - QPointF pressed_point_; - - Mode mode_; - - bool mouse_moved_; - bool mouse_pressed_; - bool selectionTracking_; - }; - - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // ! SCRIBO_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH diff --git a/scribo/demo/shared/src/internal.bak/selection_rectangle.cc b/scribo/demo/shared/src/internal.bak/selection_rectangle.cc deleted file mode 100644 index d3f82b7..0000000 --- a/scribo/demo/shared/src/internal.bak/selection_rectangle.cc +++ /dev/null @@ -1,241 +0,0 @@ -// 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 <QtGui> -#include <shared/src/internal/selection_rectangle.hh> - - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - selection_rectangle::selection_rectangle() - { - QPen pen; - pen.setColor(QColor(Qt::red)); - pen.setStyle(Qt::SolidLine); - pen.setWidth(1); - - - rects_.resize(9); - for (int i = 0; i < rects_.size(); ++i) - { - rects_[i] = new QGraphicsRectItem(this); - rects_[i]->setZValue(1); - rects_[i]->setPen(pen); - rects_[i]->show(); - rects_[i]->setAcceptHoverEvents(true); - } - - rects_[1]->setCursor(Qt::SizeFDiagCursor); - rects_[2]->setCursor(Qt::SizeVerCursor); - rects_[3]->setCursor(Qt::SizeBDiagCursor); - rects_[4]->setCursor(Qt::SizeHorCursor); - rects_[5]->setCursor(Qt::SizeHorCursor); - rects_[6]->setCursor(Qt::SizeBDiagCursor); - rects_[7]->setCursor(Qt::SizeVerCursor); - rects_[8]->setCursor(Qt::SizeFDiagCursor); - -// setHandlesChildEvents(true); - setCursor(Qt::SizeAllCursor); - setAcceptHoverEvents(true); - } - - - selection_rectangle::~selection_rectangle() - { - foreach(QGraphicsRectItem *item, rects_) - delete item; - } - - - void selection_rectangle::paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget) - { - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - - qreal border = 15; - qreal corner_width = qMin(qAbs(1/8.f * brect_.width()), border); - qreal corner_height = qMin(qAbs(1/8.f * brect_.height()), border); - - painter->setBrush(QColor(255, 255, 255, 127)); - painter->drawRect(brect_); - - // Rectangle 1 - QRectF rect1(brect_.topLeft().x(), brect_.topLeft().y(), - corner_width, - corner_height); - rects_[1]->setRect(rect1); - - // Rectangle 2 - QRectF rect2(rect1.topRight().x(), rect1.topRight().y(), - brect_.width() - 2 * corner_width, - corner_height); - rects_[2]->setRect(rect2); - - // Rectangle 3 - QRectF rect3(brect_.topRight().x() - corner_width, - brect_.topRight().y(), - corner_width, - corner_height); - rects_[3]->setRect(rect3); - - - - // Rectangle 4 - QRectF rect4(brect_.topLeft().x(), - brect_.topLeft().y() + corner_height, - corner_width, - brect_.height() - corner_height); - rects_[4]->setRect(rect4); - - // Rectangle 5 - QRectF rect5(brect_.topRight().x() - corner_width, - brect_.topRight().y() + corner_height, - corner_width, - brect_.height() - corner_height); - rects_[5]->setRect(rect5); - - - - // Rectangle 6 - QRectF rect6(brect_.bottomLeft().x(), - brect_.bottomLeft().y() - corner_height, - corner_width, - corner_height); - rects_[6]->setRect(rect6); - - // Rectangle 7 - QRectF rect7(rect6.topRight().x(), rect6.topRight().y(), - brect_.width() - 2 * corner_width, - corner_height); - rects_[7]->setRect(rect7); - - // Rectangle 8 - QRectF rect8(rect7.topRight().x(), rect7.topRight().y(), - corner_width, - corner_height); - rects_[8]->setRect(rect8); - - - painter->setPen(pen()); - painter->drawRect(brect_); - } - - - QRectF selection_rectangle::boundingRect() const - { - qreal penWidth = pen().width(); - return QRectF(brect_.x() - penWidth / 2, brect_.y() - penWidth / 2, - brect_.width() + penWidth / 2, - brect_.height() + penWidth / 2); - } - - - void selection_rectangle::setRect(qreal x, qreal y, - qreal width, qreal height) - { - prepareGeometryChange(); - brect_ = QRectF(x, y, width, height).normalized(); - } - - - void selection_rectangle::setRect(const QRectF & rectangle) - { - prepareGeometryChange(); - brect_ = rectangle.normalized(); - } - - - void selection_rectangle::update_size(QGraphicsItem *item, - const QPointF& p) - { - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - QPointF p_ = p; - - prepareGeometryChange(); - if (rects_[1] == item) - brect_.setTopLeft(p_); - else if (rects_[2] == item) - brect_.setTop(p_.y()); - else if (rects_[3] == item) - brect_.setTopRight(p_); - else if (rects_[4] == item) - brect_.setLeft(p_.x()); - else if (rects_[5] == item) - brect_.setRight(p_.x()); - else if (rects_[6] == item) - brect_.setBottomLeft(p_); - else if (rects_[7] == item) - brect_.setBottom(p_.y()); - else if (rects_[8] == item) - brect_.setBottomRight(p_); - else - qDebug() << "selection_rectangle::update_size - invalid item"; - - brect_ = brect_.normalized(); - } - - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/shared/src/internal.bak/selection_rectangle.hh b/scribo/demo/shared/src/internal.bak/selection_rectangle.hh deleted file mode 100644 index b58bad2..0000000 --- a/scribo/demo/shared/src/internal.bak/selection_rectangle.hh +++ /dev/null @@ -1,91 +0,0 @@ -// 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_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH -# define SCRIBO_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH - -# include <QtCore> -# include <QtGui> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - class selection_rectangle : public QAbstractGraphicsShapeItem - { - - public: - selection_rectangle(); - ~selection_rectangle(); - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - - QRectF boundingRect() const; - - void setRect(qreal x, qreal y, qreal width, qreal height); - void setRect(const QRectF & rectangle); - - void update_size(QGraphicsItem *item, const QPointF& p); - - private: // members - - - private: // attributes - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - QVector<QGraphicsRectItem *> rects_; - QRectF brect_; - - }; - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // !SCRIBO_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH diff --git a/scribo/demo/shared/src/internal/interactive_scene.cc b/scribo/demo/shared/src/internal/interactive_scene.cc deleted file mode 100644 index e49b855..0000000 --- a/scribo/demo/shared/src/internal/interactive_scene.cc +++ /dev/null @@ -1,94 +0,0 @@ -// 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 <shared/src/internal/interactive_scene.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - interactiveScene::interactiveScene(QObject * parent) - : QGraphicsScene(parent), mouse_moved_(false) - { - } - - - void interactiveScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) - { - super_::mouseMoveEvent(e); - - -// qDebug() << "interactiveScene::mouseMoveEvent"; - - if (e->buttons() & Qt::LeftButton) - { - emit mouse_moved_and_pressed(e->scenePos()); - mouse_moved_ = true; - } - - emit mouse_moved(e->scenePos()); - - e->ignore(); - } - - void interactiveScene::mousePressEvent(QGraphicsSceneMouseEvent *e) - { - super_::mousePressEvent(e); - - mouse_moved_ = false; - pressed_point_ = e->scenePos(); - - emit mouse_pressed(e->scenePos()); - e->ignore(); - } - - void interactiveScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) - { - super_::mouseReleaseEvent(e); - - if (!mouse_moved_) - emit mouse_click(e->scenePos()); - - emit mouse_released(e->scenePos()); - -// qDebug() << "crop_item::mouseReleaseEvent"; - e->ignore(); - } - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/shared/src/internal/interactive_scene.hh b/scribo/demo/shared/src/internal/interactive_scene.hh deleted file mode 100644 index 7099265..0000000 --- a/scribo/demo/shared/src/internal/interactive_scene.hh +++ /dev/null @@ -1,85 +0,0 @@ -// 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_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH -# define SCRIBO_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH - -# include <QtGui/QGraphicsScene> -# include <QtGui/QGraphicsSceneMouseEvent> -# include <QtGui/QGraphicsLineItem> -# include <QtCore/QPoint> -# include <QtCore/QDebug> - -# include <shared/src/internal/selection_rectangle.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - class interactiveScene : public QGraphicsScene - { - Q_OBJECT; - - typedef QGraphicsScene super_; - - public: - - interactiveScene(QObject * parent = 0); - - void mouseMoveEvent(QGraphicsSceneMouseEvent *e); - void mousePressEvent(QGraphicsSceneMouseEvent *e); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); - - signals: - void mouse_click(const QPointF& p); - void mouse_moved(const QPointF& p); - void mouse_pressed(const QPointF& p); - void mouse_moved_and_pressed(const QPointF& p); - void mouse_released(const QPointF& p); - - private: - QPointF pressed_point_; - - bool mouse_moved_; - }; - - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // ! SCRIBO_DEMO_SHARED_SRC_INTERNAL_INTERACTIVE_SCENE_HH diff --git a/scribo/demo/shared/src/internal/selection_rectangle.cc b/scribo/demo/shared/src/internal/selection_rectangle.cc deleted file mode 100644 index d3f82b7..0000000 --- a/scribo/demo/shared/src/internal/selection_rectangle.cc +++ /dev/null @@ -1,241 +0,0 @@ -// 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 <QtGui> -#include <shared/src/internal/selection_rectangle.hh> - - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - selection_rectangle::selection_rectangle() - { - QPen pen; - pen.setColor(QColor(Qt::red)); - pen.setStyle(Qt::SolidLine); - pen.setWidth(1); - - - rects_.resize(9); - for (int i = 0; i < rects_.size(); ++i) - { - rects_[i] = new QGraphicsRectItem(this); - rects_[i]->setZValue(1); - rects_[i]->setPen(pen); - rects_[i]->show(); - rects_[i]->setAcceptHoverEvents(true); - } - - rects_[1]->setCursor(Qt::SizeFDiagCursor); - rects_[2]->setCursor(Qt::SizeVerCursor); - rects_[3]->setCursor(Qt::SizeBDiagCursor); - rects_[4]->setCursor(Qt::SizeHorCursor); - rects_[5]->setCursor(Qt::SizeHorCursor); - rects_[6]->setCursor(Qt::SizeBDiagCursor); - rects_[7]->setCursor(Qt::SizeVerCursor); - rects_[8]->setCursor(Qt::SizeFDiagCursor); - -// setHandlesChildEvents(true); - setCursor(Qt::SizeAllCursor); - setAcceptHoverEvents(true); - } - - - selection_rectangle::~selection_rectangle() - { - foreach(QGraphicsRectItem *item, rects_) - delete item; - } - - - void selection_rectangle::paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget) - { - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - - qreal border = 15; - qreal corner_width = qMin(qAbs(1/8.f * brect_.width()), border); - qreal corner_height = qMin(qAbs(1/8.f * brect_.height()), border); - - painter->setBrush(QColor(255, 255, 255, 127)); - painter->drawRect(brect_); - - // Rectangle 1 - QRectF rect1(brect_.topLeft().x(), brect_.topLeft().y(), - corner_width, - corner_height); - rects_[1]->setRect(rect1); - - // Rectangle 2 - QRectF rect2(rect1.topRight().x(), rect1.topRight().y(), - brect_.width() - 2 * corner_width, - corner_height); - rects_[2]->setRect(rect2); - - // Rectangle 3 - QRectF rect3(brect_.topRight().x() - corner_width, - brect_.topRight().y(), - corner_width, - corner_height); - rects_[3]->setRect(rect3); - - - - // Rectangle 4 - QRectF rect4(brect_.topLeft().x(), - brect_.topLeft().y() + corner_height, - corner_width, - brect_.height() - corner_height); - rects_[4]->setRect(rect4); - - // Rectangle 5 - QRectF rect5(brect_.topRight().x() - corner_width, - brect_.topRight().y() + corner_height, - corner_width, - brect_.height() - corner_height); - rects_[5]->setRect(rect5); - - - - // Rectangle 6 - QRectF rect6(brect_.bottomLeft().x(), - brect_.bottomLeft().y() - corner_height, - corner_width, - corner_height); - rects_[6]->setRect(rect6); - - // Rectangle 7 - QRectF rect7(rect6.topRight().x(), rect6.topRight().y(), - brect_.width() - 2 * corner_width, - corner_height); - rects_[7]->setRect(rect7); - - // Rectangle 8 - QRectF rect8(rect7.topRight().x(), rect7.topRight().y(), - corner_width, - corner_height); - rects_[8]->setRect(rect8); - - - painter->setPen(pen()); - painter->drawRect(brect_); - } - - - QRectF selection_rectangle::boundingRect() const - { - qreal penWidth = pen().width(); - return QRectF(brect_.x() - penWidth / 2, brect_.y() - penWidth / 2, - brect_.width() + penWidth / 2, - brect_.height() + penWidth / 2); - } - - - void selection_rectangle::setRect(qreal x, qreal y, - qreal width, qreal height) - { - prepareGeometryChange(); - brect_ = QRectF(x, y, width, height).normalized(); - } - - - void selection_rectangle::setRect(const QRectF & rectangle) - { - prepareGeometryChange(); - brect_ = rectangle.normalized(); - } - - - void selection_rectangle::update_size(QGraphicsItem *item, - const QPointF& p) - { - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - QPointF p_ = p; - - prepareGeometryChange(); - if (rects_[1] == item) - brect_.setTopLeft(p_); - else if (rects_[2] == item) - brect_.setTop(p_.y()); - else if (rects_[3] == item) - brect_.setTopRight(p_); - else if (rects_[4] == item) - brect_.setLeft(p_.x()); - else if (rects_[5] == item) - brect_.setRight(p_.x()); - else if (rects_[6] == item) - brect_.setBottomLeft(p_); - else if (rects_[7] == item) - brect_.setBottom(p_.y()); - else if (rects_[8] == item) - brect_.setBottomRight(p_); - else - qDebug() << "selection_rectangle::update_size - invalid item"; - - brect_ = brect_.normalized(); - } - - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/shared/src/internal/selection_rectangle.hh b/scribo/demo/shared/src/internal/selection_rectangle.hh deleted file mode 100644 index b58bad2..0000000 --- a/scribo/demo/shared/src/internal/selection_rectangle.hh +++ /dev/null @@ -1,91 +0,0 @@ -// 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_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH -# define SCRIBO_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH - -# include <QtCore> -# include <QtGui> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - namespace internal - { - - class selection_rectangle : public QAbstractGraphicsShapeItem - { - - public: - selection_rectangle(); - ~selection_rectangle(); - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - - QRectF boundingRect() const; - - void setRect(qreal x, qreal y, qreal width, qreal height); - void setRect(const QRectF & rectangle); - - void update_size(QGraphicsItem *item, const QPointF& p); - - private: // members - - - private: // attributes - /* - -------------- - |1| 2 |3| - |--========--| - | || || | - | || || | - |4|| ||5| - | || || | - | || || | - |--========--| - |6| 7 |8| - -------------- - */ - QVector<QGraphicsRectItem *> rects_; - QRectF brect_; - - }; - - } // end of namespace mln::demo::shared::internal - - } // end of namespace mln::demo::shared - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // !SCRIBO_DEMO_SHARED_SRC_INTERNAL_SELECTION_RECTANGLE_HH diff --git a/scribo/demo/shared/src/to_mln_image.hh b/scribo/demo/shared/src/to_mln_image.hh deleted file mode 100644 index 229f975..0000000 --- a/scribo/demo/shared/src/to_mln_image.hh +++ /dev/null @@ -1,77 +0,0 @@ -// 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_DEMO_SHARED_SRC_TO_MLN_IMAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_TO_MLN_IMAGE_HH - -# include <QImage> -# include <QPoint> - -# include <mln/core/image/image2d.hh> -# include <mln/value/qt/rgb32.hh> -# include <mln/make/box2d.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - using namespace mln; - - image2d<value::qt::rgb32> - to_mln_image(const QImage& ima, const QPoint& origin) - { - trace::entering("scribo::demo::shared"); - - mln_assertion(!ima.isNull()); - - image2d<value::qt::rgb32> - output(make::box2d(origin.y(), - origin.x(), - origin.y() + ima.height() - 1, - origin.x() + ima.width() - 1), 0); - - memcpy(output.buffer(), ima.bits(), ima.numBytes()); - - mln_assertion(output.nrows() == (unsigned) ima.height()); - mln_assertion(output.ncols() == (unsigned) ima.width()); - - trace::exiting("scribo::demo::shared"); - return output; - } - - - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_TO_MLN_IMAGE_HH diff --git a/scribo/demo/shared/src/types.hh b/scribo/demo/shared/src/types.hh deleted file mode 100644 index 8edb54a..0000000 --- a/scribo/demo/shared/src/types.hh +++ /dev/null @@ -1,50 +0,0 @@ -// 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_DEMO_SHARED_SRC_TYPES_HH -# define SCRIBO_DEMO_SHARED_SRC_TYPES_HH - - -# include <mln/value/qt/rgb32.hh> - -namespace scribo -{ - - namespace demo - { - - namespace shared - { - - typedef mln::value::qt::rgb32 dsp_data_t; - - } // end of namespace scribo::demo::shared - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // !SCRIBO_DEMO_SHARED_SRC_TYPES_HH diff --git a/scribo/demo/shared/ui/browse_widget.ui b/scribo/demo/shared/ui/browse_widget.ui deleted file mode 100644 index fde675c..0000000 --- a/scribo/demo/shared/ui/browse_widget.ui +++ /dev/null @@ -1,106 +0,0 @@ -<ui version="4.0" > - <class>BrowseWidget</class> - <widget class="QWidget" name="BrowseWidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>301</width> - <height>104</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > - <number>0</number> - </property> - <item> - <layout class="QGridLayout" name="gridLayout_2" > - <property name="sizeConstraint" > - <enum>QLayout::SetMaximumSize</enum> - </property> - <item row="0" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" > - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" > - <layout class="QGridLayout" name="gridLayout" > - <property name="sizeConstraint" > - <enum>QLayout::SetMaximumSize</enum> - </property> - <item row="0" column="0" colspan="2" > - <widget class="QLabel" name="description_" > - <property name="text" > - <string>Description</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLineEdit" name="path_" /> - </item> - <item row="1" column="1" > - <widget class="QPushButton" name="browseBtn_" > - <property name="text" > - <string>&Browse</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="1" column="2" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/shared/ui/crop_widget.ui b/scribo/demo/shared/ui/crop_widget.ui deleted file mode 100644 index 6b67b2b..0000000 --- a/scribo/demo/shared/ui/crop_widget.ui +++ /dev/null @@ -1,34 +0,0 @@ -<ui version="4.0" > - <class>CropWidget</class> - <widget class="QWidget" name="CropWidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>567</width> - <height>481</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > - <number>0</number> - </property> - <item> - <widget class="scribo::demo::shared::image_viewer" native="1" name="viewer_" /> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>scribo::demo::shared::image_viewer</class> - <extends>QWidget</extends> - <header location="global" >shared/src/image_viewer.hh</header> - <container>1</container> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/shared/ui/image_viewer.ui b/scribo/demo/shared/ui/image_viewer.ui deleted file mode 100644 index fcf1239..0000000 --- a/scribo/demo/shared/ui/image_viewer.ui +++ /dev/null @@ -1,296 +0,0 @@ -<ui version="4.0" > - <class>ImageViewer</class> - <widget class="QWidget" name="ImageViewer" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>553</width> - <height>350</height> - </rect> - </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" > - <item> - <layout class="QVBoxLayout" > - <item> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="rotate_lbl" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>Rotate:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="rotate_cw_btn" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Rotate clock-wise</string> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../shared.qrc" > - <normaloff>:/icons/icons/rotate_cw.png</normaloff>:/icons/icons/rotate_cw.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="rotate_ccw_btn" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Rotate counter-clock-wise</string> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../shared.qrc" > - <normaloff>:/icons/icons/rotate_ccw.png</normaloff>:/icons/icons/rotate_ccw.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="Line" name="vline" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="zoomLabel" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>Zoom:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomIn" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../shared.qrc" > - <normaloff>:/icons/icons/search-add-icon.png</normaloff>:/icons/icons/search-add-icon.png</iconset> - </property> - <property name="shortcut" > - <string>+</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomOut" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../shared.qrc" > - <normaloff>:/icons/icons/search-remove-icon.png</normaloff>:/icons/icons/search-remove-icon.png</iconset> - </property> - <property name="iconSize" > - <size> - <width>16</width> - <height>16</height> - </size> - </property> - <property name="shortcut" > - <string>-</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomFixed" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="maximumSize" > - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text" > - <string>&Fit to screen</string> - </property> - <property name="shortcut" > - <string>F</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="zoomOriginal" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="maximumSize" > - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text" > - <string>&Original size</string> - </property> - <property name="shortcut" > - <string>O</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <widget class="QGraphicsView" name="viewer_" > - <property name="mouseTracking" > - <bool>true</bool> - </property> - <property name="acceptDrops" > - <bool>false</bool> - </property> - <property name="interactive" > - <bool>true</bool> - </property> - <property name="dragMode" > - <enum>QGraphicsView::NoDrag</enum> - </property> - <property name="viewportUpdateMode" > - <enum>QGraphicsView::BoundingRectViewportUpdate</enum> - </property> - <property name="optimizationFlags" > - <set>QGraphicsView::DontAdjustForAntialiasing|QGraphicsView::DontClipPainter|QGraphicsView::DontSavePainterState</set> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" > - <item> - <widget class="QSlider" name="slider" > - <property name="focusPolicy" > - <enum>Qt::WheelFocus</enum> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="tickPosition" > - <enum>QSlider::TicksAbove</enum> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="text" > - <string>Current Frame :</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="frame_nb" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Maximum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>60</width> - <height>0</height> - </size> - </property> - <property name="font" > - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text" > - <string>0</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </widget> - <resources> - <include location="../shared.qrc" /> - </resources> - <connections/> -</ui> diff --git a/scribo/demo/shared/ui/interactive_scene.cc b/scribo/demo/shared/ui/interactive_scene.cc deleted file mode 100644 index 1ab28a3..0000000 --- a/scribo/demo/shared/ui/interactive_scene.cc +++ /dev/null @@ -1,143 +0,0 @@ -// 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. - -# include <src/internal/interactive_scene.hh> - -namespace mln -{ - - namespace demo - { - - namespace internal - { - - interactiveScene::interactiveScene(QObject * parent) - : QGraphicsScene(parent), selectionTracking_(false) - { -// line_.setZValue(1); - rect_.setZValue(1); - - QPen pen; - pen.setColor(QColor(Qt::red)); - pen.setStyle(Qt::SolidLine); - pen.setWidth(1); - -// line_.setPen(pen); - rect_.setPen(pen); - } - - - void interactiveScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) - { - if (selectionTracking_ && mouse_pressed_) - rect_.setRect(QRectF(p_start_, e->scenePos())); -// line_.setLine(QLineF(p_start_, e->scenePos())); - - mouse_moved_ = true; - - if (mouse_pressed_) - emit mouse_pressed(e->scenePos()); - - emit mouse_moved(e->scenePos()); - - e->accept(); - } - - void interactiveScene::mousePressEvent(QGraphicsSceneMouseEvent *e) - { - p_start_ = e->scenePos(); - mouse_moved_ = false; - mouse_pressed_ = true; - - if (selectionTracking_) - { -// line_.setLine(QLineF(e->scenePos(), e->scenePos())); -// addItem(&line_); - rect_.setRect(QRectF(e->scenePos(), e->scenePos())); - if (rect_.scene() != this) - addItem(&rect_); - } - - emit mouse_pressed(e->scenePos()); - - e->accept(); - } - - void interactiveScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) - { -// if (selectionTracking_ && line_.scene() == this) -// removeItem(&line_); - - mouse_pressed_ = false; - - if (mouse_moved_ && selectionTracking_) - emit new_selection(rect_.rect()); - else - { - if (rect_.scene() == this) - { - rect_.setRect(sceneRect()); - removeItem(&rect_); - emit selection_cleared(); - } - - emit mouse_click(e->scenePos()); - } - - emit mouse_released(e->scenePos()); - - e->ignore(); - } - - - void interactiveScene::setSelectionTracking(bool b) - { - selectionTracking_ = b; - } - - bool interactiveScene::has_selection() const - { - return rect_.scene() == this; - } - - QRectF interactiveScene::selection() const - { - return rect_.rect(); - } - - void interactiveScene::clear_selection() - { - if (rect_.scene() == this) - removeItem(&rect_); - } - - - } // end of namespace mln::demo::internal - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/shared/ui/interactive_scene.hh b/scribo/demo/shared/ui/interactive_scene.hh deleted file mode 100644 index b5d5595..0000000 --- a/scribo/demo/shared/ui/interactive_scene.hh +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright (C) 2009 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 MLN_DEMO_SRC_INTERNAL_INTERACTIVE_SCENE_HH -# define MLN_DEMO_SRC_INTERNAL_INTERACTIVE_SCENE_HH - -# include <QtGui/QGraphicsScene> -# include <QtGui/QGraphicsSceneMouseEvent> -# include <QtGui/QGraphicsLineItem> -# include <QtCore/QPoint> -# include <QtCore/QDebug> - -namespace mln -{ - - namespace demo - { - - namespace internal - { - - class interactiveScene : public QGraphicsScene - { - Q_OBJECT - - public: - - interactiveScene(QObject * parent = 0); - - void mouseMoveEvent(QGraphicsSceneMouseEvent *e); - void mousePressEvent(QGraphicsSceneMouseEvent *e); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); - - void setSelectionTracking(bool b); - - bool has_selection() const; - QRectF selection() const; - void clear_selection(); - - signals: - void mouse_click(const QPointF& p); - void mouse_moved(const QPointF& p); - void mouse_pressed(const QPointF& p); - void mouse_released(const QPointF& p); - - void new_selection(const QRectF& rect); - void selection_cleared(); - - private: - QGraphicsRectItem rect_; - bool mouse_moved_; - bool mouse_pressed_; - QPointF p_start_; - - bool selectionTracking_; - }; - - - } // end of namespace mln::demo::internal - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // ! MLN_DEMO_SRC_INTERNAL_INTERACTIVE_SCENE_HH diff --git a/scribo/demo/shared/ui/rotate_widget.ui b/scribo/demo/shared/ui/rotate_widget.ui deleted file mode 100644 index 112e713..0000000 --- a/scribo/demo/shared/ui/rotate_widget.ui +++ /dev/null @@ -1,34 +0,0 @@ -<ui version="4.0" > - <class>RotateWidget</class> - <widget class="QWidget" name="RotateWidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>567</width> - <height>481</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > - <number>0</number> - </property> - <item> - <widget class="scribo::demo::shared::image_viewer" native="1" name="viewer_" /> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>scribo::demo::shared::image_viewer</class> - <extends>QWidget</extends> - <header location="global" >shared/src/image_viewer.hh</header> - <container>1</container> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/tip/gui.pro b/scribo/demo/tip/gui.pro deleted file mode 100644 index 7c6aa8e..0000000 --- a/scribo/demo/tip/gui.pro +++ /dev/null @@ -1,19 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Nov 25 13:42:17 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src ui -INCLUDEPATH += . src - -CONFIG += release - -QMAKE_CXXFLAGS = -g - -# Input -HEADERS += src/main_window.hh src/custom_delegate.hh src/launch_dialog.hh -FORMS += ui/main_window.ui ui/launch_dialog.ui -SOURCES += src/main.cc src/main_window.cc src/custom_delegate.cc src/launch_dialog.cc - -RESOURCES = gui.qrc diff --git a/scribo/demo/tip/gui.qrc b/scribo/demo/tip/gui.qrc deleted file mode 100644 index e5007a8..0000000 --- a/scribo/demo/tip/gui.qrc +++ /dev/null @@ -1,9 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file>icons/next.png</file> - <file>icons/ok.png</file> - <file>icons/photos.png</file> - <file>icons/prev.png</file> - <file>icons/remove.png</file> - </qresource> -</RCC> diff --git a/scribo/demo/tip/icons/next.png b/scribo/demo/tip/icons/next.png deleted file mode 100644 index ef6d66d..0000000 Binary files a/scribo/demo/tip/icons/next.png and /dev/null differ diff --git a/scribo/demo/tip/icons/ok.png b/scribo/demo/tip/icons/ok.png deleted file mode 100644 index 217030a..0000000 Binary files a/scribo/demo/tip/icons/ok.png and /dev/null differ diff --git a/scribo/demo/tip/icons/photos.png b/scribo/demo/tip/icons/photos.png deleted file mode 100644 index 65fe33d..0000000 Binary files a/scribo/demo/tip/icons/photos.png and /dev/null differ diff --git a/scribo/demo/tip/icons/prev.png b/scribo/demo/tip/icons/prev.png deleted file mode 100644 index 5f05d74..0000000 Binary files a/scribo/demo/tip/icons/prev.png and /dev/null differ diff --git a/scribo/demo/tip/icons/remove.png b/scribo/demo/tip/icons/remove.png deleted file mode 100644 index 3f37439..0000000 Binary files a/scribo/demo/tip/icons/remove.png and /dev/null differ diff --git a/scribo/demo/tip/src/custom_delegate.cc b/scribo/demo/tip/src/custom_delegate.cc deleted file mode 100644 index cfbb7c3..0000000 --- a/scribo/demo/tip/src/custom_delegate.cc +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (C) 2009 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 <src/custom_delegate.hh> - -#include <QtCore/QtCore> - -namespace mln -{ - - namespace demo - { - - custom_delegate::custom_delegate(QObject * parent) - : QItemDelegate(parent), - bg_(Qt::black, Qt::SolidPattern), - selected_bg_(QColor(255, 100, 0), Qt::Dense5Pattern) - { - display_rect_.setSize(QSize(149, 30)); - decoration_rect_.setSize(QSize(150, 150)); - } - - - custom_delegate::~custom_delegate() - { - } - - void - custom_delegate::drawDecoration(QPainter *painter, - const QStyleOptionViewItem& option, - const QRect& rect, - const QPixmap& pixmap) const - { - decoration_rect_.moveTo(option.rect.x() + 10, option.rect.y() + 10); - painter->fillRect(decoration_rect_, bg_); - super_::drawDecoration(painter, option, decoration_rect_, pixmap); - } - - - void - custom_delegate::drawBackground(QPainter *painter, - const QStyleOptionViewItem& option, - const QModelIndex& index) const - { - super_::drawBackground(painter, option, index); - } - - - void - custom_delegate::drawCheck(QPainter *painter, - const QStyleOptionViewItem& option, - const QRect& rect, - Qt::CheckState state) const - { - super_::drawCheck(painter, option, rect, state); - } - - - void - custom_delegate::drawDisplay(QPainter* painter, - const QStyleOptionViewItem& option, - const QRect& rect, - const QString& text) const - { - display_rect_.moveTo(option.rect.x() + 10, - option.rect.y() + 155); - super_::drawDisplay(painter, option, display_rect_, text); - painter->drawRect(display_rect_); - } - - - void - custom_delegate::drawFocus(QPainter* painter, - const QStyleOptionViewItem& option, - const QRect& rect ) const - { - super_::drawFocus(painter, option, display_rect_); - } - - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/tip/src/custom_delegate.hh b/scribo/demo/tip/src/custom_delegate.hh deleted file mode 100644 index 06fb69d..0000000 --- a/scribo/demo/tip/src/custom_delegate.hh +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (C) 2009 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 <QtGui/QtGui> - -namespace mln -{ - - namespace demo - { - - class custom_delegate : public QItemDelegate - { - - typedef QItemDelegate super_; - - public: - - custom_delegate(QObject * parent = 0); - ~custom_delegate(); - - void - drawDecoration(QPainter *painter, - const QStyleOptionViewItem& option, - const QRect& rect, - const QPixmap& pixmap) const; - - void drawBackground(QPainter *painter, - const QStyleOptionViewItem& option, - const QModelIndex& index) const; - - void drawCheck(QPainter *painter, - const QStyleOptionViewItem& option, - const QRect& rect, - Qt::CheckState state) const; - - void - drawDisplay(QPainter* painter, - const QStyleOptionViewItem& option, - const QRect& rect, - const QString& text) const; - - void - drawFocus(QPainter* painter, - const QStyleOptionViewItem& option, - const QRect& rect ) const; - - private: - mutable QRect display_rect_; - mutable QRect decoration_rect_; - QBrush bg_; - QBrush selected_bg_; - - }; - - - } // end of namespace mln::demo - -} // end of namespace mln diff --git a/scribo/demo/tip/src/launch_dialog.cc b/scribo/demo/tip/src/launch_dialog.cc deleted file mode 100644 index 9cd394a..0000000 --- a/scribo/demo/tip/src/launch_dialog.cc +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (C) 2009 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 <QtCore> -#include <QtGui> -#include <src/launch_dialog.hh> -#include <src/custom_delegate.hh> - -namespace mln -{ - - namespace demo - { - - launch_dialog::launch_dialog(QWidget *parent) - : QDialog(parent) - { - setupUi(this); - } - - launch_dialog::~launch_dialog() - { - - } - - - void - launch_dialog::on_browseBtn_clicked(bool) - { - QString dirname = QFileDialog::getExistingDirectory(this, ""); - - if (!dirname.isEmpty()) - { - pathToPics->setText(dirname); - } - } - - - void - launch_dialog::on_dialogBtnBox_accepted() - { - emit ok_clicked(pathToPics->text(), get_options()); - } - - - void - launch_dialog::on_pathToPics_textChanged(const QString& str) - { - dialogBtnBox->button(QDialogButtonBox::Ok)->setEnabled(!str.isEmpty()); - } - - - QString launch_dialog::get_options() const - { - if (binarizationMode->currentIndex() == 0) - return "0 0"; - if (binarizationMode->currentIndex() == 1) - return "1 0"; - if (binarizationMode->currentIndex() == 2) - return "0 1"; - if (binarizationMode->currentIndex() == 3) - return "1 1"; - - return ""; - } - - } // end of namespace scribo::demo - -} // end of namespace scribo - - diff --git a/scribo/demo/tip/src/launch_dialog.hh b/scribo/demo/tip/src/launch_dialog.hh deleted file mode 100644 index d3aca98..0000000 --- a/scribo/demo/tip/src/launch_dialog.hh +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (C) 2009 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 MLN_DEMO_SRC_LAUNCH_DIALOG_HH - -# include <QtGui> -# include <ui_launch_dialog.h> - -namespace mln -{ - - namespace demo - { - - - class launch_dialog : public QDialog, private Ui::LaunchDialog - { - Q_OBJECT - - public: - launch_dialog(QWidget *parent = 0); - ~launch_dialog(); - - private slots: - void on_dialogBtnBox_accepted(); - void on_browseBtn_clicked(bool); - void on_pathToPics_textChanged(const QString& str); - - signals: - void ok_clicked(const QString& path, const QString& options); - - private: // members - QString get_options() const; - }; - - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // ! MLN_DEMO_SRC_LAUNCH_DIALOG_HH diff --git a/scribo/demo/tip/src/main.cc b/scribo/demo/tip/src/main.cc deleted file mode 100644 index 5349bcb..0000000 --- a/scribo/demo/tip/src/main.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2009 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 <QApplication> -#include <QtGui> - -#include <src/main_window.hh> - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - if (argc < 2) - { - qDebug() << "Usage: " << argv[0] << " <path/text_in_photo_ppm>"; - return 1; - } - - mln::demo::main_window win(argv[1]); - - win.show(); - return app.exec(); -} - diff --git a/scribo/demo/tip/src/main_window.cc b/scribo/demo/tip/src/main_window.cc deleted file mode 100644 index c1d92c1..0000000 --- a/scribo/demo/tip/src/main_window.cc +++ /dev/null @@ -1,526 +0,0 @@ -// Copyright (C) 2009 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 <QtCore> -#include <QtGui> -#include <src/main_window.hh> -#include <src/launch_dialog.hh> -#include <src/custom_delegate.hh> - -namespace mln -{ - - namespace demo - { - - main_window::main_window(const QString& text_in_photo_ppm, QWidget *parent) - : QMainWindow(parent), text_in_photo_ppm_(text_in_photo_ppm) - { - setupUi(this); - - // Temporary output directory - output_dir_ = "/tmp/"; - - // Setup directory listing - QStringList filters; - filters << "*.ppm" - << "*.pgm" - << "*.pbm" - << "*.jpg" - << "*.png" - << "*.tiff"; - dir_.setNameFilters(filters); - dir_.setFilter(QDir::Files); - dir_.setSorting(QDir::Name); - - // Setup Signal/Slots connections - connect(&process_, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(process__error_slot(QProcess::ProcessError))); - connect(&process_, - SIGNAL(finished(int, QProcess::ExitStatus)), - this, - SLOT(process__finished_slot(int, QProcess::ExitStatus))); - - // Setup graphicsView - graphicsView->setScene(new QGraphicsScene()); - - - // Customize item view delegate for picture with text. - withTextListWidget->setItemDelegate(new custom_delegate()); - - // Setup Toolbar. - toolbar_ = new QToolBar(tr("Action")); - toolbar_->setToolButtonStyle(Qt::ToolButtonIconOnly); - QAction *removeImage = new QAction(QIcon(":/icons/remove.png"), - tr("Tag as image without text"), - toolbar_); - connect(removeImage, SIGNAL(triggered(bool)), - this, SLOT(remove_image(bool))); - toolbar_->addAction(removeImage); - - showHiddenImages_ = new QAction(QIcon(":/icons/photos.png"), - tr("Show hidden photos."), - toolbar_); - showHiddenImages_->setCheckable(true); - connect(showHiddenImages_, SIGNAL(toggled(bool)), - this, SLOT(show_hidden_images(bool))); - toolbar_->addAction(showHiddenImages_); - - - addToolBar(toolbar_); - - - // Setup StatusBar - progressToolBar_ = new QToolBar(tr("ProgressBar")); - - progressToolBar_->addWidget(&progressLabel_); - progressToolBar_->addWidget(&progressBar_); - - QPushButton *cancelBtn = new QPushButton(tr("&Cancel")); - connect(cancelBtn, SIGNAL(clicked(bool)), - this, SLOT(cancel_clicked(bool))); - progressToolBar_->addWidget(cancelBtn); - - addToolBar(progressToolBar_); - progressToolBar_->hide(); - - - - // Hide visualization buttons - textOnlyButton->hide(); - fullImageButton->hide(); - textBoxesButton->hide(); - textMaskButton->hide(); - - // Set default visualization. - textBoxesButton->setChecked(true); - actionText_Boxes->setChecked(true); - QActionGroup * actionGroup = new QActionGroup(this); - actionGroup->addAction(actionText_Boxes); - actionGroup->addAction(actionFull_Image); - actionGroup->addAction(action_Text_Only); - actionGroup->addAction(actionText_Mask); - actionGroup->setExclusive(true); - } - - main_window::~main_window() - { - if (process_.state() == QProcess::Running) - { - process_.disconnect(); - process_.close(); - } - } - - void - main_window::on_actionScan_directory_triggered() - { - launch_dialog *dialog = new launch_dialog(this); - connect(dialog, SIGNAL(ok_clicked(const QString&, const QString&)), - this, SLOT(init_and_start_process(const QString&, const QString&))); - dialog->show(); - } - - void - main_window::init_and_start_process(const QString& dirname, - const QString& options) - { - dir_.setPath(dirname); - - file_list_ = dir_.entryInfoList(); - current_file_ = 0; - - withTextListWidget->clear(); - withoutTextListWidget->clear(); - update_tab_title(); - - progressToolBar_->show(); - progressLabel_.setText(tr("Processing images...")); - progressBar_.setRange(0, file_list_.size()); - progressBar_.setValue(0); - - options_ = options; - - if (current_file_ < file_list_.size()) - start_process(); - else - { - QMessageBox::critical(this, "No image found!", QString("This application could not find any supported images in the provided directory. Supported file types are: %1").arg(dir_.nameFilters().join(" "))); - stop_process(); - } - } - - void - main_window::next_process() - { - ++current_file_; - progressBar_.setValue(current_file_); - - if (current_file_ < file_list_.size()) - start_process(); - else - stop_process(); - } - - - QString - main_window::output_file(const QString& basename) - { - return output_dir_ + basename + "_out_text.ppm"; - } - - QString - main_window::textBoxes_file(const QString& basename) - { - return output_dir_ + basename + "_input_with_bboxes.ppm"; - } - - QString - main_window::textMask_file(const QString& basename) - { - return output_dir_ + basename + "_out.ppm"; - } - - - void - main_window::start_process() - { - QStringList args; - args << file_list_.at(current_file_).absoluteFilePath() // input file. - << textMask_file(file_list_.at(current_file_).baseName()); // output file. - - // Enable/Disable remove background + Enable/Disable sauvola_ms. - QStringList options = options_.split(' '); - foreach(QString option, options) - args << option; - - args << "1" << "1" << "1" // Enable all steps. - << "/tmp/" + file_list_.at(current_file_).baseName(); - - process_.start(text_in_photo_ppm_, args); - } - - void - main_window::stop_process() - { - progressToolBar_->hide(); - emit process_finished(); - } - - void - main_window::process__error_slot(QProcess::ProcessError) - { - qDebug() << "error"; - } - - void - main_window::process__finished_slot(int exitCode, - QProcess::ExitStatus exitStatus) - { - QString filename = file_list_.at(current_file_).fileName(); - - if (exitStatus == QProcess::CrashExit) - { - qDebug() << "Process crashed with file " - << file_list_.at(current_file_).fileName(); - } - else - { - QFileInfo f(filename); - QFileInfo text_image(); - QPixmap pixmap(output_file(f.baseName())); - - QListWidgetItem *item; - if (! pixmap.isNull()) - item = new QListWidgetItem(QIcon(pixmap.scaled(150, 150, Qt::KeepAspectRatio)), filename + QString(" (%1)").arg(exitCode)); - else - item = new QListWidgetItem(filename + QString(" (%1)").arg(exitCode)); - - item->setData(Qt::UserRole, QVariant(current_file_)); - - if (exitCode) - { - item->setCheckState(Qt::Unchecked); - item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - item->setSizeHint(QSize(170, 200)); - withTextListWidget->addItem(item); - if (withTextListWidget->count() == 1) - { - withTextListWidget->setCurrentRow(0, QItemSelectionModel::SelectCurrent); - on_withTextListWidget_currentItemChanged(withTextListWidget->item(0)); - } - } - else - withoutTextListWidget->addItem(item); - } - - // Update tab title. - update_tab_title(); - - next_process(); - } - - - void - main_window::display_image(const QString& filename) - { - graphicsView->scene()->clear(); - - QPixmap pixmap(filename); - QGraphicsPixmapItem *item = graphicsView->scene()->addPixmap(pixmap); - - graphicsView->setSceneRect(item->boundingRect()); - - if (item->boundingRect().contains(graphicsView->viewport()->geometry())) - graphicsView->fitInView(item->boundingRect(), Qt::KeepAspectRatio); - else - graphicsView->fitInView(graphicsView->viewport()->geometry(), - Qt::KeepAspectRatio); - } - - - void - main_window::on_withTextListWidget_itemClicked(QListWidgetItem * item) - { - on_withTextListWidget_currentItemChanged(item); - } - - void - main_window::on_withTextListWidget_currentItemChanged(QListWidgetItem * item) - { - if (!withTextListWidget->count()) - return; - - if (fullImageButton->isChecked()) - on_fullImageButton_toggled(true); - else if (textOnlyButton->isChecked()) - on_textOnlyButton_toggled(true); - else if (textBoxesButton->isChecked()) - on_textBoxesButton_toggled(true); - else if (textMaskButton->isChecked()) - on_textMaskButton_toggled(true); - else - { - QFileInfo f(item->text()); - display_image(output_file(f.baseName())); - } - } - - void - main_window::on_withoutTextListWidget_itemClicked(QListWidgetItem * item) - { - on_withoutTextListWidget_currentItemChanged(item); - } - - void - main_window::on_withoutTextListWidget_currentItemChanged(QListWidgetItem * item) - { - if (withoutTextListWidget->count() && item) - display_image(file_list_.at(item->data(Qt::UserRole).toInt()).absoluteFilePath()); - } - - void - main_window::on_fullImageButton_toggled(bool) - { - if (withTextListWidget->count() && withTextListWidget->currentItem()) - { - QString filename = file_list_.at(withTextListWidget->currentItem()->data(Qt::UserRole).toInt()).absoluteFilePath(); - display_image(filename); - } - } - - void - main_window::on_textBoxesButton_toggled(bool) - { - if (withTextListWidget->count() && withTextListWidget->currentItem()) - { - QFileInfo f(withTextListWidget->currentItem()->text()); - display_image(textBoxes_file(f.baseName())); - } - } - - void - main_window::on_textMaskButton_toggled(bool) - { - if (withTextListWidget->count() && withTextListWidget->currentItem()) - { - QFileInfo f(withTextListWidget->currentItem()->text()); - display_image(textMask_file(f.baseName())); - } - } - - void - main_window::on_textOnlyButton_toggled(bool) - { - if (withTextListWidget->count() && withTextListWidget->currentItem()) - { - QFileInfo f(withTextListWidget->currentItem()->text()); - display_image(output_file(f.baseName())); - } - } - - - - void - main_window::on_tabWidget_currentChanged(int index) - { - bool b = (index == 0); - fullImageButton->setEnabled(b); - textOnlyButton->setEnabled(b); - textBoxesButton->setEnabled(b); - textMaskButton->setEnabled(b); - toolbar_->setEnabled(b); - - if (index == 1) - { - graphicsView->scene()->clear(); - if (withoutTextListWidget->count()) - { - withoutTextListWidget->setCurrentRow(0, QItemSelectionModel::Select); - on_withoutTextListWidget_currentItemChanged(withoutTextListWidget->item(0)); - } - } - } - - void - main_window::cancel_clicked(bool) - { - process_.disconnect(); - process_.kill(); - process_.waitForFinished(); - progressBar_.setValue(progressBar_.maximum()); - connect_process(); - progressToolBar_->hide(); - } - - void - main_window::remove_image(bool) - { - QList<QListWidgetItem *> items = withTextListWidget->selectedItems(); - foreach(QListWidgetItem *item, items) - { - hidden_.insert(item); - if (! showHiddenImages_->isChecked()) - item->setHidden(true); - } - - update_withtext_count(); -// if (withTextListWidget->count()) -// withTextListWidget->setCurrentRow(0, QItemSelectionModel::Select); - } - - - void - main_window::show_hidden_images(bool b) - { - foreach(QListWidgetItem *item, hidden_) - item->setHidden(! b); - - update_withtext_count(); -// if (withTextListWidget->count()) -// withTextListWidget->setCurrentRow(0, QItemSelectionModel::Select); - } - - - void - main_window::update_withtext_count() - { - unsigned count; - if (! showHiddenImages_->isChecked()) - count = withTextListWidget->count() - hidden_.size(); - else - count = withTextListWidget->count(); - tabWidget->setTabText(0, - QString(tr("With text (%1)")) - .arg(count)); - } - - - void main_window::connect_process() - { - connect(&process_, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(process__error_slot(QProcess::ProcessError))); - connect(&process_, - SIGNAL(finished(int, QProcess::ExitStatus)), - this, - SLOT(process__finished_slot(int, QProcess::ExitStatus))); - } - - - void - main_window::keyPressEvent(QKeyEvent * event) - { - if (tabWidget->currentIndex() == 0) - { - switch(event->key()) - { - case Qt::Key_F1: - on_textOnlyButton_toggled(true); - break; - case Qt::Key_F2: - on_fullImageButton_toggled(true); - break; - case Qt::Key_F3: - on_textBoxesButton_toggled(true); - break; - case Qt::Key_F4: - on_textMaskButton_toggled(true); - break; - } - } - else - event->ignore(); - } - - void - main_window::resizeEvent(QResizeEvent* event) - { - if (graphicsView->scene()->items().size()) - graphicsView->fitInView(graphicsView->scene()->items().at(0)->boundingRect(), - Qt::KeepAspectRatio); - - event->ignore(); - } - - - void - main_window::update_tab_title() - { - tabWidget->setTabText(0, - QString(tr("With text (%1)")) - .arg(withTextListWidget->count())); - tabWidget->setTabText(1, - QString(tr("Without text (%1)")) - .arg(withoutTextListWidget->count())); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - diff --git a/scribo/demo/tip/src/main_window.hh b/scribo/demo/tip/src/main_window.hh deleted file mode 100644 index 6732f29..0000000 --- a/scribo/demo/tip/src/main_window.hh +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (C) 2009 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 MLN_DEMO_SRC_MAIN_WINDOW_HH - -# include <QtGui> -# include <ui_main_window.h> - -namespace mln -{ - - namespace demo - { - - - class main_window : public QMainWindow, private Ui::MainWindow - { - Q_OBJECT - - public: - main_window(const QString& text_in_photo_ppm, QWidget *parent = 0); - ~main_window(); - - - private slots: - void process__error_slot(QProcess::ProcessError); - void process__finished_slot(int exitCode, - QProcess::ExitStatus exitStatus); - - void on_withTextListWidget_itemClicked(QListWidgetItem * item); - void on_withTextListWidget_currentItemChanged(QListWidgetItem * item); - void on_withoutTextListWidget_itemClicked(QListWidgetItem * item); - void on_withoutTextListWidget_currentItemChanged(QListWidgetItem * item); - - void on_fullImageButton_toggled(bool b); - void on_textBoxesButton_toggled(bool); - void on_textMaskButton_toggled(bool); - void on_textOnlyButton_toggled(bool); - - void on_tabWidget_currentChanged(int index); - void on_actionScan_directory_triggered(); - void init_and_start_process(const QString& dirname, - const QString& options); - void cancel_clicked(bool); - - void remove_image(bool); - void show_hidden_images(bool b); - - void update_tab_title(); - - signals: - void process_finished(); - - private: // Members - void keyPressEvent(QKeyEvent* event); - void resizeEvent(QResizeEvent* event); - - QString output_file(const QString& basename); - QString textBoxes_file(const QString& basename); - QString textMask_file(const QString& basename); - - void display_image(const QString& filename); - void start_process(); - void stop_process(); - void next_process(); - - void connect_process(); - - void update_withtext_count(); - - private: // Attributes - QString output_dir_; - QDir dir_; - QString text_in_photo_ppm_; - QProcess process_; - QString options_; - QSet<QListWidgetItem *> hidden_; - - QFileInfoList file_list_; - int current_file_; - - // Progress tool bar - QToolBar *progressToolBar_; - QLabel progressLabel_; - QProgressBar progressBar_; - - // ToolBar - QToolBar *toolbar_; - QAction *showHiddenImages_; - }; - - - } // end of namespace mln::demo - -} // end of namespace mln - -#endif // ! MLN_DEMO_SRC_MAIN_WINDOW_HH diff --git a/scribo/demo/tip/ui/launch_dialog.ui b/scribo/demo/tip/ui/launch_dialog.ui deleted file mode 100644 index a7aa216..0000000 --- a/scribo/demo/tip/ui/launch_dialog.ui +++ /dev/null @@ -1,117 +0,0 @@ -<ui version="4.0" > - <class>LaunchDialog</class> - <widget class="QDialog" name="LaunchDialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>371</width> - <height>160</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <widget class="QLineEdit" name="pathToPics" /> - </item> - <item> - <widget class="QPushButton" name="browseBtn" > - <property name="text" > - <string>&Browse</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Options</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QComboBox" name="binarizationMode" > - <property name="currentIndex" > - <number>3</number> - </property> - <item> - <property name="text" > - <string>Binarization from intensity</string> - </property> - </item> - <item> - <property name="text" > - <string>Binarization from foreground (slower)</string> - </property> - </item> - <item> - <property name="text" > - <string>Multiscale Binarization from intensity </string> - </property> - </item> - <item> - <property name="text" > - <string>Multiscale Binarization from foreground (slower)</string> - </property> - </item> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QDialogButtonBox" name="dialogBtnBox" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons" > - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>dialogBtnBox</sender> - <signal>accepted()</signal> - <receiver>LaunchDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel" > - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>dialogBtnBox</sender> - <signal>rejected()</signal> - <receiver>LaunchDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel" > - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/scribo/demo/tip/ui/main_window.ui b/scribo/demo/tip/ui/main_window.ui deleted file mode 100644 index 4162d98..0000000 --- a/scribo/demo/tip/ui/main_window.ui +++ /dev/null @@ -1,656 +0,0 @@ -<ui version="4.0" > - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>708</width> - <height>834</height> - </rect> - </property> - <property name="windowTitle" > - <string>MainWindow</string> - </property> - <property name="dockNestingEnabled" > - <bool>true</bool> - </property> - <property name="dockOptions" > - <set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks</set> - </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QVBoxLayout" name="verticalLayout_4" > - <item> - <widget class="QSplitter" name="splitter" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <widget class="QTabWidget" name="tabWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="autoFillBackground" > - <bool>false</bool> - </property> - <property name="tabShape" > - <enum>QTabWidget::Rounded</enum> - </property> - <property name="currentIndex" > - <number>0</number> - </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>With text</string> - </attribute> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <layout class="QVBoxLayout" name="verticalLayout_5" > - <item> - <widget class="QListWidget" name="withTextListWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="editTriggers" > - <set>QAbstractItemView::NoEditTriggers</set> - </property> - <property name="tabKeyNavigation" > - <bool>true</bool> - </property> - <property name="showDropIndicator" stdset="0" > - <bool>false</bool> - </property> - <property name="selectionMode" > - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="iconSize" > - <size> - <width>150</width> - <height>150</height> - </size> - </property> - <property name="movement" > - <enum>QListView::Static</enum> - </property> - <property name="flow" > - <enum>QListView::LeftToRight</enum> - </property> - <property name="isWrapping" stdset="0" > - <bool>true</bool> - </property> - <property name="resizeMode" > - <enum>QListView::Adjust</enum> - </property> - <property name="layoutMode" > - <enum>QListView::Batched</enum> - </property> - <property name="spacing" > - <number>10</number> - </property> - <property name="gridSize" > - <size> - <width>170</width> - <height>200</height> - </size> - </property> - <property name="viewMode" > - <enum>QListView::IconMode</enum> - </property> - <property name="uniformItemSizes" > - <bool>true</bool> - </property> - <property name="batchSize" > - <number>100</number> - </property> - <property name="wordWrap" > - <bool>true</bool> - </property> - <property name="selectionRectVisible" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4" > - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="prevBtn" > - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../gui.qrc" > - <normaloff>:/icons/prev.png</normaloff>:/icons/prev.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="comboBox" > - <item> - <property name="text" > - <string>Page 1</string> - </property> - </item> - </widget> - </item> - <item> - <widget class="QToolButton" name="nextBtn" > - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../gui.qrc" > - <normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > - <string>Without text</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_6" > - <item> - <widget class="QListWidget" name="withoutTextListWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="layoutMode" > - <enum>QListView::Batched</enum> - </property> - <property name="batchSize" > - <number>5</number> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <widget class="QDockWidget" name="dockWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Maximum" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <widget class="QWidget" name="dockWidgetContents" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <layout class="QVBoxLayout" name="verticalLayout_7" > - <item> - <spacer name="verticalSpacer_3" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <spacer name="verticalSpacer_4" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QGraphicsView" name="graphicsView" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>350</width> - <height>512</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>16777215</width> - <height>512</height> - </size> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <property name="sizeConstraint" > - <enum>QLayout::SetNoConstraint</enum> - </property> - <item> - <widget class="QLabel" name="label" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Maximum" hsizetype="Maximum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>Annnotations</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <widget class="QTextEdit" name="textEdit" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Maximum" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize" > - <size> - <width>200</width> - <height>16777215</height> - </size> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QPushButton" name="textOnlyButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>View text only</string> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <property name="autoExclusive" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="fullImageButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>View full image</string> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <property name="autoExclusive" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="textBoxesButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>View text boxes</string> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <property name="autoExclusive" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="textMaskButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>View text mask</string> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <property name="autoExclusive" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <spacer name="horizontalSpacer_3" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Minimum</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="pushButton_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Maximum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>Validate</string> - </property> - <property name="icon" > - <iconset resource="../gui.qrc" > - <normaloff>:/icons/ok.png</normaloff>:/icons/ok.png</iconset> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </item> - <item row="1" column="0" > - <spacer name="verticalSpacer_5" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </widget> - </widget> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>708</width> - <height>24</height> - </rect> - </property> - <widget class="QMenu" name="menuFile" > - <property name="title" > - <string>&File</string> - </property> - <addaction name="actionScan_directory" /> - <addaction name="separator" /> - <addaction name="action_Quit" /> - </widget> - <widget class="QMenu" name="menu_View" > - <property name="title" > - <string>&View</string> - </property> - <addaction name="actionFull_Image" /> - <addaction name="actionText_Boxes" /> - <addaction name="separator" /> - <addaction name="action_Text_Only" /> - <addaction name="actionText_Mask" /> - </widget> - <addaction name="menuFile" /> - <addaction name="menu_View" /> - </widget> - <widget class="QStatusBar" name="statusbar" /> - <action name="actionScan_directory" > - <property name="icon" > - <iconset resource="../gui.qrc" > - <normaloff>:/icons/photos.png</normaloff>:/icons/photos.png</iconset> - </property> - <property name="text" > - <string>&Scan directory...</string> - </property> - </action> - <action name="action_Text_Only" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="text" > - <string>&Text only</string> - </property> - </action> - <action name="actionFull_Image" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="text" > - <string>Full image</string> - </property> - </action> - <action name="actionText_Boxes" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="text" > - <string>Text boxes</string> - </property> - </action> - <action name="actionText_Mask" > - <property name="checkable" > - <bool>true</bool> - </property> - <property name="text" > - <string>Text mask</string> - </property> - </action> - <action name="action_Quit" > - <property name="text" > - <string>&Quit</string> - </property> - </action> - </widget> - <resources> - <include location="../gui.qrc" /> - </resources> - <connections> - <connection> - <sender>action_Quit</sender> - <signal>activated()</signal> - <receiver>MainWindow</receiver> - <slot>close()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>353</x> - <y>335</y> - </hint> - </hints> - </connection> - <connection> - <sender>actionFull_Image</sender> - <signal>activated()</signal> - <receiver>fullImageButton</receiver> - <slot>toggle()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>634</x> - <y>492</y> - </hint> - </hints> - </connection> - <connection> - <sender>action_Text_Only</sender> - <signal>activated()</signal> - <receiver>textOnlyButton</receiver> - <slot>toggle()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>634</x> - <y>457</y> - </hint> - </hints> - </connection> - <connection> - <sender>actionText_Boxes</sender> - <signal>activated()</signal> - <receiver>textBoxesButton</receiver> - <slot>toggle()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>634</x> - <y>527</y> - </hint> - </hints> - </connection> - <connection> - <sender>actionText_Mask</sender> - <signal>activated()</signal> - <receiver>textMaskButton</receiver> - <slot>toggle()</slot> - <hints> - <hint type="sourcelabel" > - <x>-1</x> - <y>-1</y> - </hint> - <hint type="destinationlabel" > - <x>634</x> - <y>562</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/scribo/demo/wizard/images/dematerialization.png b/scribo/demo/wizard/images/dematerialization.png deleted file mode 100644 index bcae3c4..0000000 Binary files a/scribo/demo/wizard/images/dematerialization.png and /dev/null differ diff --git a/scribo/demo/wizard/src/crop_page.cc b/scribo/demo/wizard/src/crop_page.cc deleted file mode 100644 index ea3ca71..0000000 --- a/scribo/demo/wizard/src/crop_page.cc +++ /dev/null @@ -1,48 +0,0 @@ -#include <src/crop_page.hh> - -namespace scribo -{ - - namespace demo - { - - - crop_page::crop_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new crop_widget(this); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setTitle("Region of interest"); - setSubTitle("Select a region of interest"); - - } - - - void crop_page::cleanupPage() - { - setField("load.input_dsp", - QPixmap(field("load.file_path").toString())); - - } - - - void crop_page::initializePage() - { - widget_->load_image(field("load.input_dsp").value<QPixmap>()); - } - - - bool crop_page::validatePage() - { - setField("load.input_dsp", widget_->image()); - return true; - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/crop_page.hh b/scribo/demo/wizard/src/crop_page.hh deleted file mode 100644 index 9891a7e..0000000 --- a/scribo/demo/wizard/src/crop_page.hh +++ /dev/null @@ -1,60 +0,0 @@ -// 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_DEMO_SHARED_SRC_CROP_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_CROP_PAGE_HH - -# include <QtGui> -# include <src/crop_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - class crop_page : public QWizardPage - { - Q_OBJECT; - - public: - crop_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - virtual bool validatePage(); - - private: - crop_widget *widget_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_CROP_PAGE_HH diff --git a/scribo/demo/wizard/src/crop_widget.cc b/scribo/demo/wizard/src/crop_widget.cc deleted file mode 100644 index 8067fda..0000000 --- a/scribo/demo/wizard/src/crop_widget.cc +++ /dev/null @@ -1,37 +0,0 @@ -#include <src/crop_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - crop_widget::crop_widget(QWidget *parent) - : QWidget(parent) - { - setupUi(this); - } - - - void crop_widget::load_image(const QPixmap& pixmap) - { - viewer_->draw_image(pixmap); - viewer_->set_selection_enabled(true); - } - - - const QRectF& crop_widget::crop_area() const - { - return viewer_->selection(); - } - - - QPixmap crop_widget::image() const - { - return viewer_->image().copy(crop_area().toRect().intersected(viewer_->image().rect())); - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/crop_widget.hh b/scribo/demo/wizard/src/crop_widget.hh deleted file mode 100644 index 8d1f80b..0000000 --- a/scribo/demo/wizard/src/crop_widget.hh +++ /dev/null @@ -1,62 +0,0 @@ -// 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_DEMO_SHARED_SRC_CROP_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_CROP_WIDGET_HH - -# include <QtGui> -# include <ui_crop_widget.h> - -namespace scribo -{ - - namespace demo - { - - - class crop_widget : public QWidget, private Ui::CropWidget - { - Q_OBJECT; - - Q_PROPERTY(QRectF crop_area READ crop_area); - - public: - crop_widget(QWidget *parent = 0); - - void load_image(const QPixmap& pixmap); - - const QRectF& crop_area() const; - - QPixmap image() const; - - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_CROP_WIDGET_HH diff --git a/scribo/demo/wizard/src/doc_type.hh b/scribo/demo/wizard/src/doc_type.hh deleted file mode 100644 index 320cd19..0000000 --- a/scribo/demo/wizard/src/doc_type.hh +++ /dev/null @@ -1,51 +0,0 @@ -// 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_DEMO_SHARED_SRC_DOC_TYPE_HH -# define SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_HH - - -namespace scribo -{ - - namespace demo - { - - enum Doc_Type - { - Text_Doc, - Picture, - Mixed_Doc, - - Invalid_Doc - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // !SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_HH diff --git a/scribo/demo/wizard/src/doc_type_page.cc b/scribo/demo/wizard/src/doc_type_page.cc deleted file mode 100644 index 7245569..0000000 --- a/scribo/demo/wizard/src/doc_type_page.cc +++ /dev/null @@ -1,48 +0,0 @@ -#include <src/doc_type_page.hh> -#include <src/doc_type_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - doc_type_page::doc_type_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new doc_type_widget(this); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setSubTitle("Please choose the document type."); - setTitle("Document type"); - - registerField("doc_type.type_mixed_doc", widget_, "type_mixed_doc", SIGNAL(toggled(bool))); - registerField("doc_type.type_picture", widget_, "type_picture", SIGNAL(toggled(bool))); - registerField("doc_type.type_text_doc", widget_, "type_text_doc", SIGNAL(toggled(bool))); - } - - - void doc_type_page::cleanupPage() - { - widget_->reset(); - } - - - void doc_type_page::initializePage() - { - } - - - bool doc_type_page::isComplete() - { - return true; - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/doc_type_page.hh b/scribo/demo/wizard/src/doc_type_page.hh deleted file mode 100644 index f0d751b..0000000 --- a/scribo/demo/wizard/src/doc_type_page.hh +++ /dev/null @@ -1,61 +0,0 @@ -// 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_DEMO_SHARED_SRC_DOC_TYPE_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_PAGE_HH - -# include <QtGui> - -namespace scribo -{ - - namespace demo - { - - // Forward declaration. - class doc_type_widget; - - class doc_type_page : public QWizardPage - { - Q_OBJECT; - - public: - doc_type_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - virtual bool isComplete(); - - private: - doc_type_widget *widget_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_PAGE_HH diff --git a/scribo/demo/wizard/src/doc_type_widget.cc b/scribo/demo/wizard/src/doc_type_widget.cc deleted file mode 100644 index c8453d4..0000000 --- a/scribo/demo/wizard/src/doc_type_widget.cc +++ /dev/null @@ -1,38 +0,0 @@ -#include <src/doc_type_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - doc_type_widget::doc_type_widget(QWidget *parent) - : QWidget(parent) - { - setupUi(this); - } - - void doc_type_widget::reset() - { - type_text_doc_->setChecked(true); - } - - bool doc_type_widget::type_mixed_doc() const - { - return type_mixed_doc_->isChecked(); - } - - bool doc_type_widget::type_picture() const - { - return type_picture_->isChecked(); - } - - bool doc_type_widget::type_text_doc() const - { - return type_text_doc_->isChecked(); - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/doc_type_widget.hh b/scribo/demo/wizard/src/doc_type_widget.hh deleted file mode 100644 index ccd5324..0000000 --- a/scribo/demo/wizard/src/doc_type_widget.hh +++ /dev/null @@ -1,64 +0,0 @@ -// 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_DEMO_SHARED_SRC_DOC_TYPE_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_WIDGET_HH - -# include <QtGui> -# include <ui_doc_type_widget.h> - -namespace scribo -{ - - namespace demo - { - - - class doc_type_widget : public QWidget, private Ui::DocTypeWidget - { - Q_OBJECT; - - Q_PROPERTY(bool type_mixed_doc READ type_mixed_doc); - Q_PROPERTY(bool type_picture READ type_picture); - Q_PROPERTY(bool type_text_doc READ type_text_doc); - - public: - doc_type_widget(QWidget *parent = 0); - - void reset(); - - bool type_mixed_doc() const; - bool type_picture() const; - bool type_text_doc() const; - - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_DOC_TYPE_WIDGET_HH diff --git a/scribo/demo/wizard/src/load_page.cc b/scribo/demo/wizard/src/load_page.cc deleted file mode 100644 index 69c2f7f..0000000 --- a/scribo/demo/wizard/src/load_page.cc +++ /dev/null @@ -1,71 +0,0 @@ -#include <src/load_page.hh> - -namespace scribo -{ - - namespace demo - { - - - load_page::load_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new load_widget(this); - - QStringList filters; - filters << tr("PNG image (*.png)") - << tr("JPEG image (*.jpg *.jpeg *.jpe)") - << tr("PNM image (*.pnm *.pbm *.pgm *.ppm)"); - widget_->setDialogFilter(filters); - - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setSubTitle("Choose a file to load"); - setTitle("Image loading"); - - registerField("load.file_path*", widget_, - "path", SIGNAL(path_updated())); - - registerField("load.must_crop", widget_, "must_crop"); - registerField("load.must_rotate", widget_, "must_rotate"); - - registerField("load.input_dsp", this, "input_dsp"); - - } - - - void load_page::cleanupPage() - { - widget_->reset(); - } - - - void load_page::initializePage() - { - cleanupPage(); - } - - - bool load_page::validatePage() - { - input_dsp_ = QPixmap(widget_->path()); - return true; - } - - - const QPixmap& load_page::input_dsp() const - { - return input_dsp_; - } - - void load_page::set_input_dsp(const QPixmap& pixmap) - { - input_dsp_ = pixmap; - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/load_page.hh b/scribo/demo/wizard/src/load_page.hh deleted file mode 100644 index f3b5ec8..0000000 --- a/scribo/demo/wizard/src/load_page.hh +++ /dev/null @@ -1,67 +0,0 @@ -// 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_DEMO_SHARED_SRC_LOAD_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_LOAD_PAGE_HH - -# include <QtGui> -# include <src/load_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - class load_page : public QWizardPage - { - Q_OBJECT; - - Q_PROPERTY(QPixmap input_dsp READ input_dsp WRITE set_input_dsp); - - public: - load_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - virtual bool validatePage(); -// virtual bool isComplete(); - - const QPixmap& input_dsp() const; - void set_input_dsp(const QPixmap& pixmap); - - private: - load_widget *widget_; - QPixmap input_dsp_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_LOAD_PAGE_HH diff --git a/scribo/demo/wizard/src/load_widget.cc b/scribo/demo/wizard/src/load_widget.cc deleted file mode 100644 index 1f327af..0000000 --- a/scribo/demo/wizard/src/load_widget.cc +++ /dev/null @@ -1,56 +0,0 @@ -#include <src/load_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - load_widget::load_widget(QWidget *parent) - : browse_widget(parent) - { - QGroupBox *group_box = new QGroupBox(tr("Options"), this); - - QVBoxLayout *layout = new QVBoxLayout(group_box); - layout->setSizeConstraint(QLayout::SetMaximumSize); - must_crop_ = new QCheckBox(tr("Select a region of interest"), - group_box); - must_rotate_ = new QCheckBox(tr("Perform a manual rotation"), - group_box); - - layout->addWidget(must_crop_); - layout->addWidget(must_rotate_); - - - QSpacerItem* - vspacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, - QSizePolicy::Expanding); - - gridLayout_2->addWidget(group_box, 2, 1); - gridLayout_2->addItem(vspacer, 3, 1, 1, 1); - - gridLayout_2->setSizeConstraint(QLayout::SetMaximumSize); - } - - void load_widget::reset() - { - browse_widget::reset(); - must_crop_->setChecked(false); - must_rotate_->setChecked(false); - } - - bool load_widget::must_crop() const - { - return must_crop_->isChecked(); - } - - bool load_widget::must_rotate() const - { - return must_rotate_->isChecked(); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/load_widget.hh b/scribo/demo/wizard/src/load_widget.hh deleted file mode 100644 index d7cf4e5..0000000 --- a/scribo/demo/wizard/src/load_widget.hh +++ /dev/null @@ -1,64 +0,0 @@ -// 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_DEMO_SHARED_SRC_LOAD_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_LOAD_WIDGET_HH - -# include <QtGui> -# include <shared/src/browse_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - class load_widget : public shared::browse_widget - { - Q_OBJECT; - - Q_PROPERTY(bool must_crop READ must_crop); - Q_PROPERTY(bool must_rotate READ must_rotate); - - public: - load_widget(QWidget *parent = 0); - void reset(); - - bool must_crop() const; - bool must_rotate() const; - - private: // attributes. - QCheckBox *must_crop_; - QCheckBox *must_rotate_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_LOAD_WIDGET_HH diff --git a/scribo/demo/wizard/src/main.cc b/scribo/demo/wizard/src/main.cc deleted file mode 100644 index 5b771e2..0000000 --- a/scribo/demo/wizard/src/main.cc +++ /dev/null @@ -1,28 +0,0 @@ -#include <QtGui> -#include <src/main_window.hh> -#include <src/preprocessing_task.hh> - -namespace scribo { namespace demo {extern QString basedir_; } } - -int main(int argc, char* argv[]) -{ - QApplication app(argc, argv); - - qRegisterMetaType<preprocessing_task_set_t>("preprocessing_task_set_t"); - - - if (argc == 2) - { - scribo::demo::basedir_ = argv[1]; - } - else - { - qDebug() << "Usage: " << argv[0] << " <path_to_scribo/src>"; - return 1; - } - - scribo::demo::wizard::main_window win; - win.show(); - - return app.exec(); -} diff --git a/scribo/demo/wizard/src/main_window.cc b/scribo/demo/wizard/src/main_window.cc deleted file mode 100644 index 2af6c82..0000000 --- a/scribo/demo/wizard/src/main_window.cc +++ /dev/null @@ -1,144 +0,0 @@ -// 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 <src/main_window.hh> - -#include <src/load_page.hh> -#include <src/doc_type_page.hh> -#include <src/crop_page.hh> -#include <src/preprocessing_page.hh> -#include <src/process_page.hh> -#include <src/rotate_page.hh> -#include <src/result_page.hh> - -namespace scribo -{ - - namespace demo - { - - namespace wizard - { - - - main_window::main_window() - : QWizard(0, Qt::Window) - { -// QPixmap bg_pixmap(":/images/images/dematerialization.png"); -// setPixmap(QWizard::WatermarkPixmap, bg_pixmap); -// setPixmap(QWizard::BackgroundPixmap, bg_pixmap); - - - connect(this, SIGNAL(currentIdChanged(int)), - this, SLOT(showCustomButton_slot(int))); - - - // Page_Load - load_page* page_load = new load_page(this); - addPage(page_load); - - // Page_Task - doc_type_page* page_doc_type = new doc_type_page(this); - addPage(page_doc_type); - - // Page_Crop - crop_page* page_crop = new crop_page(this); - addPage(page_crop); - - // Page_Crop - rotate_page* page_rotate = new rotate_page(this); - addPage(page_rotate); - - // Page_Preprocessing - preprocessing_page* - page_preprocessing = new preprocessing_page(this); - addPage(page_preprocessing); - - // Page_Processing - process_page *page_process = new process_page(this); - addPage(page_process); - - // Page_Result - addPage(new result_page(this)); - } - - - int main_window::nextId() const - { - switch (currentId()) - { - case Page_Load: - if (field("load.must_crop").toBool()) - return Page_Crop; - else if (field("load.must_rotate").toBool()) - return Page_Rotate; - else - return Page_Task; - - case Page_Crop: - if (field("load.must_rotate").toBool()) - return Page_Rotate; - else - return Page_Task; - - case Page_Rotate: - return Page_Task; - - case Page_Task: - return Page_Preprocessing; - - case Page_Preprocessing: - return Page_Process; - - case Page_Process: - return Page_Result; - - case Page_Result: - return -1; - - default: - qDebug() << "Warning: using default nextId() case."; - return currentId() + 1; - } - } - - - void main_window::showCustomButton_slot(int id) - { - if (id == Page_Result) - setOptions(options() | QWizard::HaveCustomButton1); - else - { - setOptions(QWizard::NoBackButtonOnStartPage -// | QWizard::DisabledBackButtonOnLastPage - | QWizard::NoCancelButton); - } - } - - } // end of namespace scribo::demo::wizard - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/main_window.hh b/scribo/demo/wizard/src/main_window.hh deleted file mode 100644 index 44e6d92..0000000 --- a/scribo/demo/wizard/src/main_window.hh +++ /dev/null @@ -1,72 +0,0 @@ -// 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_DEMO_WIZARD_SRC_MAIN_WINDOW_HH -# define SCRIBO_DEMO_WIZARD_SRC_MAIN_WINDOW_HH - -# include <QtGui/QWizard> -//# include <ui_main_window.h> - -namespace scribo -{ - - namespace demo - { - - namespace wizard - { - - - class main_window : public QWizard - { - Q_OBJECT; - - public: - main_window(); - - virtual int nextId() const; - - private slots: - void showCustomButton_slot(int id); - - private: - enum { Page_Load, - Page_Task, - Page_Crop, - Page_Rotate, - Page_Preprocessing, - Page_Process, - Page_Result }; - }; - - - } // end of namespace scribo::demo::wizard - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_WIZARD_SRC_MAIN_WINDOW_HH diff --git a/scribo/demo/wizard/src/mln_widgets.cc b/scribo/demo/wizard/src/mln_widgets.cc deleted file mode 100644 index 621cc6f..0000000 --- a/scribo/demo/wizard/src/mln_widgets.cc +++ /dev/null @@ -1,7 +0,0 @@ -#undef MLN_INCLUDE_ONLY - -// Widgets -#include <shared/src/image_viewer.cc> - -// Misc -#include <src/runner.cc> diff --git a/scribo/demo/wizard/src/preprocessing_page.cc b/scribo/demo/wizard/src/preprocessing_page.cc deleted file mode 100644 index f727581..0000000 --- a/scribo/demo/wizard/src/preprocessing_page.cc +++ /dev/null @@ -1,61 +0,0 @@ -#include <src/preprocessing_page.hh> - -namespace scribo -{ - - namespace demo - { - - - preprocessing_page::preprocessing_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new preprocessing_widget(this); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setTitle("Preprocessing tasks"); - setSubTitle("Choose preprocessing algorithms."); - - registerField("preprocessing.tasks", this, "tasks"); - } - - - void preprocessing_page::cleanupPage() - { - widget_->reset(); - } - - - void preprocessing_page::initializePage() - { - if (field("doc_type.type_text_doc").toBool()) - widget_->setup_text_doc(); - else if (field("doc_type.type_mixed_doc").toBool()) - widget_->setup_mixed_doc(); - else if (field("doc_type.type_picture").toBool()) - widget_->setup_picture(); - else - qDebug() << "preprocessing_page - initializePage - invalid document type"; - } - - - const preprocessing_task_set_t& preprocessing_page::tasks() const - { - return tasks_; - } - - - bool preprocessing_page::validatePage() - { - tasks_ = widget_->tasks(); - return true; - } - - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/preprocessing_page.hh b/scribo/demo/wizard/src/preprocessing_page.hh deleted file mode 100644 index 1cfbea9..0000000 --- a/scribo/demo/wizard/src/preprocessing_page.hh +++ /dev/null @@ -1,66 +0,0 @@ -// 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_DEMO_SHARED_SRC_PREPROCESSING_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_PAGE_HH - -# include <QtGui> -# include <src/preprocessing_widget.hh> -# include <src/preprocessing_task.hh> - -namespace scribo -{ - - namespace demo - { - - - class preprocessing_page : public QWizardPage - { - Q_OBJECT; - - Q_PROPERTY(preprocessing_task_set_t tasks READ tasks); - - public: - preprocessing_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - virtual bool validatePage(); - - const preprocessing_task_set_t& tasks() const; - - private: - preprocessing_widget *widget_; - preprocessing_task_set_t tasks_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_PAGE_HH diff --git a/scribo/demo/wizard/src/preprocessing_task.hh b/scribo/demo/wizard/src/preprocessing_task.hh deleted file mode 100644 index 5c335b7..0000000 --- a/scribo/demo/wizard/src/preprocessing_task.hh +++ /dev/null @@ -1,61 +0,0 @@ -// 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_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH -# define SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH - -# include <QSet> - - -namespace scribo -{ - - namespace demo - { - - enum Preprocessing_Task - { - RemoveBg = 0, - Unskew, - RemoveNoise, - ImproveContrast, - ReduceSize, - - BinarizationSimple, - BinarizationSauvola, - BinarizationSauvolaMs, - - PREPROCESSING_TASK_COUNT // Invalid task. - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - -typedef QSet<scribo::demo::Preprocessing_Task> preprocessing_task_set_t; -Q_DECLARE_METATYPE(preprocessing_task_set_t); - -#endif // !SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_TASK_HH diff --git a/scribo/demo/wizard/src/preprocessing_widget.cc b/scribo/demo/wizard/src/preprocessing_widget.cc deleted file mode 100644 index 7c66719..0000000 --- a/scribo/demo/wizard/src/preprocessing_widget.cc +++ /dev/null @@ -1,93 +0,0 @@ -#include <src/preprocessing_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - preprocessing_widget::preprocessing_widget(QWidget *parent) - : QWidget(parent) - { - setupUi(this); - } - - void preprocessing_widget::reset() - { - binarizationCBox->setCurrentIndex(2); // Sauvola ms - clear_checked(); - } - - void preprocessing_widget::setup_picture() - { - qDebug() << "setup picture"; - - removeBg->setChecked(true); - } - - void preprocessing_widget::setup_mixed_doc() - { - qDebug() << "setup mixed doc"; - } - - void preprocessing_widget::setup_text_doc() - { - qDebug() << "setup text doc"; - - // Disabled - removeBg->setChecked(false); - unskew->setChecked(false); - - // Enabled - removeNoise->setChecked(true); - improveContrast->setChecked(true); - } - - - void preprocessing_widget::clear_checked() - { - // Enabled - - // Disabled - removeBg->setChecked(false); - unskew->setChecked(false); - removeNoise->setChecked(false); - improveContrast->setChecked(false); - reduceSize->setChecked(false); - } - - - preprocessing_task_set_t preprocessing_widget::tasks() const - { - preprocessing_task_set_t tasks; - - if (removeBg->isChecked()) - tasks.insert(RemoveBg); - - if (unskew->isChecked()) - tasks.insert(Unskew); - - if (removeNoise->isChecked()) - tasks.insert(RemoveNoise); - - if (improveContrast->isChecked()) - tasks.insert(ImproveContrast); - - if (reduceSize->isChecked()) - tasks.insert(ReduceSize); - - if (binarizationCBox->currentIndex() == 0) - tasks.insert(BinarizationSimple); - else if (binarizationCBox->currentIndex() == 1) - tasks.insert(BinarizationSauvola); - else if (binarizationCBox->currentIndex() == 2) - tasks.insert(BinarizationSauvolaMs); - - return tasks; - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/preprocessing_widget.hh b/scribo/demo/wizard/src/preprocessing_widget.hh deleted file mode 100644 index fff268d..0000000 --- a/scribo/demo/wizard/src/preprocessing_widget.hh +++ /dev/null @@ -1,65 +0,0 @@ -// 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_DEMO_SHARED_SRC_PREPROCESSING_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_WIDGET_HH - -# include <QtGui> -# include <ui_preprocessing_widget.h> -# include <src/preprocessing_task.hh> - -namespace scribo -{ - - namespace demo - { - - - class preprocessing_widget : public QWidget, - private Ui::PreprocessingWidget - { - Q_OBJECT; - - public: - preprocessing_widget(QWidget *parent = 0); - void reset(); - - void setup_picture(); - void setup_mixed_doc(); - void setup_text_doc(); - - preprocessing_task_set_t tasks() const; - - private: // members - void clear_checked(); - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_PREPROCESSING_WIDGET_HH diff --git a/scribo/demo/wizard/src/process_page.cc b/scribo/demo/wizard/src/process_page.cc deleted file mode 100644 index bff087a..0000000 --- a/scribo/demo/wizard/src/process_page.cc +++ /dev/null @@ -1,68 +0,0 @@ -#include <src/process_page.hh> -#include <src/process_widget.hh> -#include <src/preprocessing_task.hh> - - -namespace scribo -{ - - namespace demo - { - - - process_page::process_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new process_widget(this); - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setSubTitle("Processing..."); - setTitle("Please wait while computing results."); - - connect(&runner_, SIGNAL(new_intermediate_result(const QImage&)), - widget_, SLOT(update_pixmap(const QImage&))); - - connect(&runner_, SIGNAL(new_progress_max_value(unsigned)), - widget_, SLOT(set_progress_max_value(unsigned))); - - connect(&runner_, SIGNAL(new_progress_label(const QString&)), - widget_, SLOT(update_progress_label(const QString&))); - - connect(&runner_, SIGNAL(progress(unsigned)), - widget_, SLOT(progress(unsigned))); - } - - - void process_page::cleanupPage() - { - widget_->reset(); - runner_.stop(); - } - - - void process_page::initializePage() - { - runner_.start(field("load.input_dsp").value<QPixmap>().toImage(), - get_doc_type(), - field("preprocessing.tasks").value<preprocessing_task_set_t>()); - } - - - Doc_Type process_page::get_doc_type() - { - if (field("doc_type.type_text_doc").toBool()) - return Text_Doc; - else if (field("doc_type.type_picture").toBool()) - return Picture; - else if (field("doc_type.type_mixed_doc").toBool()) - return Mixed_Doc; - - return Invalid_Doc; - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/process_page.hh b/scribo/demo/wizard/src/process_page.hh deleted file mode 100644 index 6425a53..0000000 --- a/scribo/demo/wizard/src/process_page.hh +++ /dev/null @@ -1,64 +0,0 @@ -// 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_DEMO_SHARED_SRC_PROCESS_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_PROCESS_PAGE_HH - -# include <QtGui> -# include <src/process_widget.hh> -# include <src/runner.hh> - -namespace scribo -{ - - namespace demo - { - - - class process_page : public QWizardPage - { - Q_OBJECT; - - public: - process_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - - private: // members - Doc_Type get_doc_type(); - - private: // attributes - process_widget* widget_; - runner runner_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_PROCESS_PAGE_HH diff --git a/scribo/demo/wizard/src/process_widget.cc b/scribo/demo/wizard/src/process_widget.cc deleted file mode 100644 index c0d652f..0000000 --- a/scribo/demo/wizard/src/process_widget.cc +++ /dev/null @@ -1,80 +0,0 @@ -#include <src/process_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - process_widget::process_widget(QWidget *parent) - : QWidget(parent) - { - view_ = new QGraphicsView(this); - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(view_); - setLayout(layout); - - QVBoxLayout *progress_layout = new QVBoxLayout; - progress_bar_ = new QProgressBar(this); - progress_bar_->setMinimum(0); - progress_label_ = new QLabel("Processing..."); - progress_layout->addWidget(progress_bar_); - progress_layout->addWidget(progress_label_); - - progress_dialog_ = new QWidget(); - progress_dialog_->setLayout(progress_layout); - - view_->setScene(new QGraphicsScene()); - progress_ = view_->scene()->addWidget(progress_dialog_); - progress_->setZValue(1); - - image_ = view_->scene()->addPixmap(QPixmap()); - } - - void process_widget::reset() - { - progress_bar_->show(); - progress_bar_->setValue(0); - progress_bar_->setMaximum(0); - image_->setPixmap(QPixmap()); - } - - void process_widget::set_progress_max_value(unsigned max) - { - progress_bar_->setMaximum(max); - } - - void process_widget::update_pixmap(const QImage& image) - { - image_->setPixmap(QPixmap::fromImage(image)); - } - - void process_widget::progress(unsigned i) - { - progress_bar_->setValue(progress_bar_->value() + i); - - if (progress_bar_->value() == progress_bar_->maximum()) - progress_->hide(); - } - - void process_widget::update_progress_label(const QString& msg) - { - progress_label_->setText(msg); - } - - void process_widget::resizeEvent(QResizeEvent* event) - { - QPoint tmp(view_->geometry().center().x() - - progress_->boundingRect().width() / 2, - view_->geometry().center().y() - - progress_->boundingRect().height() / 2); - - progress_->setPos(view_->mapToScene(tmp)); - - event->ignore(); - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/process_widget.hh b/scribo/demo/wizard/src/process_widget.hh deleted file mode 100644 index 8c0ed88..0000000 --- a/scribo/demo/wizard/src/process_widget.hh +++ /dev/null @@ -1,71 +0,0 @@ -// 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_DEMO_SHARED_SRC_PROCESS_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_PROCESS_WIDGET_HH - -# include <QtGui> - -namespace scribo -{ - - namespace demo - { - - - class process_widget : public QWidget - { - Q_OBJECT; - - public: - process_widget(QWidget *parent = 0); - void reset(); - - public slots: - void set_progress_max_value(unsigned max); - void update_pixmap(const QImage& image); - void progress(unsigned i); - void update_progress_label(const QString& msg); - - virtual void resizeEvent(QResizeEvent* event); - - private: - QGraphicsView *view_; - QGraphicsPixmapItem *image_; - - QLabel *progress_label_; - QProgressBar* progress_bar_; - QWidget* progress_dialog_; - - QGraphicsProxyWidget* progress_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_PROCESS_WIDGET_HH diff --git a/scribo/demo/wizard/src/result_page.cc b/scribo/demo/wizard/src/result_page.cc deleted file mode 100644 index 1bb08d8..0000000 --- a/scribo/demo/wizard/src/result_page.cc +++ /dev/null @@ -1,43 +0,0 @@ -#include <src/result_page.hh> -#include <src/result_widget.hh> - - -namespace scribo -{ - - namespace demo - { - - - result_page::result_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new result_widget(this); - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setTitle("Result"); - setSubTitle("Copy and paste the recognized text."); - - connect(parent, SIGNAL(customButtonClicked(int)), - parent, SLOT(restart())); - } - - - void result_page::cleanupPage() - { - widget_->reset(); - } - - - void result_page::initializePage() - { - setButtonText(QWizard::CustomButton1, "restart"); - widget_->load("/tmp/out.txt"); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/result_page.hh b/scribo/demo/wizard/src/result_page.hh deleted file mode 100644 index c6f02b9..0000000 --- a/scribo/demo/wizard/src/result_page.hh +++ /dev/null @@ -1,60 +0,0 @@ -// 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_DEMO_SHARED_SRC_RESULT_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_RESULT_PAGE_HH - -# include <QtGui> -# include <src/result_widget.hh> -# include <src/runner.hh> - -namespace scribo -{ - - namespace demo - { - - - class result_page : public QWizardPage - { - Q_OBJECT; - - public: - result_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - - private: // attributes - result_widget* widget_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_RESULT_PAGE_HH diff --git a/scribo/demo/wizard/src/result_widget.cc b/scribo/demo/wizard/src/result_widget.cc deleted file mode 100644 index 889ba4b..0000000 --- a/scribo/demo/wizard/src/result_widget.cc +++ /dev/null @@ -1,43 +0,0 @@ -#include <src/result_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - result_widget::result_widget(QWidget *parent) - : QWidget(parent) - { - text_ = new QTextEdit(this); - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(text_); - setLayout(layout); - } - - void result_widget::load(const QString& filename) - { - QFile file(filename); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) - return; - - QTextStream in(&file); - in.setCodec("UTF-8"); - while (!in.atEnd()) - { - QString line = in.readLine(); - text_->append(line); - } - - } - - void result_widget::reset() - { - text_->clear(); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/result_widget.hh b/scribo/demo/wizard/src/result_widget.hh deleted file mode 100644 index 4472238..0000000 --- a/scribo/demo/wizard/src/result_widget.hh +++ /dev/null @@ -1,58 +0,0 @@ -// 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_DEMO_SHARED_SRC_RESULT_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_RESULT_WIDGET_HH - -# include <QtGui> - -namespace scribo -{ - - namespace demo - { - - - class result_widget : public QWidget - { - Q_OBJECT; - - public: - result_widget(QWidget *parent = 0); - void reset(); - - void load(const QString& filename); - - private: - QTextEdit *text_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_RESULT_WIDGET_HH diff --git a/scribo/demo/wizard/src/rotate_page.cc b/scribo/demo/wizard/src/rotate_page.cc deleted file mode 100644 index 9b17a5d..0000000 --- a/scribo/demo/wizard/src/rotate_page.cc +++ /dev/null @@ -1,45 +0,0 @@ -#include <src/rotate_page.hh> - -namespace scribo -{ - - namespace demo - { - - - rotate_page::rotate_page(QWidget *parent) - : QWizardPage(parent) - { - widget_ = new rotate_widget(this); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(widget_); - setLayout(layout); - - setTitle("Rotation."); - setSubTitle("Rotate the input image using the buttons above."); - - } - - - void rotate_page::cleanupPage() - { - } - - - void rotate_page::initializePage() - { - widget_->load_image(field("load.input_dsp").value<QPixmap>()); - } - - - bool rotate_page::isComplete() - { - setField("load.input_dsp", widget_->image()); - return true; - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/rotate_page.hh b/scribo/demo/wizard/src/rotate_page.hh deleted file mode 100644 index 21c2074..0000000 --- a/scribo/demo/wizard/src/rotate_page.hh +++ /dev/null @@ -1,60 +0,0 @@ -// 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_DEMO_SHARED_SRC_ROTATE_PAGE_HH -# define SCRIBO_DEMO_SHARED_SRC_ROTATE_PAGE_HH - -# include <QtGui> -# include <src/rotate_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - class rotate_page : public QWizardPage - { - Q_OBJECT; - - public: - rotate_page(QWidget *parent = 0); - - virtual void cleanupPage(); - virtual void initializePage(); - virtual bool isComplete(); - - private: - rotate_widget *widget_; - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_ROTATE_PAGE_HH diff --git a/scribo/demo/wizard/src/rotate_widget.cc b/scribo/demo/wizard/src/rotate_widget.cc deleted file mode 100644 index 41de670..0000000 --- a/scribo/demo/wizard/src/rotate_widget.cc +++ /dev/null @@ -1,38 +0,0 @@ -#include <src/rotate_widget.hh> - -namespace scribo -{ - - namespace demo - { - - - rotate_widget::rotate_widget(QWidget *parent) - : QWidget(parent) - { - setupUi(this); - } - - - void rotate_widget::load_image(const QPixmap& pixmap) - { - viewer_->draw_image(pixmap); - viewer_->set_rotation_enabled(true); - } - - - const QRectF& rotate_widget::rotate_area() const - { - return viewer_->selection(); - } - - - QPixmap rotate_widget::image() const - { - return viewer_->image(); - } - - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/rotate_widget.hh b/scribo/demo/wizard/src/rotate_widget.hh deleted file mode 100644 index 8465f98..0000000 --- a/scribo/demo/wizard/src/rotate_widget.hh +++ /dev/null @@ -1,62 +0,0 @@ -// 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_DEMO_SHARED_SRC_ROTATE_WIDGET_HH -# define SCRIBO_DEMO_SHARED_SRC_ROTATE_WIDGET_HH - -# include <QtGui> -# include <ui_rotate_widget.h> - -namespace scribo -{ - - namespace demo - { - - - class rotate_widget : public QWidget, private Ui::RotateWidget - { - Q_OBJECT; - - Q_PROPERTY(QRectF rotate_area READ rotate_area); - - public: - rotate_widget(QWidget *parent = 0); - - void load_image(const QPixmap& pixmap); - - const QRectF& rotate_area() const; - - QPixmap image() const; - - }; - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_ROTATE_WIDGET_HH diff --git a/scribo/demo/wizard/src/runner.cc b/scribo/demo/wizard/src/runner.cc deleted file mode 100644 index 7e888f6..0000000 --- a/scribo/demo/wizard/src/runner.cc +++ /dev/null @@ -1,296 +0,0 @@ -#include <src/runner.hh> - -#include <shared/src/to_mln_image.hh> -#include <src/preprocessing_task.hh> -#include <src/doc_type.hh> - -#include <mln/convert/to_qimage.hh> -#include <mln/convert/to_qimage_nocopy.hh> -#include <mln/fun/v2v/rgb_to_int_u.hh> -#include <mln/value/int_u8.hh> -#include <mln/data/convert.hh> -#include <mln/io/pbm/save.hh> - -#include <scribo/preprocessing/split_bg_fg.hh> -#include <scribo/preprocessing/denoise.hh> -#include <scribo/preprocessing/homogeneous_contrast.hh> -#include <scribo/preprocessing/unskew.hh> -#include <scribo/binarization/sauvola.hh> -#include <scribo/binarization/sauvola_ms.hh> -#include <scribo/binarization/global_threshold_auto.hh> - -#include <mln/logical/not.hh> - -namespace scribo -{ - - namespace demo - { - - QString basedir_ = ""; - - runner::runner(QObject *parent) - : QThread(parent) - { - process_.moveToThread(this); - } - - - void runner::start(const QImage& input, - const Doc_Type& doc_type, - const preprocessing_task_set_t& tasks) - { - input_ = input; - doc_type_ = doc_type; - tasks_ = tasks; - - QThread::start(); - } - - - void runner::run() - { - // Notification of the number of tasks. - emit new_progress_max_value(tasks_.size() + 2); - - qDebug() << "progress steps : " << tasks_.size() + 2; - - image2d<value::qt::rgb32> ima = load(); - - preprocess(ima); - - process(); - } - - - image2d<value::qt::rgb32> runner::load() - { - emit new_progress_label("Loading image"); - - // FIXME: specify the right top left corner. - // This is relevant when the image is cropped... - image2d<value::qt::rgb32> - output = shared::to_mln_image(input_, QPoint(0, 0)); - - QImage q_ima = convert::to_qimage_nocopy(output); - q_ima.save("/tmp/tmp.ppm"); - -// io::magick::load(output, filename_.toStdString()); - - emit progress(1); - emit new_intermediate_result(input_); - - return output; - } - - - void runner::preprocess(const image2d<value::qt::rgb32>& ima) - { - - image2d<value::rgb8> tmp_color; - io::ppm::load(tmp_color, "/tmp/tmp.ppm"); - - image2d<bool> out_bool; - - - //================== - // Remove background - //================== - if (tasks_.contains(RemoveBg)) - { - std::cout << "Foreground extraction" << std::endl; - emit new_progress_label("Foreground Extraction"); - - QStringList args; - args << "/tmp/tmp.ppm" << "10000" << "32" - << "/tmp/tmp.ppm" << "/dev/null"; - if (process_.execute(basedir_ + "/preprocessing/split_bg_fg", args)) - { - qDebug() << "Error running split_bg_fg"; - return; - } - - emit progress(1); - emit new_intermediate_result(mln::convert::to_qimage(tmp_color)); - } - - - //============================================= - // Convert to grayscale image (always happens). - //============================================= - emit new_progress_label("Convert to gray-scale image"); - image2d<value::int_u8> - intensity_ima = data::transform(tmp_color, - mln::fun::v2v::rgb_to_int_u<8>()); - emit progress(1); - - - //============================= - // Improve contrast homogeneity - //============================= - if (tasks_.contains(ImproveContrast)) - { - std::cout << "Improve contrast homogeneity" << std::endl; - emit new_progress_label("Improve contrast homogeneity"); - - intensity_ima = arith::revert(preprocessing::homogeneous_contrast(intensity_ima, 75)); - - image2d<value::qt::rgb32> - tmp_color32 = data::convert(value::qt::rgb32(), intensity_ima); - emit new_intermediate_result(convert::to_qimage(tmp_color32)); - emit progress(1); - } - - - //============================== - // Binarization (always happens) - //============================== - emit new_progress_label("Binarization"); - - if (tasks_.contains(BinarizationSauvola)) - { - // FIXME: sauvola should not negate the image. - std::cout << "Binarization Sauvola" << std::endl; - out_bool = binarization::sauvola(intensity_ima); - } - else if (tasks_.contains(BinarizationSauvolaMs)) - { - // FIXME: sauvola should not negate the image. - std::cout << "Binarization Sauvola_ms" << std::endl; - out_bool = binarization::sauvola_ms(intensity_ima, 51, 2); - } - else if (tasks_.contains(BinarizationSimple)) - { - std::cout << "Binarization Simple" << std::endl; - out_bool = scribo::binarization::global_threshold_auto(intensity_ima); - } - else - { - std::cout << "Binary image conversion" << std::endl; - out_bool = data::convert(bool(), intensity_ima); - } - - image2d<value::qt::rgb32> - tmp_color32 = data::convert(value::qt::rgb32(), out_bool); - emit new_intermediate_result(convert::to_qimage(tmp_color32)); - emit progress(1); - - - // FIXME: remove! - logical::not_inplace(out_bool); - - //======== - // Denoise - //======== -// if (tasks_.contains(RemoveNoise)) -// { -// std::cout << "Remove noise" << std::endl; -// emit new_progress_label("Remove noise"); - -// out_bool = preprocessing::denoise(out_bool, c8(), 2, 2); - -// image2d<value::qt::rgb32> -// tmp_color32 = data::convert(value::qt::rgb32(), out_bool); -// emit new_intermediate_result(convert::to_qimage(tmp_color32)); -// emit progress(1); -// } - - //======= - // Unskew - //======= - if (tasks_.contains(Unskew)) - { - std::cout << "Unskew" << std::endl; - emit new_progress_label("Unskew"); - - out_bool = scribo::preprocessing::unskew(out_bool).first(); - - image2d<value::qt::rgb32> - tmp_color32 = data::convert(value::qt::rgb32(), out_bool); - emit new_intermediate_result(convert::to_qimage(tmp_color32)); - emit progress(1); - } - - - //========================= - // Save preprocessed image. - //========================= - io::pbm::save(out_bool, "/tmp/tmp.pbm"); - } - - - void runner::process() - { - QStringList args; - - - // FIXME: require binaries to ask for a filename for bboxes - // output files. - switch(doc_type_) - { - case Text_Doc: - emit new_progress_label("Finding text in document..."); - qDebug() << "Running text_in_article_pbm"; - args << "/tmp/tmp.pbm" << "/tmp/out.txt"; - - // Denoise. - if (! tasks_.contains(RemoveNoise)) - args << "0"; - else - { - args << "1"; - emit progress(1); // Consider denoising as done even though it is performed later. - } - - args << "/tmp/"; - - if (process_.execute(basedir_ + "/text_in_article_pbm", args)) - { - qDebug() << "Error while running text_in_article_pbm."; - return; - } - break; - - case Picture: - emit new_progress_label("Finding text in picture..."); - qDebug() << "Running text_in_photo_pbm_fast"; - args << "/tmp/tmp.pbm" << "/tmp/out.ppm" << "1" << "1" << "1"; - if (process_.execute(basedir_ + "/text_in_photo_pbm_fast", args)) - { - qDebug() << "Error while running text_in_photo_pbm_fast."; - return; - } - break; - - case Mixed_Doc: - qDebug() << "Running pbm_text_in_mixed_doc"; - if (process_.execute(basedir_ + "/pbm_text_in_mixed_doc", args)) - { - qDebug() << "Error while running pbm_text_in_mixed_doc."; - return; - } - break; - - default: - case Invalid_Doc: - qDebug() << "runner - Invalid doc type..."; - return; - } - - process_.waitForFinished(-1); - - emit progress(1); - emit new_intermediate_result(QImage("/tmp/_09_step2_bboxes.ppm")); - qDebug() << "Done"; - } - - - void runner::stop() - { - process_.kill(); - terminate(); - } - - } // end of namespace scribo::demo - -} // end of namespace scribo diff --git a/scribo/demo/wizard/src/runner.hh b/scribo/demo/wizard/src/runner.hh deleted file mode 100644 index 4dcedc0..0000000 --- a/scribo/demo/wizard/src/runner.hh +++ /dev/null @@ -1,84 +0,0 @@ -// 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_DEMO_SHARED_SRC_RUNNER_HH -# define SCRIBO_DEMO_SHARED_SRC_RUNNER_HH - -# include <QtGui> -# include <QProcess> - -# include <src/preprocessing_task.hh> -# include <src/doc_type.hh> - -# include <mln/core/image/image2d.hh> -# include <mln/value/qt/rgb32.hh> - -namespace scribo -{ - - namespace demo - { - - - class runner : public QThread - { - Q_OBJECT; - - public: - runner(QObject *parent = 0); - - void start(const QImage& input, - const Doc_Type& doc_type, - const preprocessing_task_set_t& tasks); - - void stop(); - - signals: - void new_intermediate_result(const QImage& ima); - void new_progress_max_value(unsigned i); - void new_progress_label(const QString& msg); - void progress(unsigned i); - - private: // members - mln::image2d<mln::value::qt::rgb32> load(); - void preprocess(const mln::image2d<mln::value::qt::rgb32>& ima); - void process(); - virtual void run(); - - private: // attributes - QProcess process_; - Doc_Type doc_type_; - QSet<Preprocessing_Task> tasks_; - QImage input_; - }; - - - - } // end of namespace scribo::demo - -} // end of namespace scribo - - -#endif // ! SCRIBO_DEMO_SHARED_SRC_RUNNER_HH diff --git a/scribo/demo/wizard/src/test.cc b/scribo/demo/wizard/src/test.cc deleted file mode 100644 index 3d95db6..0000000 --- a/scribo/demo/wizard/src/test.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include <QtGui> -#include <shared/src/image_viewer.hh> -#include <shared/src/crop_item.hh> - -int main(int argc, char* argv[]) -{ - QApplication app(argc, argv); - - scribo::demo::shared::image_viewer win; - win.show(); - win.draw_image(QPixmap("image.jpg"), QPoint(0,0)); - - win.setSelectionEnabled(true); - - return app.exec(); -} diff --git a/scribo/demo/wizard/ui/doc_type_widget.ui b/scribo/demo/wizard/ui/doc_type_widget.ui deleted file mode 100644 index 39c8422..0000000 --- a/scribo/demo/wizard/ui/doc_type_widget.ui +++ /dev/null @@ -1,115 +0,0 @@ -<ui version="4.0" > - <class>DocTypeWidget</class> - <widget class="QWidget" name="DocTypeWidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>166</width> - <height>140</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > - <number>0</number> - </property> - <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" > - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Document type</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <widget class="QRadioButton" name="type_text_doc_" > - <property name="text" > - <string>Text Document </string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="type_picture_" > - <property name="text" > - <string>Picture</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="type_mixed_doc_" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>Mixed document</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="2" > - <spacer name="horizontalSpacer_3" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/wizard/ui/load_widget.ui b/scribo/demo/wizard/ui/load_widget.ui deleted file mode 100644 index db0dbc4..0000000 --- a/scribo/demo/wizard/ui/load_widget.ui +++ /dev/null @@ -1,110 +0,0 @@ -<ui version="4.0" > - <class>Form</class> - <widget class="QWidget" name="Form" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>76</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" > - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>83</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" colspan="2" > - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="scribo::demo::shared::browse_widget" native="1" name="widget" /> - </item> - <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Options</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <widget class="QCheckBox" name="checkBox" > - <property name="text" > - <string>Select a region of interest</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBox_2" > - <property name="text" > - <string>Perform a manual rotation</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </item> - <item row="1" column="3" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>83</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>76</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>scribo::demo::shared::browse_widget</class> - <extends>QWidget</extends> - <header location="global" >shared/src/browse_widget.hh</header> - <container>1</container> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/wizard/ui/main_window.ui b/scribo/demo/wizard/ui/main_window.ui deleted file mode 100644 index 0facd09..0000000 --- a/scribo/demo/wizard/ui/main_window.ui +++ /dev/null @@ -1,216 +0,0 @@ -<ui version="4.0" > - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>507</width> - <height>476</height> - </rect> - </property> - <property name="windowTitle" > - <string>MainWindow</string> - </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > - <number>0</number> - </property> - <item> - <widget class="QStackedWidget" name="stackedWidget" > - <property name="currentIndex" > - <number>0</number> - </property> - <widget class="QWidget" name="page_3" > - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <widget class="scribo::demo::shared::wizard_title_widget" native="1" name="title_0" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item> - <widget class="scribo::demo::shared::browse_widget" native="1" name="widget_1" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="page" > - <layout class="QVBoxLayout" name="verticalLayout_4" > - <item> - <widget class="scribo::demo::shared::wizard_title_widget" native="1" name="title_2" /> - </item> - <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" > - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string/> - </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <widget class="QRadioButton" name="radioButton_4" > - <property name="text" > - <string>Extract all (Text, tables, images...)</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioButton" > - <property name="text" > - <string>Find text</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioButton_2" > - <property name="text" > - <string>Extract tables</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioButton_3" > - <property name="text" > - <string>Detect text</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="2" > - <spacer name="horizontalSpacer_3" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="page_2" /> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="prevBtn" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>&Previous</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="nextBtn" > - <property name="text" > - <string>&Next</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>507</width> - <height>31</height> - </rect> - </property> - </widget> - <widget class="QStatusBar" name="statusbar" /> - </widget> - <customwidgets> - <customwidget> - <class>scribo::demo::shared::wizard_title_widget</class> - <extends>QWidget</extends> - <header location="global" >shared/src/wizard_title_widget.hh</header> - <container>1</container> - </customwidget> - <customwidget> - <class>scribo::demo::shared::browse_widget</class> - <extends>QWidget</extends> - <header location="global" >shared/src/browse_widget.hh</header> - <container>1</container> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/wizard/ui/preprocessing_widget.ui b/scribo/demo/wizard/ui/preprocessing_widget.ui deleted file mode 100644 index 6b9c178..0000000 --- a/scribo/demo/wizard/ui/preprocessing_widget.ui +++ /dev/null @@ -1,223 +0,0 @@ -<ui version="4.0" > - <class>PreprocessingWidget</class> - <widget class="QWidget" name="PreprocessingWidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>398</width> - <height>318</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="1" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>1</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>1</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" > - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Preprocessing</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <widget class="QCheckBox" name="removeBg" > - <property name="text" > - <string>Remove background (slow)</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="unskew" > - <property name="text" > - <string>Unskew</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="removeNoise" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="text" > - <string>Remove noise</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="improveContrast" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="text" > - <string>Improve brightness/contrast</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <widget class="QCheckBox" name="reduceSize" > - <property name="text" > - <string>Reduce size by</string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="spinBox" > - <property name="minimum" > - <number>2</number> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > - <string>Advanced options</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <widget class="QLabel" name="binarizeLbl" > - <property name="text" > - <string>Binarization method:</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QComboBox" name="binarizationCBox" > - <property name="currentIndex" > - <number>2</number> - </property> - <item> - <property name="text" > - <string>Simple</string> - </property> - </item> - <item> - <property name="text" > - <string>Sauvola</string> - </property> - </item> - <item> - <property name="text" > - <string>Sauvola multi-scale</string> - </property> - </item> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - </layout> - </item> - <item row="1" column="2" > - <spacer name="horizontalSpacer_3" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>1</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer_3" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>2</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/scribo/demo/wizard/wizard.pro b/scribo/demo/wizard/wizard.pro deleted file mode 100644 index e517b4a..0000000 --- a/scribo/demo/wizard/wizard.pro +++ /dev/null @@ -1,71 +0,0 @@ -# -*- c++ -*- -###################################################################### -# Automatically generated by qmake (2.01a) Tue Feb 9 12:02:10 2010 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src -INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN)/scribo - -DEFINES += NDEBUG MLN_INCLUDE_ONLY - -# Input - HEADERS += \ - ../shared/src/image_viewer.hh \ - ../shared/src/internal/interactive_scene.hh \ - ../shared/src/crop_item.hh \ - ../shared/src/browse_widget.hh \ - src/load_page.hh \ - src/load_widget.hh \ - src/doc_type_widget.hh \ - src/doc_type_page.hh \ - src/crop_widget.hh \ - src/crop_page.hh \ - src/rotate_widget.hh \ - src/rotate_page.hh \ - src/preprocessing_widget.hh \ - src/preprocessing_page.hh \ - src/process_page.hh \ - src/process_widget.hh \ - src/runner.hh \ - src/preprocessing_task.hh \ - src/doc_type.hh \ - src/main_window.hh \ - src/result_page.hh \ - src/result_widget.hh - - -SOURCES += \ - ../shared/src/crop_item.cc \ - ../shared/src/internal/interactive_scene.cc \ - ../shared/src/browse_widget.cc \ - src/main.cc \ - src/main_window.cc \ - src/doc_type_widget.cc \ - src/doc_type_page.cc \ - src/load_page.cc \ - src/load_widget.cc \ - src/crop_widget.cc \ - src/crop_page.cc \ - src/rotate_widget.cc \ - src/rotate_page.cc \ - src/preprocessing_widget.cc \ - src/preprocessing_page.cc \ - src/process_page.cc \ - src/process_widget.cc \ - src/mln_widgets.cc \ - src/result_page.cc \ - src/result_widget.cc - -FORMS += \ - ../shared/ui/browse_widget.ui \ - ../shared/ui/crop_widget.ui \ - ../shared/ui/rotate_widget.ui \ - ../shared/ui/image_viewer.ui \ - ui/preprocessing_widget.ui \ - ui/doc_type_widget.ui \ - ui/main_window.ui - - -RESOURCES += ../shared/shared.qrc wizard.qrc diff --git a/scribo/demo/wizard/wizard.qrc b/scribo/demo/wizard/wizard.qrc deleted file mode 100644 index bd6b146..0000000 --- a/scribo/demo/wizard/wizard.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="images" > - <file>images/dematerialization.png</file> - </qresource> -</RCC> -- 1.7.2.5

1 0

branch exp/viewer-new updated: olena-2.0-226-g219cea3
by git＠lrde.epita.fr 07 Mar '13

07 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 exp/viewer-new has been updated discards c471441b433eb1f1b6e662737905d09ffd541e2a (commit) via 219cea371cdcc04bfb029023ce0fb85f2673edfe (commit) via 8dfa78afec71e0b960b3a2b2178f70bd87094643 (commit) via 69a8bfc3ef6b444b37f7c6d2e974d86ef5d4488a (commit) via aca68d9d5cead2bcf349ea3d4f2a22e9d24a3775 (commit) via 94d54581bce6a3bfe96ac3614a3a7017c879fcd5 (commit) via 6c791fefc2a93fe92eaf4d91821b157fb7efd22f (commit) via ab0344329d2bdd21a19307a1ffadd58115937ce8 (commit) via e27c410b8f3e81106432ab14212e886e245c11b3 (commit) via 096f3277a5dc84d0a4dc284dc030d13c94f7ccc0 (commit) via 4d0f7e21480dcafde0dcdffd90770e39d0724b2b (commit) via d8df2a51a54be6a929145348178edc41368d79db (commit) via 155ebbe20c5028ce77059696dbc1c31279fd4916 (commit) via 843aad8f634ad3f8950127dbd390a10f03473e0f (commit) via 9ec795020788ea4faba152b7774b62c4736a3bc8 (commit) via 824b198117b490e8e368f7705fec4bfe2a48bc9c (commit) via 355b7419a5130d0c9891fe2b151d73cce563883a (commit) via 32803c365ae89bb5411c6c708dfeaef28d84e37e (commit) via 0f3d77e27c06085247b3005024aceb37f40dfd65 (commit) via 3a248bc84533d6a24aa80dae9bcffe9742a7ac55 (commit) via 12d0a854b02ee047bd2139472c62fec2c24ca329 (commit) via 245453d30a1fd640924990d2164968a44e147e6e (commit) via 1db398e0b2928df6e8ac40c96864f1e460bcaa77 (commit) via 50e66038cb273e1a9a44847821729781030cde92 (commit) via 063c717a3628a5ddba0eced68ba8154403cf3156 (commit) via 2088b4c018a40c82f47a55de17d646d29519b488 (commit) via 0abc322fa3646540c4c31787a1b86893270b48e8 (commit) via 62a8605f575c8c161a68fc74ee33890b914f53d1 (commit) via 40e7cc0fc6488f9fbcc9860dcc4e8a8a57fbbf89 (commit) via 5d515548a805f3ff3675796d48a68712e8154518 (commit) via a814e2b86d4746b08c4ea2c2e565f051a38580cf (commit) via 5d7fb449c3d5506f11f483df0436265b900a2f0e (commit) via 176908242450d2d4457f592041d1b76e1e257755 (commit) via 6e24fcedd67b80c1bd531626631dee19e980f767 (commit) via 6a5f908ae3bb1927c93cc1c5e1fadf84b0fe979b (commit) via 8ae6c4cd403b65251711a61357adcd508340f7dc (commit) via f2b50a1a59ae30cd8c3c6a8aa5398bfeb3463834 (commit) via d4f02abaac288198bb1c74ad64817d2dfd015824 (commit) via 85c24dedfb231d87cdfbdc4b9fb5d1c8185fab9e (commit) via f782485fde9e54c6ff3140d3640078d1ee2b291b (commit) via 1f8557cf6b87813b244af2e50fda82428f433a37 (commit) via c52c5f64e6a2fc3b94e0cf171f4d59e78a4b4bc5 (commit) via 44a94cb2fff571b70ad79e79c711481654e6be6b (commit) via 9f51f7b4638bc3d792638d22753f3f2b02181798 (commit) via 279bb010ecb9b8aac09d53da5c849c7149ffc160 (commit) via 8bafffd99d6176417e15a4b63fc838b64c8b8b62 (commit) via 8fbf9f2fbe5d3d41ffdc5d9a7a6e395615a8a8e3 (commit) via d4b9819e60f71e7f6e56f4fa48a9246ad5720225 (commit) via 996b7f6c5acfd0d00dadc2029d18c2e08f028cec (commit) via 26f95b1755a17fd2493f70fddde58f1f92362c31 (commit) via fddc057bccf8cb5a54f17d2d14a22f8a56126273 (commit) via 3cf38cdc895c378bab0a62dac04988850ef17e0f (commit) via 9e4ce856d1d29493dab00b083740dad80e701f1f (commit) via 4eb9bb1fcae2fa1ec32ccb3dd5975b09d7255421 (commit) via aa29f39128e0a0dcb09361568357d3b3217bc35e (commit) via cffe62e5cff26c4b5dbdc5d2d598ffbada51d9eb (commit) via 13174eafba2824096b4916382075b98085208e85 (commit) via b654f0d48265b56eda78f0df27cb1a414f7f7e5a (commit) via b4ca8d4c88354e1577271f6103b13e1ab1f285c6 (commit) via 08bc024b524e8e1c89b9baa4070eb562715f0b03 (commit) via 72ee021ea66c1cb31d559c7803596199c11dea02 (commit) via 3864857f85d254caf232b2a9fb4c547d7bf8f11a (commit) via f8e2ffe537bc8dc29cc432ef21462dee8046d0dc (commit) via bc142a16b5a6963f43b63f286e4f201a69ad9211 (commit) via cfc65f324dbe578cea17162f954e90e696f260c3 (commit) via b2369d6d4c5f48d3b44808b8be120cc380363774 (commit) via 2b70784ca52b9411cc83b882ee3009d1d673fbc3 (commit) via 0495fcc3c300f95b89efeb60315c99a6d4cc7b7d (commit) via 223d19db8b270a2aea87a45a5bf3b26d136bc3e0 (commit) via 4cc8793a572e16b76ca437fdefc8d3539c25ccbe (commit) via 324abfb27047a96a29edd686dc0a8aa5cc2d6699 (commit) via e33727052ccf1d6c683cd2492d060ded7fccd7f4 (commit) via 39e1152eceddabf1c61e368c2f7bd477dbc2c46e (commit) via 1a7b4fcf3f2e141a6b59bc39db3ae2298329b379 (commit) via 0a1c1c9af1b82c13146555ce8caca89030e7af58 (commit) via 287d09bba75106e59f22e1a313225481cf7f9bd8 (commit) via cc2c4ef347d9a8fdce6fc6bbf29213f14e366131 (commit) via 3363574ac18e8b13b42f21d354a1901a511c513d (commit) via bd2670fbf582fc5c238507bdb3d9543d5bcb0577 (commit) via 849c13701f8eb2e08d838979c7b3539332cf099a (commit) via dcad6adc4a6b9469f79c055f1c2a5138c74e6f29 (commit) via d590e49dcb0541a2f964fbbc10032fa3ffcc260b (commit) via 21c2800d395c87adb3e456adb3a2f1ece83fe0fd (commit) via 558a2abb439427e9f267698ce3f1541bda95b395 (commit) via 6b931cc6d218c25448e7bf3479c98c16acd7daa1 (commit) via 1e58a782ca5f922f685e967dd35a570c7b6dd16e (commit) via 4649bd3bb8ff982893c774075f03d937fe3d995b (commit) via 7cbb3cb04ebbf5b76672a8733629fce9a8cb591b (commit) via 5a934f2c1678ae9bce79836ef2a11f6005e69b7b (commit) via e32d709852606cfc30d2bb673b1fa6042e2b0185 (commit) via 14bf21225e9519b342dbc7eea62ce761f1523d4e (commit) via 75d065e29b6a317d9d4c78ba8d35a214639bb02c (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (c471441b433eb1f1b6e662737905d09ffd541e2a) \ N -- N -- N (219cea371cdcc04bfb029023ce0fb85f2673edfe) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 219cea3 AUTHORS: Add Antoine Froger. 8dfa78a Move new viewer to scribo/demo. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 3 + ChangeLog | 357 +- HACKING | 92 +- Makefile.am | 99 +- README | 15 - bootstrap | 25 +- build-aux/.gitignore | 1 + build-aux/build_unit_test.sh | 4 +- build-aux/generate_dist_headers.sh | 44 +- build-aux/strip-lrde | 23 - {milena/tests => build-aux}/tests-recursive.mk | 0 build-aux/texi2dvi | 146 +- configure.ac | 43 +- dynamic-use-of-static-c++/.vcs | 23 - .../vcs/dynamic_static_bridge_vcs.rb | 15 - external/Makefile.am | 21 - external/README | 71 - external/trimesh/.gitignore | 6 - external/trimesh/COPYING | 302 - external/trimesh/ChangeLog | 95 - external/trimesh/Makedefs.Darwin | 53 - external/trimesh/Makedefs.Linux | 59 - external/trimesh/Makedefs.Linux64 | 59 - external/trimesh/Makedefs.SunOS | 50 - external/trimesh/Makedefs.Win32 | 69 - external/trimesh/Makefile.am | 19 - external/trimesh/Makerules | 80 - external/trimesh/README | 144 - external/trimesh/configure.ac | 62 - external/trimesh/gluit/COPYING.freeglut | 27 - external/trimesh/gluit/COPYING.glui | 504 - external/trimesh/gluit/Makefile.am | 91 - external/trimesh/gluit/freeglut_callbacks.c | 336 - external/trimesh/gluit/freeglut_cursor.c | 270 - external/trimesh/gluit/freeglut_display.c | 99 - external/trimesh/gluit/freeglut_ext.c | 205 - external/trimesh/gluit/freeglut_font.c | 368 - external/trimesh/gluit/freeglut_font_data.c | 2024 - external/trimesh/gluit/freeglut_gamemode.c | 598 - external/trimesh/gluit/freeglut_geometry.c | 1147 - .../trimesh/gluit/freeglut_glutfont_definitions.c | 77 - external/trimesh/gluit/freeglut_init.c | 899 - external/trimesh/gluit/freeglut_internal.h | 854 - external/trimesh/gluit/freeglut_joystick.c | 1805 - external/trimesh/gluit/freeglut_main.c | 1982 - external/trimesh/gluit/freeglut_menu.c | 949 - external/trimesh/gluit/freeglut_misc.c | 179 - external/trimesh/gluit/freeglut_overlay.c | 49 - external/trimesh/gluit/freeglut_state.c | 694 - .../trimesh/gluit/freeglut_stroke_mono_roman.c | 2821 - external/trimesh/gluit/freeglut_stroke_roman.c | 2821 - external/trimesh/gluit/freeglut_structure.c | 651 - external/trimesh/gluit/freeglut_teapot.c | 207 - external/trimesh/gluit/freeglut_teapot_data.h | 2428 - external/trimesh/gluit/freeglut_videoresize.c | 54 - external/trimesh/gluit/freeglut_window.c | 1092 - external/trimesh/gluit/glui.cc | 1960 - external/trimesh/gluit/glui_add_controls.cc | 742 - external/trimesh/gluit/glui_algebra3.cc | 1037 - external/trimesh/gluit/glui_algebra3.h | 474 - external/trimesh/gluit/glui_arcball.cc | 223 - external/trimesh/gluit/glui_arcball.h | 80 - external/trimesh/gluit/glui_bitmap_img_data.cc | 22 - external/trimesh/gluit/glui_bitmaps.cc | 104 - external/trimesh/gluit/glui_button.cc | 208 - external/trimesh/gluit/glui_checkbox.cc | 313 - external/trimesh/gluit/glui_column.cc | 76 - external/trimesh/gluit/glui_control.cc | 1223 - external/trimesh/gluit/glui_edittext.cc | 1045 - external/trimesh/gluit/glui_img_checkbox_0.c | 38 - external/trimesh/gluit/glui_img_checkbox_0_dis.c | 38 - external/trimesh/gluit/glui_img_checkbox_1.c | 38 - external/trimesh/gluit/glui_img_checkbox_1_dis.c | 38 - external/trimesh/gluit/glui_img_downarrow.c | 56 - external/trimesh/gluit/glui_img_leftarrow.c | 56 - external/trimesh/gluit/glui_img_listbox_down.c | 42 - external/trimesh/gluit/glui_img_listbox_up.c | 42 - external/trimesh/gluit/glui_img_listbox_up_dis.c | 42 - external/trimesh/gluit/glui_img_radiobutton_0.c | 44 - .../trimesh/gluit/glui_img_radiobutton_0_dis.c | 44 - external/trimesh/gluit/glui_img_radiobutton_1.c | 44 - .../trimesh/gluit/glui_img_radiobutton_1_dis.c | 44 - external/trimesh/gluit/glui_img_rightarrow.c | 56 - external/trimesh/gluit/glui_img_spindown_0.c | 24 - external/trimesh/gluit/glui_img_spindown_1.c | 24 - external/trimesh/gluit/glui_img_spindown_dis.c | 24 - external/trimesh/gluit/glui_img_spinup_0.c | 24 - external/trimesh/gluit/glui_img_spinup_1.c | 24 - external/trimesh/gluit/glui_img_spinup_dis.c | 24 - external/trimesh/gluit/glui_img_uparrow.c | 56 - external/trimesh/gluit/glui_listbox.cc | 445 - external/trimesh/gluit/glui_mouse_iaction.cc | 212 - external/trimesh/gluit/glui_node.cc | 175 - external/trimesh/gluit/glui_panel.cc | 178 - external/trimesh/gluit/glui_quaternion.cc | 229 - external/trimesh/gluit/glui_quaternion.h | 97 - external/trimesh/gluit/glui_radio.cc | 341 - external/trimesh/gluit/glui_rollout.cc | 286 - external/trimesh/gluit/glui_rotation.cc | 389 - external/trimesh/gluit/glui_separator.cc | 60 - external/trimesh/gluit/glui_slider.cc | 725 - external/trimesh/gluit/glui_spinner.cc | 579 - external/trimesh/gluit/glui_statictext.cc | 124 - external/trimesh/gluit/glui_stdinc.h | 131 - external/trimesh/gluit/glui_translation.cc | 518 - external/trimesh/gluit/gluit.mk | 16 - external/trimesh/include/Color.h | 107 - external/trimesh/include/GL/freeglut.h | 22 - external/trimesh/include/GL/freeglut_ext.h | 124 - external/trimesh/include/GL/freeglut_std.h | 579 - external/trimesh/include/GL/glui.h | 1767 - external/trimesh/include/GL/glut.h | 29 - external/trimesh/include/GLCamera.h | 74 - external/trimesh/include/ICP.h | 40 - external/trimesh/include/KDtree.h | 46 - external/trimesh/include/Makefile.am | 21 - external/trimesh/include/TriMesh.h | 161 - external/trimesh/include/TriMesh_algo.h | 145 - external/trimesh/include/Vec.h | 459 - external/trimesh/include/XForm.h | 317 - external/trimesh/include/bsphere.h | 273 - external/trimesh/include/lineqn.h | 358 - external/trimesh/include/mempool.h | 88 - external/trimesh/include/noise3d.h | 127 - external/trimesh/include/timestamp.h | 69 - external/trimesh/libsrc/GLCamera.cc | 378 - external/trimesh/libsrc/ICP.cc | 859 - external/trimesh/libsrc/KDtree.cc | 299 - external/trimesh/libsrc/Makefile.am | 34 - external/trimesh/libsrc/TriMesh_bounding.cc | 135 - external/trimesh/libsrc/TriMesh_connectivity.cc | 124 - external/trimesh/libsrc/TriMesh_curvature.cc | 325 - external/trimesh/libsrc/TriMesh_grid.cc | 109 - external/trimesh/libsrc/TriMesh_io.cc | 1925 - external/trimesh/libsrc/TriMesh_normals.cc | 118 - external/trimesh/libsrc/TriMesh_pointareas.cc | 77 - external/trimesh/libsrc/TriMesh_stats.cc | 46 - external/trimesh/libsrc/TriMesh_tstrips.cc | 245 - external/trimesh/libsrc/diffuse.cc | 353 - external/trimesh/libsrc/edgeflip.cc | 176 - external/trimesh/libsrc/faceflip.cc | 30 - external/trimesh/libsrc/filter.cc | 491 - external/trimesh/libsrc/lmsmooth.cc | 76 - external/trimesh/libsrc/mesh_align.cc | 78 - external/trimesh/libsrc/mesh_view.cc | 599 - external/trimesh/libsrc/remove.cc | 137 - external/trimesh/libsrc/reorder_verts.cc | 210 - external/trimesh/libsrc/subdiv.cc | 396 - external/trimesh/utilsrc/Makefile.am | 26 - external/trimesh/utilsrc/mesh_align.cc | 91 - external/trimesh/utilsrc/mesh_cat.cc | 84 - external/trimesh/utilsrc/mesh_cc.cc | 333 - external/trimesh/utilsrc/mesh_filter.cc | 394 - external/trimesh/utilsrc/mesh_make.cc | 976 - external/trimesh/utilsrc/mesh_shade.cc | 508 - external/trimesh/utilsrc/mesh_view.cc | 598 - milena/ChangeLog | 636 +- milena/Makefile.am | 14 +- milena/apps/Makefile.am | 5 +- milena/apps/constrained-connectivity/Makefile.am | 5 +- milena/apps/graph-morpho/Makefile.am | 8 +- milena/apps/mesh-segm-skel/Makefile.am | 79 +- milena/apps/mesh-segm-skel/io.hh | 205 - .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 2 +- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 2 +- milena/apps/mesh-segm-skel/mesh-max-curv.cc | 125 - milena/apps/mesh-segm-skel/mesh-pinv-curv.cc | 105 - milena/apps/mesh-segm-skel/mesh-segm.cc | 230 - milena/apps/mesh-segm-skel/mesh-skel.cc | 207 - milena/apps/mesh-segm-skel/misc.hh | 661 + milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 23 - milena/apps/mesh-segm-skel/test-mesh-segm.in | 26 - milena/apps/mesh-segm-skel/trimesh/README | 4 - milena/apps/mesh-segm-skel/trimesh/misc.hh | 660 - milena/apps/morphers/Makefile.am | 71 + milena/apps/morphers/image2d-skel.hh | 137 + milena/apps/morphers/iz.cc | 173 + milena/apps/morphers/iz_input.pbm | Bin 0 -> 21890 bytes milena/apps/morphers/lazy_recorder.cc | 62 + milena/apps/morphers/lazy_recorder.hh | 206 + milena/apps/morphers/mask+channel.cc | 67 + milena/apps/morphers/mask+recorder.cc | 65 + milena/apps/morphers/recorder-bft.cc | 114 + milena/apps/morphers/recorder-wst.cc | 106 + milena/apps/morphers/recorder.cc | 61 + milena/apps/morphers/recorder.hh | 182 + milena/apps/papers/levillain.09.ismm/Makefile.am | 30 +- .../papers/levillain.09.ismm/classif-1complex.cc | 307 + .../apps/papers/levillain.09.ismm/classif-graph.cc | 287 + .../apps/papers/levillain.09.ismm/classseedsi.pbm | 6415 + milena/apps/papers/levillain.09.ismm/graph.cc | 255 +- .../papers/levillain.09.ismm/influence_zones.hh | 84 + milena/apps/papers/levillain.09.ismm/io.hh | 242 + milena/common.mk | 22 + .../examples/tuto4_genericity_and_algorithms.cc | 5 +- milena/doc/tools/split_sample.sh | 6 +- milena/headers.mk | 111 +- milena/mln/accu/math/all.hh | 5 - milena/mln/accu/math/inf.hh | 178 - milena/mln/accu/math/sup.hh | 180 - milena/mln/accu/site_set/rectangularity.hh | 19 +- milena/mln/all.hh | 12 +- milena/mln/canvas/browsing/diagonal2d.hh | 7 +- milena/mln/canvas/browsing/snake_fwd.hh | 2 +- milena/mln/canvas/browsing/snake_vert.hh | 2 +- milena/mln/canvas/labeling/sorted.hh | 6 +- milena/mln/canvas/labeling/video.hh | 5 +- milena/mln/clustering/kmean_rgb.hh | 18 +- milena/mln/core/concept/proxy.hxx | 26 +- milena/mln/core/image/imorph/decorated_image.hh | 26 + milena/mln/core/image/vmorph/all.hh | 5 +- milena/mln/core/image/vmorph/fun_image.hh | 4 +- milena/mln/core/image/vmorph/thrubin_image.hh | 254 - milena/mln/data/all.hh | 4 +- milena/mln/data/was.median.hh | 207 - milena/mln/essential/routine.hh | 12 +- milena/mln/extract/all.hh | 51 - milena/mln/extract/blue.hh | 63 - milena/mln/extract/essential.hh | 36 - milena/mln/extract/green.hh | 63 - milena/mln/extract/hue.hh | 63 - milena/mln/extract/lum.hh | 63 - milena/mln/extract/red.hh | 63 - milena/mln/extract/sat.hh | 63 - milena/mln/fun/access/all.hh | 50 - milena/mln/fun/access/mean.hh | 89 - milena/mln/fun/accu_result.hh | 70 - milena/mln/fun/all.hh | 8 +- milena/mln/fun/binary.hh | 92 - milena/mln/fun/binary_param.hh | 100 - milena/mln/fun/component/comp.hh | 108 - milena/mln/fun/component/comp_count.hh | 96 - milena/mln/fun/component/ithcomp.hh | 80 - milena/mln/fun/component/scomp.hh | 87 - milena/mln/fun/compose.hh | 115 - milena/mln/fun/composition.hh | 221 - milena/mln/fun/essential.hh | 4 +- milena/mln/fun/from_accu.hh | 136 - milena/mln/fun/math/abs.hh | 67 - milena/mln/fun/math/cos.hh | 89 - milena/mln/fun/math/inf.hh | 67 - milena/mln/fun/math/norm.hh | 117 - milena/mln/fun/math/sup.hh | 67 - milena/mln/fun/meta/all.hh | 51 - milena/mln/fun/meta/blue.hh | 90 - milena/mln/fun/meta/essential.hh | 31 - milena/mln/fun/meta/first.hh | 90 - milena/mln/fun/meta/green.hh | 90 - milena/mln/fun/meta/hue.hh | 119 - milena/mln/fun/meta/inty.hh | 88 - milena/mln/fun/meta/lum.hh | 88 - milena/mln/fun/meta/red.hh | 90 - milena/mln/fun/meta/sat.hh | 122 - milena/mln/fun/meta/second.hh | 90 - milena/mln/fun/meta/to_enc.hh | 77 - milena/mln/fun/point/col.hh | 83 - milena/mln/fun/point/row.hh | 81 - milena/mln/fun/point/sli.hh | 81 - milena/mln/fun/spe/binary.hh | 145 - milena/mln/fun/unary_param.hh | 100 - milena/mln/fun/v2v/all.hh | 10 +- milena/mln/fun/v2v/essential.hh | 4 +- milena/mln/fun/v2v/hsi_to_rgb.hh | 134 - milena/mln/fun/v2v/rgb_to_hsi.hh | 124 - milena/mln/geom/seeds2tiling_roundness.hh | 3 +- milena/mln/io/plot/save.hh | 6 +- milena/mln/labeling/value_and_compute.hh | 15 +- milena/mln/linear/all.hh | 12 - milena/mln/linear/gaussian/filter.hh | 140 - milena/mln/linear/gaussian/impl.hh | 460 - .../mln/linear/gaussian/internal/coefficients.hh | 298 - milena/mln/metal/math/pow.hh | 7 +- milena/mln/metal/math/root.hh | 5 +- milena/mln/morpho/tree/propagate_node.hh | 4 +- milena/mln/morpho/watershed/topological.hh | 6 +- milena/mln/registration/all.hh | 48 - milena/mln/registration/essential.hh | 36 - milena/mln/registration/get_rot.hh | 151 - milena/mln/registration/get_rtransf.hh | 94 - milena/mln/registration/internal/rms.hh | 80 - milena/mln/registration/registration.hh | 391 - milena/mln/subsampling/all.hh | 47 - milena/mln/subsampling/antialiased.hh | 3 +- milena/mln/subsampling/essential.hh | 35 - milena/mln/subsampling/gaussian_subsampling.hh | 90 - milena/mln/subsampling/subsampling.hh | 114 - milena/mln/tag/init.hh | 3 + milena/mln/topo/complex.hh | 54 +- milena/mln/topo/face_iter.hh | 7 +- milena/mln/topo/n_face_iter.hh | 5 +- milena/mln/trait/all.hh | 6 - milena/mln/trait/ch_value.hh | 19 - milena/mln/util/object_id.hh | 4 +- milena/mln/util/tracked_ptr.hh | 32 +- milena/mln/value/all.hh | 8 - milena/mln/value/essential.hh | 5 - milena/mln/value/graylevel.hh | 23 +- milena/mln/value/graylevel_f.hh | 255 +- milena/mln/value/graylevel_f.hxx | 319 + milena/mln/value/hsi.hh | 113 - milena/mln/value/int_s24.hh | 49 + milena/mln/value/int_u24.hh | 49 + milena/mln/value/internal/gray_f.hh | 320 +- milena/mln/value/internal/gray_f.hxx | 160 + milena/mln/value/shell.hh | 164 - milena/mln/value/stack.hh | 334 - .../mln/world/inter_pixel/dim2/make_edge_image.hh | 3 +- milena/mln/world/rgb/invert.hh | 6 +- milena/new-header | 155 + milena/nodist-headers | 84 - milena/sandbox/ChangeLog |12247 -- milena/sandbox/abraham/README | 11 - milena/sandbox/abraham/img/dots.pgm | Bin 452 -> 0 bytes milena/sandbox/abraham/img/lena.pgm | 5 - milena/sandbox/abraham/img/lena.ppm | 5 - milena/sandbox/abraham/img/little_test.pgm | 5 - milena/sandbox/abraham/img/test.pgm | Bin 243 -> 0 bytes .../abraham/mln/core/site_set/p_priority_queue.hh | 352 - milena/sandbox/abraham/mln/fun/v2v/rgb_to_hsi.hh | 175 - milena/sandbox/abraham/mln/io/tikz/save.hh | 254 - milena/sandbox/abraham/mln/io/tikz/save_header.hh | 90 - milena/sandbox/abraham/mln/level/thru.hh | 115 - .../abraham/mln/morpho/autarkical_leveling.hh | 156 - milena/sandbox/abraham/mln/morpho/basic_najman.hh | 893 - milena/sandbox/abraham/mln/morpho/hit_or_miss.hh | 84 - .../mln/morpho/images/result_m_watershed.pgm | Bin 177 -> 0 bytes .../mln/morpho/images/result_topo_watershed.pgm | Bin 177 -> 0 bytes .../sandbox/abraham/mln/morpho/images/test_2.pgm | 5 - .../sandbox/abraham/mln/morpho/images/test_3.pgm | 29 - .../sandbox/abraham/mln/morpho/images/test_4.pgm | 5 - .../mln/morpho/images/test_component_mapping.pgm | 5 - .../mln/morpho/images/test_component_tree.pgm | Bin 65 -> 0 bytes .../abraham/mln/morpho/images/test_watershed.pgm | Bin 177 -> 0 bytes milena/sandbox/abraham/mln/morpho/najman_wst.hh | 791 - milena/sandbox/abraham/mln/morpho/topo_wst.hh | 768 - milena/sandbox/abraham/mln/morpho/vector_median.hh | 129 - milena/sandbox/abraham/mln/morpho/vmt.hh | 126 - milena/sandbox/abraham/mln/trait/images.hh | 239 - milena/sandbox/abraham/mln/transform/fft.hh | 693 - .../sandbox/abraham/mln/value/builtin/symbolics.hh | 76 - milena/sandbox/abraham/tests/core/concept/test.cc | 75 - .../abraham/tests/core/image/fun_image_const.cc | 65 - .../abraham/tests/core/image/fun_image_norm.cc | 64 - .../abraham/tests/core/image/fun_image_v2v.cc | 57 - .../abraham/tests/core/image/fun_image_v2w2v.cc | 64 - .../sandbox/abraham/tests/core/image/thru_const.cc | 65 - .../sandbox/abraham/tests/core/image/thru_norm.cc | 59 - .../sandbox/abraham/tests/core/image/thru_v2v.cc | 57 - .../sandbox/abraham/tests/core/image/thru_v2w2v.cc | 65 - .../abraham/tests/core/image/violent_cast_image.cc | 56 - milena/sandbox/abraham/tests/fun/meta/red.cc | 67 - milena/sandbox/abraham/tests/fun/v2w2v/cos.cc | 41 - milena/sandbox/abraham/tests/fun/v2w_w2v/norm.cc | 71 - milena/sandbox/abraham/tests/io/tikz/Makefile | 33 - milena/sandbox/abraham/tests/io/tikz/tikz.cc | 44 - milena/sandbox/abraham/tests/morpho/Makefile | 22 - .../sandbox/abraham/tests/morpho/images/+irm6.pgm | Bin 262159 -> 0 bytes .../tests/morpho/images/+test_watershed.pgm | Bin 177 -> 0 bytes .../tests/morpho/images/result_m_watershed.pgm | Bin 177 -> 0 bytes .../tests/morpho/images/result_topo_watershed.pgm | Bin 177 -> 0 bytes .../sandbox/abraham/tests/morpho/images/test_2.pgm | 5 - .../sandbox/abraham/tests/morpho/images/test_3.pgm | 29 - .../sandbox/abraham/tests/morpho/images/test_4.pgm | 5 - .../tests/morpho/images/test_component_mapping.pgm | 5 - .../tests/morpho/images/test_component_tree.pgm | Bin 65 -> 0 bytes .../abraham/tests/morpho/images/test_watershed.pgm | Bin 177 -> 0 bytes milena/sandbox/abraham/tests/morpho/levelings.cc | 49 - milena/sandbox/abraham/tests/morpho/red_erosion.cc | 41 - .../sandbox/abraham/tests/morpho/red_erosion3.cc | 65 - milena/sandbox/abraham/tests/morpho/ref/Makefile | 52 - .../tests/morpho/ref/include/lattribheight.h | 4 - .../abraham/tests/morpho/ref/include/lwshedtopo.h | 4 - .../abraham/tests/morpho/ref/include/mccodimage.h | 100 - .../abraham/tests/morpho/ref/include/mccomptree.h | 79 - .../tests/morpho/ref/include/mcfahsalembier.h | 64 - .../abraham/tests/morpho/ref/include/mcimage.h | 98 - .../abraham/tests/morpho/ref/include/mcindic.h | 27 - .../abraham/tests/morpho/ref/include/mclifo.h | 48 - .../abraham/tests/morpho/ref/include/mcunionfind.h | 24 - .../abraham/tests/morpho/ref/include/mcutil.h | 31 - .../abraham/tests/morpho/ref/src/com/wshedtopo.c | 97 - .../abraham/tests/morpho/ref/src/lib/lattrib.c | 1754 - .../tests/morpho/ref/src/lib/lattribheight.c | 717 - .../abraham/tests/morpho/ref/src/lib/lwshedtopo.c | 1011 - .../abraham/tests/morpho/ref/src/lib/mccodimage.c | 586 - .../abraham/tests/morpho/ref/src/lib/mccomptree.c | 805 - .../tests/morpho/ref/src/lib/mcfahsalembier.c | 236 - .../abraham/tests/morpho/ref/src/lib/mcimage.c | 2219 - .../abraham/tests/morpho/ref/src/lib/mcindic.c | 76 - .../abraham/tests/morpho/ref/src/lib/mclifo.c | 155 - .../abraham/tests/morpho/ref/src/lib/mcunionfind.c | 188 - .../sandbox/abraham/tests/morpho/ref/test/UrOx.pgm | 6 - .../sandbox/abraham/tests/morpho/test_watershed.cc | 51 - .../abraham/tests/morpho/test_watershed_topo.cc | 42 - milena/sandbox/abraham/tests/transform/fft.cc | 34 - milena/sandbox/abraham/tests/transform/fft_.cc | 92 - milena/sandbox/abraham/tests/value/mixin.cc | 98 - .../aroumougame/retin/headers/Trimesh/Color.h | 105 - .../aroumougame/retin/headers/Trimesh/KDtree.h | 47 - .../aroumougame/retin/headers/Trimesh/TriMesh.h | 133 - .../retin/headers/Trimesh/TriMesh_algo.h | 77 - .../retin/headers/Trimesh/TriMesh_bounding.h | 1 - .../retin/headers/Trimesh/TriMesh_connectivity.h | 1 - .../retin/headers/Trimesh/TriMesh_normals.h | 1 - .../retin/headers/Trimesh/TriMesh_pointareas.h | 1 - .../retin/headers/Trimesh/TriMesh_stats.h | 1 - .../retin/headers/Trimesh/TriMesh_tstrips.h | 1 - .../aroumougame/retin/headers/Trimesh/Vec.h | 396 - .../aroumougame/retin/headers/Trimesh/XForm.h | 303 - .../aroumougame/retin/headers/Trimesh/bsphere.h | 273 - .../aroumougame/retin/headers/Trimesh/lineqn.h | 358 - .../aroumougame/retin/headers/Trimesh/mempool.h | 88 - .../retin/headers/Trimesh/mesh_filter.h | 7 - .../aroumougame/retin/headers/Trimesh/mesh_shade.h | 6 - .../aroumougame/retin/headers/Trimesh/remove.h | 1 - .../retin/headers/Trimesh/reorder_verts.h | 1 - .../aroumougame/retin/headers/Trimesh/timestamp.h | 69 - .../sandbox/aroumougame/retin/headers/WRL/Coin.h | 53 - .../retin/headers/WRL/MaillageTriangulaire.h | 58 - .../retin/headers/WRL/MailleTriangulaire.h | 35 - milena/sandbox/aroumougame/retin/headers/WRL/OFF.h | 88 - .../aroumougame/retin/headers/WRL/Objet3D.h | 89 - .../retin/headers/WRL/OutilsListePoints.h | 47 - .../aroumougame/retin/headers/WRL/OutilsPoint3D.h | 52 - .../aroumougame/retin/headers/WRL/PreTraitement.h | 53 - milena/sandbox/aroumougame/retin/headers/WRL/WRL.h | 74 - .../sandbox/aroumougame/retin/headers/WRL/calcul.h | 37 - .../aroumougame/retin/headers/binvox/file/Buffer.h | 69 - .../retin/headers/binvox/file/Datafile.h | 115 - .../retin/headers/binvox/file/Tokenfile.h | 113 - .../aroumougame/retin/headers/binvox/geom/Face.h | 76 - .../retin/headers/binvox/geom/Globals.h | 55 - .../aroumougame/retin/headers/binvox/geom/Mesh.h | 122 - .../retin/headers/binvox/geom/MeshFile.h | 69 - .../retin/headers/binvox/geom/MeshFileIdentifier.h | 82 - .../retin/headers/binvox/geom/MeshRef.h | 56 - .../retin/headers/binvox/geom/MeshView.h | 59 - .../retin/headers/binvox/geom/ObjMeshFile.h | 53 - .../retin/headers/binvox/geom/OffMeshFile.h | 35 - .../retin/headers/binvox/geom/PlyMeshFile.h | 53 - .../aroumougame/retin/headers/binvox/geom/Vertex.h | 58 - .../retin/headers/binvox/geom/WrlMeshFile.h | 35 - .../retin/headers/binvox/geom/geom_defs.h | 40 - .../aroumougame/retin/headers/binvox/libvox.h | 12 - .../aroumougame/retin/headers/binvox/math/Matrix.h | 100 - .../retin/headers/binvox/math/MyRandom.h | 54 - .../aroumougame/retin/headers/binvox/math/Vector.h | 144 - .../aroumougame/retin/headers/binvox/math/common.h | 92 - .../retin/headers/binvox/ply/ply_gatech.h | 238 - .../retin/headers/binvox/time/WallTimer.h | 71 - .../aroumougame/retin/headers/binvox/ui/Camera.h | 84 - .../retin/headers/binvox/ui/CameraList.h | 68 - .../aroumougame/retin/headers/binvox/ui/GLwindow.h | 124 - .../aroumougame/retin/headers/binvox/ui/View.h | 73 - .../aroumougame/retin/headers/binvox/ui/opengl.h | 49 - .../retin/headers/binvox/voxel/PalagyiFilter.h | 69 - .../retin/headers/binvox/voxel/Template.h | 81 - .../retin/headers/binvox/voxel/Templates.h | 78 - .../retin/headers/binvox/voxel/VoxelFile.h | 105 - .../retin/headers/binvox/voxel/VoxelFilter.h | 51 - .../retin/headers/binvox/voxel/VoxelRef.h | 75 - .../retin/headers/binvox/voxel/Voxelizer.h | 89 - .../retin/headers/binvox/voxel/Voxels.h | 199 - .../retin/headers/binvox/voxel/typedefs.h | 31 - milena/sandbox/aroumougame/retin/headers/cb3dr.h | 5 - .../aroumougame/retin/headers/histogramme/hist.h | 57 - .../retin/headers/histogramme/listeHisto.h | 50 - .../aroumougame/retin/headers/matrice/MatriceF.h | 35 - .../retin/headers/matrice/valeursVecteursPropres.h | 13 - .../aroumougame/retin/sources/Trimesh/KDtree.cpp | 321 - .../retin/sources/Trimesh/TriMesh_bounding.cpp | 133 - .../retin/sources/Trimesh/TriMesh_connectivity.cpp | 124 - .../retin/sources/Trimesh/TriMesh_curvature.cpp | 325 - .../retin/sources/Trimesh/TriMesh_io.cpp | 1814 - .../retin/sources/Trimesh/TriMesh_normals.cpp | 50 - .../retin/sources/Trimesh/TriMesh_pointareas.cpp | 77 - .../retin/sources/Trimesh/TriMesh_stats.cpp | 46 - .../retin/sources/Trimesh/TriMesh_tstrips.cpp | 246 - .../aroumougame/retin/sources/Trimesh/diffuse.cpp | 246 - .../aroumougame/retin/sources/Trimesh/lmsmooth.cpp | 73 - .../retin/sources/Trimesh/mesh_filter.cpp | 470 - .../retin/sources/Trimesh/mesh_shade.cpp | 90 - .../aroumougame/retin/sources/Trimesh/remove.cpp | 212 - .../retin/sources/Trimesh/reorder_verts.cpp | 126 - .../retin/sources/WRL/MaillageTriangulaire.cpp | 281 - .../retin/sources/WRL/MailleTriangulaire.cpp | 94 - .../sandbox/aroumougame/retin/sources/WRL/OFF.cpp | 174 - .../aroumougame/retin/sources/WRL/Objet3D.cpp | 146 - .../retin/sources/WRL/OutilsListePoints.cpp | 198 - .../retin/sources/WRL/OutilsPoint3D.cpp | 247 - .../retin/sources/WRL/PreTraitement.cpp | 213 - .../sandbox/aroumougame/retin/sources/WRL/WRL.cpp | 639 - .../aroumougame/retin/sources/WRL/calcul.cpp | 194 - .../retin/sources/binvox/file/Buffer.cpp | 61 - .../retin/sources/binvox/file/Datafile.cpp | 420 - .../retin/sources/binvox/file/Tokenfile.cpp | 367 - .../aroumougame/retin/sources/binvox/geom/Face.cpp | 201 - .../aroumougame/retin/sources/binvox/geom/Mesh.cpp | 281 - .../retin/sources/binvox/geom/MeshFile.cpp | 54 - .../sources/binvox/geom/MeshFileIdentifier.cpp | 143 - .../retin/sources/binvox/geom/MeshRef.cpp | 42 - .../retin/sources/binvox/geom/MeshView.cpp | 103 - .../retin/sources/binvox/geom/ObjMeshFile.cpp | 179 - .../retin/sources/binvox/geom/OffMeshFile.cpp | 65 - .../retin/sources/binvox/geom/PlyMeshFile.cpp | 197 - .../retin/sources/binvox/geom/Vertex.cpp | 59 - .../retin/sources/binvox/geom/WrlMeshFile.cpp | 96 - .../aroumougame/retin/sources/binvox/libvox.cpp | 190 - .../retin/sources/binvox/math/Matrix.cpp | 510 - .../retin/sources/binvox/math/MyRandom.cpp | 56 - .../retin/sources/binvox/math/Vector.cpp | 543 - .../retin/sources/binvox/math/common.cpp | 139 - .../retin/sources/binvox/ply/ply_gatech.c | 3428 - .../retin/sources/binvox/time/WallTimer.cpp | 158 - .../aroumougame/retin/sources/binvox/ui/Camera.cpp | 192 - .../retin/sources/binvox/ui/CameraList.cpp | 130 - .../retin/sources/binvox/ui/GLwindow.cpp | 333 - .../aroumougame/retin/sources/binvox/ui/View.cpp | 86 - .../aroumougame/retin/sources/binvox/ui/opengl.cpp | 67 - .../retin/sources/binvox/voxel/PalagyiFilter.cpp | 180 - .../retin/sources/binvox/voxel/Template.cpp | 220 - .../retin/sources/binvox/voxel/Templates.cpp | 170 - .../retin/sources/binvox/voxel/VoxelFile.cpp | 721 - .../retin/sources/binvox/voxel/VoxelFilter.cpp | 54 - .../retin/sources/binvox/voxel/VoxelRef.cpp | 101 - .../retin/sources/binvox/voxel/Voxelizer.cpp | 519 - .../retin/sources/binvox/voxel/Voxels.cpp | 1021 - milena/sandbox/aroumougame/retin/sources/cb3dr.cpp | 3 - .../aroumougame/retin/sources/histogramme/hist.cpp | 399 - .../retin/sources/histogramme/listeHisto.cpp | 273 - .../aroumougame/retin/sources/matrice/MatriceF.cpp | 233 - .../sources/matrice/valeursVecteursPropres.cpp | 58 - milena/sandbox/aroumougame/skeleton/io.hh | 157 - milena/sandbox/aroumougame/skeleton/mesh-skel.cc | 216 - .../aroumougame/skeleton/mesh-skel_region.cc | 256 - .../sandbox/aroumougame/skeleton/miscellenous.hh | 142 - .../sandbox/aroumougame/skeleton/neighborhood1.hh | 35 - milena/sandbox/aroumougame/skeleton/sedt.hh | 431 - milena/sandbox/aroumougame/skeleton/test.cc | 100 - .../sandbox/aroumougame/skeleton/test_image2d.cc | 50 - .../sandbox/aroumougame/skeleton/test_image3d.cc | 83 - milena/sandbox/aroumougame/skeleton/thinning.hh | 972 - milena/sandbox/aroumougame/test/m0.wrl |180539 -------------------- milena/sandbox/aroumougame/test/m05.wrl | 806 - milena/sandbox/aroumougame/test/m9l0.wrl |26434 --- milena/sandbox/aroumougame/test/makefile | 402 - milena/sandbox/aroumougame/test/ml0.wrl |173118 ------------------- milena/sandbox/aroumougame/test/ml09.wrl | 2267 - milena/sandbox/aroumougame/test/mmake.sh | 3 - .../aroumougame/test/sources/test_graph.cpp | 263 - milena/sandbox/aroumougame/test/test.off |92102 ---------- milena/sandbox/aroumougame/test/test_graph.cpp | 273 - milena/sandbox/aroumougame/test/test_graph_off.cpp | 243 - milena/sandbox/aroumougame/test/test_graph_wrl.cpp | 303 - milena/sandbox/ballas/compilation_unit.rb | 56 - milena/sandbox/ballas/doc/draft.txt | 370 - milena/sandbox/ballas/doc/image_tours.txt | 885 - milena/sandbox/ballas/doc/image_types/doc.tex | 28 - .../ballas/doc/image_types/include/image_tour.tex | 480 - milena/sandbox/ballas/methods | 104 - milena/sandbox/ballas/refactorization/box2d.hh | 246 - milena/sandbox/ballas/refactorization/concept.hh | 229 - milena/sandbox/ballas/refactorization/exact.hh | 95 - milena/sandbox/ballas/refactorization/image2d.hh | 108 - .../ballas/refactorization/internal/exact.hh | 124 - .../ballas/refactorization/internal/force_exact.hh | 77 - .../ballas/refactorization/internal/image_base.hh | 49 - .../ballas/refactorization/internal/impl.hh | 16 - .../ballas/refactorization/internal/piter_base.hh | 75 - .../ballas/refactorization/internal/pset_base.hh | 49 - .../ballas/refactorization/internal/psite_base.hh | 40 - .../ballas/refactorization/internal/site_base.hh | 21 - .../sandbox/ballas/refactorization/metal/bexpr.hh | 80 - .../sandbox/ballas/refactorization/metal/bool.hh | 99 - .../sandbox/ballas/refactorization/metal/equal.hh | 63 - milena/sandbox/ballas/refactorization/p_run.hh | 286 - milena/sandbox/ballas/refactorization/point2d.hh | 214 - .../sandbox/ballas/refactorization/point2d_impl.hh | 41 - milena/sandbox/ballas/refactorization/rle_image.hh | 118 - milena/sandbox/ballas/refactorization/rle_pset.hh | 308 - milena/sandbox/ballas/refactorization/rle_psite.hh | 137 - .../sandbox/ballas/refactorization/test/box2d.cc | 22 - .../sandbox/ballas/refactorization/test/image2d.cc | 26 - milena/sandbox/ballas/refactorization/test/rle.cc | 62 - milena/sandbox/ballas/test.cc | 69 - milena/sandbox/ballas/vaucanson_bench | 141 - milena/sandbox/beguin/fusion_graph.hh | 60 - milena/sandbox/beguin/graph_link.hh | 37 - milena/sandbox/beguin/irm.cc | 536 - milena/sandbox/beguin/irm.jpg | Bin 84574 -> 0 bytes milena/sandbox/beguin/irm6.pgm | Bin 262159 -> 0 bytes milena/sandbox/beguin/irm_g.cc | 186 - milena/sandbox/beguin/puzzle.jpg | Bin 80492 -> 0 bytes milena/sandbox/beguin/segm_to_pregraph.hh | 66 - milena/sandbox/beguin/try.hh | 69 - milena/sandbox/bench/README_CFLAGS | 8 - milena/sandbox/bench/extract_vertical_lines.cc | 49 - .../bench/fast_components_and_attributes.cc | 402 - milena/sandbox/bench/fast_rows.cc | 247 - milena/sandbox/bench/fast_tiles.cc | 140 - milena/sandbox/bench/fastest.cc | 351 - milena/sandbox/bench/fastest_forall_p_browsing.cc | 384 - .../bench/fastest_statistical_tour_browsing.cc | 168 - .../bench/fastest_statistical_tour_nbh_browsing.cc | 186 - milena/sandbox/bench/input_iz.pgm.gz | Bin 59982 -> 0 bytes milena/sandbox/bench/iz.cc | 386 - milena/sandbox/bench/z_sub_browsing/+inc | 1 - milena/sandbox/bench/z_sub_browsing/README | 5 - milena/sandbox/bench/z_sub_browsing/debase.cc | 23 - milena/sandbox/bench/z_sub_browsing/debase.hh | 351 - milena/sandbox/bench/z_sub_browsing/fast.cc | 139 - milena/sandbox/bench/z_sub_browsing/in.pgm.gz | Bin 3649560 -> 0 bytes milena/sandbox/bench/z_sub_browsing/integral.cc | 23 - milena/sandbox/bench/z_sub_browsing/integral.hh | 165 - milena/sandbox/bin/labeling/colorize.cc | 24 - milena/sandbox/bin/pgm_to_pbm.cc | 39 - milena/sandbox/bin/ppm_negate.cc | 43 - milena/sandbox/bugs/concept_and_assignment.cc | 84 - milena/sandbox/bugs/io_xv_imview.pbm | Bin 13 -> 0 bytes milena/sandbox/bugs/lut.cc | 23 - milena/sandbox/bugs/piter_slice.cc | 33 - milena/sandbox/bugs/piter_slice.solved.cc | 38 - milena/sandbox/camille/.gitignore | 4 - milena/sandbox/camille/Makefile | 9 - .../sandbox/camille/graph-line-gradient-closing.cc | 149 - milena/sandbox/camille/graph-wst.cc | 219 - milena/sandbox/delmon/growcut/Makefile | 30 - milena/sandbox/delmon/growcut/README | 12 - milena/sandbox/delmon/growcut/check.sh | 16 - milena/sandbox/delmon/growcut/keep_color.cc | 34 - milena/sandbox/delmon/growcut/main.cc | 150 - milena/sandbox/delmon/growcut/main_bw.cc | 111 - milena/sandbox/delmon/growcut/remove_if_blue.cc | 34 - milena/sandbox/delmon/minsurf/Makefile | 17 - milena/sandbox/delmon/minsurf/README | 11 - milena/sandbox/delmon/minsurf/check.sh | 9 - milena/sandbox/delmon/minsurf/keep_object.cc | 24 - milena/sandbox/delmon/minsurf/main.cc | 274 - milena/sandbox/duhamel/abr.cc | 54 - milena/sandbox/duhamel/abr.hh | 156 - milena/sandbox/duhamel/abr_to_image.cc | 147 - milena/sandbox/duhamel/border_duplicate.cc | 98 - milena/sandbox/duhamel/border_duplicate.hh | 220 - milena/sandbox/duhamel/border_fill.cc | 114 - milena/sandbox/duhamel/border_fill.hh | 292 - milena/sandbox/duhamel/border_mirror.cc | 61 - milena/sandbox/duhamel/border_mirror.hh | 139 - milena/sandbox/duhamel/canvas_chamfer.hh | 98 - milena/sandbox/duhamel/canvas_labeling.hh | 404 - milena/sandbox/duhamel/chamfer.cc | 51 - milena/sandbox/duhamel/chamfer.hh | 126 - milena/sandbox/duhamel/color_sub.cc | 70 - milena/sandbox/duhamel/color_sub.hh | 64 - milena/sandbox/duhamel/compil.cmd | 1 - .../sandbox/duhamel/debug_print_3d_with_border.hh | 70 - milena/sandbox/duhamel/draw_mesh.hh | 241 - milena/sandbox/duhamel/extract_array.cc | 149 - milena/sandbox/duhamel/fill.hh | 131 - milena/sandbox/duhamel/fills_test.cc | 226 - milena/sandbox/duhamel/graph.hh | 183 - milena/sandbox/duhamel/graph.hxx | 97 - milena/sandbox/duhamel/graph_labeling.cc | 14 - milena/sandbox/duhamel/graph_labeling.hh | 98 - milena/sandbox/duhamel/graph_labeling2.cc | 13 - milena/sandbox/duhamel/labeling.hh | 138 - milena/sandbox/duhamel/labeling_algo.cc | 83 - milena/sandbox/duhamel/labeling_algo.hh | 301 - milena/sandbox/duhamel/labeling_cpy_from_mln.hh | 276 - milena/sandbox/duhamel/labeling_level.hh | 213 - milena/sandbox/duhamel/labeling_level_fast.cc | 63 - .../duhamel/labeling_level_fast_10000x1000.cc | 63 - .../duhamel/labeling_level_generic_10000x1000.cc | 63 - milena/sandbox/duhamel/level.hh | 117 - milena/sandbox/duhamel/level_cpy_from_mln.hh | 147 - milena/sandbox/duhamel/log.txt | 24 - milena/sandbox/duhamel/main.cc | 39 - milena/sandbox/duhamel/main_mesh_image.cc | 65 - milena/sandbox/duhamel/mem.hh | 118 - milena/sandbox/duhamel/mesh_image.hh | 190 - milena/sandbox/duhamel/mesh_p.hh | 159 - milena/sandbox/duhamel/mesh_psite.hh | 55 - milena/sandbox/duhamel/paste.hh | 36 - milena/sandbox/duhamel/queue_p_fast.hh | 275 - milena/sandbox/duhamel/queue_p_priority.cc | 64 - milena/sandbox/duhamel/queue_p_priority.hh | 316 - milena/sandbox/duhamel/slow_seed2tiling.cc | 156 - .../duhamel/test_border_duplicate_image1d_1.cc | 54 - .../duhamel/test_border_duplicate_image1d_2.cc | 53 - .../duhamel/test_border_duplicate_image1d_3.cc | 57 - .../duhamel/test_border_duplicate_image1d_4.cc | 56 - .../duhamel/test_border_duplicate_image1d_5.cc | 56 - .../duhamel/test_border_duplicate_image2d_1.cc | 54 - .../duhamel/test_border_duplicate_image2d_2.cc | 53 - .../duhamel/test_border_duplicate_image2d_3.cc | 54 - .../duhamel/test_border_duplicate_image2d_4.cc | 56 - .../duhamel/test_border_duplicate_image3d_1.cc | 53 - .../duhamel/test_border_duplicate_image3d_2.cc | 52 - .../duhamel/test_border_duplicate_image3d_3.cc | 56 - .../duhamel/test_border_duplicate_image3d_4.cc | 55 - .../sandbox/duhamel/test_border_fill_image1d_1.cc | 51 - .../sandbox/duhamel/test_border_fill_image1d_2.cc | 50 - .../sandbox/duhamel/test_border_fill_image1d_3.cc | 54 - .../sandbox/duhamel/test_border_fill_image1d_4.cc | 55 - .../sandbox/duhamel/test_border_fill_image1d_5.cc | 54 - .../sandbox/duhamel/test_border_fill_image2d_1.cc | 51 - .../sandbox/duhamel/test_border_fill_image2d_2.cc | 50 - .../sandbox/duhamel/test_border_fill_image2d_3.cc | 54 - .../sandbox/duhamel/test_border_fill_image2d_4.cc | 54 - .../sandbox/duhamel/test_border_fill_image3d_1.cc | 51 - .../sandbox/duhamel/test_border_fill_image3d_2.cc | 50 - .../sandbox/duhamel/test_border_fill_image3d_3.cc | 53 - .../sandbox/duhamel/test_border_fill_image3d_4.cc | 53 - milena/sandbox/duhamel/test_debug_iota_3d.cc | 50 - milena/sandbox/duhamel/translate_image.cc | 43 - milena/sandbox/duhamel/translate_image.hh | 196 - milena/sandbox/edwin/Makefile | 29 - milena/sandbox/edwin/exec/benchmark/Makefile | 21 - milena/sandbox/edwin/exec/benchmark/newv.cc | 86 - milena/sandbox/edwin/exec/benchmark/oldv.cc | 82 - milena/sandbox/edwin/exec/color_distance.hh | 80 - .../sandbox/edwin/exec/color_internal_gradient.hh | 149 - milena/sandbox/edwin/exec/color_labeling_mean.hh | 70 - milena/sandbox/edwin/exec/give_me_the_curve.cc | 92 - milena/sandbox/edwin/exec/internal_gradient.cc | 41 - milena/sandbox/edwin/exec/mask_colorize.cc | 78 - milena/sandbox/edwin/exec/mask_fill_mean_color.cc | 61 - .../sandbox/edwin/exec/max_delta_colormean_obj.cc | 244 - milena/sandbox/edwin/exec/pgm_gradient.cc | 42 - milena/sandbox/edwin/exec/plot.conf | 3 - milena/sandbox/edwin/exec/score.hh | 287 - .../edwin/exec/sharpest_obj_reconstruction.cc | 145 - milena/sandbox/edwin/exec/tree_debug.cc | 86 - .../sandbox/edwin/exec/wst_from_reconstructed.cc | 85 - milena/sandbox/edwin/exec/zi.cc | 353 - milena/sandbox/edwin/exec/zi.hh | 152 - .../sandbox/edwin/mln/core/concept/dindex_site.hh | 253 - .../sandbox/edwin/mln/core/concept/index_site.hh | 311 - milena/sandbox/edwin/mln/core/concept/tree.hh | 148 - milena/sandbox/edwin/mln/core/dindex_site.hh | 119 - .../edwin/mln/core/image/attribute_image.hh | 435 - .../edwin/mln/core/internal/index_site_base.hh | 254 - .../sandbox/edwin/mln/core/site_set/p_run_idx.hh | 458 - .../edwin/mln/core/site_set/p_run_idx_piter.hh | 222 - milena/sandbox/edwin/mln/debug/ctree.hh | 155 - milena/sandbox/edwin/mln/morpho/attribute/bbox.hh | 203 - .../edwin/mln/morpho/attribute/mysharpness.hh | 59 - .../edwin/mln/morpho/attribute/occupation.hh | 252 - .../edwin/mln/morpho/tree/component_tree.hh | 124 - milena/sandbox/edwin/mln/morpho/tree/components.hh | 322 - .../edwin/mln/morpho/tree/components_debug.hh | 384 - .../mln/morpho/tree/compute_attribute_image.hh | 178 - milena/sandbox/edwin/mln/morpho/tree/debug.hh | 124 - .../edwin/mln/morpho/tree/impl/dual_hqueue.hh | 408 - .../edwin/mln/morpho/tree/impl/dual_union_find.hh | 361 - .../edwin/mln/morpho/tree/impl/union_find.hh | 172 - milena/sandbox/edwin/mln/morpho/tree/propagate.hh | 148 - .../edwin/mln/morpho/tree/propagate_node.hh | 112 - .../edwin/mln/morpho/tree/propagate_node_debug.hh | 217 - milena/sandbox/edwin/mln/util/ctree/ctree.hh | 589 - .../edwin/mln/util/ctree/internal/tree_base.hh | 140 - milena/sandbox/edwin/mln/util/ctree/node.hh | 183 - milena/sandbox/edwin/move_accu.sh | 91 - milena/sandbox/edwin/rush/exo2/configure | 21 - milena/sandbox/edwin/rush/exo2/test.cc | 133 - milena/sandbox/edwin/rush/exo2/wst_from_closing.cc | 127 - .../edwin/rush/granulometry/granulometry.hh | 163 - milena/sandbox/edwin/rush/granulometry/test.cc | 115 - milena/sandbox/edwin/rush/leaves/Makefile | 35 - milena/sandbox/edwin/rush/leaves/chain.sh | 34 - milena/sandbox/edwin/rush/leaves/configure | 21 - milena/sandbox/edwin/rush/leaves/export_leaves.hh | 115 - milena/sandbox/edwin/rush/leaves/get_leaves.cc | 65 - milena/sandbox/edwin/rush/leaves/splot.sh | 10 - milena/sandbox/edwin/rush/leaves/test/Makefile | 41 - milena/sandbox/edwin/rush/leaves/test/configure | 21 - milena/sandbox/edwin/rush/leaves/test/export.cc | 63 - milena/sandbox/edwin/tests/sharp.cc | 311 - milena/sandbox/edwin/tests/sharpness_attribute.cc | 140 - milena/sandbox/edwin/tools/make_the_curves.sh | 15 - milena/sandbox/edwin/tree/Makefile | 1838 - milena/sandbox/edwin/tree/accumulator/arg_max.hh | 160 - milena/sandbox/edwin/tree/configure | 21 - milena/sandbox/edwin/tree/propagation.cc | 104 - milena/sandbox/edwin/tree/run.hh | 271 - milena/sandbox/edwin/tree/tree.cc | 293 - milena/sandbox/exec/Makefile | 7 - milena/sandbox/exec/bw_negate_in_color.cc | 46 - milena/sandbox/exec/filetype.hh | 54 - milena/sandbox/exec/histo_save.cc | 46 - milena/sandbox/fabien/README | 204 - milena/sandbox/fabien/bin/Makefile | 12 - milena/sandbox/fabien/bin/dicom2dump.cc | 32 - milena/sandbox/fabien/bin/dicom2pgm.cc | 34 - milena/sandbox/fabien/bin/dicom_mask.cc | 104 - milena/sandbox/fabien/bin/dump2pbm.cc | 51 - milena/sandbox/fabien/bin/dump2pgm.cc | 37 - milena/sandbox/fabien/bin/dump2pgm8b.cc | 33 - milena/sandbox/fabien/bin/dump2ppm.cc | 35 - milena/sandbox/fabien/bin/dump_mask.cc | 86 - milena/sandbox/fabien/bin/dumpi12_to_pgm.cc | 58 - milena/sandbox/fabien/bin/dumpl16_to_colorize.cc | 64 - milena/sandbox/fabien/bin/dumpl32_to_colorize.cc | 61 - milena/sandbox/fabien/bin/dumpl8_to_colorize.cc | 62 - milena/sandbox/fabien/bin/filetype.hh | 54 - milena/sandbox/fabien/bin/pnms2dump.cc | 98 - milena/sandbox/fabien/binarization/Makefile | 5 - milena/sandbox/fabien/binarization/test.cc | 149 - milena/sandbox/fabien/dcmtk/Makefile | 2 - milena/sandbox/fabien/dcmtk/dicom.cc | 14 - milena/sandbox/fabien/dcmtk/load.hh | 388 - milena/sandbox/fabien/dcmtk/save.hh | 951 - milena/sandbox/fabien/igr/Makefile | 99 - milena/sandbox/fabien/igr/Makefile.rules | 8 - milena/sandbox/fabien/igr/all_labels2gif.sh | 33 - milena/sandbox/fabien/igr/check.sh | 49 - milena/sandbox/fabien/igr/check2d_wsd.sh | 32 - milena/sandbox/fabien/igr/check3d_wsd.sh | 35 - milena/sandbox/fabien/igr/check_dist.sh | 19 - milena/sandbox/fabien/igr/check_edges.sh | 55 - milena/sandbox/fabien/igr/check_us_morpho.sh | 46 - milena/sandbox/fabien/igr/clo_vol.cc | 76 - milena/sandbox/fabien/igr/color/find_color.cc | 100 - milena/sandbox/fabien/igr/crop.cc | 73 - milena/sandbox/fabien/igr/dist_edges.cc | 276 - milena/sandbox/fabien/igr/filter.cc | 151 - milena/sandbox/fabien/igr/filter_morpho_us.cc | 100 - milena/sandbox/fabien/igr/fixed_seg/Makefile | 9 - milena/sandbox/fabien/igr/fixed_seg/main.cc | 321 - milena/sandbox/fabien/igr/fun_labels.cc | 253 - milena/sandbox/fabien/igr/fun_labels.sh | 104 - milena/sandbox/fabien/igr/grad.cc | 66 - milena/sandbox/fabien/igr/graph.cc | 331 - milena/sandbox/fabien/igr/igr.cc | 179 - milena/sandbox/fabien/igr/label2gif.cc | 105 - milena/sandbox/fabien/igr/launch.sh | 4 - milena/sandbox/fabien/igr/launch2d.sh | 32 - milena/sandbox/fabien/igr/launch3d.sh | 28 - milena/sandbox/fabien/igr/maj.cc | 61 - milena/sandbox/fabien/igr/mat2mln/mat2mln.cc | 60 - milena/sandbox/fabien/igr/mat2mln/mat2raw.cc | 52 - milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc | 130 - milena/sandbox/fabien/igr/matlab.cc | 382 - milena/sandbox/fabien/igr/mean_median_label.cc | 191 - milena/sandbox/fabien/igr/mean_slices.cc | 89 - milena/sandbox/fabien/igr/med.cc | 148 - milena/sandbox/fabien/igr/min_max_float.cc | 89 - milena/sandbox/fabien/igr/nbasins_check.sh | 17 - milena/sandbox/fabien/igr/nbasins_finder.cc | 79 - milena/sandbox/fabien/igr/norm.cc | 105 - milena/sandbox/fabien/igr/plot_label.hh | 58 - milena/sandbox/fabien/igr/plot_points/Makefile | 11 - milena/sandbox/fabien/igr/plot_points/README | 2 - milena/sandbox/fabien/igr/plot_points/int2rgb.hh | 36 - milena/sandbox/fabien/igr/plot_points/main.cc | 77 - .../fabien/igr/plot_points/plot_points_of_label.cc | 95 - milena/sandbox/fabien/igr/point_filtering/Makefile | 9 - milena/sandbox/fabien/igr/point_filtering/main.cc | 83 - milena/sandbox/fabien/igr/seg2d.cc | 55 - milena/sandbox/fabien/igr/seg3d.cc | 57 - milena/sandbox/fabien/igr/seg_vol_irm.hh | 349 - milena/sandbox/fabien/igr/segment_us_morpho.sh | 40 - milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc | 243 - milena/sandbox/fabien/igr/space_smooth/Makefile | 15 - milena/sandbox/fabien/igr/space_smooth/linear.cc | 78 - milena/sandbox/fabien/igr/space_smooth/median.cc | 133 - milena/sandbox/fabien/igr/space_smooth/morpho.cc | 98 - milena/sandbox/fabien/igr/thres.cc | 72 - milena/sandbox/fabien/igr/time_max.cc | 118 - milena/sandbox/fabien/igr/time_max_norm.cc | 117 - milena/sandbox/fabien/igr/time_smooth/Makefile | 15 - milena/sandbox/fabien/igr/time_smooth/linear.cc | 95 - milena/sandbox/fabien/igr/time_smooth/median.cc | 102 - milena/sandbox/fabien/igr/time_smooth/morpho.cc | 102 - milena/sandbox/fabien/igr/tmax.sh | 23 - milena/sandbox/fabien/igr/watershed.hh | 331 - milena/sandbox/fabien/igr/watershed2d.cc | 318 - milena/sandbox/fabien/igr/watershed3d.cc | 330 - milena/sandbox/fabien/igr/wst.cc | 74 - milena/sandbox/fabien/igr/wst_edges.cc | 147 - milena/sandbox/fabien/magick/Makefile | 14 - milena/sandbox/fabien/magick/magick.cc | 27 - milena/sandbox/fabien/magick/save.cc | 23 - milena/sandbox/fabien/magick/tiled_image.cc | 38 - .../fabien/mln/canvas/browsing/directional.hh | 157 - milena/sandbox/fabien/mln/canvas/browsing/snake.hh | 128 - milena/sandbox/fabien/mln/core/image/cache.hh | 200 - milena/sandbox/fabien/mln/core/image/disk_ima.hh | 644 - .../fabien/mln/core/image/magick_tiled2d.hh | 610 - milena/sandbox/fabien/mln/core/image/page.hh | 155 - milena/sandbox/fabien/mln/core/image/tiled2d.hh | 652 - milena/sandbox/fabien/mln/data/fast_median.hh | 180 - milena/sandbox/fabien/mln/debug/int2rgb.hh | 91 - .../sandbox/fabien/mln/display/display_region.hh | 90 - milena/sandbox/fabien/mln/io/pnm/load.hh | 334 - milena/sandbox/fabien/mln/io/pnm/load_disk_ima.hh | 88 - milena/sandbox/fabien/mln/test/conversion.hh | 140 - milena/sandbox/fabien/mln/upsampling/hq2x.hh | 2990 - milena/sandbox/fabien/mln/upsampling/hq3x.hh | 3949 - milena/sandbox/fabien/mln/upsampling/hq4x.hh | 5429 - .../fabien/mln/world/inter_pixel/display_region.hh | 163 - .../fabien/mln/world/inter_pixel/is_zero_face.hh | 90 - milena/sandbox/fabien/tests/core/image/Makefile | 15 - milena/sandbox/fabien/tests/core/image/bench.hh | 19 - milena/sandbox/fabien/tests/core/image/bench.sh | 17 - milena/sandbox/fabien/tests/core/image/disk_ima.cc | 32 - milena/sandbox/fabien/tests/core/image/ima2d.cc | 31 - milena/sandbox/fabien/tests/core/image/tiled2d.cc | 32 - milena/sandbox/fabien/tests/display/Makefile | 7 - .../sandbox/fabien/tests/display/display_region.cc | 64 - milena/sandbox/fabien/tests/test/conversion.cc | 33 - milena/sandbox/fabien/tests/upsampling/Makefile | 12 - milena/sandbox/fabien/tests/upsampling/hq2x.cc | 29 - milena/sandbox/fabien/tests/upsampling/hq3x.cc | 29 - milena/sandbox/fabien/tests/upsampling/hq4x.cc | 29 - .../fabien/tests/world/inter_pixel/Makefile | 7 - .../tests/world/inter_pixel/display_region.cc | 59 - .../folio/exercices/heritage_conditionnel.cc | 7 - .../folio/exercices/heritage_conditionnel.hh | 46 - milena/sandbox/folio/img/monkeys_april.ppm | Bin 3099112 -> 0 bytes milena/sandbox/folio/mln/dt/canvas_dt.hh | 178 - milena/sandbox/folio/mln/dt/chamfer.hh | 156 - milena/sandbox/folio/mln/dt/cp.hh | 121 - milena/sandbox/folio/mln/dt/dmap.hh | 119 - milena/sandbox/folio/mln/dt/dt_old/canevas_dt.hh | 231 - milena/sandbox/folio/mln/dt/dt_old/chamfer.cc | 206 - .../sandbox/folio/mln/dt/dt_old/distance_front.cc | 88 - .../folio/mln/dt/dt_old/distance_front_new.hh | 420 - milena/sandbox/folio/mln/dt/dt_old/dt.cc | 59 - milena/sandbox/folio/mln/dt/dt_old/dt.hh | 101 - milena/sandbox/folio/mln/dt/dt_old/dt.spe.hh | 123 - milena/sandbox/folio/mln/dt/dt_old/naive.cc | 142 - milena/sandbox/folio/mln/dt/dt_old/psn.cc | 204 - milena/sandbox/folio/mln/dt/dt_old/psn_log.cc | 290 - milena/sandbox/folio/mln/dt/path.hh | 121 - milena/sandbox/folio/mln/dt/raw_cp_fast.hh | 173 - milena/sandbox/folio/mln/dt/raw_cp_slow.hh | 155 - milena/sandbox/folio/mln/dt/raw_dmap_fast.hh | 164 - milena/sandbox/folio/mln/dt/raw_dmap_slow.hh | 149 - milena/sandbox/folio/mln/dt/raw_path_fast.hh | 173 - milena/sandbox/folio/mln/dt/raw_path_slow.hh | 155 - milena/sandbox/folio/mln/fun/v2v/hsl_to_hsv.hh | 141 - milena/sandbox/folio/mln/fun/v2v/rgb_to_hsv.hh | 160 - .../folio/mln/histo/classify_with_histo_3d.hh | 59 - .../folio/mln/histo/classify_with_histo_rgb.hh | 39 - milena/sandbox/folio/mln/histo/compute_histo.hh | 69 - milena/sandbox/folio/mln/histo/compute_histo_3d.hh | 67 - .../sandbox/folio/mln/histo/compute_histo_rgb.hh | 43 - milena/sandbox/folio/mln/histo/project_histo_3d.hh | 61 - milena/sandbox/folio/mln/value/circular.hh | 268 - milena/sandbox/folio/mln/value/hsv.hh | 413 - milena/sandbox/folio/mln/value/pipo.hh | 107 - milena/sandbox/folio/papers/dt_resume.txt | 33 - milena/sandbox/folio/papers/examples.txt | 63 - milena/sandbox/folio/test/dt/canvas/dt.hh | 101 - milena/sandbox/folio/test/dt/canvas/dt.spe.hh | 123 - milena/sandbox/folio/test/dt/chamfer.cc | 52 - milena/sandbox/folio/test/dt/dt.cc | 66 - milena/sandbox/folio/test/dt/dt_bench.cc | 53 - milena/sandbox/folio/test/dt/dt_maze.cc | 124 - milena/sandbox/folio/test/dt/naive.cc | 142 - milena/sandbox/folio/test/dt/psn.cc | 204 - milena/sandbox/folio/test/dt/psn_log.cc | 290 - milena/sandbox/folio/test/dt/tmp.ppm | Bin 4966 -> 0 bytes .../sandbox/folio/test/histo/compute_histo_3d.cc | 76 - .../sandbox/folio/test/histo/compute_histo_rgb.cc | 52 - .../folio/test/histo/compute_histo_rgb_from_ppm.cc | 30 - milena/sandbox/folio/test/histo/plot_lena.cc | 55 - milena/sandbox/folio/test/histo/plot_lena_3d.cc | 63 - milena/sandbox/folio/test/histo/plot_lena_rgb.cc | 56 - .../folio/test/histo/project_histo_3d_add.cc | 75 - .../folio/test/histo/project_histo_3d_mean.cc | 80 - milena/sandbox/folio/test/histo/project_screen.cc | 149 - milena/sandbox/folio/test/histo/projected.cc | 49 - milena/sandbox/folio/test/histo/projected3d.cc | 138 - milena/sandbox/folio/test/value/circular.cc | 89 - milena/sandbox/folio/test/value/comp.cc | 9 - milena/sandbox/folio/test/value/hsv.cc | 34 - milena/sandbox/folio/test/value/pipo.cc | 21 - .../folio/tools/histo/classify_with_histo_gs.cc | 110 - .../histo/projected_histo_classified_color_maj.cc | 116 - .../tools/histo/projected_histo_classified_gs.cc | 116 - .../folio/tools/histo/projected_histo_gs.cc | 89 - milena/sandbox/fred/fun/abs.hh | 39 - milena/sandbox/fred/fun/assignability.hh | 103 - milena/sandbox/fred/fun/binary.hh | 137 - milena/sandbox/fred/fun/compose.hh | 71 - milena/sandbox/fred/fun/composition.hh | 210 - milena/sandbox/fred/fun/cos.cc | 34 - milena/sandbox/fred/fun/cos.hh | 48 - milena/sandbox/fred/fun/fun.cc | 108 - milena/sandbox/fred/fun/inc.hh | 43 - milena/sandbox/fred/fun/meta_function.hh | 203 - milena/sandbox/fred/fun/norm.hh | 96 - milena/sandbox/fred/fun/nsolve.hh | 152 - milena/sandbox/fred/fun/nsolve_binary.hh | 302 - milena/sandbox/fred/fun/nsolve_unary.hh | 171 - milena/sandbox/fred/fun/red.hh | 44 - milena/sandbox/fred/fun/thru.cc | 31 - milena/sandbox/fred/fun/thru_morpher.hh | 302 - milena/sandbox/fred/fun/unary.hh | 357 - milena/sandbox/fred/functions.html | 478 - milena/sandbox/fred/functions.mkdown | 441 - milena/sandbox/fred/old/accu_trait.hh | 94 - milena/sandbox/fred/old/accuprops.cc | 331 - milena/sandbox/fred/old/accuprops2.cc | 380 - milena/sandbox/fred/old/algebraic.cc | 406 - milena/sandbox/fred/old/closing_area.cc | 50 - milena/sandbox/fred/old/connected_filter.hh | 123 - milena/sandbox/fred/old/leveling.cc | 47 - milena/sandbox/fred/old/leveling_filter.hh | 381 - milena/sandbox/fred/old/mean.hh | 202 - milena/sandbox/fred/old/meantest.cc | 21 - milena/sandbox/fred/old/overload.cc | 296 - milena/sandbox/fred/old/p2p/Makefile | 12 - milena/sandbox/fred/old/p2p/compose_p2p.hh | 44 - milena/sandbox/fred/old/p2p/p2p_morpher.hh | 284 - milena/sandbox/fred/old/p2p/symmetry_p2p.hh | 47 - milena/sandbox/fred/old/p2p/test_morph_image.cc | 62 - milena/sandbox/fred/old/p2p/translate_p2p.hh | 43 - milena/sandbox/fred/old/site_wrapper.hh | 188 - milena/sandbox/fred/old/value.cc | 24 - milena/sandbox/fred/old/value_wrapper.hh | 188 - milena/sandbox/fred/tests/Makefile | 24 - milena/sandbox/fred/tests/cos.cc | 35 - milena/sandbox/fred/tests/fun.cc | 120 - milena/sandbox/fred/tests/thru.cc | 50 - milena/sandbox/fred/tests/wip.cc | 25 - milena/sandbox/garrigues/TODO | 43 - milena/sandbox/garrigues/area_filter_auto_dual.cc | 268 - milena/sandbox/garrigues/factures/extract_array.cc | 114 - .../garrigues/factures/extract_array_highlight.cc | 164 - milena/sandbox/garrigues/fllt/compute_level_set.hh | 410 - .../garrigues/fllt/compute_level_set_fast.hh | 486 - .../garrigues/fllt/compute_level_set_fast2.hh | 471 - milena/sandbox/garrigues/fllt/debug.hh | 205 - milena/sandbox/garrigues/fllt/doc.hh | 91 - milena/sandbox/garrigues/fllt/essai.cc | 104 - milena/sandbox/garrigues/fllt/fllt.hh | 136 - milena/sandbox/garrigues/fllt/fllt_doc.hh | 86 - milena/sandbox/garrigues/fllt/fllt_merge.hh | 200 - milena/sandbox/garrigues/fllt/fllt_optimized.hh | 193 - milena/sandbox/garrigues/fllt/fllt_simple.cc | 730 - milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 325 - milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 349 - milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 612 - milena/sandbox/garrigues/fllt/fllt_theo.cc | 322 - milena/sandbox/garrigues/fllt/fllt_types.hh | 71 - milena/sandbox/garrigues/fllt/give_confs.cc | 56 - .../sandbox/garrigues/fllt/local_configurations.hh | 144 - milena/sandbox/garrigues/fllt/lower.hh | 90 - milena/sandbox/garrigues/fllt/merge.hh | 216 - milena/sandbox/garrigues/fllt/test.cc | 62 - milena/sandbox/garrigues/fllt/test_fllt.cc | 34 - milena/sandbox/garrigues/fllt/test_fllt10.cc | 31 - milena/sandbox/garrigues/fllt/test_fllt10_inv.cc | 31 - milena/sandbox/garrigues/fllt/test_fllt12.cc | 29 - milena/sandbox/garrigues/fllt/test_fllt13.cc | 30 - milena/sandbox/garrigues/fllt/test_fllt15.cc | 43 - milena/sandbox/garrigues/fllt/test_fllt2.cc | 33 - milena/sandbox/garrigues/fllt/test_fllt3.cc | 31 - milena/sandbox/garrigues/fllt/test_fllt3_inv.cc | 45 - milena/sandbox/garrigues/fllt/test_fllt4.cc | 40 - milena/sandbox/garrigues/fllt/test_fllt5.cc | 40 - milena/sandbox/garrigues/fllt/test_fllt6.cc | 28 - milena/sandbox/garrigues/fllt/test_fllt7.cc | 44 - milena/sandbox/garrigues/fllt/test_fllt7_inv.cc | 31 - milena/sandbox/garrigues/fllt/test_fllt8.cc | 33 - milena/sandbox/garrigues/fllt/test_fllt9.cc | 41 - milena/sandbox/garrigues/fllt/test_fllt_lena.cc | 24 - .../sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 32 - milena/sandbox/garrigues/fllt/test_fllt_tiny.cc | 19 - milena/sandbox/garrigues/fllt/test_flltb.cc | 40 - milena/sandbox/garrigues/fllt/types.hh | 211 - milena/sandbox/garrigues/fllt/upper.hh | 89 - .../image_identity/image_domain_morpher.hh | 122 - .../garrigues/image_identity/image_identity.cc | 9 - .../garrigues/image_identity/image_identity.hh | 77 - .../image_identity/image_value_morpher.hh | 95 - .../garrigues/image_identity/interpolated.cc | 70 - .../garrigues/image_identity/interpolated.hh | 185 - milena/sandbox/garrigues/level_set.hh | 494 - milena/sandbox/garrigues/log | 35 - milena/sandbox/garrigues/lower.hh | 89 - .../garrigues/tiled_image2d/backend/file.hh | 76 - .../sandbox/garrigues/tiled_image2d/backend/ios.hh | 79 - .../garrigues/tiled_image2d/backend/mmap.hh | 128 - milena/sandbox/garrigues/tiled_image2d/block.hh | 68 - milena/sandbox/garrigues/tiled_image2d/context.hh | 38 - .../sandbox/garrigues/tiled_image2d/layout/all.hh | 8 - .../garrigues/tiled_image2d/layout/image2d/all.hh | 7 - .../garrigues/tiled_image2d/layout/image2d/lrtb.hh | 70 - .../garrigues/tiled_image2d/layout/image2d/tblr.hh | 33 - .../garrigues/tiled_image2d/layout/layout2d.hh | 56 - .../garrigues/tiled_image2d/layout/page2d/all.hh | 7 - .../garrigues/tiled_image2d/layout/page2d/lrtb.hh | 52 - .../garrigues/tiled_image2d/layout/page2d/tblr.hh | 21 - milena/sandbox/garrigues/tiled_image2d/page.hh | 91 - .../sandbox/garrigues/tiled_image2d/paged_image.hh | 56 - .../sandbox/garrigues/tiled_image2d/support/lru.hh | 198 - .../garrigues/tiled_image2d/support/simple.hh | 35 - .../garrigues/tiled_image2d/tiled_image2d.cc | 54 - .../garrigues/tiled_image2d/tiled_image2d.hh | 374 - milena/sandbox/garrigues/union_find/Makefile | 27 - .../garrigues/union_find/canvas/find_root.hh | 61 - .../canvas/reconstruction_on_function.hh | 165 - .../union_find/canvas/reconstruction_on_set.hh | 149 - .../union_find/canvas/self_dual_reconstruction.hh | 217 - .../union_find/images/marker_to_dilate.pbm | 4 - .../union_find/images/marker_to_erode.pbm | Bin 221 -> 0 bytes .../sandbox/garrigues/union_find/images/mask.pbm | 5 - .../union_find/reconstructions_on_function.cc | 66 - .../union_find/reconstructions_on_function.hh | 247 - .../garrigues/union_find/reconstructions_on_set.cc | 90 - .../garrigues/union_find/reconstructions_on_set.hh | 224 - .../sandbox/garrigues/union_find/reunion_avec_theo | 23 - .../union_find/self_dual_reconstruction.cc | 105 - .../union_find/self_dual_reconstruction.hh | 206 - milena/sandbox/garrigues/upper.hh | 89 - milena/sandbox/garrigues/value_behavior.cc | 106 - milena/sandbox/green/README | 301 - .../green/bench/transform/distance/Makefile.am | 150 - .../green/bench/transform/distance/distance.cc | 775 - .../green/bug/labeling/mean_values/Makefile.am | 148 - .../green/bug/labeling/mean_values/label.pgm | Bin 16504 -> 0 bytes .../green/bug/labeling/mean_values/mean_values.cc | 59 - .../green/demo/accu/stat/histo2d/Makefile.am | 148 - .../green/demo/accu/stat/histo2d/histo2d.cc | 155 - .../sandbox/green/demo/annotating/bic/Makefile.am | 150 - milena/sandbox/green/demo/annotating/bic/bic.cc | 87 - .../sandbox/green/demo/annotating/hsv/Makefile.am | 152 - milena/sandbox/green/demo/annotating/hsv/hsv.cc | 607 - .../sandbox/green/demo/annotating/lep/Makefile.am | 150 - milena/sandbox/green/demo/annotating/lep/lep.cc | 92 - .../green/demo/annotating/nb_color/Makefile.am | 150 - .../green/demo/annotating/nb_color/nb_color.cc | 101 - .../green/demo/annotating/project/Makefile.am | 150 - .../green/demo/annotating/project/project.cc | 210 - .../green/demo/annotating/rgb_64/Makefile.am | 150 - .../sandbox/green/demo/annotating/rgb_64/rgb_64.cc | 47 - .../green/demo/annotating/rgb_64_9/Makefile.am | 150 - .../green/demo/annotating/rgb_64_9/rgb_64_9.cc | 97 - .../green/demo/annotating/stddev_color/Makefile.am | 150 - .../demo/annotating/stddev_color/stddev_color.cc | 124 - .../demo/annotating/stddev_color_16/Makefile.am | 150 - .../annotating/stddev_color_16/stddev_color_16.cc | 178 - .../green/demo/clustering/kmean1d/Makefile.am | 148 - .../green/demo/clustering/kmean1d/kmean1d.cc | 161 - .../green/demo/clustering/kmean2d/Makefile.am | 148 - .../green/demo/clustering/kmean2d/kmean2d.cc | 440 - .../green/demo/clustering/kmean3d/Makefile.am | 148 - .../green/demo/clustering/kmean3d/kmean3d.cc | 169 - .../green/demo/clustering/kmean_rgb/Makefile.am | 148 - .../green/demo/clustering/kmean_rgb/kmean_rgb.cc | 91 - .../demo/labeling/regional_maxima/Makefile.am | 150 - .../labeling/regional_maxima/regional_maxima.cc | 821 - .../demo/labeling/regional_maxima/thresholds.txt | 42 - milena/sandbox/green/doc/annotating/class.txt | 42 - .../green/doc/annotating/syntheseMillet2008.txt | 283 - milena/sandbox/green/doc/annotating/testMillet2008 | 69 - .../green/doc/examples/accu_color/accu_color.cc | 249 - milena/sandbox/green/doc/examples/frac/Makefile.am | 148 - milena/sandbox/green/doc/examples/frac/frac.cc | 423 - milena/sandbox/green/doc/examples/frac/frac.hh | 793 - milena/sandbox/green/doc/examples/frac/gcd.hh | 91 - .../sandbox/green/doc/examples/frac/sign_prod.hh | 74 - .../green/doc/examples/hello_milena/Makefile.am | 49 - .../doc/examples/hello_milena/hello_milena.cc | 41 - .../green/doc/examples/hello_world/Makefile.am | 49 - .../green/doc/examples/hello_world/hello_world.cc | 9 - .../green/doc/examples/hello_world/print.cc | 6 - milena/sandbox/green/doc/examples/io/Makefile.am | 150 - milena/sandbox/green/doc/examples/io/io.cc | 71 - .../green/doc/examples/learn_milena/Makefile.am | 49 - .../doc/examples/learn_milena/learn_milena.cc | 151 - milena/sandbox/green/doc/examples/otsu/Makefile.am | 49 - milena/sandbox/green/doc/examples/otsu/otsu.cc | 193 - .../sandbox/green/doc/examples/stats/Makefile.am | 49 - milena/sandbox/green/doc/examples/stats/stats.cc | 32 - milena/sandbox/green/doc/formulae/formulae.tex | 1157 - milena/sandbox/green/doc/quick_tour/quick_tour.tex | 115 - .../doc/regional_maxima/cmp_method/h0_input.pgm.gz | Bin 18078 -> 0 bytes .../doc/regional_maxima/cmp_method/h2_mean.pgm.gz | Bin 374 -> 0 bytes .../doc/regional_maxima/cmp_method/h2_merge.pgm.gz | Bin 4491 -> 0 bytes .../doc/regional_maxima/cmp_method/h3_mean.pgm.gz | Bin 391 -> 0 bytes .../doc/regional_maxima/cmp_method/h3_merge.pgm.gz | Bin 10188 -> 0 bytes .../doc/regional_maxima/cmp_method/h4_mean.pgm.gz | Bin 367 -> 0 bytes .../doc/regional_maxima/cmp_method/h4_merge.pgm.gz | Bin 18078 -> 0 bytes .../doc/regional_maxima/cmp_method/h5_mean.pgm.gz | Bin 372 -> 0 bytes .../doc/regional_maxima/cmp_method/h5_merge.pgm.gz | Bin 12777 -> 0 bytes .../doc/regional_maxima/cmp_method/i2_mean.ppm.gz | Bin 566650 -> 0 bytes .../doc/regional_maxima/cmp_method/i2_merge.ppm.gz | Bin 1586150 -> 0 bytes .../doc/regional_maxima/cmp_method/i3_mean.ppm.gz | Bin 573407 -> 0 bytes .../doc/regional_maxima/cmp_method/i3_merge.ppm.gz | Bin 3050979 -> 0 bytes .../doc/regional_maxima/cmp_method/i4_mean.ppm.gz | Bin 663621 -> 0 bytes .../doc/regional_maxima/cmp_method/i4_merge.ppm.gz | Bin 3387044 -> 0 bytes .../doc/regional_maxima/cmp_method/i5_mean.ppm.gz | Bin 653140 -> 0 bytes .../doc/regional_maxima/cmp_method/i5_merge.ppm.gz | Bin 3217839 -> 0 bytes .../doc/regional_maxima/cmp_method/l2_input.pgm.gz | Bin 423612 -> 0 bytes .../doc/regional_maxima/cmp_method/l3_input.pgm.gz | Bin 420801 -> 0 bytes .../doc/regional_maxima/cmp_method/l4_input.pgm.gz | Bin 486206 -> 0 bytes .../doc/regional_maxima/cmp_method/l5_input.pgm.gz | Bin 479055 -> 0 bytes .../regional_maxima/cmp_method/reponse_theo.eml | 106 - .../doc/regional_maxima/cmp_method/s2_histo.txt | 31 - .../doc/regional_maxima/cmp_method/s3_histo.txt | 31 - .../doc/regional_maxima/cmp_method/s4_histo.txt | 31 - .../doc/regional_maxima/cmp_method/s5_histo.txt | 31 - .../doc/regional_maxima/cmp_method/synthese.txt | 223 - .../doc/regional_maxima/cmp_quant/h0_input.pgm.gz | Bin 18078 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q2.pgm.gz | Bin 247 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q3.pgm.gz | Bin 280 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q4.pgm.gz | Bin 319 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q5.pgm.gz | Bin 375 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q6.pgm.gz | Bin 392 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q7.pgm.gz | Bin 383 -> 0 bytes .../regional_maxima/cmp_quant/h5_mean_q8.pgm.gz | Bin 470 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q2.pgm.gz | Bin 18081 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q3.pgm.gz | Bin 18081 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q4.pgm.gz | Bin 16358 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q5.pgm.gz | Bin 12780 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q6.pgm.gz | Bin 9694 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q7.pgm.gz | Bin 6211 -> 0 bytes .../regional_maxima/cmp_quant/h5_merge_q8.pgm.gz | Bin 1564 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q2.ppm.gz | Bin 112779 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q3.ppm.gz | Bin 191264 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q4.ppm.gz | Bin 298062 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q5.ppm.gz | Bin 653143 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q6.ppm.gz | Bin 807617 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q7.ppm.gz | Bin 813222 -> 0 bytes .../regional_maxima/cmp_quant/i5_mean_q8.ppm.gz | Bin 861711 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q2.ppm.gz | Bin 3387047 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q3.ppm.gz | Bin 3387047 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q4.ppm.gz | Bin 3355365 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q5.ppm.gz | Bin 3217842 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q6.ppm.gz | Bin 3033730 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q7.ppm.gz | Bin 2295150 -> 0 bytes .../regional_maxima/cmp_quant/i5_merge_q8.ppm.gz | Bin 1319396 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q2.pgm.gz | Bin 83951 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q3.pgm.gz | Bin 143817 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q4.pgm.gz | Bin 220346 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q5.pgm.gz | Bin 479058 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q6.pgm.gz | Bin 593359 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q7.pgm.gz | Bin 600121 -> 0 bytes .../regional_maxima/cmp_quant/l5_input_q8.pgm.gz | Bin 630760 -> 0 bytes .../doc/regional_maxima/cmp_quant/s5_histo_q2.txt | 3 - .../doc/regional_maxima/cmp_quant/s5_histo_q3.txt | 8 - .../doc/regional_maxima/cmp_quant/s5_histo_q4.txt | 18 - .../doc/regional_maxima/cmp_quant/s5_histo_q5.txt | 33 - .../doc/regional_maxima/cmp_quant/s5_histo_q6.txt | 33 - .../doc/regional_maxima/cmp_quant/s5_histo_q7.txt | 32 - .../doc/regional_maxima/cmp_quant/s5_histo_q8.txt | 75 - .../doc/regional_maxima/cmp_quant/synthese.txt | 205 - .../mp00411c/colormap_all_q4.txt.gz | Bin 187 -> 0 bytes .../mp00411c/colormap_all_q5.txt.gz | Bin 420 -> 0 bytes .../mp00411c/colormap_thick_q4.txt.gz | Bin 159 -> 0 bytes .../mp00411c/colormap_thick_q5.txt.gz | Bin 352 -> 0 bytes .../mp00411c/colormap_thin_q4.txt.gz | Bin 173 -> 0 bytes .../mp00411c/colormap_thin_q5.txt.gz | Bin 366 -> 0 bytes .../regional_maxima/mp00411c/histo_all_q4.dump.gz | Bin 1233 -> 0 bytes .../regional_maxima/mp00411c/histo_all_q5.dump.gz | Bin 4779 -> 0 bytes .../mp00411c/histo_thick_q4.dump.gz | Bin 781 -> 0 bytes .../mp00411c/histo_thick_q5.dump.gz | Bin 2532 -> 0 bytes .../regional_maxima/mp00411c/histo_thin_q4.dump.gz | Bin 901 -> 0 bytes .../regional_maxima/mp00411c/histo_thin_q5.dump.gz | Bin 2976 -> 0 bytes .../doc/regional_maxima/mp00411c/iz_all_q4.dump.gz | Bin 659040 -> 0 bytes .../doc/regional_maxima/mp00411c/iz_all_q5.dump.gz | Bin 1505619 -> 0 bytes .../regional_maxima/mp00411c/iz_thick_q4.dump.gz | Bin 482831 -> 0 bytes .../regional_maxima/mp00411c/iz_thick_q5.dump.gz | Bin 1414258 -> 0 bytes .../regional_maxima/mp00411c/iz_thin_q4.dump.gz | Bin 647722 -> 0 bytes .../regional_maxima/mp00411c/iz_thin_q5.dump.gz | Bin 1458415 -> 0 bytes .../mp00411c/labeled_all_q4.dump.gz | Bin 149 -> 0 bytes .../mp00411c/labeled_all_q5.dump.gz | Bin 343 -> 0 bytes .../mp00411c/labeled_thick_q4.dump.gz | Bin 149 -> 0 bytes .../mp00411c/labeled_thick_q5.dump.gz | Bin 309 -> 0 bytes .../mp00411c/labeled_thin_q4.dump.gz | Bin 149 -> 0 bytes .../mp00411c/labeled_thin_q5.dump.gz | Bin 308 -> 0 bytes .../regional_maxima/mp00411c/mean3_all_q4.ppm.gz | Bin 985276 -> 0 bytes .../regional_maxima/mp00411c/mean3_all_q5.ppm.gz | Bin 1961577 -> 0 bytes .../regional_maxima/mp00411c/mean3_thick_q4.ppm.gz | Bin 865034 -> 0 bytes .../regional_maxima/mp00411c/mean3_thick_q5.ppm.gz | Bin 1831699 -> 0 bytes .../regional_maxima/mp00411c/mean3_thin_q4.ppm.gz | Bin 958289 -> 0 bytes .../regional_maxima/mp00411c/mean3_thin_q5.ppm.gz | Bin 1872271 -> 0 bytes .../regional_maxima/mp00411c/mean4_all_q4.ppm.gz | Bin 772605 -> 0 bytes .../regional_maxima/mp00411c/mean4_all_q5.ppm.gz | Bin 1852455 -> 0 bytes .../regional_maxima/mp00411c/mean4_thick_q4.ppm.gz | Bin 559850 -> 0 bytes .../regional_maxima/mp00411c/mean4_thick_q5.ppm.gz | Bin 1727247 -> 0 bytes .../regional_maxima/mp00411c/mean4_thin_q4.ppm.gz | Bin 760428 -> 0 bytes .../regional_maxima/mp00411c/mean4_thin_q5.ppm.gz | Bin 1781495 -> 0 bytes .../doc/regional_maxima/mp00411c/mp00411c.ppm.gz | Bin 5316204 -> 0 bytes .../doc/regional_maxima/mp00411c/mp00411c.sh.gz | Bin 636 -> 0 bytes .../regional_maxima/mp00411c/mp00411c_thick.pbm.gz | Bin 190478 -> 0 bytes .../regional_maxima/mp00411c/mp00411c_thin.pbm.gz | Bin 248730 -> 0 bytes .../regional_maxima/mp00411c/opened_all_q4.dump.gz | Bin 1159 -> 0 bytes .../regional_maxima/mp00411c/opened_all_q5.dump.gz | Bin 4531 -> 0 bytes .../mp00411c/opened_thick_q4.dump.gz | Bin 747 -> 0 bytes .../mp00411c/opened_thick_q5.dump.gz | Bin 2351 -> 0 bytes .../mp00411c/opened_thin_q4.dump.gz | Bin 848 -> 0 bytes .../mp00411c/opened_thin_q5.dump.gz | Bin 2772 -> 0 bytes .../regional_maxima/mp00411c/proj1_all_q4.pgm.gz | Bin 343 -> 0 bytes .../regional_maxima/mp00411c/proj1_all_q5.pgm.gz | Bin 779 -> 0 bytes .../regional_maxima/mp00411c/proj1_thick_q4.pgm.gz | Bin 312 -> 0 bytes .../regional_maxima/mp00411c/proj1_thick_q5.pgm.gz | Bin 612 -> 0 bytes .../regional_maxima/mp00411c/proj1_thin_q4.pgm.gz | Bin 339 -> 0 bytes .../regional_maxima/mp00411c/proj1_thin_q5.pgm.gz | Bin 718 -> 0 bytes .../regional_maxima/mp00411c/proj2_all_q4.pgm.gz | Bin 338 -> 0 bytes .../regional_maxima/mp00411c/proj2_all_q5.pgm.gz | Bin 750 -> 0 bytes .../regional_maxima/mp00411c/proj2_thick_q4.pgm.gz | Bin 315 -> 0 bytes .../regional_maxima/mp00411c/proj2_thick_q5.pgm.gz | Bin 606 -> 0 bytes .../regional_maxima/mp00411c/proj2_thin_q4.pgm.gz | Bin 331 -> 0 bytes .../regional_maxima/mp00411c/proj2_thin_q5.pgm.gz | Bin 693 -> 0 bytes .../regional_maxima/mp00411c/proj3_all_q4.ppm.gz | Bin 230 -> 0 bytes .../regional_maxima/mp00411c/proj3_all_q5.ppm.gz | Bin 401 -> 0 bytes .../regional_maxima/mp00411c/proj3_thick_q4.ppm.gz | Bin 224 -> 0 bytes .../regional_maxima/mp00411c/proj3_thick_q5.ppm.gz | Bin 343 -> 0 bytes .../regional_maxima/mp00411c/proj3_thin_q4.ppm.gz | Bin 229 -> 0 bytes .../regional_maxima/mp00411c/proj3_thin_q5.ppm.gz | Bin 359 -> 0 bytes .../regional_maxima/mp00411c/proj4_all_q4.ppm.gz | Bin 252 -> 0 bytes .../regional_maxima/mp00411c/proj4_all_q5.ppm.gz | Bin 447 -> 0 bytes .../regional_maxima/mp00411c/proj4_thick_q4.ppm.gz | Bin 221 -> 0 bytes .../regional_maxima/mp00411c/proj4_thick_q5.ppm.gz | Bin 369 -> 0 bytes .../regional_maxima/mp00411c/proj4_thin_q4.ppm.gz | Bin 234 -> 0 bytes .../regional_maxima/mp00411c/proj4_thin_q5.ppm.gz | Bin 415 -> 0 bytes .../doc/regional_maxima/mp00411c/quant_q4.ppm.gz | Bin 2590062 -> 0 bytes .../doc/regional_maxima/mp00411c/quant_q5.ppm.gz | Bin 3775184 -> 0 bytes .../regional_maxima/mp00411c/stats3_all_q4.txt.gz | Bin 292 -> 0 bytes .../regional_maxima/mp00411c/stats3_all_q5.txt.gz | Bin 701 -> 0 bytes .../mp00411c/stats3_thick_q4.txt.gz | Bin 244 -> 0 bytes .../mp00411c/stats3_thick_q5.txt.gz | Bin 584 -> 0 bytes .../regional_maxima/mp00411c/stats3_thin_q4.txt.gz | Bin 262 -> 0 bytes .../regional_maxima/mp00411c/stats3_thin_q5.txt.gz | Bin 606 -> 0 bytes .../regional_maxima/mp00411c/stats4_all_q4.txt.gz | Bin 284 -> 0 bytes .../regional_maxima/mp00411c/stats4_all_q5.txt.gz | Bin 704 -> 0 bytes .../mp00411c/stats4_thick_q4.txt.gz | Bin 234 -> 0 bytes .../mp00411c/stats4_thick_q5.txt.gz | Bin 580 -> 0 bytes .../regional_maxima/mp00411c/stats4_thin_q4.txt.gz | Bin 255 -> 0 bytes .../regional_maxima/mp00411c/stats4_thin_q5.txt.gz | Bin 591 -> 0 bytes .../doc/regional_maxima/mp00411c/synthese.txt.gz | Bin 4062 -> 0 bytes .../green/exp/annotating/achromastism/Makefile.am | 153 - .../exp/annotating/achromastism/achromastism.cc | 113 - .../exp/annotating/achromastism/text-color.txt | 15 - .../green/exp/annotating/achromastism/text-img.txt | 40 - .../exp/annotating/achromastism/text-only.txt | 8 - .../sandbox/green/exp/annotating/bench/Makefile.am | 153 - milena/sandbox/green/exp/annotating/bench/bench.cc | 1213 - .../sandbox/green/exp/annotating/error/Makefile.am | 153 - milena/sandbox/green/exp/annotating/error/error.cc | 700 - .../sandbox/green/exp/annotating/histo/Makefile.am | 153 - milena/sandbox/green/exp/annotating/histo/histo.cc | 306 - .../sandbox/green/exp/annotating/hsv/Makefile.am | 153 - milena/sandbox/green/exp/annotating/hsv/hsv.cc | 652 - .../sandbox/green/exp/annotating/hue/Makefile.am | 153 - milena/sandbox/green/exp/annotating/hue/hue.cc | 291 - .../green/exp/annotating/hue/text-color.txt | 15 - .../sandbox/green/exp/annotating/hue/text-img.txt | 40 - .../sandbox/green/exp/annotating/hue/text-only.txt | 8 - .../green/exp/annotating/nb_color/Makefile.am | 151 - .../green/exp/annotating/nb_color/nb_color.cc | 131 - .../green/exp/annotating/saturation/Makefile.am | 153 - .../green/exp/annotating/saturation/saturation.cc | 119 - .../green/exp/annotating/saturation/text-color.txt | 15 - .../green/exp/annotating/saturation/text-img.txt | 40 - .../green/exp/annotating/saturation/text-only.txt | 8 - .../green/exp/annotating/stddev_color/Makefile.am | 151 - .../exp/annotating/stddev_color/stddev_color.cc | 153 - .../exp/annotating/stddev_color_16/Makefile.am | 151 - .../annotating/stddev_color_16/stddev_color_16.cc | 195 - .../sandbox/green/exp/annotating/value/Makefile.am | 153 - .../green/exp/annotating/value/text-color.txt | 15 - .../green/exp/annotating/value/text-img.txt | 40 - .../green/exp/annotating/value/text-only.txt | 8 - milena/sandbox/green/exp/annotating/value/value.cc | 316 - .../green/exp/labeling/regional_maxima/Makefile.am | 151 - .../labeling/regional_maxima/regional_maxima.cc | 156 - milena/sandbox/green/mln/accu/stat/histo1d.hh | 348 - milena/sandbox/green/mln/accu/stat/histo2d.hh | 346 - milena/sandbox/green/mln/accu/stat/histo3d_hsl.hh | 380 - milena/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 349 - milena/sandbox/green/mln/clustering/k_mean.hh | 672 - milena/sandbox/green/mln/clustering/kmean1d.hh | 1100 - milena/sandbox/green/mln/clustering/kmean2d.hh | 1343 - milena/sandbox/green/mln/clustering/kmean3d.hh | 1347 - milena/sandbox/green/mln/clustering/kmean_rgb.hh | 973 - milena/sandbox/green/mln/display/display_histo.hh | 180 - milena/sandbox/green/mln/display/project_histo.hh | 536 - milena/sandbox/green/mln/fun/p2b/achromatic.hh | 112 - .../sandbox/green/mln/fun/p2b/component_equals.hh | 99 - milena/sandbox/green/mln/fun/v2v/achromatism.hh | 64 - .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 100 - .../green/mln/fun/v2v/int_u16_to_int_u14.hh | 71 - milena/sandbox/green/mln/fun/v2v/log.hh | 70 - milena/sandbox/green/mln/fun/v2v/rg_to_rgb.hh | 70 - milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 71 - milena/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh | 82 - .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 77 - milena/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 149 - milena/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh | 96 - milena/sandbox/green/mln/fun/v2v/rgb_to_rg.hh | 70 - .../green/mln/fun/v2v/rgb_to_saturation_map.hh | 83 - .../sandbox/green/mln/fun/v2v/rgb_to_value_map.hh | 75 - milena/sandbox/green/mln/img_path.hh | 239 - milena/sandbox/green/mln/io/plot/save_histo_sh.hh | 204 - milena/sandbox/green/mln/io/plot/save_image_sh.hh | 1058 - milena/sandbox/green/mln/math/ceil.hh | 64 - milena/sandbox/green/mln/math/floor.hh | 64 - milena/sandbox/green/mln/value/hsv.hh | 424 - milena/sandbox/green/mln/value/rg.hh | 116 - .../green/tests/accu/stat/histo1d/Makefile.am | 148 - .../green/tests/accu/stat/histo1d/gaussian.sh | 12 - .../green/tests/accu/stat/histo1d/histo1d.cc | 706 - .../green/tests/accu/stat/histo2d/Makefile.am | 148 - .../green/tests/accu/stat/histo2d/gaussian2d.sh | 21 - .../green/tests/accu/stat/histo3d_hsl/Makefile.am | 148 - .../tests/accu/stat/histo3d_hsl/histo3d_hsl.cc | 423 - .../green/tests/accu/stat/histo3d_rgb/Makefile.am | 148 - .../tests/accu/stat/histo3d_rgb/histo3d_rgb.cc | 398 - .../green/tests/clustering/k_mean/Makefile.am | 148 - .../green/tests/clustering/k_mean/k_mean.cc | 450 - .../green/tests/clustering/kmean1d/Makefile.am | 148 - .../green/tests/clustering/kmean1d/kmean1d.cc | 483 - .../green/tests/io/plot/save_image_sh/Makefile.am | 148 - .../tests/io/plot/save_image_sh/save_image_sh.cc | 662 - .../green/tools/annotating/histo/Makefile.am | 150 - .../sandbox/green/tools/annotating/histo/histo.cc | 143 - .../sandbox/green/tools/annotating/iz/Makefile.am | 150 - milena/sandbox/green/tools/annotating/iz/iz.cc | 373 - .../green/tools/annotating/opening/Makefile.am | 150 - .../green/tools/annotating/opening/opening.cc | 111 - .../green/tools/annotating/regmax/Makefile.am | 150 - .../green/tools/annotating/regmax/regmax.cc | 328 - milena/sandbox/icdar/2009/README | 13 - milena/sandbox/icdar/2009/dibco/binarization.cc | 840 - milena/sandbox/icdar/2009/dibco/quasi.cc | 180 - .../sandbox/icdar/2009/dibco/svg.1.binarization.cc | 466 - .../sandbox/icdar/2009/dibco/svg.2.binarization.cc | 738 - .../sandbox/icdar/2009/dibco/svg.3.binarization.cc | 860 - milena/sandbox/icdar/2009/dibco/wst-based.sh | 8 - milena/sandbox/icdar/2009/hsc/clean_input.cc | 41 - milena/sandbox/icdar/2009/hsc/clean_input.hh | 45 - milena/sandbox/icdar/2009/hsc/clean_lines.hh | 72 - .../2009/hsc/clean_lines_with_grouped_bboxes.hh | 104 - .../icdar/2009/hsc/dummy_input_to_words_dat.cc | 59 - .../sandbox/icdar/2009/hsc/first_attempts/boxes.cc | 109 - .../sandbox/icdar/2009/hsc/first_attempts/dist.sh | 8 - .../icdar/2009/hsc/first_attempts/exec/iz_lines.cc | 106 - .../2009/hsc/first_attempts/exec/relabel_lines.cc | 296 - .../2009/hsc/first_attempts/exec/show_lines.cc | 53 - .../2009/hsc/first_attempts/exec/show_lines_pbm.cc | 44 - .../sandbox/icdar/2009/hsc/first_attempts/fuzzy.sh | 18 - .../sandbox/icdar/2009/hsc/first_attempts/main.cc | 389 - .../icdar/2009/hsc/first_attempts/reduce.sh | 4 - .../sandbox/icdar/2009/hsc/first_attempts/words.sh | 7 - .../icdar/2009/hsc/first_attempts/words_25p.sh | 11 - milena/sandbox/icdar/2009/hsc/get_line_images.hh | 69 - milena/sandbox/icdar/2009/hsc/icdar2ppm.cc | 16 - milena/sandbox/icdar/2009/hsc/icdar2ppm.hh | 35 - milena/sandbox/icdar/2009/hsc/icdar_io.cc | 51 - .../sandbox/icdar/2009/hsc/input_lines_to_lines.cc | 46 - milena/sandbox/icdar/2009/hsc/input_to_lines.hh | 46 - .../sandbox/icdar/2009/hsc/input_to_lines_dat.cc | 88 - .../sandbox/icdar/2009/hsc/input_to_words_dat.cc | 146 - milena/sandbox/icdar/2009/hsc/input_to_ws.hh | 116 - milena/sandbox/icdar/2009/hsc/input_to_wsl.cc | 68 - milena/sandbox/icdar/2009/hsc/io/icdar/load.hh | 96 - milena/sandbox/icdar/2009/hsc/io/icdar/save.hh | 89 - milena/sandbox/icdar/2009/hsc/label_maj.hh | 197 - milena/sandbox/icdar/2009/hsc/line_to_words.hh | 166 - milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc | 54 - milena/sandbox/icdar/2009/hsc/lines_to_words.cc | 50 - .../sandbox/icdar/2009/hsc/old_input_to_lines.cc | 380 - milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh | 451 - milena/sandbox/icdar/2009/pscomp/iz.cc | 174 - milena/sandbox/icdar/2009/pscomp/rect_filter.cc | 165 - milena/sandbox/igr/code/test.cc | 50 - .../sandbox/inim/2009/binarization/binarization.cc | 36 - .../sandbox/inim/2009/binarization/binarization.hh | 78 - .../2009/binarization/proof-of-concept/ChangeLog | 69 - .../2009/binarization/proof-of-concept/Makefile | 87 - .../binarization/proof-of-concept/build/Makefile | 79 - .../proof-of-concept/build/configure.in | 5 - .../binarization/proof-of-concept/check/Makefile | 71 - .../binarization/proof-of-concept/check/graph.sh | 27 - .../binarization/proof-of-concept/check/histo.gp | 19 - .../2009/binarization/proof-of-concept/configure | 264 - .../binarization/proof-of-concept/configure.in | 26 - .../binarization/proof-of-concept/scripts/flower | 33 - .../proof-of-concept/scripts/init_tar.sh | 14 - .../binarization/proof-of-concept/scripts/todo.sh | 26 - .../binarization/proof-of-concept/src/basic.cc | 75 - .../binarization/proof-of-concept/src/gradient.cc | 109 - .../binarization/proof-of-concept/src/snake2d.hh | 190 - .../binarization/proof-of-concept/src/util.hxx | 97 - milena/sandbox/inim/2009/binarization/snake2d.cc | 39 - milena/sandbox/inim/2009/binarization/snake2d.hh | 190 - milena/sandbox/inim/2009/classif/Makefile | 87 - milena/sandbox/inim/2009/classif/plotscript | 4 - milena/sandbox/inim/2009/classif/src/display.hh | 80 - milena/sandbox/inim/2009/classif/src/iccvg04.cc | 171 - milena/sandbox/inim/2009/classif/src/max_tree.hh | 312 - milena/sandbox/inim/2009/classif/src/proj.hh | 139 - milena/sandbox/inim/2009/classif/src/v2.cc | 178 - milena/sandbox/inim/2009/color/README | 83 - milena/sandbox/inim/2009/color/laplacien.cc | 130 - .../inim/2009/color/min_tree_area_filter.cc | 515 - milena/sandbox/inim/2009/color/min_tree_color.cc | 536 - .../sandbox/inim/2009/color/min_tree_color_v2.cc | 533 - .../inim/2009/color/min_tree_height_filter.cc | 553 - .../inim/2009/color/min_tree_volume_filter.cc | 551 - milena/sandbox/inim/2009/color/reference.cc | 557 - milena/sandbox/inim/2009/color/reference2.cc | 408 - milena/sandbox/inim/2009/color/src/convert.hh | 37 - milena/sandbox/inim/2009/color/src/distance.hh | 52 - milena/sandbox/inim/2009/color/src/graph.hh | 62 - milena/sandbox/inim/2009/color/src/io.hh | 57 - milena/sandbox/inim/2009/nature/Makefile | 24 - milena/sandbox/inim/2009/nature/closing.cc | 61 - milena/sandbox/inim/2009/nature/co_occurence.hh | 77 - milena/sandbox/inim/2009/nature/erosion.cc | 60 - milena/sandbox/inim/2009/nature/fft.cc | 61 - milena/sandbox/inim/2009/nature/gradient.cc | 60 - milena/sandbox/inim/2009/nature/histo_hsi.cc | 181 - milena/sandbox/inim/2009/nature/hom.cc | 316 - milena/sandbox/inim/2009/nature/mco.cc | 48 - milena/sandbox/inim/2009/nature/nature.cc | 499 - milena/sandbox/inim/2009/nature/opening.cc | 61 - milena/sandbox/inim/2009/nature/proj.cc | 68 - milena/sandbox/inim/2009/nature/proj.hh | 64 - milena/sandbox/inim/2009/nature/test.sh | 11 - milena/sandbox/inim/2009/ocr/Makefile | 26 - milena/sandbox/inim/2009/ocr/check.sh | 31 - milena/sandbox/inim/2009/ocr/check_simple_point.cc | 61 - .../inim/2009/ocr/compute_local_configurations.cc | 74 - milena/sandbox/inim/2009/ocr/enlarge.hh | 202 - .../sandbox/inim/2009/ocr/ocr_with_preprocess.cc | 173 - .../inim/2009/ocr/ocr_without_preprocess.cc | 90 - milena/sandbox/inim/2009/ocr/resize.hh | 96 - milena/sandbox/inim/2009/ocr/simple_point.cc | 39 - milena/sandbox/inim/2009/ocr/simple_point.hh | 206 - milena/sandbox/inim/2009/ocr/skeleton.hh | 200 - milena/sandbox/inim/2009/ocr/skeleton.old.cc | 30 - milena/sandbox/inim/2009/ocr/skeleton.old.hh | 612 - milena/sandbox/inim/2009/ocr/tesseract_wrap.hh | 91 - milena/sandbox/inim/2010/blur/AUTHORS | 2 - milena/sandbox/inim/2010/blur/Makefile | 29 - milena/sandbox/inim/2010/blur/README | 7 - milena/sandbox/inim/2010/blur/advance_iterator.hh | 55 - milena/sandbox/inim/2010/blur/advance_iterator.hxx | 95 - milena/sandbox/inim/2010/blur/cuttor.hh | 61 - milena/sandbox/inim/2010/blur/cuttor.hxx | 304 - milena/sandbox/inim/2010/blur/main.cc | 39 - milena/sandbox/inim/2010/blur/vect_it.hh | 43 - milena/sandbox/inim/2010/blur/vect_it.hxx | 152 - milena/sandbox/inim/2010/blur/vect_it_OLD.hxx | 145 - milena/sandbox/inim/2010/blur/vector.hh | 43 - milena/sandbox/inim/2010/blur/vector.hxx | 115 - milena/sandbox/inim/2010/boxes/Makefile | 47 - milena/sandbox/inim/2010/boxes/boxes.cc | 221 - milena/sandbox/inim/2010/boxes/configure | 27 - milena/sandbox/inim/2010/cag/Makefile | 7 - milena/sandbox/inim/2010/cag/README | 47 - milena/sandbox/inim/2010/cag/get_lines.hh | 113 - milena/sandbox/inim/2010/cag/graph.hh | 189 - milena/sandbox/inim/2010/cag/main.cc | 113 - milena/sandbox/inim/2010/cag/superpose.hh | 125 - milena/sandbox/inim/2010/morpho/README | 19 - milena/sandbox/inim/2010/morpho/configure | 45 - milena/sandbox/inim/2010/morpho/dilation-n.hh | 41 - milena/sandbox/inim/2010/morpho/erosion-n.hh | 41 - milena/sandbox/inim/2010/morpho/main_dilation-n.cc | 54 - milena/sandbox/inim/2010/morpho/morpho.cc | 129 - milena/sandbox/inim/2010/morpho/run.sh | 21 - milena/sandbox/inim/2010/page/AUTHORS | 3 - milena/sandbox/inim/2010/page/Makefile | 43 - milena/sandbox/inim/2010/page/README | 51 - .../inim/2010/page/binarization/binarization.hh | 36 - .../inim/2010/page/binarization/binarization.hxx | 72 - .../inim/2010/page/binarization/functors.hh | 23 - .../inim/2010/page/binarization/functors.hxx | 33 - .../inim/2010/page/binarization/grayscale.hh | 32 - .../inim/2010/page/binarization/grayscale.hxx | 15 - .../inim/2010/page/binarization/integral-image.hh | 34 - .../inim/2010/page/binarization/integral-image.hxx | 57 - .../sandbox/inim/2010/page/check_size_functor.hh | 30 - milena/sandbox/inim/2010/page/main.cc | 89 - milena/sandbox/inim/2010/page/white.hh | 36 - milena/sandbox/inim/2010/page/white.hxx | 233 - milena/sandbox/inim/2010/rag/Makefile | 25 - milena/sandbox/inim/2010/rag/center_weight.hh | 183 - milena/sandbox/inim/2010/rag/dijkstra.hh | 71 - .../sandbox/inim/2010/rag/p_vertices_with_accu.hh | 115 - milena/sandbox/inim/2010/rag/rag.cc | 29 - milena/sandbox/inim/2010/rag/rag.hh | 246 - milena/sandbox/inim/2011/fredwin/Makefile | 37 - milena/sandbox/inim/2011/fredwin/configure | 21 - milena/sandbox/inim/2011/fredwin/inim.cc | 273 - milena/sandbox/jardonnet/TODO | 6 - milena/sandbox/jardonnet/array/Makefile | 2 - milena/sandbox/jardonnet/array/array.cc | 22 - milena/sandbox/jardonnet/array/array.hh | 300 - milena/sandbox/jardonnet/array/old/1d.hh | 293 - milena/sandbox/jardonnet/array/old/1d.hxx | 237 - milena/sandbox/jardonnet/array/old/2d.hh | 327 - milena/sandbox/jardonnet/array/old/2d.hxx | 283 - milena/sandbox/jardonnet/array/old/3d.hh | 334 - milena/sandbox/jardonnet/array/old/3d.hxx | 293 - milena/sandbox/jardonnet/array/old/all.hh | 36 - milena/sandbox/jardonnet/array/old/nd.hh | 50 - milena/sandbox/jardonnet/array/old/objs.hh | 75 - milena/sandbox/jardonnet/icc.txt | 2 - milena/sandbox/jardonnet/igr/Makefile | 61 - milena/sandbox/jardonnet/igr/check/check | 10 - milena/sandbox/jardonnet/igr/check/s7.ppm | 6001 - milena/sandbox/jardonnet/igr/check/tiny.ppm | 317 - milena/sandbox/jardonnet/igr/src/igr.cc | 109 - milena/sandbox/jardonnet/n_cmpt/Makefile | 46 - milena/sandbox/jardonnet/n_cmpt/check/mg_ima.pgm | Bin 96121 -> 0 bytes milena/sandbox/jardonnet/n_cmpt/check/test.pgm | 5 - milena/sandbox/jardonnet/n_cmpt/check/test2.pgm | Bin 152 -> 0 bytes milena/sandbox/jardonnet/n_cmpt/check/test3.pgm | Bin 152 -> 0 bytes milena/sandbox/jardonnet/n_cmpt/check/test4.pgm | Bin 114 -> 0 bytes milena/sandbox/jardonnet/n_cmpt/check/tiny.pgm | 193 - .../jardonnet/n_cmpt/diff_ref_fused_on_small | 13 - milena/sandbox/jardonnet/n_cmpt/fused | 26 - milena/sandbox/jardonnet/n_cmpt/fused_filter.cc | 254 - milena/sandbox/jardonnet/n_cmpt/n_cmpt.cc | 43 - milena/sandbox/jardonnet/n_cmpt/n_cmpt.hh | 193 - milena/sandbox/jardonnet/n_cmpt/n_cmpt2.cc | 37 - milena/sandbox/jardonnet/n_cmpt/n_cmpt2.hh | 175 - milena/sandbox/jardonnet/n_cmpt/n_cmpt3.cc | 46 - milena/sandbox/jardonnet/n_cmpt/n_cmpt3.hh | 205 - milena/sandbox/jardonnet/n_cmpt/n_cmpt4.cc | 48 - milena/sandbox/jardonnet/n_cmpt/n_cmpt4.hh | 208 - milena/sandbox/jardonnet/n_cmpt/n_cmpt5.cc | 46 - milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh | 253 - milena/sandbox/jardonnet/n_cmpt/nwst.cc | 48 - milena/sandbox/jardonnet/n_cmpt/nwst.hh | 200 - milena/sandbox/jardonnet/n_cmpt/prob.pgm | 5 - milena/sandbox/jardonnet/n_cmpt/ref | 22 - milena/sandbox/jardonnet/n_cmpt/ref_filter.cc | 226 - milena/sandbox/jardonnet/n_cmpt/seg15.pgm | 5 - milena/sandbox/jardonnet/n_cmpt/test3.cc | 42 - .../jardonnet/n_cmpt/test_attribute_watershed.cc | 79 - milena/sandbox/jardonnet/n_cmpt/tikz.cc | 63 - milena/sandbox/jardonnet/n_cmpt/tikz.hh | 309 - milena/sandbox/jardonnet/n_cmpt/tiny_seg15.pgm | 5 - milena/sandbox/jardonnet/n_cmpt/wst.cc | 46 - milena/sandbox/jardonnet/perl/hxx.pl | 27 - milena/sandbox/jardonnet/perl/test/all.hh | 63 - milena/sandbox/jardonnet/perl/test/c.hh | 140 - milena/sandbox/jardonnet/perl/test/cast.hh | 85 - milena/sandbox/jardonnet/perl/test/i2v/all.hh | 56 - milena/sandbox/jardonnet/perl/test/i2v/all_to.hh | 108 - milena/sandbox/jardonnet/perl/test/i2v/array.hh | 147 - .../jardonnet/perl/test/internal/selector.hh | 200 - .../perl/test/internal/x2x_linear_impl.hh | 102 - milena/sandbox/jardonnet/perl/test/ops.hh | 199 - milena/sandbox/jardonnet/perl/test/p2b/all.hh | 56 - milena/sandbox/jardonnet/perl/test/p2b/chess.hh | 78 - milena/sandbox/jardonnet/perl/test/p2b/has.hh | 137 - milena/sandbox/jardonnet/perl/test/p2v/all.hh | 58 - milena/sandbox/jardonnet/perl/test/p2v/elifs.hh | 85 - milena/sandbox/jardonnet/perl/test/p2v/iota.hh | 106 - milena/sandbox/jardonnet/perl/test/p2v/ternary.hh | 120 - .../sandbox/jardonnet/perl/test/v2b/threshold.hh | 90 - milena/sandbox/jardonnet/perl/test/v2v/abs.hh | 78 - milena/sandbox/jardonnet/perl/test/v2v/all.hh | 61 - milena/sandbox/jardonnet/perl/test/v2v/cast.hh | 81 - milena/sandbox/jardonnet/perl/test/v2v/dec.hh | 78 - milena/sandbox/jardonnet/perl/test/v2v/enc.hh | 77 - milena/sandbox/jardonnet/perl/test/v2v/id.hh | 78 - milena/sandbox/jardonnet/perl/test/v2v/inc.hh | 78 - milena/sandbox/jardonnet/perl/test/v2v/linear.hh | 94 - milena/sandbox/jardonnet/perl/test/v2v/norm.hh | 130 - .../sandbox/jardonnet/perl/test/v2v/rgb_to_hsi.hh | 143 - milena/sandbox/jardonnet/perl/test/v2v/saturate.hh | 129 - milena/sandbox/jardonnet/perl/test/vv2v/max.hh | 77 - milena/sandbox/jardonnet/perl/test/vv2v/min.hh | 77 - milena/sandbox/jardonnet/perl/test/x2x/all.hh | 66 - .../jardonnet/perl/test/x2x/geom/composed.hh | 285 - .../jardonnet/perl/test/x2x/geom/rotation.hh | 243 - .../jardonnet/perl/test/x2x/geom/translation.hh | 152 - .../jardonnet/perl/test/x2x/interpol/bilinear.hh | 139 - .../jardonnet/perl/test/x2x/interpol/linear.hh | 124 - .../jardonnet/perl/test/x2x/interpol/test.cc | 14 - milena/sandbox/jardonnet/registration/center.hh | 72 - milena/sandbox/jardonnet/registration/chamfer.hh | 189 - milena/sandbox/jardonnet/registration/cloud.hh | 107 - milena/sandbox/jardonnet/registration/cov.hh | 82 - milena/sandbox/jardonnet/registration/cross_cov.hh | 18 - milena/sandbox/jardonnet/registration/exp_val.hh | 73 - milena/sandbox/jardonnet/registration/final_qk.hh | 111 - .../jardonnet/registration/frankel_young.hh | 46 - milena/sandbox/jardonnet/registration/icp.hh | 255 - milena/sandbox/jardonnet/registration/icp_ref.hh | 234 - .../jardonnet/registration/interpolation.hh | 41 - milena/sandbox/jardonnet/registration/jacobi.hh | 116 - milena/sandbox/jardonnet/registration/misc.hh | 19 - .../sandbox/jardonnet/registration/multiscale.hh | 78 - milena/sandbox/jardonnet/registration/power_it.hh | 39 - .../sandbox/jardonnet/registration/projection.hh | 86 - milena/sandbox/jardonnet/registration/quat7.hh | 191 - .../sandbox/jardonnet/registration/registration.hh | 172 - milena/sandbox/jardonnet/registration/rotation.hh | 70 - milena/sandbox/jardonnet/registration/save.hh | 131 - milena/sandbox/jardonnet/registration/tools.hh | 314 - milena/sandbox/jardonnet/registration/update_qk.hh | 74 - milena/sandbox/jardonnet/registration/variance.hh | 27 - .../jardonnet/subsampling/gaussian_subsampling.hh | 93 - .../jardonnet/subsampling/sub_sampled_image.hh | 226 - milena/sandbox/jardonnet/test/Makefile | 57 - milena/sandbox/jardonnet/test/bench | 88 - milena/sandbox/jardonnet/test/bench.rb | 39 - milena/sandbox/jardonnet/test/big_chess.cc | 76 - .../sandbox/jardonnet/test/final/final_qk2_1.ppm | Bin 840120 -> 0 bytes .../sandbox/jardonnet/test/final/final_qk2_2.ppm | Bin 840120 -> 0 bytes milena/sandbox/jardonnet/test/final/final_qk_1.ppm | Bin 1016184 -> 0 bytes .../jardonnet/test/final/final_qk_1_c1_x1.ppm | Bin 726972 -> 0 bytes milena/sandbox/jardonnet/test/final/final_qk_2.ppm | Bin 840120 -> 0 bytes .../jardonnet/test/final/final_qk_2_c1_x1.ppm | Bin 726972 -> 0 bytes milena/sandbox/jardonnet/test/final/final_qk_3.ppm | Bin 1016184 -> 0 bytes milena/sandbox/jardonnet/test/final/no_final.ppm | Bin 840120 -> 0 bytes .../jardonnet/test/final/no_final_1_c1_x1.ppm | Bin 726972 -> 0 bytes milena/sandbox/jardonnet/test/gaussian.cc | 21 - .../sandbox/jardonnet/test/gaussian_subsampling.cc | 21 - milena/sandbox/jardonnet/test/icp.cc | 122 - milena/sandbox/jardonnet/test/icp_ref.cc | 109 - milena/sandbox/jardonnet/test/img/c0.pbm | 5 - milena/sandbox/jardonnet/test/img/c1.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/c10.pbm | Bin 1351 -> 0 bytes milena/sandbox/jardonnet/test/img/c11.pbm | 4 - milena/sandbox/jardonnet/test/img/c2.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/c3.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/c4.pbm | 5 - milena/sandbox/jardonnet/test/img/c5.pbm | Bin 5050 -> 0 bytes milena/sandbox/jardonnet/test/img/c55.pbm | Bin 5050 -> 0 bytes milena/sandbox/jardonnet/test/img/c6.pbm | 4 - milena/sandbox/jardonnet/test/img/c7.pbm | 4 - milena/sandbox/jardonnet/test/img/c8.pbm | 4 - milena/sandbox/jardonnet/test/img/c9.pbm | 4 - milena/sandbox/jardonnet/test/img/x0.pbm | 5 - milena/sandbox/jardonnet/test/img/x1.pbm | 4 - milena/sandbox/jardonnet/test/img/x10.pbm | Bin 1351 -> 0 bytes milena/sandbox/jardonnet/test/img/x11.pbm | 4 - milena/sandbox/jardonnet/test/img/x2.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/x3.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/x4.pbm | Bin 20050 -> 0 bytes milena/sandbox/jardonnet/test/img/x5.pbm | 4 - milena/sandbox/jardonnet/test/img/x6.pbm | 4 - milena/sandbox/jardonnet/test/img/x7.pbm | Bin 45050 -> 0 bytes milena/sandbox/jardonnet/test/img/x8.pbm | Bin 45050 -> 0 bytes milena/sandbox/jardonnet/test/img/x9.pbm | 6 - milena/sandbox/jardonnet/test/length.ppm | Bin 840120 -> 0 bytes milena/sandbox/jardonnet/test/no_final.ppm | Bin 1016184 -> 0 bytes milena/sandbox/jardonnet/test/plotscript | 9 - milena/sandbox/jardonnet/test/reduce.cc | 26 - milena/sandbox/jardonnet/test/registration.cc | 71 - milena/sandbox/jardonnet/test/script_latex.plot | 8 - milena/sandbox/jardonnet/test/subsampling.cc | 22 - milena/sandbox/jardonnet/test/test.cc | 12 - milena/sandbox/jardonnet/test/test.rb | 51 - milena/sandbox/jardonnet/test/type.cc | 15 - milena/sandbox/jardonnet/virtual/Makefile | 2 - milena/sandbox/jardonnet/virtual/access.cc | 92 - milena/sandbox/jardonnet/virtual/access.hh | 179 - milena/sandbox/jardonnet/virtual/bilinear.ppm | Bin 786552 -> 0 bytes milena/sandbox/jardonnet/virtual/lena.pgm | 4 - milena/sandbox/jardonnet/virtual/lena.ppm | 541 - milena/sandbox/jardonnet/virtual/nn.ppm | Bin 786552 -> 0 bytes milena/sandbox/laurent/ismm2009.cc | 1178 - milena/sandbox/laurent/ismm2009.hh | 342 - milena/sandbox/laurent/memo/ismm2009.v0.cc | 563 - milena/sandbox/laurent/memo/ismm2009.v1.cc | 745 - milena/sandbox/laurent/memo/ismm2009.v2.cc | 978 - milena/sandbox/laurent/playing_with_attributes.cc | 397 - milena/sandbox/lazzara/afp/micro_films/Makefile | 8 - .../lazzara/afp/micro_films/demat_mf_afp.sh | 52 - .../sandbox/lazzara/afp/micro_films/extract_mf.cc | 126 - .../lazzara/afp/micro_films/keep_background.cc | 85 - .../sandbox/lazzara/afp/micro_films/split_image.cc | 80 - milena/sandbox/lazzara/csv2vtk/csv2vtk.cc | 83 - milena/sandbox/lazzara/fonctionnalites_milena.ods | Bin 21834 -> 0 bytes milena/sandbox/lazzara/igr/gui/Makefile.am | 11 - milena/sandbox/lazzara/igr/gui/demo.pro | 16 - .../sandbox/lazzara/igr/gui/src/bak/mainwindow.cc | 441 - .../sandbox/lazzara/igr/gui/src/bak/mainwindow.hh | 146 - milena/sandbox/lazzara/igr/gui/src/display.cc | 135 - milena/sandbox/lazzara/igr/gui/src/display.hh | 88 - milena/sandbox/lazzara/igr/gui/src/display_seg.cc | 172 - milena/sandbox/lazzara/igr/gui/src/display_seg.hh | 95 - milena/sandbox/lazzara/igr/gui/src/edit_seg.cc | 250 - milena/sandbox/lazzara/igr/gui/src/edit_seg.hh | 89 - milena/sandbox/lazzara/igr/gui/src/image_viewer.cc | 194 - milena/sandbox/lazzara/igr/gui/src/image_viewer.hh | 102 - .../igr/gui/src/internal/interactive_scene.cc | 88 - .../igr/gui/src/internal/interactive_scene.hh | 73 - milena/sandbox/lazzara/igr/gui/src/main.cc | 39 - milena/sandbox/lazzara/igr/gui/src/main_window.cc | 56 - milena/sandbox/lazzara/igr/gui/src/main_window.hh | 60 - milena/sandbox/lazzara/igr/gui/src/to_qimage.hh | 63 - milena/sandbox/lazzara/igr/gui/src/widgets.cc | 4 - .../sandbox/lazzara/igr/gui/ui/bak/mainwindow.ui | 277 - milena/sandbox/lazzara/igr/gui/ui/display.ui | 88 - milena/sandbox/lazzara/igr/gui/ui/display_seg.ui | 108 - milena/sandbox/lazzara/igr/gui/ui/edit_seg.ui | 97 - milena/sandbox/lazzara/igr/gui/ui/image_viewer.ui | 154 - milena/sandbox/lazzara/igr/gui/ui/main_window.ui | 75 - milena/sandbox/lazzara/igr/igr-biggest-comp.cc | 294 - milena/sandbox/lazzara/igr/igr-cloud.cc | 61 - milena/sandbox/lazzara/igr/igr.cc | 295 - .../sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc | 93 - milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc | 142 - milena/sandbox/lazzara/igr/irm/wst_rag.cc | 298 - milena/sandbox/lazzara/igr/irm/wst_rag_hsl.cc | 310 - .../lazzara/igr/irm_seg_with_mm_and_rag.mine.cc | 331 - milena/sandbox/lazzara/igr/registration_3d.cc | 58 - milena/sandbox/lazzara/igr/tr_image.cc | 185 - .../lazzara/scribo/binarization_naive/main.cc | 54 - .../lazzara/scribo/binarization_naive/toto.cc | 28 - milena/sandbox/lazzara/scribo/fill_holes/main.cc | 118 - .../separateurs_materialises/lines_pattern.cc | 69 - .../sandbox/lazzara/scribo/skeleton_crest/main.cc | 52 - milena/sandbox/markov/T_gen.hh | 76 - milena/sandbox/markov/approx_exp.hh | 77 - milena/sandbox/markov/markov.cc | 57 - milena/sandbox/markov/markov.hh | 112 - milena/sandbox/markov/random.hh | 29 - milena/sandbox/markov/random.hxx | 53 - milena/sandbox/modules/icdar/lines.cc | 358 - milena/sandbox/modules/icdar/words.cc | 250 - milena/sandbox/nivault/dmap.hh | 577 - milena/sandbox/nivault/dmap.hxx | 372 - milena/sandbox/nivault/dyn_line.hh | 183 - milena/sandbox/nivault/extract_character.cc | 360 - milena/sandbox/nivault/extract_score.cc | 228 - milena/sandbox/nivault/log | 19 - milena/sandbox/nivault/median.hh | 257 - milena/sandbox/nivault/plugin-gimp/.gitignore | 13 - milena/sandbox/nivault/plugin-gimp/AUTHORS | 2 - milena/sandbox/nivault/plugin-gimp/COPYING | 21 - milena/sandbox/nivault/plugin-gimp/ChangeLog | 347 - milena/sandbox/nivault/plugin-gimp/HACKING | 29 - milena/sandbox/nivault/plugin-gimp/INSTALL | 229 - milena/sandbox/nivault/plugin-gimp/Makefile.am | 15 - milena/sandbox/nivault/plugin-gimp/TODO | 1 - milena/sandbox/nivault/plugin-gimp/autogen.sh | 184 - milena/sandbox/nivault/plugin-gimp/configure.ac | 125 - .../sandbox/nivault/plugin-gimp/help/Makefile.am | 3 - .../nivault/plugin-gimp/help/en/Makefile.am | 9 - .../nivault/plugin-gimp/help/en/gimp-help.xml | 4 - .../sandbox/nivault/plugin-gimp/help/en/index.html | 33 - .../nivault/plugin-gimp/help/images/Makefile.am | 8 - .../nivault/plugin-gimp/help/images/wilber.png | Bin 5022 -> 0 bytes milena/sandbox/nivault/plugin-gimp/po/ChangeLog | 72 - milena/sandbox/nivault/plugin-gimp/po/az.po | 115 - milena/sandbox/nivault/plugin-gimp/po/de.po | 91 - milena/sandbox/nivault/plugin-gimp/po/fr.po | 114 - milena/sandbox/nivault/plugin-gimp/po/sk.po | 115 - milena/sandbox/nivault/plugin-gimp/po/sv.po | 116 - milena/sandbox/nivault/plugin-gimp/po/zh_TW.po | 114 - milena/sandbox/nivault/plugin-gimp/src/Makefile.am | 27 - .../sandbox/nivault/plugin-gimp/src/build-image.hh | 55 - .../nivault/plugin-gimp/src/build-image.hxx | 103 - .../sandbox/nivault/plugin-gimp/src/gimp-image.hh | 620 - .../sandbox/nivault/plugin-gimp/src/interface.hh | 40 - .../sandbox/nivault/plugin-gimp/src/interface.hxx | 94 - milena/sandbox/nivault/plugin-gimp/src/main.cc | 153 - .../sandbox/nivault/plugin-gimp/src/plugin-intl.hh | 45 - milena/sandbox/nivault/rotation.cc | 72 - milena/sandbox/nivault/tests/pouet.cc | 49 - milena/sandbox/nivault/tests/test | 4 - milena/sandbox/nivault/vec.hh | 363 - milena/sandbox/pellegrin/Makefile | 26 - milena/sandbox/pellegrin/cond_inheritance/Makefile | 2 - .../cond_inheritance/concept/point_set.hh | 72 - .../cond_inheritance/internal/multi_set.hh | 72 - .../cond_inheritance/internal/point_set_base.hh | 97 - .../pellegrin/cond_inheritance/internal/uni_set.hh | 70 - .../sandbox/pellegrin/cond_inheritance/p_array.hh | 71 - milena/sandbox/pellegrin/cond_inheritance/p_set.hh | 71 - .../cond_inheritance/test_cond_inherit.cc | 61 - milena/sandbox/pellegrin/first_test.cc | 40 - .../pellegrin/set/core/concept/point_set.hh | 246 - .../pellegrin/set/core/internal/multi_set.hh | 176 - .../sandbox/pellegrin/set/core/internal/uni_set.hh | 176 - milena/sandbox/pellegrin/set/core/line2d.hh | 212 - milena/sandbox/pellegrin/set/core/p_array.hh | 247 - milena/sandbox/pellegrin/set/core/p_bgraph.hh | 235 - milena/sandbox/pellegrin/set/core/p_graph.hh | 263 - milena/sandbox/pellegrin/set/core/p_line_graph.hh | 178 - .../sandbox/pellegrin/set/core/p_priority_queue.hh | 365 - .../pellegrin/set/core/p_priority_queue_fast.hh | 365 - .../set/core/p_priority_queue_fast_with_array.hh | 351 - milena/sandbox/pellegrin/set/core/p_queue.hh | 311 - milena/sandbox/pellegrin/set/core/p_queue_fast.hh | 318 - milena/sandbox/pellegrin/set/core/p_run.hh | 250 - milena/sandbox/pellegrin/set/core/p_runs.hh | 541 - milena/sandbox/pellegrin/set/core/p_set.hh | 195 - milena/sandbox/pellegrin/set/core/pset_if.hh | 227 - milena/sandbox/pellegrin/set/test/Makefile | 16 - milena/sandbox/pellegrin/set/test/detest.sh | 17 - milena/sandbox/pellegrin/set/test/p_bgraph.cc | 85 - .../sandbox/pellegrin/set/test/p_priority_queue.cc | 98 - .../pellegrin/set/test/p_priority_queue_fast.cc | 98 - .../set/test/p_priority_queue_fast_with_array.cc | 105 - milena/sandbox/pellegrin/set/test/p_queue.cc | 57 - milena/sandbox/pellegrin/set/test/p_queue_fast.cc | 57 - milena/sandbox/pellegrin/set/test/p_runs.cc | 82 - milena/sandbox/pellegrin/set/test/p_set.cc | 57 - milena/sandbox/pellegrin/set/test/pset_if.cc | 53 - milena/sandbox/pellegrin/set/test/test.sh | 18 - milena/sandbox/pellegrin/set/trait/point_set.hh | 110 - milena/sandbox/pellegrin/set/types_de_points.txt | 14 - milena/sandbox/roland/.gitignore | 3 - milena/sandbox/roland/Makefile | 25 - milena/sandbox/roland/double.cc | 47 - milena/sandbox/roland/min-max.cc | 48 - milena/sandbox/roland/morpho/lower_completion.hh | 152 - .../roland/morpho/shortest_path_watershed.hh | 221 - milena/sandbox/theo/Rd/debase.union_find.hh | 165 - milena/sandbox/theo/Rd/deco.cc | 71 - milena/sandbox/theo/Rd/diff.cc | 28 - milena/sandbox/theo/Rd/diff_pgm.cc | 43 - milena/sandbox/theo/Rd/hybrid.cc | 53 - milena/sandbox/theo/Rd/hybrid.hh | 117 - milena/sandbox/theo/Rd/min.cc | 42 - milena/sandbox/theo/Rd/parallel.cc | 54 - milena/sandbox/theo/Rd/parallel.hh | 85 - milena/sandbox/theo/Rd/parallel_wo.cc | 46 - milena/sandbox/theo/Rd/queue_based.cc | 51 - milena/sandbox/theo/Rd/queue_based.hh | 124 - milena/sandbox/theo/Rd/sequential.cc | 50 - milena/sandbox/theo/Rd/sequential.hh | 87 - milena/sandbox/theo/Rd/sequential_bench.cc | 51 - milena/sandbox/theo/Rd/sequential_bench.hh | 100 - milena/sandbox/theo/Rd/svg.queue_based.hh | 118 - milena/sandbox/theo/Rd/union_find.cc | 52 - milena/sandbox/theo/Rd/union_find.hh | 166 - milena/sandbox/theo/Rd/utils.hh | 269 - milena/sandbox/theo/browsing/fwd.cc | 515 - milena/sandbox/theo/browsing/fwd.hh | 88 - milena/sandbox/theo/color/blen_pix.hh | 187 - milena/sandbox/theo/color/change_attributes.hh | 360 - milena/sandbox/theo/color/filter_blen_rgb_edges.cc | 387 - .../theo/color/filter_meandist_rgb_pixels.cc | 227 - milena/sandbox/theo/color/mean_rgb_pix.hh | 151 - milena/sandbox/theo/color/segment.hh | 578 - milena/sandbox/theo/color/segment_gl_pixels.cc | 117 - milena/sandbox/theo/color/segment_rgb_edges.cc | 368 - milena/sandbox/theo/color/segment_rgb_pixels.cc | 205 - milena/sandbox/theo/color/sum_pix.hh | 162 - milena/sandbox/theo/compute_parent_more.hh | 191 - milena/sandbox/theo/cs2d/cs2d.cc | 110 - milena/sandbox/theo/cs2d/cs2d.hh | 172 - milena/sandbox/theo/cs2d/cs2d_morpho.hh | 372 - milena/sandbox/theo/cs2d/cs2d_utils.hh | 251 - milena/sandbox/theo/cs2d/dbl_neighb.hh | 167 - milena/sandbox/theo/cs2d/kruskal.cc | 357 - milena/sandbox/theo/cs2d/tuto.cc | 145 - milena/sandbox/theo/csi/edwin.cc | 144 - milena/sandbox/theo/csi/fred.cc | 148 - milena/sandbox/theo/dead/inplace.hh | 66 - milena/sandbox/theo/dead/instant.hh | 168 - milena/sandbox/theo/dmap.cc | 131 - milena/sandbox/theo/dmap.txt | 92 - milena/sandbox/theo/esiee/jean/pfg2d.cc | 51 - milena/sandbox/theo/esiee/jean/pfg3d.cc | 135 - milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh | 162 - .../esiee/laurent/ismm09/extinct_attributes.hh | 167 - milena/sandbox/theo/esiee/laurent/ismm09/lca.hh | 173 - milena/sandbox/theo/esiee/laurent/ismm09/main.cc | 140 - .../sandbox/theo/esiee/laurent/ismm09/main.ext.cc | 76 - .../theo/esiee/laurent/ismm09/pseudo_tree.hh | 597 - .../sandbox/theo/esiee/laurent/ismm09/topo_wst.cc | 114 - milena/sandbox/theo/esiee/laurent/ismm09/trash.hh | 106 - milena/sandbox/theo/esiee/laurent/ismm09/util.hh | 72 - .../theo/esiee/laurent/presentation/classif.cc | 419 - .../esiee/laurent/presentation/segmentation.hh | 14 - .../theo/esiee/laurent/presentation/wst2d.cc | 162 - .../theo/esiee/laurent/presentation/wst3d.cc | 79 - .../theo/esiee/laurent/presentation/wst_edge.cc | 409 - .../sandbox/theo/esiee/slides_2009_may/dilation.hh | 70 - milena/sandbox/theo/esiee/slides_2009_may/main.cc | 31 - milena/sandbox/theo/estimate.hh | 90 - milena/sandbox/theo/exec/clean_holes.cc | 66 - milena/sandbox/theo/exec/closing_area.cc | 60 - milena/sandbox/theo/exec/closing_height.cc | 60 - milena/sandbox/theo/exec/closing_isotropic.cc | 81 - milena/sandbox/theo/exec/closing_rectangle.cc | 62 - milena/sandbox/theo/exec/closing_volume.cc | 60 - .../sandbox/theo/exec/color_internal_gradient.cc | 148 - milena/sandbox/theo/exec/color_labeling_mean.cc | 67 - milena/sandbox/theo/exec/diff_abs.cc | 38 - milena/sandbox/theo/exec/distance_thick.cc | 46 - milena/sandbox/theo/exec/dump2cloud.cc | 34 - milena/sandbox/theo/exec/dump2pnm.cc | 93 - milena/sandbox/theo/exec/dump_12bit_to_pgm.cc | 35 - milena/sandbox/theo/exec/elementary_gradient.cc | 90 - milena/sandbox/theo/exec/filetype.hh | 54 - .../sandbox/theo/exec/gaussian_directional_2d.cc | 99 - .../sandbox/theo/exec/gaussian_directional_2d.hh | 475 - .../theo/exec/gaussian_directional_2d__float.cc | 99 - milena/sandbox/theo/exec/opening_rectangle.cc | 62 - milena/sandbox/theo/exec/pnms2dump.cc | 97 - milena/sandbox/theo/exec/rank_rectangle.cc | 52 - milena/sandbox/theo/exec/subsample.cc | 43 - milena/sandbox/theo/exec/superpose.cc | 39 - milena/sandbox/theo/exec/threshold_low.cc | 69 - milena/sandbox/theo/exec/watershed_flooding.cc | 96 - milena/sandbox/theo/exec/watershed_superpose.cc | 36 - milena/sandbox/theo/experimental/depeche/col.cc | 286 - .../sandbox/theo/experimental/depeche/homogen.cc | 43 - milena/sandbox/theo/experimental/depeche/row.cc | 117 - milena/sandbox/theo/experimental/depeche/row_mm.cc | 96 - milena/sandbox/theo/experimental/histo_image.cc | 421 - .../theo/experimental/op_pw_value_pw_cst.cc | 91 - .../sandbox/theo/experimental/projected_histo.cc | 66 - milena/sandbox/theo/fllt.svg.6.cc | 1139 - milena/sandbox/theo/fllt.svg.7.hh | 838 - milena/sandbox/theo/fllt/compute_fllt.cc | 19 - .../theo/fllt/connected_filters/area_filter.cc | 26 - .../theo/fllt/connected_filters/area_filter.hh | 69 - .../theo/fllt/connected_filters/canonize_tree.hh | 51 - .../fllt/connected_filters/pseudo_flat_zones.cc | 44 - milena/sandbox/theo/fllt/fllt.hh | 1017 - milena/sandbox/theo/fllt/fllt.svg.1.cc | 222 - milena/sandbox/theo/fllt/fllt.svg.2.cc | 304 - milena/sandbox/theo/fllt/fllt.svg.3.cc | 313 - milena/sandbox/theo/fllt/fllt.svg.4.cc | 352 - milena/sandbox/theo/fllt/fllt.svg.5.cc | 353 - milena/sandbox/theo/fllt/fllt.svg.6.cc | 1136 - milena/sandbox/theo/fllt/fllt.svg.7.hh | 913 - milena/sandbox/theo/fllt/fllt_test.hh | 874 - milena/sandbox/theo/fllt/fllt_tree_to_image.hh | 30 - milena/sandbox/theo/fllt/simple_tests.cc | 84 - milena/sandbox/theo/igr/dump_cut.cc | 47 - milena/sandbox/theo/igr/dump_to_dist.cc | 160 - milena/sandbox/theo/igr/irm_anat_segm.cc | 69 - milena/sandbox/theo/igr/irm_anat_segm__2D_ONLY.cc | 57 - milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc | 178 - .../theo/igr/melimage/irm_perf/dynaparam7.m | 299 - milena/sandbox/theo/igr/pgms2pgm.cc | 41 - milena/sandbox/theo/igr/segment_2d_t.cc | 128 - milena/sandbox/theo/mln/browsing/window_sliding.cc | 52 - milena/sandbox/theo/mln/core/concept/walue.hh | 80 - .../sandbox/theo/mln/morpho/canvas/f_and_g.pbm.gz | Bin 3400 -> 0 bytes milena/sandbox/theo/mln/morpho/canvas/g.pbm.gz | Bin 31955 -> 0 bytes .../theo/mln/morpho/canvas/internal/find_root.hh | 89 - milena/sandbox/theo/mln/morpho/canvas/lena.pgm.gz | Bin 222842 -> 0 bytes .../theo/mln/morpho/canvas/lena_blurred.pgm.gz | Bin 104878 -> 0 bytes .../sandbox/theo/mln/morpho/canvas/lena_min.pgm.gz | Bin 216190 -> 0 bytes .../sandbox/theo/mln/morpho/canvas/one_domain.cc | 569 - .../mln/morpho/canvas/reconstruction_on_set.cc | 376 - .../mln/morpho/canvas/reconstruction_on_set.hh | 356 - .../morpho/canvas/reconstruction_on_set_tiny.cc | 190 - .../sandbox/theo/mln/morpho/canvas/regminid.pbm.gz | Bin 1794 -> 0 bytes .../theo/mln/morpho/conditional/dilation.cc | 29 - .../theo/mln/morpho/conditional/dilation.hh | 111 - .../sandbox/theo/mln/morpho/geodesic/dilation.cc | 31 - .../sandbox/theo/mln/morpho/geodesic/dilation.hh | 88 - .../mln/morpho/geodesic/dilation_permissive.cc | 47 - .../mln/morpho/geodesic/dilation_permissive.hh | 463 - .../morpho/geodesic/dilation_permissive_bench.cc | 60 - .../mln/morpho/geodesic/dilation_permissive_n.cc | 35 - milena/sandbox/theo/mln/morpho/max.hh | 143 - .../theo/mln/morpho/reconstruction/by_dilation.cc | 68 - .../theo/mln/morpho/reconstruction/by_dilation.hh | 776 - .../mln/morpho/reconstruction/by_dilation_tiny.cc | 71 - milena/sandbox/theo/mln/subsampling/debase.cc | 23 - milena/sandbox/theo/mln/subsampling/debase.hh | 351 - milena/sandbox/theo/mln/subsampling/in.pgm.gz | Bin 3649560 -> 0 bytes milena/sandbox/theo/mln/subsampling/integral.cc | 38 - milena/sandbox/theo/mln/subsampling/integral.hh | 295 - milena/sandbox/theo/mln/subsampling/sizes.cc | 45 - milena/sandbox/theo/mln/walue/approx_equal.hh | 98 - milena/sandbox/theo/mln/walue/color.hh | 66 - milena/sandbox/theo/mln/walue/gl.cc | 76 - milena/sandbox/theo/mln/walue/gl.hh | 362 - milena/sandbox/theo/mln/walue/gl16.hh | 50 - milena/sandbox/theo/mln/walue/gl8.hh | 50 - milena/sandbox/theo/mln/walue/glf.cc | 39 - milena/sandbox/theo/mln/walue/glf.hh | 152 - milena/sandbox/theo/mln/walue/int_u.cc | 32 - milena/sandbox/theo/mln/walue/int_u.hh | 170 - milena/sandbox/theo/mln/walue/internal/rgb_base.hh | 240 - milena/sandbox/theo/mln/walue/rgb.hh | 86 - milena/sandbox/theo/mln/walue/rgb_3x8.cc | 26 - milena/sandbox/theo/mln/walue/rgb_3x8.hh | 51 - milena/sandbox/theo/mln/walue/rgb_3xn.hh | 98 - milena/sandbox/theo/mln/walue/rgb_t.hh | 97 - milena/sandbox/theo/mln/walue/set_encoding.hh | 176 - .../sandbox/theo/p_runs__with_dedicated_piter.hh | 758 - milena/sandbox/theo/publis/icip2009/compute_a.cc | 578 - .../sandbox/theo/publis/icip2009/regmin_count.cc | 175 - milena/sandbox/theo/rush/exo2/Makefile | 36 - milena/sandbox/theo/rush/exo2/exo2.cc | 118 - milena/sandbox/theo/rush/exo2/exo2.sh | 16 - milena/sandbox/theo/rush/exo2/propagate.hh | 77 - milena/sandbox/theo/rush/exo3/Makefile | 28 - milena/sandbox/theo/rush/exo3/assignable.cc | 251 - milena/sandbox/theo/rush/exo3/exo3_fun_area.cc | 313 - .../sandbox/theo/rush/exo3/exo3_fun_generator.cc | 366 - milena/sandbox/theo/skel.cc | 106 - milena/sandbox/theo/test_attribute.cc | 122 - milena/sandbox/theo/tufa_2008/closed_gradient.cc | 64 - milena/sandbox/theo/tufa_2008/closing.cc | 64 - milena/sandbox/theo/tufa_2008/experiment.cc | 138 - milena/sandbox/theo/tufa_2008/filter.cc | 169 - milena/sandbox/theo/tufa_2008/filter_n.cc | 341 - milena/sandbox/theo/tufa_2008/fz_count.cc | 160 - milena/sandbox/theo/tufa_2008/gradient.cc | 58 - milena/sandbox/theo/tufa_2008/n_cmpt.cc | 263 - milena/sandbox/theo/tufa_2008/opening.cc | 63 - milena/sandbox/theo/tufa_2008/steps.0.cc | 171 - milena/sandbox/theo/tufa_2008/steps.1.cc | 274 - milena/sandbox/theo/tufa_2008/steps.2.cc | 259 - milena/sandbox/theo/tufa_2008/steps.2b.cc | 185 - milena/sandbox/theo/tufa_2008/steps.3.cc | 186 - milena/sandbox/theo/tufa_2008/wst.cc | 69 - milena/sandbox/theo/tufa_2008/wst_f_equal_wst_a.cc | 140 - milena/sandbox/theo/win_fun.cc | 160 - milena/sandbox/theo/win_fun.hh | 160 - milena/sandbox/vigouroux/cmy/fun.hh | 54 - milena/sandbox/vigouroux/cmy/get_blue.hh | 67 - milena/sandbox/vigouroux/cmy/get_green.hh | 56 - milena/sandbox/vigouroux/cmy/my_cmy.hh | 90 - milena/sandbox/vigouroux/cmy/rgb_to_cmy.hh | 78 - milena/sandbox/vigouroux/cmy/test.cc | 28 - milena/sandbox/vigouroux/cmy/testfun.cc | 30 - milena/sandbox/vigouroux/color.cc | 27 - milena/sandbox/vigouroux/color.hh | 45 - milena/sandbox/vigouroux/color/color.hh | 309 - milena/sandbox/vigouroux/color/hsi.hh | 64 - milena/sandbox/vigouroux/color/hsl.hh | 55 - milena/sandbox/vigouroux/color/hsv.hh | 56 - milena/sandbox/vigouroux/color/is_HSI.cc | 33 - milena/sandbox/vigouroux/color/my_cmy.hh | 65 - milena/sandbox/vigouroux/color/my_hsi.hh | 93 - milena/sandbox/vigouroux/color/my_hsl.hh | 90 - milena/sandbox/vigouroux/color/my_hsv.hh | 90 - milena/sandbox/vigouroux/color/my_xyz.hh | 93 - milena/sandbox/vigouroux/color/my_yiq.hh | 133 - milena/sandbox/vigouroux/color/my_yuv.hh | 133 - milena/sandbox/vigouroux/color/nrgb.hh | 131 - milena/sandbox/vigouroux/color/rgb.hh | 59 - milena/sandbox/vigouroux/color/rgb_to_cmy.hh | 47 - milena/sandbox/vigouroux/color/rgb_to_hsi.hh | 105 - milena/sandbox/vigouroux/color/rgb_to_hsl.hh | 82 - milena/sandbox/vigouroux/color/rgb_to_hsv.hh | 60 - milena/sandbox/vigouroux/color/rgb_to_xyz.hh | 76 - milena/sandbox/vigouroux/color/rgb_to_yiq.hh | 48 - milena/sandbox/vigouroux/color/rgb_to_yuv.hh | 48 - milena/sandbox/vigouroux/color/tests.cc | 31 - milena/sandbox/vigouroux/color/xyz.hh | 55 - milena/sandbox/vigouroux/color/yiq.hh | 65 - milena/sandbox/vigouroux/color/yuv.hh | 64 - milena/sandbox/vigouroux/conv/getred.hh | 76 - milena/sandbox/vigouroux/conv/rgbto.hh | 149 - milena/sandbox/vigouroux/conv/test.cc | 33 - milena/sandbox/vigouroux/conv/tored.hh | 118 - milena/sandbox/vigouroux/conv/torgb.hh | 140 - .../vigouroux/convert/abstract/colorconv.hh | 69 - .../vigouroux/convert/abstract/conversion.hh | 178 - milena/sandbox/vigouroux/convert/basics.hh | 39 - milena/sandbox/vigouroux/convert/bound.hh | 67 - milena/sandbox/vigouroux/convert/cast.hh | 64 - milena/sandbox/vigouroux/convert/conversion.hh | 160 - .../sandbox/vigouroux/convert/conversion_ng_se.hh | 82 - milena/sandbox/vigouroux/convert/force.hh | 63 - milena/sandbox/vigouroux/convert/nrgbxyz.hh | 182 - milena/sandbox/vigouroux/convert/rgbhsi.hh | 154 - milena/sandbox/vigouroux/convert/rgbhsl.hh | 227 - milena/sandbox/vigouroux/convert/rgbhsv.hh | 205 - milena/sandbox/vigouroux/convert/rgbnrgb.hh | 146 - milena/sandbox/vigouroux/convert/rgbxyz.hh | 144 - milena/sandbox/vigouroux/convert/rgbyiq.hh | 142 - milena/sandbox/vigouroux/convert/rgbyuv.hh | 140 - milena/sandbox/vigouroux/convert/stretch.hh | 218 - milena/sandbox/vigouroux/convert/value_to_point.hh | 131 - milena/sandbox/vigouroux/function.hh | 72 - milena/sandbox/vigouroux/gradation.hh | 91 - milena/sandbox/vigouroux/hsi/get_blue.hh | 67 - milena/sandbox/vigouroux/hsi/get_green.hh | 67 - milena/sandbox/vigouroux/hsi/get_red.hh | 67 - milena/sandbox/vigouroux/hsi/my_hsi.hh | 93 - milena/sandbox/vigouroux/hsi/rgb_to_hsi.hh | 110 - milena/sandbox/vigouroux/lap.cc | 49 - milena/sandbox/vigouroux/lap.hh | 77 - milena/sandbox/vigouroux/literal/black.hh | 38 - milena/sandbox/vigouroux/literal/blue.hh | 38 - milena/sandbox/vigouroux/literal/brown.hh | 37 - milena/sandbox/vigouroux/literal/cyan.hh | 44 - milena/sandbox/vigouroux/literal/darkgray.hh | 33 - milena/sandbox/vigouroux/literal/gray.hh | 33 - milena/sandbox/vigouroux/literal/green.hh | 38 - milena/sandbox/vigouroux/literal/lightgray.hh | 33 - milena/sandbox/vigouroux/literal/lime.hh | 37 - milena/sandbox/vigouroux/literal/magenta.hh | 37 - milena/sandbox/vigouroux/literal/olive.hh | 33 - milena/sandbox/vigouroux/literal/orange.hh | 37 - milena/sandbox/vigouroux/literal/pink.hh | 37 - milena/sandbox/vigouroux/literal/purple.hh | 37 - milena/sandbox/vigouroux/literal/red.hh | 38 - milena/sandbox/vigouroux/literal/teal.hh | 37 - milena/sandbox/vigouroux/literal/violet.hh | 37 - milena/sandbox/vigouroux/literal/white.hh | 38 - milena/sandbox/vigouroux/literal/yellow.hh | 37 - milena/sandbox/vigouroux/load.cc | 78 - milena/sandbox/vigouroux/moyenne.cc | 63 - milena/sandbox/vigouroux/testfun.cc | 32 - milena/sandbox/vigouroux/tests.cc | 31 - milena/sandbox/vigouroux/xyz/get_blue.hh | 56 - milena/sandbox/vigouroux/xyz/get_green.hh | 56 - milena/sandbox/vigouroux/xyz/get_red.hh | 52 - milena/sandbox/vigouroux/xyz/my_xyz.hh | 93 - milena/sandbox/vigouroux/xyz/rgb_to_xyz.hh | 76 - milena/sandbox/vigouroux/xyz/test.cc | 28 - milena/sandbox/vigouroux/xyz/testfun.cc | 31 - milena/sandbox/vigouroux/yiq/get_blue.hh | 56 - milena/sandbox/vigouroux/yiq/get_green.hh | 55 - milena/sandbox/vigouroux/yiq/get_red.hh | 54 - milena/sandbox/vigouroux/yiq/my_yiq.hh | 91 - milena/sandbox/vigouroux/yiq/rgb_to_yiq.hh | 78 - milena/sandbox/vigouroux/yiq/test.cc | 28 - milena/sandbox/vigouroux/yiq/testfun.cc | 30 - milena/sandbox/vigouroux/yuv/get_blue.hh | 56 - milena/sandbox/vigouroux/yuv/get_green.hh | 56 - milena/sandbox/vigouroux/yuv/get_red.hh | 58 - milena/sandbox/vigouroux/yuv/my_yuv.hh | 91 - milena/sandbox/vigouroux/yuv/rgb_to_yuv.hh | 79 - milena/sandbox/vigouroux/yuv/test.cc | 28 - milena/sandbox/vigouroux/yuv/testfun.cc | 30 - milena/tests/Makefile.am | 12 +- milena/tests/accu/Makefile.am | 14 - milena/tests/accu/image/Makefile.am | 9 +- milena/tests/accu/math/Makefile.am | 3 +- milena/tests/accu/shape/Makefile.am | 3 +- milena/tests/accu/site_set/Makefile.am | 3 +- milena/tests/accu/stat/Makefile.am | 12 - milena/tests/algebra/Makefile.am | 10 +- milena/tests/algebra/h_vec.cc | 6 +- milena/tests/arith/Makefile.am | 9 +- milena/tests/binarization/Makefile.am | 1 - milena/tests/border/Makefile.am | 24 +- milena/tests/canvas/Makefile.am | 4 +- milena/tests/canvas/browsing/Makefile.am | 11 +- milena/tests/canvas/morpho/Makefile.am | 7 +- milena/tests/convert/Makefile.am | 18 +- milena/tests/convert/impl/Makefile.am | 3 +- milena/tests/convert/to_hsl.cc | 44 - milena/tests/core/alias/Makefile.am | 18 +- milena/tests/core/alias/point1d.cc | 9 +- milena/tests/core/image/Makefile.am | 14 +- milena/tests/core/image/dmorph/Makefile.am | 10 +- milena/tests/core/image/imorph/Makefile.am | 7 +- milena/tests/core/image/vmorph/Makefile.am | 4 +- milena/tests/core/other/Makefile.am | 22 +- milena/tests/core/routine/Makefile.am | 8 +- milena/tests/core/site_set/Makefile.am | 18 +- milena/tests/data.hh.in | 10 +- milena/tests/data/Makefile.am | 29 +- milena/tests/data/approx/Makefile.am | 3 +- milena/tests/data/naive/Makefile.am | 3 +- milena/tests/debug/Makefile.am | 7 +- milena/tests/draw/Makefile.am | 6 +- milena/tests/estim/Makefile.am | 6 +- milena/tests/extension/Makefile.am | 4 +- milena/tests/extract/Makefile.am | 20 +- milena/tests/extract/blue.cc | 47 - milena/tests/extract/green.cc | 47 - milena/tests/extract/hue.cc | 47 - milena/tests/extract/lum.cc | 47 - milena/tests/extract/red.cc | 47 - milena/tests/extract/sat.cc | 47 - milena/tests/fun/Makefile.am | 4 +- milena/tests/fun/i2v/Makefile.am | 6 +- milena/tests/fun/p2b/Makefile.am | 7 +- milena/tests/fun/p2p/Makefile.am | 4 +- milena/tests/fun/p2v/Makefile.am | 7 +- milena/tests/fun/stat/Makefile.am | 3 +- milena/tests/fun/v2i/Makefile.am | 3 +- milena/tests/fun/v2v/Makefile.am | 16 +- milena/tests/fun/v2v/component.cc | 69 - milena/tests/fun/vv2v/Makefile.am | 5 +- milena/tests/fun/x2x/Makefile.am | 7 +- milena/tests/geom/Makefile.am | 23 - milena/tests/graph/Makefile.am | 3 +- milena/tests/graph/attribute/Makefile.am | 4 +- milena/tests/histo/Makefile.am | 5 +- milena/tests/io/dicom/Makefile.am | 3 +- milena/tests/io/dump/Makefile.am | 1 - milena/tests/io/fits/Makefile.am | 1 - milena/tests/io/fld/Makefile.am | 6 +- milena/tests/io/magick/Makefile.am | 2 - milena/tests/io/off/Makefile.am | 3 - milena/tests/io/pbm/Makefile.am | 2 - milena/tests/io/pbms/Makefile.am | 1 - milena/tests/io/pfm/Makefile.am | 7 +- milena/tests/io/pgm/Makefile.am | 5 - milena/tests/io/pgms/Makefile.am | 1 - milena/tests/io/pnm/Makefile.am | 7 +- milena/tests/io/ppm/Makefile.am | 3 - milena/tests/io/ppms/Makefile.am | 1 - milena/tests/io/tiff/Makefile.am | 3 +- milena/tests/labeling/Makefile.am | 19 +- milena/tests/linear/Makefile.am | 21 +- milena/tests/linear/gaussian/Makefile.am | 13 +- milena/tests/linear/gaussian/filter.cc | 48 - milena/tests/linear/local/Makefile.am | 5 +- milena/tests/literal/Makefile.am | 14 +- milena/tests/logical/Makefile.am | 9 +- milena/tests/make/Makefile.am | 18 +- milena/tests/make/p_edges_with_mass_centers.cc | 3 +- milena/tests/make/p_vertices_with_mass_centers.cc | 3 +- milena/tests/math/Makefile.am | 7 +- milena/tests/metal/Makefile.am | 7 +- milena/tests/metal/converts_to.cc | 23 +- milena/tests/metal/make/Makefile.am | 7 +- milena/tests/metal/math/Makefile.am | 6 +- milena/tests/morpho/Makefile.am | 27 +- milena/tests/morpho/approx/Makefile.am | 2 - milena/tests/morpho/attribute/Makefile.am | 6 +- milena/tests/morpho/closing/Makefile.am | 8 - milena/tests/morpho/closing/approx/Makefile.am | 1 - milena/tests/morpho/elementary/Makefile.am | 12 +- milena/tests/morpho/opening/Makefile.am | 8 - milena/tests/morpho/opening/approx/Makefile.am | 1 - .../morpho/reconstruction/by_dilation/Makefile.am | 3 - .../morpho/reconstruction/by_erosion/Makefile.am | 3 - milena/tests/morpho/tree/Makefile.am | 8 +- milena/tests/morpho/tree/filter/Makefile.am | 3 +- milena/tests/morpho/watershed/Makefile.am | 3 - milena/tests/opt/Makefile.am | 4 +- milena/tests/pw/Makefile.am | 6 +- milena/tests/registration/Makefile.am | 9 +- milena/tests/registration/registration.cc | 55 - milena/tests/set/Makefile.am | 12 +- milena/tests/subsampling/Makefile.am | 3 +- milena/tests/tag/Makefile.am | 7 +- milena/tests/test/Makefile.am | 4 +- milena/tests/tests.mk | 13 +- milena/tests/topo/Makefile.am | 4 +- milena/tests/topo/skeleton/Makefile.am | 4 +- milena/tests/trace/Makefile.am | 7 +- milena/tests/trait/Makefile.am | 6 +- milena/tests/trait/ch_value.cc | 12 - milena/tests/trait/image/Makefile.am | 5 +- milena/tests/trait/op/Makefile.am | 6 +- milena/tests/trait/op/plus.cc | 41 +- milena/tests/trait/value/Makefile.am | 6 +- milena/tests/transform/Makefile.am | 11 +- milena/tests/unit_test/unit-tests.mk | 1410 +- milena/tests/upscaling/art/Makefile.am | 4 +- milena/tests/util/Makefile.am | 20 +- milena/tests/value/Makefile.am | 32 +- milena/tests/value/builtin/Makefile.am | 5 +- milena/tests/value/concept/Makefile.am | 7 +- milena/tests/value/graylevel.cc | 74 +- milena/tests/value/int_s16.cc | 5 +- milena/tests/value/int_u8.cc | 5 +- milena/tests/value/stack.cc | 55 - milena/tests/win/Makefile.am | 20 +- milena/tests/world/binary_2d/Makefile.am | 4 +- milena/tests/world/inter_pixel/Makefile.am | 7 +- milena/tests/world/inter_pixel/dim2/Makefile.am | 3 +- milena/tools/Makefile.am | 6 +- milena/tools/tools.mk | 3 +- milena/vcs/milena.rb | 16 - scribo/ChangeLog | 389 +- scribo/Makefile.am | 16 +- scribo/common.mk | 28 + scribo/demo/viewer/BUGS | 1 + scribo/demo/viewer/GScribo.pro | 83 + scribo/demo/viewer/GScribo.pro.user | 405 + scribo/demo/viewer/GScribo.pro.user.1.3 | 283 + scribo/demo/viewer/Makefile.am | 154 +- scribo/demo/viewer/PagesWidget/pagesdelegate.cc | 38 + scribo/demo/viewer/PagesWidget/pagesdelegate.hh | 36 + scribo/demo/viewer/PagesWidget/pagesmodel.cc | 91 + scribo/demo/viewer/PagesWidget/pagesmodel.hh | 51 + scribo/demo/viewer/PagesWidget/pageswidget.cc | 119 + scribo/demo/viewer/PagesWidget/pageswidget.hh | 61 + scribo/demo/viewer/Preferences/generaloptions.cc | 60 + scribo/demo/viewer/Preferences/generaloptions.hh | 50 + scribo/demo/viewer/Preferences/generaloptions.ui | 100 + scribo/demo/viewer/Preferences/ocroptions.cc | 69 + scribo/demo/viewer/Preferences/ocroptions.hh | 49 + scribo/demo/viewer/Preferences/ocroptions.ui | 62 + scribo/demo/viewer/Preferences/optionwidget.hh | 15 + .../demo/viewer/Preferences/preferencesdialog.cc | 120 + .../demo/viewer/Preferences/preferencesdialog.hh | 55 + .../demo/viewer/Preferences/preferencesdialog.ui | 121 + .../viewer/Preferences/preprocessingoptions.cc | 61 + .../viewer/Preferences/preprocessingoptions.hh | 48 + .../viewer/Preferences/preprocessingoptions.ui | 76 + .../demo/viewer/Preferences/segmentationoptions.cc | 49 + .../demo/viewer/Preferences/segmentationoptions.hh | 46 + .../demo/viewer/Preferences/segmentationoptions.ui | 52 + scribo/demo/viewer/Processing/preprocess.cc | 27 + scribo/demo/viewer/Processing/preprocess.hh | 42 + scribo/demo/viewer/Processing/process.cc | 37 + scribo/demo/viewer/Processing/process.hh | 45 + scribo/demo/viewer/Processing/progressdialog.cc | 37 + scribo/demo/viewer/Processing/progressdialog.hh | 36 + scribo/demo/viewer/Processing/runner.cc | 199 + scribo/demo/viewer/Processing/runner.hh | 74 + scribo/demo/viewer/README | 32 - scribo/demo/viewer/Rendering/abstractregionitem.hh | 13 + scribo/demo/viewer/Rendering/backgroundtexture.hh | 12 + scribo/demo/viewer/Rendering/graphicsview.cc | 165 + scribo/demo/viewer/Rendering/graphicsview.hh | 59 + scribo/demo/viewer/Rendering/regionitem.cc | 130 + scribo/demo/viewer/Rendering/regionitem.hh | 66 + scribo/demo/viewer/Rendering/rootgraphicsitem.cc | 46 + scribo/demo/viewer/Rendering/rootgraphicsitem.hh | 39 + scribo/demo/viewer/Rendering/scene.cc | 289 + scribo/demo/viewer/Rendering/scene.hh | 118 + scribo/demo/viewer/Rendering/selection.cc | 52 + scribo/demo/viewer/Rendering/selection.hh | 20 + scribo/demo/viewer/TODO | 100 + scribo/demo/viewer/XmlWidget/attributesmodel.cc | 108 + scribo/demo/viewer/XmlWidget/attributesmodel.hh | 55 + scribo/demo/viewer/XmlWidget/selectionproxy.hh | 47 + scribo/demo/viewer/XmlWidget/xmlattributes.cc | 49 + scribo/demo/viewer/XmlWidget/xmlattributes.hh | 44 + scribo/demo/viewer/XmlWidget/xmldelegate.hh | 30 + scribo/demo/viewer/XmlWidget/xmlitem.cc | 59 + scribo/demo/viewer/XmlWidget/xmlitem.hh | 106 + scribo/demo/viewer/XmlWidget/xmlmodel.cc | 123 + scribo/demo/viewer/XmlWidget/xmlmodel.hh | 51 + scribo/demo/viewer/XmlWidget/xmlview.cc | 104 + scribo/demo/viewer/XmlWidget/xmlview.hh | 95 + scribo/demo/viewer/XmlWidget/xmlwidget.cc | 66 + scribo/demo/viewer/XmlWidget/xmlwidget.hh | 61 + scribo/demo/viewer/aboutdialog.cc | 31 + scribo/demo/viewer/aboutdialog.hh | 40 + scribo/demo/viewer/aboutdialog.ui | 136 + scribo/demo/viewer/configs.cc | 149 + scribo/demo/viewer/configs.hh | 74 + scribo/demo/viewer/demodir.hh.in | 8 +- scribo/demo/viewer/dir.hh | 7 + scribo/demo/viewer/dockwidget.cc | 34 + scribo/demo/viewer/dockwidget.hh | 36 + scribo/demo/viewer/main.cc | 2 +- scribo/demo/viewer/mainwindow.cc | 496 + scribo/demo/viewer/mainwindow.hh | 130 + scribo/demo/viewer/mainwindow.ui | 35 + scribo/demo/viewer/preprocess.cc | 27 - scribo/demo/viewer/preprocess.hh | 42 - scribo/demo/viewer/process.cc | 37 - scribo/demo/viewer/process.hh | 45 - scribo/demo/viewer/region.hh | 72 + scribo/demo/viewer/regionwidget.cc | 114 + scribo/demo/viewer/regionwidget.hh | 58 + scribo/demo/viewer/runner.cc | 199 - scribo/demo/viewer/runner.hh | 74 - scribo/demo/viewer/variantpointer.cc | 39 + scribo/demo/viewer/variantpointer.hh | 33 + scribo/demo/viewer/xml.cc | 253 + scribo/demo/viewer/xml.hh | 91 + scribo/headers.mk | 4 - scribo/sandbox/ChangeLog | 219 - scribo/sandbox/green/ChangeLog | 1666 - scribo/sandbox/green/README | 219 - scribo/sandbox/green/README.green | 1211 - scribo/sandbox/green/README.img | 124 - scribo/sandbox/green/README.result | 143 - .../green/bench/clustering/distance/Makefile.am | 153 - .../green/bench/clustering/distance/distance.cc | 842 - .../sandbox/green/demo/annotating/bic/Makefile.am | 153 - scribo/sandbox/green/demo/annotating/bic/bic.cc | 122 - .../sandbox/green/demo/annotating/hsv/Makefile.am | 153 - scribo/sandbox/green/demo/annotating/hsv/hsv.cc | 721 - .../sandbox/green/demo/annotating/lep/Makefile.am | 153 - scribo/sandbox/green/demo/annotating/lep/lep.cc | 127 - .../green/demo/annotating/nb_color/Makefile.am | 153 - .../green/demo/annotating/nb_color/nb_color.cc | 143 - .../green/demo/annotating/project/Makefile.am | 153 - .../green/demo/annotating/project/project.cc | 275 - .../green/demo/annotating/rgb_64/Makefile.am | 153 - .../sandbox/green/demo/annotating/rgb_64/rgb_64.cc | 80 - .../green/demo/annotating/rgb_64_9/Makefile.am | 153 - .../green/demo/annotating/rgb_64_9/rgb_64_9.cc | 132 - .../green/demo/annotating/stddev_color/Makefile.am | 153 - .../demo/annotating/stddev_color/stddev_color.cc | 191 - .../demo/annotating/stddev_color_16/Makefile.am | 153 - .../annotating/stddev_color_16/stddev_color_16.cc | 261 - .../green/demo/clustering/kmean1d/Makefile.am | 153 - .../green/demo/clustering/kmean1d/kmean1d.cc | 258 - .../green/demo/clustering/kmean2d/Makefile.am | 153 - .../green/demo/clustering/kmean2d/kmean2d.cc | 278 - .../green/demo/clustering/kmean3d/Makefile.am | 153 - .../green/demo/clustering/kmean3d/kmean3d.cc | 265 - .../green/demo/clustering/kmean_rgb/Makefile.am | 153 - .../green/demo/clustering/kmean_rgb/kmean_rgb.cc | 239 - .../demo/labeling/regional_maxima/Makefile.am | 153 - .../labeling/regional_maxima/regional_maxima.cc | 198 - .../demo/labeling/regional_maxima/thresholds.txt | 42 - .../green/demo/labeling/watershed/Makefile.am | 153 - .../green/demo/labeling/watershed/gaussian.sh | 12 - .../green/demo/labeling/watershed/watershed.cc | 360 - scribo/sandbox/green/doc/annotating/class.txt | 42 - .../green/doc/annotating/syntheseMillet2008.txt | 283 - scribo/sandbox/green/doc/annotating/testMillet2008 | 69 - .../green/doc/examples/accu_color/accu_color.cc | 249 - scribo/sandbox/green/doc/examples/frac/Makefile.am | 148 - scribo/sandbox/green/doc/examples/frac/frac.cc | 423 - scribo/sandbox/green/doc/examples/frac/frac.hh | 793 - scribo/sandbox/green/doc/examples/frac/gcd.hh | 91 - .../sandbox/green/doc/examples/frac/sign_prod.hh | 74 - .../green/doc/examples/hello_milena/Makefile.am | 49 - .../doc/examples/hello_milena/hello_milena.cc | 41 - .../green/doc/examples/hello_world/Makefile.am | 49 - .../green/doc/examples/hello_world/hello_world.cc | 9 - .../green/doc/examples/hello_world/print.cc | 6 - scribo/sandbox/green/doc/examples/io/Makefile.am | 150 - scribo/sandbox/green/doc/examples/io/io.cc | 71 - .../green/doc/examples/learn_milena/Makefile.am | 49 - .../doc/examples/learn_milena/learn_milena.cc | 151 - scribo/sandbox/green/doc/examples/otsu/Makefile.am | 49 - scribo/sandbox/green/doc/examples/otsu/otsu.cc | 193 - .../sandbox/green/doc/examples/stats/Makefile.am | 49 - scribo/sandbox/green/doc/examples/stats/stats.cc | 32 - scribo/sandbox/green/doc/formulae/formulae.tex | 1157 - scribo/sandbox/green/doc/quick_tour/quick_tour.tex | 115 - .../green/exp/annotating/achromastism/Makefile.am | 153 - .../exp/annotating/achromastism/achromastism.cc | 179 - .../exp/annotating/achromastism/text-color.txt | 15 - .../green/exp/annotating/achromastism/text-img.txt | 40 - .../exp/annotating/achromastism/text-only.txt | 8 - .../sandbox/green/exp/annotating/bench/Makefile.am | 153 - scribo/sandbox/green/exp/annotating/bench/bench.cc | 1450 - .../sandbox/green/exp/annotating/error/Makefile.am | 153 - scribo/sandbox/green/exp/annotating/error/error.cc | 833 - .../sandbox/green/exp/annotating/histo/Makefile.am | 153 - scribo/sandbox/green/exp/annotating/histo/histo.cc | 366 - .../sandbox/green/exp/annotating/hsv/Makefile.am | 153 - scribo/sandbox/green/exp/annotating/hsv/hsv.cc | 912 - .../sandbox/green/exp/annotating/hue/Makefile.am | 153 - scribo/sandbox/green/exp/annotating/hue/hue.cc | 402 - .../green/exp/annotating/hue/text-color.txt | 15 - .../sandbox/green/exp/annotating/hue/text-img.txt | 40 - .../sandbox/green/exp/annotating/hue/text-only.txt | 8 - .../green/exp/annotating/nb_color/Makefile.am | 153 - .../green/exp/annotating/nb_color/nb_color.cc | 171 - .../green/exp/annotating/saturation/Makefile.am | 153 - .../green/exp/annotating/saturation/saturation.cc | 175 - .../green/exp/annotating/saturation/text-color.txt | 15 - .../green/exp/annotating/saturation/text-img.txt | 40 - .../green/exp/annotating/saturation/text-only.txt | 8 - .../green/exp/annotating/stddev_color/Makefile.am | 153 - .../exp/annotating/stddev_color/stddev_color.cc | 216 - .../exp/annotating/stddev_color_16/Makefile.am | 153 - .../annotating/stddev_color_16/stddev_color_16.cc | 277 - .../sandbox/green/exp/annotating/value/Makefile.am | 153 - .../green/exp/annotating/value/text-color.txt | 15 - .../green/exp/annotating/value/text-img.txt | 40 - .../green/exp/annotating/value/text-only.txt | 8 - scribo/sandbox/green/exp/annotating/value/value.cc | 468 - .../sandbox/green/exp/regional_maxima/Makefile.am | 153 - .../green/exp/regional_maxima/regional_maxima.cc | 196 - .../green/exp/regional_maxima/thresholds.txt | 42 - scribo/sandbox/green/gaussian.sh | 12 - scribo/sandbox/green/gaussian2d.sh | 21 - scribo/sandbox/green/mln/accu/stat/histo1d.hh | 338 - scribo/sandbox/green/mln/accu/stat/histo2d.hh | 342 - scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh | 388 - scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 345 - scribo/sandbox/green/mln/clustering/k_mean.hh | 785 - scribo/sandbox/green/mln/clustering/kmean1d.hh | 1082 - scribo/sandbox/green/mln/clustering/kmean2d.hh | 1345 - scribo/sandbox/green/mln/clustering/kmean3d.hh | 1345 - scribo/sandbox/green/mln/clustering/kmean_rgb.hh | 1042 - scribo/sandbox/green/mln/display/display_histo.hh | 295 - scribo/sandbox/green/mln/display/project_histo.hh | 679 - scribo/sandbox/green/mln/fun/p2b/achromatic.hh | 128 - .../sandbox/green/mln/fun/p2b/component_equals.hh | 99 - scribo/sandbox/green/mln/fun/v2v/achromatism.hh | 64 - .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 111 - .../green/mln/fun/v2v/int_u16_to_int_u14.hh | 71 - scribo/sandbox/green/mln/fun/v2v/log.hh | 70 - scribo/sandbox/green/mln/fun/v2v/rg_to_rgb.hh | 119 - scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 71 - scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh | 119 - .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 81 - scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 162 - scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh | 96 - scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh | 109 - .../green/mln/fun/v2v/rgb_to_saturation_map.hh | 83 - .../sandbox/green/mln/fun/v2v/rgb_to_value_map.hh | 75 - scribo/sandbox/green/mln/img_path.hh | 239 - scribo/sandbox/green/mln/io/plot/save_image_sh.hh | 1090 - scribo/sandbox/green/mln/math/ceil.hh | 64 - scribo/sandbox/green/mln/math/floor.hh | 64 - scribo/sandbox/green/mln/value/hsv.hh | 424 - scribo/sandbox/green/mln/value/rg.hh | 175 - scribo/sandbox/green/ok/mln/accu/histo/histo1d.hh | 334 - scribo/sandbox/green/ok/mln/accu/histo/histo2d.hh | 346 - scribo/sandbox/green/ok/mln/accu/histo/histo3d.hh | 349 - scribo/sandbox/green/ok/mln/img_path.hh | 239 - .../sandbox/green/ok/test/accu/histo/gaussian.sh | 12 - scribo/sandbox/green/ok/test/accu/histo/histo1d | Bin 802920 -> 0 bytes scribo/sandbox/green/ok/test/accu/histo/histo1d.cc | 726 - scribo/sandbox/green/test_labelling.cc | 336 - scribo/sandbox/green/test_labelling_2.cc | 342 - scribo/sandbox/green/test_labelling_3.cc | 463 - .../green/tests/accu/stat/histo1d/Makefile.am | 153 - .../green/tests/accu/stat/histo1d/histo1d.cc | 507 - .../green/tests/accu/stat/histo3d_hsl/Makefile.am | 153 - .../tests/accu/stat/histo3d_hsl/histo3d_hsl.cc | 391 - .../green/tests/accu/stat/histo3d_rgb/Makefile.am | 153 - .../tests/accu/stat/histo3d_rgb/histo3d_rgb.cc | 397 - .../green/tests/clustering/k_mean/Makefile.am | 153 - .../green/tests/clustering/k_mean/k_mean.cc | 547 - .../green/tests/clustering/kmean1d/Makefile.am | 148 - .../green/tests/clustering/kmean1d/kmean1d.cc | 483 - .../green/tests/io/plot/save_image_sh/Makefile.am | 153 - .../tests/io/plot/save_image_sh/save_image_sh.cc | 774 - .../sandbox/green/tools/labeling/histo/Makefile.am | 153 - scribo/sandbox/green/tools/labeling/histo/histo.cc | 204 - scribo/sandbox/green/tools/labeling/iz/Makefile.am | 153 - scribo/sandbox/green/tools/labeling/iz/iz.cc | 495 - .../green/tools/labeling/opening/Makefile.am | 153 - .../green/tools/labeling/opening/opening.cc | 174 - .../green/tools/labeling/regmax/Makefile.am | 153 - .../sandbox/green/tools/labeling/regmax/regmax.cc | 428 - .../green/use/accu/stat/histo1d/Makefile.am | 153 - .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 50 - .../green/use/accu/stat/histo2d/Makefile.am | 153 - .../sandbox/green/use/accu/stat/histo2d/histo2d.cc | 58 - .../green/use/accu/stat/histo3d_hsl/Makefile.am | 153 - .../green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc | 59 - .../green/use/accu/stat/histo3d_rgb/Makefile.am | 153 - .../green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc | 57 - .../green/use/clustering/k_mean/Makefile.am | 153 - .../sandbox/green/use/clustering/k_mean/k_mean.cc | 55 - .../green/use/clustering/kmean1d/Makefile.am | 153 - .../green/use/clustering/kmean1d/kmean1d.cc | 50 - .../green/use/clustering/kmean2d/Makefile.am | 153 - .../green/use/clustering/kmean2d/kmean2d.cc | 61 - .../green/use/clustering/kmean3d/Makefile.am | 153 - .../green/use/clustering/kmean3d/kmean3d.cc | 63 - .../green/use/clustering/kmean_rgb/Makefile.am | 153 - .../green/use/clustering/kmean_rgb/kmean_rgb.cc | 63 - .../green/use/display/display_histo/Makefile.am | 153 - .../use/display/display_histo/display_histo.cc | 86 - .../green/use/fun/v2v/rg_to_rgb/Makefile.am | 153 - .../green/use/fun/v2v/rg_to_rgb/rg_to_rgb.cc | 68 - .../green/use/fun/v2v/rgb8_to_rgbn/Makefile.am | 153 - .../green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc | 57 - .../green/use/fun/v2v/rgb_to_rg/Makefile.am | 153 - .../green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc | 58 - .../green/use/io/plot/save_image_sh/Makefile.am | 153 - .../use/io/plot/save_image_sh/save_image_sh.cc | 53 - scribo/sandbox/green/use/value/rg/Makefile.am | 153 - scribo/sandbox/green/use/value/rg/rg.cc | 58 - scribo/sandbox/z/white_spaces/hom_sep.cc | 133 - .../sandbox/z/white_spaces/white_space_closing.cc | 123 - scribo/sandbox/z/white_spaces/white_spaces.cc | 842 - scribo/scribo.mk | 10 +- scribo/scribo/binarization/otsu_threshold.hh | 7 +- scribo/scribo/debug/alignment_decision_image.hh | 6 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 4 +- scribo/scribo/debug/decision_image.hh | 10 +- scribo/scribo/debug/links_decision_image.hh | 6 +- scribo/scribo/debug/links_image.hh | 4 +- .../scribo/debug/looks_like_a_text_line_image.hh | 4 +- scribo/scribo/io/text_boxes/save.hh | 4 +- scribo/scribo/io/xml/load.hh | 2 +- scribo/scribo/primitive/extract/components.hh | 6 +- .../primitive/link/with_single_right_link.hh | 4 +- scribo/scribo/text/paragraphs_closing.hh | 11 +- scribo/scribo/text/recognition.hh | 10 +- scribo/scribo/toolchain/content_in_doc.hh | 12 +- scribo/scribo/toolchain/content_in_hdoc.hh | 10 +- scribo/scribo/toolchain/text_in_doc.hh | 10 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 20 +- scribo/scribo/toolchain/text_in_picture.hh | 6 +- scribo/src/Makefile.am | 9 +- scribo/src/afp/components.hh | 6 +- scribo/src/binarization/Makefile.am | 16 +- scribo/src/binarization/otsu.cc | 4 +- scribo/src/content_in_hdoc.cc | 4 +- scribo/src/contest/DAE-2011/Makefile.am | 7 +- scribo/src/contest/DAE-2011/content_in_doc_dae.cc | 2 +- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 2 +- scribo/src/contest/Makefile.am | 3 - scribo/src/contest/hdibco-2010/Makefile.am | 6 +- scribo/src/contest/hdlac-2011/Makefile.am | 6 +- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 8 + scribo/src/debug/Makefile.am | 39 - scribo/src/debug/show_separators.cc | 5 +- scribo/src/filter/Makefile.am | 7 - scribo/src/misc/Makefile.am | 7 - scribo/src/misc/morpho.cc | 9 +- scribo/src/non_text_components.cc | 2 +- scribo/src/postprocessing/Makefile.am | 6 +- scribo/src/preprocessing/Makefile.am | 10 - scribo/src/primitive/extract/Makefile.am | 13 +- scribo/src/primitive/find/Makefile.am | 6 - scribo/src/primitive/group/Makefile.am | 9 +- scribo/src/primitive/remove/Makefile.am | 3 +- scribo/src/table/Makefile.am | 5 - scribo/src/text/Makefile.am | 5 - scribo/src/text_in_doc_preprocess.cc | 2 +- scribo/src/toolchain/nepomuk/Makefile.am | 3 +- scribo/src/util/Makefile.am | 3 +- scribo/src/util/component_precise_outline.cc | 5 +- scribo/tests/binarization/Makefile.am | 12 +- scribo/tests/convert/Makefile.am | 6 +- scribo/tests/core/Makefile.am | 7 +- scribo/tests/estim/Makefile.am | 7 +- scribo/tests/filter/Makefile.am | 18 - scribo/tests/preprocessing/Makefile.am | 5 - scribo/tests/primitive/extract/Makefile.am | 3 +- scribo/tests/primitive/link/Makefile.am | 3 +- scribo/tests/table/Makefile.am | 5 +- scribo/tests/tests.mk | 50 +- scribo/tests/toolchain/nepomuk/Makefile.am | 6 +- scribo/tests/unit_test/unit-tests.mk | 294 - scribo/tests/util/Makefile.am | 5 +- scribo/vcs/scribo.rb | 16 - swilena/ChangeLog | 15 + swilena/Makefile.am | 4 +- swilena/image2d_int_u8.i | 15 +- swilena/int_u24.i | 40 + swilena/python/Makefile.am | 12 +- vcs/oln.rb | 16 - 2725 files changed, 19232 insertions(+), 870783 deletions(-) delete mode 100755 build-aux/strip-lrde rename {milena/tests => build-aux}/tests-recursive.mk (100%) delete mode 100644 dynamic-use-of-static-c++/.vcs delete mode 100644 dynamic-use-of-static-c++/vcs/dynamic_static_bridge_vcs.rb delete mode 100644 external/Makefile.am delete mode 100644 external/README delete mode 100644 external/trimesh/.gitignore delete mode 100644 external/trimesh/COPYING delete mode 100644 external/trimesh/ChangeLog delete mode 100644 external/trimesh/Makedefs.Darwin delete mode 100644 external/trimesh/Makedefs.Linux delete mode 100644 external/trimesh/Makedefs.Linux64 delete mode 100644 external/trimesh/Makedefs.SunOS delete mode 100644 external/trimesh/Makedefs.Win32 delete mode 100644 external/trimesh/Makefile.am delete mode 100644 external/trimesh/Makerules delete mode 100644 external/trimesh/README delete mode 100644 external/trimesh/configure.ac delete mode 100644 external/trimesh/gluit/COPYING.freeglut delete mode 100644 external/trimesh/gluit/COPYING.glui delete mode 100644 external/trimesh/gluit/Makefile.am delete mode 100644 external/trimesh/gluit/freeglut_callbacks.c delete mode 100644 external/trimesh/gluit/freeglut_cursor.c delete mode 100644 external/trimesh/gluit/freeglut_display.c delete mode 100644 external/trimesh/gluit/freeglut_ext.c delete mode 100644 external/trimesh/gluit/freeglut_font.c delete mode 100644 external/trimesh/gluit/freeglut_font_data.c delete mode 100644 external/trimesh/gluit/freeglut_gamemode.c delete mode 100644 external/trimesh/gluit/freeglut_geometry.c delete mode 100644 external/trimesh/gluit/freeglut_glutfont_definitions.c delete mode 100644 external/trimesh/gluit/freeglut_init.c delete mode 100644 external/trimesh/gluit/freeglut_internal.h delete mode 100644 external/trimesh/gluit/freeglut_joystick.c delete mode 100644 external/trimesh/gluit/freeglut_main.c delete mode 100644 external/trimesh/gluit/freeglut_menu.c delete mode 100644 external/trimesh/gluit/freeglut_misc.c delete mode 100644 external/trimesh/gluit/freeglut_overlay.c delete mode 100644 external/trimesh/gluit/freeglut_state.c delete mode 100644 external/trimesh/gluit/freeglut_stroke_mono_roman.c delete mode 100644 external/trimesh/gluit/freeglut_stroke_roman.c delete mode 100644 external/trimesh/gluit/freeglut_structure.c delete mode 100644 external/trimesh/gluit/freeglut_teapot.c delete mode 100644 external/trimesh/gluit/freeglut_teapot_data.h delete mode 100644 external/trimesh/gluit/freeglut_videoresize.c delete mode 100644 external/trimesh/gluit/freeglut_window.c delete mode 100644 external/trimesh/gluit/glui.cc delete mode 100644 external/trimesh/gluit/glui_add_controls.cc delete mode 100644 external/trimesh/gluit/glui_algebra3.cc delete mode 100644 external/trimesh/gluit/glui_algebra3.h delete mode 100644 external/trimesh/gluit/glui_arcball.cc delete mode 100644 external/trimesh/gluit/glui_arcball.h delete mode 100644 external/trimesh/gluit/glui_bitmap_img_data.cc delete mode 100644 external/trimesh/gluit/glui_bitmaps.cc delete mode 100644 external/trimesh/gluit/glui_button.cc delete mode 100644 external/trimesh/gluit/glui_checkbox.cc delete mode 100644 external/trimesh/gluit/glui_column.cc delete mode 100644 external/trimesh/gluit/glui_control.cc delete mode 100644 external/trimesh/gluit/glui_edittext.cc delete mode 100644 external/trimesh/gluit/glui_img_checkbox_0.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_0_dis.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_1.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_1_dis.c delete mode 100644 external/trimesh/gluit/glui_img_downarrow.c delete mode 100644 external/trimesh/gluit/glui_img_leftarrow.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_down.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_up.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_up_dis.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_0.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_0_dis.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_1.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_1_dis.c delete mode 100644 external/trimesh/gluit/glui_img_rightarrow.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_0.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_1.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_dis.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_0.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_1.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_dis.c delete mode 100644 external/trimesh/gluit/glui_img_uparrow.c delete mode 100644 external/trimesh/gluit/glui_listbox.cc delete mode 100644 external/trimesh/gluit/glui_mouse_iaction.cc delete mode 100644 external/trimesh/gluit/glui_node.cc delete mode 100644 external/trimesh/gluit/glui_panel.cc delete mode 100644 external/trimesh/gluit/glui_quaternion.cc delete mode 100644 external/trimesh/gluit/glui_quaternion.h delete mode 100644 external/trimesh/gluit/glui_radio.cc delete mode 100644 external/trimesh/gluit/glui_rollout.cc delete mode 100644 external/trimesh/gluit/glui_rotation.cc delete mode 100644 external/trimesh/gluit/glui_separator.cc delete mode 100644 external/trimesh/gluit/glui_slider.cc delete mode 100644 external/trimesh/gluit/glui_spinner.cc delete mode 100644 external/trimesh/gluit/glui_statictext.cc delete mode 100644 external/trimesh/gluit/glui_stdinc.h delete mode 100644 external/trimesh/gluit/glui_translation.cc delete mode 100644 external/trimesh/gluit/gluit.mk delete mode 100644 external/trimesh/include/Color.h delete mode 100644 external/trimesh/include/GL/freeglut.h delete mode 100644 external/trimesh/include/GL/freeglut_ext.h delete mode 100644 external/trimesh/include/GL/freeglut_std.h delete mode 100644 external/trimesh/include/GL/glui.h delete mode 100644 external/trimesh/include/GL/glut.h delete mode 100644 external/trimesh/include/GLCamera.h delete mode 100644 external/trimesh/include/ICP.h delete mode 100644 external/trimesh/include/KDtree.h delete mode 100644 external/trimesh/include/Makefile.am delete mode 100644 external/trimesh/include/TriMesh.h delete mode 100644 external/trimesh/include/TriMesh_algo.h delete mode 100644 external/trimesh/include/Vec.h delete mode 100644 external/trimesh/include/XForm.h delete mode 100644 external/trimesh/include/bsphere.h delete mode 100644 external/trimesh/include/lineqn.h delete mode 100644 external/trimesh/include/mempool.h delete mode 100644 external/trimesh/include/noise3d.h delete mode 100644 external/trimesh/include/timestamp.h delete mode 100644 external/trimesh/libsrc/GLCamera.cc delete mode 100644 external/trimesh/libsrc/ICP.cc delete mode 100644 external/trimesh/libsrc/KDtree.cc delete mode 100644 external/trimesh/libsrc/Makefile.am delete mode 100644 external/trimesh/libsrc/TriMesh_bounding.cc delete mode 100644 external/trimesh/libsrc/TriMesh_connectivity.cc delete mode 100644 external/trimesh/libsrc/TriMesh_curvature.cc delete mode 100644 external/trimesh/libsrc/TriMesh_grid.cc delete mode 100644 external/trimesh/libsrc/TriMesh_io.cc delete mode 100644 external/trimesh/libsrc/TriMesh_normals.cc delete mode 100644 external/trimesh/libsrc/TriMesh_pointareas.cc delete mode 100644 external/trimesh/libsrc/TriMesh_stats.cc delete mode 100644 external/trimesh/libsrc/TriMesh_tstrips.cc delete mode 100644 external/trimesh/libsrc/diffuse.cc delete mode 100644 external/trimesh/libsrc/edgeflip.cc delete mode 100644 external/trimesh/libsrc/faceflip.cc delete mode 100644 external/trimesh/libsrc/filter.cc delete mode 100644 external/trimesh/libsrc/lmsmooth.cc delete mode 100644 external/trimesh/libsrc/mesh_align.cc delete mode 100644 external/trimesh/libsrc/mesh_view.cc delete mode 100644 external/trimesh/libsrc/remove.cc delete mode 100644 external/trimesh/libsrc/reorder_verts.cc delete mode 100644 external/trimesh/libsrc/subdiv.cc delete mode 100644 external/trimesh/utilsrc/Makefile.am delete mode 100644 external/trimesh/utilsrc/mesh_align.cc delete mode 100644 external/trimesh/utilsrc/mesh_cat.cc delete mode 100644 external/trimesh/utilsrc/mesh_cc.cc delete mode 100644 external/trimesh/utilsrc/mesh_filter.cc delete mode 100644 external/trimesh/utilsrc/mesh_make.cc delete mode 100644 external/trimesh/utilsrc/mesh_shade.cc delete mode 100644 external/trimesh/utilsrc/mesh_view.cc delete mode 100644 milena/apps/mesh-segm-skel/io.hh delete mode 100644 milena/apps/mesh-segm-skel/mesh-max-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-pinv-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-segm.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-skel.cc create mode 100644 milena/apps/mesh-segm-skel/misc.hh delete mode 100644 milena/apps/mesh-segm-skel/test-mesh-max-curv.in delete mode 100755 milena/apps/mesh-segm-skel/test-mesh-segm.in delete mode 100644 milena/apps/mesh-segm-skel/trimesh/README delete mode 100644 milena/apps/mesh-segm-skel/trimesh/misc.hh create mode 100644 milena/apps/morphers/Makefile.am create mode 100644 milena/apps/morphers/image2d-skel.hh create mode 100644 milena/apps/morphers/iz.cc create mode 100644 milena/apps/morphers/iz_input.pbm create mode 100644 milena/apps/morphers/lazy_recorder.cc create mode 100644 milena/apps/morphers/lazy_recorder.hh create mode 100644 milena/apps/morphers/mask+channel.cc create mode 100644 milena/apps/morphers/mask+recorder.cc create mode 100644 milena/apps/morphers/recorder-bft.cc create mode 100644 milena/apps/morphers/recorder-wst.cc create mode 100644 milena/apps/morphers/recorder.cc create mode 100644 milena/apps/morphers/recorder.hh create mode 100644 milena/apps/papers/levillain.09.ismm/classif-1complex.cc create mode 100644 milena/apps/papers/levillain.09.ismm/classif-graph.cc create mode 100644 milena/apps/papers/levillain.09.ismm/classseedsi.pbm create mode 100644 milena/apps/papers/levillain.09.ismm/influence_zones.hh create mode 100644 milena/apps/papers/levillain.09.ismm/io.hh create mode 100644 milena/common.mk delete mode 100644 milena/mln/accu/math/inf.hh delete mode 100644 milena/mln/accu/math/sup.hh delete mode 100644 milena/mln/core/image/vmorph/thrubin_image.hh delete mode 100644 milena/mln/data/was.median.hh delete mode 100644 milena/mln/extract/all.hh delete mode 100644 milena/mln/extract/blue.hh delete mode 100644 milena/mln/extract/essential.hh delete mode 100644 milena/mln/extract/green.hh delete mode 100644 milena/mln/extract/hue.hh delete mode 100644 milena/mln/extract/lum.hh delete mode 100644 milena/mln/extract/red.hh delete mode 100644 milena/mln/extract/sat.hh delete mode 100644 milena/mln/fun/access/all.hh delete mode 100644 milena/mln/fun/access/mean.hh delete mode 100644 milena/mln/fun/accu_result.hh delete mode 100644 milena/mln/fun/binary.hh delete mode 100644 milena/mln/fun/binary_param.hh delete mode 100644 milena/mln/fun/component/comp.hh delete mode 100644 milena/mln/fun/component/comp_count.hh delete mode 100644 milena/mln/fun/component/ithcomp.hh delete mode 100644 milena/mln/fun/component/scomp.hh delete mode 100644 milena/mln/fun/compose.hh delete mode 100644 milena/mln/fun/composition.hh delete mode 100644 milena/mln/fun/from_accu.hh delete mode 100644 milena/mln/fun/math/abs.hh delete mode 100644 milena/mln/fun/math/cos.hh delete mode 100644 milena/mln/fun/math/inf.hh delete mode 100644 milena/mln/fun/math/norm.hh delete mode 100644 milena/mln/fun/math/sup.hh delete mode 100644 milena/mln/fun/meta/all.hh delete mode 100644 milena/mln/fun/meta/blue.hh delete mode 100644 milena/mln/fun/meta/essential.hh delete mode 100644 milena/mln/fun/meta/first.hh delete mode 100644 milena/mln/fun/meta/green.hh delete mode 100644 milena/mln/fun/meta/hue.hh delete mode 100644 milena/mln/fun/meta/inty.hh delete mode 100644 milena/mln/fun/meta/lum.hh delete mode 100644 milena/mln/fun/meta/red.hh delete mode 100644 milena/mln/fun/meta/sat.hh delete mode 100644 milena/mln/fun/meta/second.hh delete mode 100644 milena/mln/fun/meta/to_enc.hh delete mode 100644 milena/mln/fun/point/col.hh delete mode 100644 milena/mln/fun/point/row.hh delete mode 100644 milena/mln/fun/point/sli.hh delete mode 100644 milena/mln/fun/spe/binary.hh delete mode 100644 milena/mln/fun/unary_param.hh delete mode 100644 milena/mln/fun/v2v/hsi_to_rgb.hh delete mode 100644 milena/mln/fun/v2v/rgb_to_hsi.hh delete mode 100644 milena/mln/linear/gaussian/filter.hh delete mode 100644 milena/mln/linear/gaussian/impl.hh delete mode 100644 milena/mln/linear/gaussian/internal/coefficients.hh delete mode 100644 milena/mln/registration/all.hh delete mode 100644 milena/mln/registration/essential.hh delete mode 100644 milena/mln/registration/get_rot.hh delete mode 100644 milena/mln/registration/get_rtransf.hh delete mode 100644 milena/mln/registration/internal/rms.hh delete mode 100644 milena/mln/registration/registration.hh delete mode 100644 milena/mln/subsampling/all.hh delete mode 100644 milena/mln/subsampling/essential.hh delete mode 100644 milena/mln/subsampling/gaussian_subsampling.hh delete mode 100644 milena/mln/subsampling/subsampling.hh create mode 100644 milena/mln/value/graylevel_f.hxx delete mode 100644 milena/mln/value/hsi.hh create mode 100644 milena/mln/value/int_s24.hh create mode 100644 milena/mln/value/int_u24.hh create mode 100644 milena/mln/value/internal/gray_f.hxx delete mode 100644 milena/mln/value/shell.hh delete mode 100644 milena/mln/value/stack.hh create mode 100755 milena/new-header delete mode 100644 milena/nodist-headers delete mode 100644 milena/sandbox/ChangeLog delete mode 100644 milena/sandbox/abraham/README delete mode 100644 milena/sandbox/abraham/img/dots.pgm delete mode 100644 milena/sandbox/abraham/img/lena.pgm delete mode 100644 milena/sandbox/abraham/img/lena.ppm delete mode 100644 milena/sandbox/abraham/img/little_test.pgm delete mode 100644 milena/sandbox/abraham/img/test.pgm delete mode 100644 milena/sandbox/abraham/mln/core/site_set/p_priority_queue.hh delete mode 100644 milena/sandbox/abraham/mln/fun/v2v/rgb_to_hsi.hh delete mode 100644 milena/sandbox/abraham/mln/io/tikz/save.hh delete mode 100644 milena/sandbox/abraham/mln/io/tikz/save_header.hh delete mode 100644 milena/sandbox/abraham/mln/level/thru.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/autarkical_leveling.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/basic_najman.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/hit_or_miss.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/images/result_m_watershed.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/result_topo_watershed.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_2.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_3.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_4.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_component_mapping.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_component_tree.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/images/test_watershed.pgm delete mode 100644 milena/sandbox/abraham/mln/morpho/najman_wst.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/topo_wst.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/vector_median.hh delete mode 100644 milena/sandbox/abraham/mln/morpho/vmt.hh delete mode 100644 milena/sandbox/abraham/mln/trait/images.hh delete mode 100644 milena/sandbox/abraham/mln/transform/fft.hh delete mode 100644 milena/sandbox/abraham/mln/value/builtin/symbolics.hh delete mode 100644 milena/sandbox/abraham/tests/core/concept/test.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/fun_image_const.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/fun_image_norm.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/fun_image_v2v.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/fun_image_v2w2v.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/thru_const.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/thru_norm.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/thru_v2v.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/thru_v2w2v.cc delete mode 100644 milena/sandbox/abraham/tests/core/image/violent_cast_image.cc delete mode 100644 milena/sandbox/abraham/tests/fun/meta/red.cc delete mode 100644 milena/sandbox/abraham/tests/fun/v2w2v/cos.cc delete mode 100644 milena/sandbox/abraham/tests/fun/v2w_w2v/norm.cc delete mode 100644 milena/sandbox/abraham/tests/io/tikz/Makefile delete mode 100644 milena/sandbox/abraham/tests/io/tikz/tikz.cc delete mode 100644 milena/sandbox/abraham/tests/morpho/Makefile delete mode 100644 milena/sandbox/abraham/tests/morpho/images/+irm6.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/+test_watershed.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/result_m_watershed.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/result_topo_watershed.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_2.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_3.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_4.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_component_mapping.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_component_tree.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/images/test_watershed.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/levelings.cc delete mode 100644 milena/sandbox/abraham/tests/morpho/red_erosion.cc delete mode 100644 milena/sandbox/abraham/tests/morpho/red_erosion3.cc delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/Makefile delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/lattribheight.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/lwshedtopo.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mccodimage.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mccomptree.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mcfahsalembier.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mcimage.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mcindic.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mclifo.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mcunionfind.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/include/mcutil.h delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/com/wshedtopo.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/lattrib.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/lattribheight.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/lwshedtopo.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mccodimage.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mccomptree.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mcfahsalembier.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mcimage.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mcindic.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mclifo.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/src/lib/mcunionfind.c delete mode 100644 milena/sandbox/abraham/tests/morpho/ref/test/UrOx.pgm delete mode 100644 milena/sandbox/abraham/tests/morpho/test_watershed.cc delete mode 100644 milena/sandbox/abraham/tests/morpho/test_watershed_topo.cc delete mode 100644 milena/sandbox/abraham/tests/transform/fft.cc delete mode 100644 milena/sandbox/abraham/tests/transform/fft_.cc delete mode 100644 milena/sandbox/abraham/tests/value/mixin.cc delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/Color.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/KDtree.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_algo.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_bounding.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_connectivity.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_curvature.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_io.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_normals.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_pointareas.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_stats.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/TriMesh_tstrips.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/Vec.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/XForm.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/bsphere.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/diffuse.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/lineqn.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/lmsmooth.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/mempool.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/mesh_filter.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/mesh_shade.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/remove.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/reorder_verts.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/Trimesh/timestamp.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/Coin.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/MaillageTriangulaire.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/MailleTriangulaire.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/OFF.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/Objet3D.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/OutilsListePoints.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/OutilsPoint3D.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/PreTraitement.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/WRL.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/WRL/calcul.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/file/Buffer.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/file/Datafile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/file/Tokenfile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/Face.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/Globals.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/Mesh.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/MeshFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/MeshFileIdentifier.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/MeshRef.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/MeshView.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/ObjMeshFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/OffMeshFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/PlyMeshFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/Vertex.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/WrlMeshFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/geom/geom_defs.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/libvox.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/math/Matrix.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/math/MyRandom.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/math/Vector.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/math/common.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ply/ply_gatech.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/time/WallTimer.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ui/Camera.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ui/CameraList.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ui/GLwindow.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ui/View.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/ui/opengl.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/PalagyiFilter.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/Template.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/Templates.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/VoxelFile.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/VoxelFilter.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/VoxelRef.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/Voxelizer.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/Voxels.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/binvox/voxel/typedefs.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/cb3dr.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/histogramme/hist.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/histogramme/listeHisto.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/matrice/MatriceF.h delete mode 100755 milena/sandbox/aroumougame/retin/headers/matrice/valeursVecteursPropres.h delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/KDtree.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_bounding.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_connectivity.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_curvature.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_io.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_normals.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_pointareas.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_stats.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/TriMesh_tstrips.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/diffuse.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/lmsmooth.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/mesh_filter.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/mesh_shade.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/remove.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/Trimesh/reorder_verts.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/MaillageTriangulaire.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/MailleTriangulaire.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/OFF.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/Objet3D.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/OutilsListePoints.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/OutilsPoint3D.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/PreTraitement.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/WRL.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/WRL/calcul.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/file/Buffer.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/file/Datafile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/file/Tokenfile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/Face.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/Mesh.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/MeshFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/MeshFileIdentifier.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/MeshRef.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/MeshView.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/ObjMeshFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/OffMeshFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/PlyMeshFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/Vertex.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/geom/WrlMeshFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/libvox.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/math/Matrix.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/math/MyRandom.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/math/Vector.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/math/common.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ply/ply_gatech.c delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/time/WallTimer.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ui/Camera.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ui/CameraList.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ui/GLwindow.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ui/View.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/ui/opengl.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/PalagyiFilter.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/Template.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/Templates.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/VoxelFile.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/VoxelFilter.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/VoxelRef.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/Voxelizer.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/binvox/voxel/Voxels.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/cb3dr.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/histogramme/hist.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/histogramme/listeHisto.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/matrice/MatriceF.cpp delete mode 100755 milena/sandbox/aroumougame/retin/sources/matrice/valeursVecteursPropres.cpp delete mode 100644 milena/sandbox/aroumougame/skeleton/io.hh delete mode 100644 milena/sandbox/aroumougame/skeleton/mesh-skel.cc delete mode 100644 milena/sandbox/aroumougame/skeleton/mesh-skel_region.cc delete mode 100644 milena/sandbox/aroumougame/skeleton/miscellenous.hh delete mode 100755 milena/sandbox/aroumougame/skeleton/neighborhood1.hh delete mode 100644 milena/sandbox/aroumougame/skeleton/sedt.hh delete mode 100644 milena/sandbox/aroumougame/skeleton/test.cc delete mode 100755 milena/sandbox/aroumougame/skeleton/test_image2d.cc delete mode 100755 milena/sandbox/aroumougame/skeleton/test_image3d.cc delete mode 100755 milena/sandbox/aroumougame/skeleton/thinning.hh delete mode 100755 milena/sandbox/aroumougame/test/m0.wrl delete mode 100755 milena/sandbox/aroumougame/test/m05.wrl delete mode 100755 milena/sandbox/aroumougame/test/m9l0.wrl delete mode 100755 milena/sandbox/aroumougame/test/makefile delete mode 100755 milena/sandbox/aroumougame/test/ml0.wrl delete mode 100755 milena/sandbox/aroumougame/test/ml09.wrl delete mode 100755 milena/sandbox/aroumougame/test/mmake.sh delete mode 100755 milena/sandbox/aroumougame/test/sources/test_graph.cpp delete mode 100755 milena/sandbox/aroumougame/test/test.off delete mode 100755 milena/sandbox/aroumougame/test/test_graph.cpp delete mode 100755 milena/sandbox/aroumougame/test/test_graph_off.cpp delete mode 100755 milena/sandbox/aroumougame/test/test_graph_wrl.cpp delete mode 100644 milena/sandbox/ballas/compilation_unit.rb delete mode 100644 milena/sandbox/ballas/doc/draft.txt delete mode 100644 milena/sandbox/ballas/doc/image_tours.txt delete mode 100644 milena/sandbox/ballas/doc/image_types/doc.tex delete mode 100644 milena/sandbox/ballas/doc/image_types/include/image_tour.tex delete mode 100644 milena/sandbox/ballas/methods delete mode 100644 milena/sandbox/ballas/refactorization/box2d.hh delete mode 100644 milena/sandbox/ballas/refactorization/concept.hh delete mode 100644 milena/sandbox/ballas/refactorization/exact.hh delete mode 100644 milena/sandbox/ballas/refactorization/image2d.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/exact.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/force_exact.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/image_base.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/impl.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/piter_base.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/pset_base.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/psite_base.hh delete mode 100644 milena/sandbox/ballas/refactorization/internal/site_base.hh delete mode 100644 milena/sandbox/ballas/refactorization/metal/bexpr.hh delete mode 100644 milena/sandbox/ballas/refactorization/metal/bool.hh delete mode 100644 milena/sandbox/ballas/refactorization/metal/equal.hh delete mode 100644 milena/sandbox/ballas/refactorization/p_run.hh delete mode 100644 milena/sandbox/ballas/refactorization/point2d.hh delete mode 100644 milena/sandbox/ballas/refactorization/point2d_impl.hh delete mode 100644 milena/sandbox/ballas/refactorization/rle_image.hh delete mode 100644 milena/sandbox/ballas/refactorization/rle_pset.hh delete mode 100644 milena/sandbox/ballas/refactorization/rle_psite.hh delete mode 100644 milena/sandbox/ballas/refactorization/test/box2d.cc delete mode 100644 milena/sandbox/ballas/refactorization/test/image2d.cc delete mode 100644 milena/sandbox/ballas/refactorization/test/rle.cc delete mode 100644 milena/sandbox/ballas/test.cc delete mode 100644 milena/sandbox/ballas/vaucanson_bench delete mode 100644 milena/sandbox/beguin/fusion_graph.hh delete mode 100644 milena/sandbox/beguin/graph_link.hh delete mode 100644 milena/sandbox/beguin/irm.cc delete mode 100644 milena/sandbox/beguin/irm.jpg delete mode 100644 milena/sandbox/beguin/irm6.pgm delete mode 100644 milena/sandbox/beguin/irm_g.cc delete mode 100644 milena/sandbox/beguin/puzzle.jpg delete mode 100644 milena/sandbox/beguin/segm_to_pregraph.hh delete mode 100644 milena/sandbox/beguin/try.hh delete mode 100644 milena/sandbox/bench/README_CFLAGS delete mode 100644 milena/sandbox/bench/extract_vertical_lines.cc delete mode 100644 milena/sandbox/bench/fast_components_and_attributes.cc delete mode 100644 milena/sandbox/bench/fast_rows.cc delete mode 100644 milena/sandbox/bench/fast_tiles.cc delete mode 100644 milena/sandbox/bench/fastest.cc delete mode 100644 milena/sandbox/bench/fastest_forall_p_browsing.cc delete mode 100644 milena/sandbox/bench/fastest_statistical_tour_browsing.cc delete mode 100644 milena/sandbox/bench/fastest_statistical_tour_nbh_browsing.cc delete mode 100644 milena/sandbox/bench/input_iz.pgm.gz delete mode 100644 milena/sandbox/bench/iz.cc delete mode 120000 milena/sandbox/bench/z_sub_browsing/+inc delete mode 100644 milena/sandbox/bench/z_sub_browsing/README delete mode 100644 milena/sandbox/bench/z_sub_browsing/debase.cc delete mode 100644 milena/sandbox/bench/z_sub_browsing/debase.hh delete mode 100644 milena/sandbox/bench/z_sub_browsing/fast.cc delete mode 100644 milena/sandbox/bench/z_sub_browsing/in.pgm.gz delete mode 100644 milena/sandbox/bench/z_sub_browsing/integral.cc delete mode 100644 milena/sandbox/bench/z_sub_browsing/integral.hh delete mode 100644 milena/sandbox/bin/labeling/colorize.cc delete mode 100644 milena/sandbox/bin/pgm_to_pbm.cc delete mode 100644 milena/sandbox/bin/ppm_negate.cc delete mode 100644 milena/sandbox/bugs/concept_and_assignment.cc delete mode 100644 milena/sandbox/bugs/io_xv_imview.pbm delete mode 100644 milena/sandbox/bugs/lut.cc delete mode 100644 milena/sandbox/bugs/piter_slice.cc delete mode 100644 milena/sandbox/bugs/piter_slice.solved.cc delete mode 100644 milena/sandbox/camille/.gitignore delete mode 100644 milena/sandbox/camille/Makefile delete mode 100644 milena/sandbox/camille/graph-line-gradient-closing.cc delete mode 100644 milena/sandbox/camille/graph-wst.cc delete mode 100644 milena/sandbox/delmon/growcut/Makefile delete mode 100644 milena/sandbox/delmon/growcut/README delete mode 100755 milena/sandbox/delmon/growcut/check.sh delete mode 100644 milena/sandbox/delmon/growcut/keep_color.cc delete mode 100644 milena/sandbox/delmon/growcut/main.cc delete mode 100644 milena/sandbox/delmon/growcut/main_bw.cc delete mode 100644 milena/sandbox/delmon/growcut/remove_if_blue.cc delete mode 100644 milena/sandbox/delmon/minsurf/Makefile delete mode 100644 milena/sandbox/delmon/minsurf/README delete mode 100755 milena/sandbox/delmon/minsurf/check.sh delete mode 100644 milena/sandbox/delmon/minsurf/keep_object.cc delete mode 100644 milena/sandbox/delmon/minsurf/main.cc delete mode 100644 milena/sandbox/duhamel/abr.cc delete mode 100644 milena/sandbox/duhamel/abr.hh delete mode 100644 milena/sandbox/duhamel/abr_to_image.cc delete mode 100644 milena/sandbox/duhamel/border_duplicate.cc delete mode 100644 milena/sandbox/duhamel/border_duplicate.hh delete mode 100644 milena/sandbox/duhamel/border_fill.cc delete mode 100644 milena/sandbox/duhamel/border_fill.hh delete mode 100644 milena/sandbox/duhamel/border_mirror.cc delete mode 100644 milena/sandbox/duhamel/border_mirror.hh delete mode 100644 milena/sandbox/duhamel/canvas_chamfer.hh delete mode 100644 milena/sandbox/duhamel/canvas_labeling.hh delete mode 100644 milena/sandbox/duhamel/chamfer.cc delete mode 100644 milena/sandbox/duhamel/chamfer.hh delete mode 100644 milena/sandbox/duhamel/color_sub.cc delete mode 100644 milena/sandbox/duhamel/color_sub.hh delete mode 100755 milena/sandbox/duhamel/compil.cmd delete mode 100644 milena/sandbox/duhamel/debug_print_3d_with_border.hh delete mode 100644 milena/sandbox/duhamel/draw_mesh.hh delete mode 100644 milena/sandbox/duhamel/extract_array.cc delete mode 100644 milena/sandbox/duhamel/fill.hh delete mode 100644 milena/sandbox/duhamel/fills_test.cc delete mode 100644 milena/sandbox/duhamel/graph.hh delete mode 100644 milena/sandbox/duhamel/graph.hxx delete mode 100644 milena/sandbox/duhamel/graph_labeling.cc delete mode 100644 milena/sandbox/duhamel/graph_labeling.hh delete mode 100644 milena/sandbox/duhamel/graph_labeling2.cc delete mode 100644 milena/sandbox/duhamel/labeling.hh delete mode 100644 milena/sandbox/duhamel/labeling_algo.cc delete mode 100644 milena/sandbox/duhamel/labeling_algo.hh delete mode 100644 milena/sandbox/duhamel/labeling_cpy_from_mln.hh delete mode 100644 milena/sandbox/duhamel/labeling_level.hh delete mode 100644 milena/sandbox/duhamel/labeling_level_fast.cc delete mode 100644 milena/sandbox/duhamel/labeling_level_fast_10000x1000.cc delete mode 100644 milena/sandbox/duhamel/labeling_level_generic_10000x1000.cc delete mode 100644 milena/sandbox/duhamel/level.hh delete mode 100644 milena/sandbox/duhamel/level_cpy_from_mln.hh delete mode 100644 milena/sandbox/duhamel/log.txt delete mode 100644 milena/sandbox/duhamel/main.cc delete mode 100644 milena/sandbox/duhamel/main_mesh_image.cc delete mode 100644 milena/sandbox/duhamel/mem.hh delete mode 100644 milena/sandbox/duhamel/mesh_image.hh delete mode 100644 milena/sandbox/duhamel/mesh_p.hh delete mode 100644 milena/sandbox/duhamel/mesh_psite.hh delete mode 100644 milena/sandbox/duhamel/paste.hh delete mode 100644 milena/sandbox/duhamel/queue_p_fast.hh delete mode 100644 milena/sandbox/duhamel/queue_p_priority.cc delete mode 100644 milena/sandbox/duhamel/queue_p_priority.hh delete mode 100644 milena/sandbox/duhamel/slow_seed2tiling.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image1d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image1d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image1d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image1d_4.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image1d_5.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image2d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image2d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image2d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image2d_4.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image3d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image3d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image3d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_duplicate_image3d_4.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image1d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image1d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image1d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image1d_4.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image1d_5.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image2d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image2d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image2d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image2d_4.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image3d_1.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image3d_2.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image3d_3.cc delete mode 100644 milena/sandbox/duhamel/test_border_fill_image3d_4.cc delete mode 100644 milena/sandbox/duhamel/test_debug_iota_3d.cc delete mode 100644 milena/sandbox/duhamel/translate_image.cc delete mode 100644 milena/sandbox/duhamel/translate_image.hh delete mode 100644 milena/sandbox/edwin/Makefile delete mode 100644 milena/sandbox/edwin/exec/benchmark/Makefile delete mode 100644 milena/sandbox/edwin/exec/benchmark/newv.cc delete mode 100644 milena/sandbox/edwin/exec/benchmark/oldv.cc delete mode 100644 milena/sandbox/edwin/exec/color_distance.hh delete mode 100644 milena/sandbox/edwin/exec/color_internal_gradient.hh delete mode 100644 milena/sandbox/edwin/exec/color_labeling_mean.hh delete mode 100644 milena/sandbox/edwin/exec/give_me_the_curve.cc delete mode 100644 milena/sandbox/edwin/exec/internal_gradient.cc delete mode 100644 milena/sandbox/edwin/exec/mask_colorize.cc delete mode 100644 milena/sandbox/edwin/exec/mask_fill_mean_color.cc delete mode 100644 milena/sandbox/edwin/exec/max_delta_colormean_obj.cc delete mode 100644 milena/sandbox/edwin/exec/pgm_gradient.cc delete mode 100644 milena/sandbox/edwin/exec/plot.conf delete mode 100644 milena/sandbox/edwin/exec/score.hh delete mode 100644 milena/sandbox/edwin/exec/sharpest_obj_reconstruction.cc delete mode 100644 milena/sandbox/edwin/exec/tree_debug.cc delete mode 100644 milena/sandbox/edwin/exec/wst_from_reconstructed.cc delete mode 100644 milena/sandbox/edwin/exec/zi.cc delete mode 100644 milena/sandbox/edwin/exec/zi.hh delete mode 100644 milena/sandbox/edwin/mln/core/concept/dindex_site.hh delete mode 100644 milena/sandbox/edwin/mln/core/concept/index_site.hh delete mode 100644 milena/sandbox/edwin/mln/core/concept/tree.hh delete mode 100644 milena/sandbox/edwin/mln/core/dindex_site.hh delete mode 100644 milena/sandbox/edwin/mln/core/image/attribute_image.hh delete mode 100644 milena/sandbox/edwin/mln/core/internal/index_site_base.hh delete mode 100644 milena/sandbox/edwin/mln/core/site_set/p_run_idx.hh delete mode 100644 milena/sandbox/edwin/mln/core/site_set/p_run_idx_piter.hh delete mode 100644 milena/sandbox/edwin/mln/debug/ctree.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/attribute/bbox.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/attribute/mysharpness.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/attribute/occupation.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/component_tree.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/components.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/components_debug.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/compute_attribute_image.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/debug.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/impl/dual_hqueue.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/impl/dual_union_find.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/impl/union_find.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/propagate.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh delete mode 100644 milena/sandbox/edwin/mln/morpho/tree/propagate_node_debug.hh delete mode 100644 milena/sandbox/edwin/mln/util/ctree/ctree.hh delete mode 100644 milena/sandbox/edwin/mln/util/ctree/internal/tree_base.hh delete mode 100644 milena/sandbox/edwin/mln/util/ctree/node.hh delete mode 100755 milena/sandbox/edwin/move_accu.sh delete mode 100755 milena/sandbox/edwin/rush/exo2/configure delete mode 100755 milena/sandbox/edwin/rush/exo2/test.cc delete mode 100644 milena/sandbox/edwin/rush/exo2/wst_from_closing.cc delete mode 100644 milena/sandbox/edwin/rush/granulometry/granulometry.hh delete mode 100644 milena/sandbox/edwin/rush/granulometry/test.cc delete mode 100644 milena/sandbox/edwin/rush/leaves/Makefile delete mode 100755 milena/sandbox/edwin/rush/leaves/chain.sh delete mode 100755 milena/sandbox/edwin/rush/leaves/configure delete mode 100644 milena/sandbox/edwin/rush/leaves/export_leaves.hh delete mode 100644 milena/sandbox/edwin/rush/leaves/get_leaves.cc delete mode 100755 milena/sandbox/edwin/rush/leaves/splot.sh delete mode 100644 milena/sandbox/edwin/rush/leaves/test/Makefile delete mode 100755 milena/sandbox/edwin/rush/leaves/test/configure delete mode 100644 milena/sandbox/edwin/rush/leaves/test/export.cc delete mode 100644 milena/sandbox/edwin/tests/sharp.cc delete mode 100644 milena/sandbox/edwin/tests/sharpness_attribute.cc delete mode 100755 milena/sandbox/edwin/tools/make_the_curves.sh delete mode 100644 milena/sandbox/edwin/tree/Makefile delete mode 100644 milena/sandbox/edwin/tree/accumulator/arg_max.hh delete mode 100755 milena/sandbox/edwin/tree/configure delete mode 100644 milena/sandbox/edwin/tree/propagation.cc delete mode 100644 milena/sandbox/edwin/tree/run.hh delete mode 100644 milena/sandbox/edwin/tree/tree.cc delete mode 100644 milena/sandbox/exec/Makefile delete mode 100644 milena/sandbox/exec/bw_negate_in_color.cc delete mode 100644 milena/sandbox/exec/filetype.hh delete mode 100644 milena/sandbox/exec/histo_save.cc delete mode 100644 milena/sandbox/fabien/README delete mode 100644 milena/sandbox/fabien/bin/Makefile delete mode 100644 milena/sandbox/fabien/bin/dicom2dump.cc delete mode 100644 milena/sandbox/fabien/bin/dicom2pgm.cc delete mode 100644 milena/sandbox/fabien/bin/dicom_mask.cc delete mode 100644 milena/sandbox/fabien/bin/dump2pbm.cc delete mode 100644 milena/sandbox/fabien/bin/dump2pgm.cc delete mode 100644 milena/sandbox/fabien/bin/dump2pgm8b.cc delete mode 100644 milena/sandbox/fabien/bin/dump2ppm.cc delete mode 100644 milena/sandbox/fabien/bin/dump_mask.cc delete mode 100644 milena/sandbox/fabien/bin/dumpi12_to_pgm.cc delete mode 100644 milena/sandbox/fabien/bin/dumpl16_to_colorize.cc delete mode 100644 milena/sandbox/fabien/bin/dumpl32_to_colorize.cc delete mode 100644 milena/sandbox/fabien/bin/dumpl8_to_colorize.cc delete mode 100644 milena/sandbox/fabien/bin/filetype.hh delete mode 100644 milena/sandbox/fabien/bin/pnms2dump.cc delete mode 100644 milena/sandbox/fabien/binarization/Makefile delete mode 100644 milena/sandbox/fabien/binarization/test.cc delete mode 100644 milena/sandbox/fabien/dcmtk/Makefile delete mode 100644 milena/sandbox/fabien/dcmtk/dicom.cc delete mode 100644 milena/sandbox/fabien/dcmtk/load.hh delete mode 100644 milena/sandbox/fabien/dcmtk/save.hh delete mode 100644 milena/sandbox/fabien/igr/Makefile delete mode 100644 milena/sandbox/fabien/igr/Makefile.rules delete mode 100755 milena/sandbox/fabien/igr/all_labels2gif.sh delete mode 100755 milena/sandbox/fabien/igr/check.sh delete mode 100755 milena/sandbox/fabien/igr/check2d_wsd.sh delete mode 100755 milena/sandbox/fabien/igr/check3d_wsd.sh delete mode 100755 milena/sandbox/fabien/igr/check_dist.sh delete mode 100755 milena/sandbox/fabien/igr/check_edges.sh delete mode 100755 milena/sandbox/fabien/igr/check_us_morpho.sh delete mode 100644 milena/sandbox/fabien/igr/clo_vol.cc delete mode 100644 milena/sandbox/fabien/igr/color/find_color.cc delete mode 100644 milena/sandbox/fabien/igr/crop.cc delete mode 100644 milena/sandbox/fabien/igr/dist_edges.cc delete mode 100644 milena/sandbox/fabien/igr/filter.cc delete mode 100644 milena/sandbox/fabien/igr/filter_morpho_us.cc delete mode 100644 milena/sandbox/fabien/igr/fixed_seg/Makefile delete mode 100644 milena/sandbox/fabien/igr/fixed_seg/main.cc delete mode 100644 milena/sandbox/fabien/igr/fun_labels.cc delete mode 100755 milena/sandbox/fabien/igr/fun_labels.sh delete mode 100644 milena/sandbox/fabien/igr/grad.cc delete mode 100644 milena/sandbox/fabien/igr/graph.cc delete mode 100644 milena/sandbox/fabien/igr/igr.cc delete mode 100644 milena/sandbox/fabien/igr/label2gif.cc delete mode 100755 milena/sandbox/fabien/igr/launch.sh delete mode 100755 milena/sandbox/fabien/igr/launch2d.sh delete mode 100755 milena/sandbox/fabien/igr/launch3d.sh delete mode 100644 milena/sandbox/fabien/igr/maj.cc delete mode 100644 milena/sandbox/fabien/igr/mat2mln/mat2mln.cc delete mode 100644 milena/sandbox/fabien/igr/mat2mln/mat2raw.cc delete mode 100644 milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc delete mode 100644 milena/sandbox/fabien/igr/matlab.cc delete mode 100644 milena/sandbox/fabien/igr/mean_median_label.cc delete mode 100644 milena/sandbox/fabien/igr/mean_slices.cc delete mode 100644 milena/sandbox/fabien/igr/med.cc delete mode 100644 milena/sandbox/fabien/igr/min_max_float.cc delete mode 100755 milena/sandbox/fabien/igr/nbasins_check.sh delete mode 100644 milena/sandbox/fabien/igr/nbasins_finder.cc delete mode 100644 milena/sandbox/fabien/igr/norm.cc delete mode 100644 milena/sandbox/fabien/igr/plot_label.hh delete mode 100644 milena/sandbox/fabien/igr/plot_points/Makefile delete mode 100644 milena/sandbox/fabien/igr/plot_points/README delete mode 100644 milena/sandbox/fabien/igr/plot_points/int2rgb.hh delete mode 100644 milena/sandbox/fabien/igr/plot_points/main.cc delete mode 100644 milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc delete mode 100644 milena/sandbox/fabien/igr/point_filtering/Makefile delete mode 100644 milena/sandbox/fabien/igr/point_filtering/main.cc delete mode 100644 milena/sandbox/fabien/igr/seg2d.cc delete mode 100644 milena/sandbox/fabien/igr/seg3d.cc delete mode 100644 milena/sandbox/fabien/igr/seg_vol_irm.hh delete mode 100755 milena/sandbox/fabien/igr/segment_us_morpho.sh delete mode 100644 milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc delete mode 100644 milena/sandbox/fabien/igr/space_smooth/Makefile delete mode 100644 milena/sandbox/fabien/igr/space_smooth/linear.cc delete mode 100644 milena/sandbox/fabien/igr/space_smooth/median.cc delete mode 100644 milena/sandbox/fabien/igr/space_smooth/morpho.cc delete mode 100644 milena/sandbox/fabien/igr/thres.cc delete mode 100644 milena/sandbox/fabien/igr/time_max.cc delete mode 100644 milena/sandbox/fabien/igr/time_max_norm.cc delete mode 100644 milena/sandbox/fabien/igr/time_smooth/Makefile delete mode 100644 milena/sandbox/fabien/igr/time_smooth/linear.cc delete mode 100644 milena/sandbox/fabien/igr/time_smooth/median.cc delete mode 100644 milena/sandbox/fabien/igr/time_smooth/morpho.cc delete mode 100755 milena/sandbox/fabien/igr/tmax.sh delete mode 100644 milena/sandbox/fabien/igr/watershed.hh delete mode 100644 milena/sandbox/fabien/igr/watershed2d.cc delete mode 100644 milena/sandbox/fabien/igr/watershed3d.cc delete mode 100644 milena/sandbox/fabien/igr/wst.cc delete mode 100644 milena/sandbox/fabien/igr/wst_edges.cc delete mode 100644 milena/sandbox/fabien/magick/Makefile delete mode 100644 milena/sandbox/fabien/magick/magick.cc delete mode 100644 milena/sandbox/fabien/magick/save.cc delete mode 100644 milena/sandbox/fabien/magick/tiled_image.cc delete mode 100644 milena/sandbox/fabien/mln/canvas/browsing/directional.hh delete mode 100644 milena/sandbox/fabien/mln/canvas/browsing/snake.hh delete mode 100644 milena/sandbox/fabien/mln/core/image/cache.hh delete mode 100644 milena/sandbox/fabien/mln/core/image/disk_ima.hh delete mode 100644 milena/sandbox/fabien/mln/core/image/magick_tiled2d.hh delete mode 100644 milena/sandbox/fabien/mln/core/image/page.hh delete mode 100644 milena/sandbox/fabien/mln/core/image/tiled2d.hh delete mode 100644 milena/sandbox/fabien/mln/data/fast_median.hh delete mode 100644 milena/sandbox/fabien/mln/debug/int2rgb.hh delete mode 100644 milena/sandbox/fabien/mln/display/display_region.hh delete mode 100644 milena/sandbox/fabien/mln/io/pnm/load.hh delete mode 100644 milena/sandbox/fabien/mln/io/pnm/load_disk_ima.hh delete mode 100644 milena/sandbox/fabien/mln/test/conversion.hh delete mode 100644 milena/sandbox/fabien/mln/upsampling/hq2x.hh delete mode 100644 milena/sandbox/fabien/mln/upsampling/hq3x.hh delete mode 100644 milena/sandbox/fabien/mln/upsampling/hq4x.hh delete mode 100644 milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh delete mode 100644 milena/sandbox/fabien/mln/world/inter_pixel/is_zero_face.hh delete mode 100644 milena/sandbox/fabien/tests/core/image/Makefile delete mode 100644 milena/sandbox/fabien/tests/core/image/bench.hh delete mode 100755 milena/sandbox/fabien/tests/core/image/bench.sh delete mode 100644 milena/sandbox/fabien/tests/core/image/disk_ima.cc delete mode 100644 milena/sandbox/fabien/tests/core/image/ima2d.cc delete mode 100644 milena/sandbox/fabien/tests/core/image/tiled2d.cc delete mode 100644 milena/sandbox/fabien/tests/display/Makefile delete mode 100644 milena/sandbox/fabien/tests/display/display_region.cc delete mode 100644 milena/sandbox/fabien/tests/test/conversion.cc delete mode 100644 milena/sandbox/fabien/tests/upsampling/Makefile delete mode 100644 milena/sandbox/fabien/tests/upsampling/hq2x.cc delete mode 100644 milena/sandbox/fabien/tests/upsampling/hq3x.cc delete mode 100644 milena/sandbox/fabien/tests/upsampling/hq4x.cc delete mode 100644 milena/sandbox/fabien/tests/world/inter_pixel/Makefile delete mode 100644 milena/sandbox/fabien/tests/world/inter_pixel/display_region.cc delete mode 100644 milena/sandbox/folio/exercices/heritage_conditionnel.cc delete mode 100644 milena/sandbox/folio/exercices/heritage_conditionnel.hh delete mode 100644 milena/sandbox/folio/img/monkeys_april.ppm delete mode 100644 milena/sandbox/folio/mln/dt/canvas_dt.hh delete mode 100644 milena/sandbox/folio/mln/dt/chamfer.hh delete mode 100644 milena/sandbox/folio/mln/dt/cp.hh delete mode 100644 milena/sandbox/folio/mln/dt/dmap.hh delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/canevas_dt.hh delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/chamfer.cc delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/distance_front.cc delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/distance_front_new.hh delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/dt.cc delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/dt.hh delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/dt.spe.hh delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/naive.cc delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/psn.cc delete mode 100644 milena/sandbox/folio/mln/dt/dt_old/psn_log.cc delete mode 100644 milena/sandbox/folio/mln/dt/path.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_cp_fast.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_cp_slow.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_dmap_fast.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_dmap_slow.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_path_fast.hh delete mode 100644 milena/sandbox/folio/mln/dt/raw_path_slow.hh delete mode 100644 milena/sandbox/folio/mln/fun/v2v/hsl_to_hsv.hh delete mode 100644 milena/sandbox/folio/mln/fun/v2v/rgb_to_hsv.hh delete mode 100644 milena/sandbox/folio/mln/histo/classify_with_histo_3d.hh delete mode 100644 milena/sandbox/folio/mln/histo/classify_with_histo_rgb.hh delete mode 100644 milena/sandbox/folio/mln/histo/compute_histo.hh delete mode 100644 milena/sandbox/folio/mln/histo/compute_histo_3d.hh delete mode 100644 milena/sandbox/folio/mln/histo/compute_histo_rgb.hh delete mode 100644 milena/sandbox/folio/mln/histo/project_histo_3d.hh delete mode 100644 milena/sandbox/folio/mln/value/circular.hh delete mode 100644 milena/sandbox/folio/mln/value/hsv.hh delete mode 100644 milena/sandbox/folio/mln/value/pipo.hh delete mode 100644 milena/sandbox/folio/papers/dt_resume.txt delete mode 100644 milena/sandbox/folio/papers/examples.txt delete mode 100644 milena/sandbox/folio/test/dt/canvas/dt.hh delete mode 100644 milena/sandbox/folio/test/dt/canvas/dt.spe.hh delete mode 100644 milena/sandbox/folio/test/dt/chamfer.cc delete mode 100644 milena/sandbox/folio/test/dt/dt.cc delete mode 100644 milena/sandbox/folio/test/dt/dt_bench.cc delete mode 100644 milena/sandbox/folio/test/dt/dt_maze.cc delete mode 100644 milena/sandbox/folio/test/dt/naive.cc delete mode 100644 milena/sandbox/folio/test/dt/psn.cc delete mode 100644 milena/sandbox/folio/test/dt/psn_log.cc delete mode 100644 milena/sandbox/folio/test/dt/tmp.ppm delete mode 100644 milena/sandbox/folio/test/histo/compute_histo_3d.cc delete mode 100644 milena/sandbox/folio/test/histo/compute_histo_rgb.cc delete mode 100644 milena/sandbox/folio/test/histo/compute_histo_rgb_from_ppm.cc delete mode 100644 milena/sandbox/folio/test/histo/plot_lena.cc delete mode 100644 milena/sandbox/folio/test/histo/plot_lena_3d.cc delete mode 100644 milena/sandbox/folio/test/histo/plot_lena_rgb.cc delete mode 100644 milena/sandbox/folio/test/histo/project_histo_3d_add.cc delete mode 100644 milena/sandbox/folio/test/histo/project_histo_3d_mean.cc delete mode 100644 milena/sandbox/folio/test/histo/project_screen.cc delete mode 100644 milena/sandbox/folio/test/histo/projected.cc delete mode 100644 milena/sandbox/folio/test/histo/projected3d.cc delete mode 100644 milena/sandbox/folio/test/value/circular.cc delete mode 100644 milena/sandbox/folio/test/value/comp.cc delete mode 100644 milena/sandbox/folio/test/value/hsv.cc delete mode 100644 milena/sandbox/folio/test/value/pipo.cc delete mode 100644 milena/sandbox/folio/tools/histo/classify_with_histo_gs.cc delete mode 100644 milena/sandbox/folio/tools/histo/projected_histo_classified_color_maj.cc delete mode 100644 milena/sandbox/folio/tools/histo/projected_histo_classified_gs.cc delete mode 100644 milena/sandbox/folio/tools/histo/projected_histo_gs.cc delete mode 100644 milena/sandbox/fred/fun/abs.hh delete mode 100644 milena/sandbox/fred/fun/assignability.hh delete mode 100644 milena/sandbox/fred/fun/binary.hh delete mode 100644 milena/sandbox/fred/fun/compose.hh delete mode 100644 milena/sandbox/fred/fun/composition.hh delete mode 100644 milena/sandbox/fred/fun/cos.cc delete mode 100644 milena/sandbox/fred/fun/cos.hh delete mode 100644 milena/sandbox/fred/fun/fun.cc delete mode 100644 milena/sandbox/fred/fun/inc.hh delete mode 100644 milena/sandbox/fred/fun/meta_function.hh delete mode 100644 milena/sandbox/fred/fun/norm.hh delete mode 100644 milena/sandbox/fred/fun/nsolve.hh delete mode 100644 milena/sandbox/fred/fun/nsolve_binary.hh delete mode 100644 milena/sandbox/fred/fun/nsolve_unary.hh delete mode 100644 milena/sandbox/fred/fun/red.hh delete mode 100644 milena/sandbox/fred/fun/thru.cc delete mode 100644 milena/sandbox/fred/fun/thru_morpher.hh delete mode 100644 milena/sandbox/fred/fun/unary.hh delete mode 100644 milena/sandbox/fred/functions.html delete mode 100644 milena/sandbox/fred/functions.mkdown delete mode 100644 milena/sandbox/fred/old/accu_trait.hh delete mode 100644 milena/sandbox/fred/old/accuprops.cc delete mode 100644 milena/sandbox/fred/old/accuprops2.cc delete mode 100644 milena/sandbox/fred/old/algebraic.cc delete mode 100644 milena/sandbox/fred/old/closing_area.cc delete mode 100644 milena/sandbox/fred/old/connected_filter.hh delete mode 100644 milena/sandbox/fred/old/leveling.cc delete mode 100644 milena/sandbox/fred/old/leveling_filter.hh delete mode 100644 milena/sandbox/fred/old/mean.hh delete mode 100644 milena/sandbox/fred/old/meantest.cc delete mode 100644 milena/sandbox/fred/old/overload.cc delete mode 100644 milena/sandbox/fred/old/p2p/Makefile delete mode 100644 milena/sandbox/fred/old/p2p/compose_p2p.hh delete mode 100644 milena/sandbox/fred/old/p2p/p2p_morpher.hh delete mode 100644 milena/sandbox/fred/old/p2p/symmetry_p2p.hh delete mode 100644 milena/sandbox/fred/old/p2p/test_morph_image.cc delete mode 100644 milena/sandbox/fred/old/p2p/translate_p2p.hh delete mode 100644 milena/sandbox/fred/old/site_wrapper.hh delete mode 100644 milena/sandbox/fred/old/value.cc delete mode 100644 milena/sandbox/fred/old/value_wrapper.hh delete mode 100644 milena/sandbox/fred/tests/Makefile delete mode 100644 milena/sandbox/fred/tests/cos.cc delete mode 100644 milena/sandbox/fred/tests/fun.cc delete mode 100644 milena/sandbox/fred/tests/thru.cc delete mode 100644 milena/sandbox/fred/tests/wip.cc delete mode 100644 milena/sandbox/garrigues/TODO delete mode 100644 milena/sandbox/garrigues/area_filter_auto_dual.cc delete mode 100644 milena/sandbox/garrigues/factures/extract_array.cc delete mode 100644 milena/sandbox/garrigues/factures/extract_array_highlight.cc delete mode 100644 milena/sandbox/garrigues/fllt/compute_level_set.hh delete mode 100644 milena/sandbox/garrigues/fllt/compute_level_set_fast.hh delete mode 100644 milena/sandbox/garrigues/fllt/compute_level_set_fast2.hh delete mode 100644 milena/sandbox/garrigues/fllt/debug.hh delete mode 100644 milena/sandbox/garrigues/fllt/doc.hh delete mode 100644 milena/sandbox/garrigues/fllt/essai.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt.hh delete mode 100644 milena/sandbox/garrigues/fllt/fllt_doc.hh delete mode 100644 milena/sandbox/garrigues/fllt/fllt_merge.hh delete mode 100644 milena/sandbox/garrigues/fllt/fllt_optimized.hh delete mode 100644 milena/sandbox/garrigues/fllt/fllt_simple.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt_theo.cc delete mode 100644 milena/sandbox/garrigues/fllt/fllt_types.hh delete mode 100644 milena/sandbox/garrigues/fllt/give_confs.cc delete mode 100644 milena/sandbox/garrigues/fllt/local_configurations.hh delete mode 100644 milena/sandbox/garrigues/fllt/lower.hh delete mode 100644 milena/sandbox/garrigues/fllt/merge.hh delete mode 100644 milena/sandbox/garrigues/fllt/test.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt10.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt10_inv.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt12.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt13.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt15.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt2.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt3.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt3_inv.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt4.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt5.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt6.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt7.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt7_inv.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt8.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt9.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt_lena.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt_lena_tiles.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_fllt_tiny.cc delete mode 100644 milena/sandbox/garrigues/fllt/test_flltb.cc delete mode 100644 milena/sandbox/garrigues/fllt/types.hh delete mode 100644 milena/sandbox/garrigues/fllt/upper.hh delete mode 100644 milena/sandbox/garrigues/image_identity/image_domain_morpher.hh delete mode 100644 milena/sandbox/garrigues/image_identity/image_identity.cc delete mode 100644 milena/sandbox/garrigues/image_identity/image_identity.hh delete mode 100644 milena/sandbox/garrigues/image_identity/image_value_morpher.hh delete mode 100644 milena/sandbox/garrigues/image_identity/interpolated.cc delete mode 100644 milena/sandbox/garrigues/image_identity/interpolated.hh delete mode 100644 milena/sandbox/garrigues/level_set.hh delete mode 100644 milena/sandbox/garrigues/log delete mode 100644 milena/sandbox/garrigues/lower.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/backend/file.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/backend/ios.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/backend/mmap.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/block.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/context.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/all.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/image2d/all.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/image2d/tblr.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/layout2d.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/page2d/all.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/layout/page2d/tblr.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/page.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/paged_image.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/support/lru.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/support/simple.hh delete mode 100644 milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc delete mode 100644 milena/sandbox/garrigues/tiled_image2d/tiled_image2d.hh delete mode 100644 milena/sandbox/garrigues/union_find/Makefile delete mode 100644 milena/sandbox/garrigues/union_find/canvas/find_root.hh delete mode 100644 milena/sandbox/garrigues/union_find/canvas/reconstruction_on_function.hh delete mode 100644 milena/sandbox/garrigues/union_find/canvas/reconstruction_on_set.hh delete mode 100644 milena/sandbox/garrigues/union_find/canvas/self_dual_reconstruction.hh delete mode 100644 milena/sandbox/garrigues/union_find/images/marker_to_dilate.pbm delete mode 100644 milena/sandbox/garrigues/union_find/images/marker_to_erode.pbm delete mode 100644 milena/sandbox/garrigues/union_find/images/mask.pbm delete mode 100644 milena/sandbox/garrigues/union_find/reconstructions_on_function.cc delete mode 100644 milena/sandbox/garrigues/union_find/reconstructions_on_function.hh delete mode 100644 milena/sandbox/garrigues/union_find/reconstructions_on_set.cc delete mode 100644 milena/sandbox/garrigues/union_find/reconstructions_on_set.hh delete mode 100644 milena/sandbox/garrigues/union_find/reunion_avec_theo delete mode 100644 milena/sandbox/garrigues/union_find/self_dual_reconstruction.cc delete mode 100644 milena/sandbox/garrigues/union_find/self_dual_reconstruction.hh delete mode 100644 milena/sandbox/garrigues/upper.hh delete mode 100644 milena/sandbox/garrigues/value_behavior.cc delete mode 100644 milena/sandbox/green/README delete mode 100644 milena/sandbox/green/bench/transform/distance/Makefile.am delete mode 100644 milena/sandbox/green/bench/transform/distance/distance.cc delete mode 100644 milena/sandbox/green/bug/labeling/mean_values/Makefile.am delete mode 100644 milena/sandbox/green/bug/labeling/mean_values/label.pgm delete mode 100644 milena/sandbox/green/bug/labeling/mean_values/mean_values.cc delete mode 100644 milena/sandbox/green/demo/accu/stat/histo2d/Makefile.am delete mode 100644 milena/sandbox/green/demo/accu/stat/histo2d/histo2d.cc delete mode 100644 milena/sandbox/green/demo/annotating/bic/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/bic/bic.cc delete mode 100644 milena/sandbox/green/demo/annotating/hsv/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/hsv/hsv.cc delete mode 100644 milena/sandbox/green/demo/annotating/lep/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/lep/lep.cc delete mode 100644 milena/sandbox/green/demo/annotating/nb_color/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/nb_color/nb_color.cc delete mode 100644 milena/sandbox/green/demo/annotating/project/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/project/project.cc delete mode 100644 milena/sandbox/green/demo/annotating/rgb_64/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc delete mode 100644 milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc delete mode 100644 milena/sandbox/green/demo/annotating/stddev_color/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc delete mode 100644 milena/sandbox/green/demo/annotating/stddev_color_16/Makefile.am delete mode 100644 milena/sandbox/green/demo/annotating/stddev_color_16/stddev_color_16.cc delete mode 100644 milena/sandbox/green/demo/clustering/kmean1d/Makefile.am delete mode 100644 milena/sandbox/green/demo/clustering/kmean1d/kmean1d.cc delete mode 100644 milena/sandbox/green/demo/clustering/kmean2d/Makefile.am delete mode 100644 milena/sandbox/green/demo/clustering/kmean2d/kmean2d.cc delete mode 100644 milena/sandbox/green/demo/clustering/kmean3d/Makefile.am delete mode 100644 milena/sandbox/green/demo/clustering/kmean3d/kmean3d.cc delete mode 100644 milena/sandbox/green/demo/clustering/kmean_rgb/Makefile.am delete mode 100644 milena/sandbox/green/demo/clustering/kmean_rgb/kmean_rgb.cc delete mode 100644 milena/sandbox/green/demo/labeling/regional_maxima/Makefile.am delete mode 100644 milena/sandbox/green/demo/labeling/regional_maxima/regional_maxima.cc delete mode 100644 milena/sandbox/green/demo/labeling/regional_maxima/thresholds.txt delete mode 100644 milena/sandbox/green/doc/annotating/class.txt delete mode 100644 milena/sandbox/green/doc/annotating/syntheseMillet2008.txt delete mode 100644 milena/sandbox/green/doc/annotating/testMillet2008 delete mode 100644 milena/sandbox/green/doc/examples/accu_color/accu_color.cc delete mode 100644 milena/sandbox/green/doc/examples/frac/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/frac/frac.cc delete mode 100644 milena/sandbox/green/doc/examples/frac/frac.hh delete mode 100644 milena/sandbox/green/doc/examples/frac/gcd.hh delete mode 100644 milena/sandbox/green/doc/examples/frac/sign_prod.hh delete mode 100644 milena/sandbox/green/doc/examples/hello_milena/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/hello_milena/hello_milena.cc delete mode 100644 milena/sandbox/green/doc/examples/hello_world/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/hello_world/hello_world.cc delete mode 100644 milena/sandbox/green/doc/examples/hello_world/print.cc delete mode 100644 milena/sandbox/green/doc/examples/io/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/io/io.cc delete mode 100644 milena/sandbox/green/doc/examples/learn_milena/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/learn_milena/learn_milena.cc delete mode 100644 milena/sandbox/green/doc/examples/otsu/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/otsu/otsu.cc delete mode 100644 milena/sandbox/green/doc/examples/stats/Makefile.am delete mode 100644 milena/sandbox/green/doc/examples/stats/stats.cc delete mode 100644 milena/sandbox/green/doc/formulae/formulae.tex delete mode 100644 milena/sandbox/green/doc/quick_tour/quick_tour.tex delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h0_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h2_mean.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h2_merge.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h3_mean.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h3_merge.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h4_mean.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h4_merge.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h5_mean.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h5_merge.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i2_mean.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i2_merge.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i3_mean.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i3_merge.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i4_mean.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i4_merge.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i5_mean.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i5_merge.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l2_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l3_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l4_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l5_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/reponse_theo.eml delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s2_histo.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s3_histo.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s4_histo.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s5_histo.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/synthese.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h0_input.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q2.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q3.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q6.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q7.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q8.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q2.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q3.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q6.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q7.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q8.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q2.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q3.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q6.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q7.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q8.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q2.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q3.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q6.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q7.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q8.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q2.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q3.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q6.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q7.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q8.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q2.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q3.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q4.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q5.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q6.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q7.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q8.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/synthese.txt delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_all_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_all_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thick_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thick_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thin_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thin_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_all_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_all_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thick_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thick_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thin_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thin_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_all_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_all_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thick_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thick_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thin_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thin_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_all_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_all_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thick_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thick_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thin_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thin_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_all_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_all_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thick_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thick_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thin_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thin_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_all_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_all_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thick_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thick_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thin_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thin_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c.ppm.gz delete mode 100755 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c.sh.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c_thick.pbm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c_thin.pbm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_all_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_all_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thick_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thick_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thin_q4.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thin_q5.dump.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_all_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_all_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thick_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thick_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thin_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thin_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_all_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_all_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thick_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thick_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thin_q4.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thin_q5.pgm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_all_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_all_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thick_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thick_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thin_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thin_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_all_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_all_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thick_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thick_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thin_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thin_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/quant_q4.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/quant_q5.ppm.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_all_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_all_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thick_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thick_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thin_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thin_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_all_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_all_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thick_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thick_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thin_q4.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thin_q5.txt.gz delete mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/synthese.txt.gz delete mode 100644 milena/sandbox/green/exp/annotating/achromastism/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/achromastism/achromastism.cc delete mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-color.txt delete mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-img.txt delete mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-only.txt delete mode 100644 milena/sandbox/green/exp/annotating/bench/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/bench/bench.cc delete mode 100644 milena/sandbox/green/exp/annotating/error/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/error/error.cc delete mode 100644 milena/sandbox/green/exp/annotating/histo/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/histo/histo.cc delete mode 100644 milena/sandbox/green/exp/annotating/hsv/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/hsv/hsv.cc delete mode 100644 milena/sandbox/green/exp/annotating/hue/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/hue/hue.cc delete mode 100644 milena/sandbox/green/exp/annotating/hue/text-color.txt delete mode 100644 milena/sandbox/green/exp/annotating/hue/text-img.txt delete mode 100644 milena/sandbox/green/exp/annotating/hue/text-only.txt delete mode 100644 milena/sandbox/green/exp/annotating/nb_color/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/nb_color/nb_color.cc delete mode 100644 milena/sandbox/green/exp/annotating/saturation/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/saturation/saturation.cc delete mode 100644 milena/sandbox/green/exp/annotating/saturation/text-color.txt delete mode 100644 milena/sandbox/green/exp/annotating/saturation/text-img.txt delete mode 100644 milena/sandbox/green/exp/annotating/saturation/text-only.txt delete mode 100644 milena/sandbox/green/exp/annotating/stddev_color/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc delete mode 100644 milena/sandbox/green/exp/annotating/stddev_color_16/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/stddev_color_16/stddev_color_16.cc delete mode 100644 milena/sandbox/green/exp/annotating/value/Makefile.am delete mode 100644 milena/sandbox/green/exp/annotating/value/text-color.txt delete mode 100644 milena/sandbox/green/exp/annotating/value/text-img.txt delete mode 100644 milena/sandbox/green/exp/annotating/value/text-only.txt delete mode 100644 milena/sandbox/green/exp/annotating/value/value.cc delete mode 100644 milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am delete mode 100644 milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc delete mode 100644 milena/sandbox/green/mln/accu/stat/histo1d.hh delete mode 100644 milena/sandbox/green/mln/accu/stat/histo2d.hh delete mode 100644 milena/sandbox/green/mln/accu/stat/histo3d_hsl.hh delete mode 100644 milena/sandbox/green/mln/accu/stat/histo3d_rgb.hh delete mode 100644 milena/sandbox/green/mln/clustering/k_mean.hh delete mode 100644 milena/sandbox/green/mln/clustering/kmean1d.hh delete mode 100644 milena/sandbox/green/mln/clustering/kmean2d.hh delete mode 100644 milena/sandbox/green/mln/clustering/kmean3d.hh delete mode 100644 milena/sandbox/green/mln/clustering/kmean_rgb.hh delete mode 100644 milena/sandbox/green/mln/display/display_histo.hh delete mode 100644 milena/sandbox/green/mln/display/project_histo.hh delete mode 100644 milena/sandbox/green/mln/fun/p2b/achromatic.hh delete mode 100644 milena/sandbox/green/mln/fun/p2b/component_equals.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/achromatism.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/hue_concentration.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/int_u16_to_int_u14.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/log.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rg_to_rgb.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_rg.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh delete mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_value_map.hh delete mode 100644 milena/sandbox/green/mln/img_path.hh delete mode 100644 milena/sandbox/green/mln/io/plot/save_histo_sh.hh delete mode 100644 milena/sandbox/green/mln/io/plot/save_image_sh.hh delete mode 100644 milena/sandbox/green/mln/math/ceil.hh delete mode 100644 milena/sandbox/green/mln/math/floor.hh delete mode 100644 milena/sandbox/green/mln/value/hsv.hh delete mode 100644 milena/sandbox/green/mln/value/rg.hh delete mode 100644 milena/sandbox/green/tests/accu/stat/histo1d/Makefile.am delete mode 100755 milena/sandbox/green/tests/accu/stat/histo1d/gaussian.sh delete mode 100644 milena/sandbox/green/tests/accu/stat/histo1d/histo1d.cc delete mode 100644 milena/sandbox/green/tests/accu/stat/histo2d/Makefile.am delete mode 100755 milena/sandbox/green/tests/accu/stat/histo2d/gaussian2d.sh delete mode 100644 milena/sandbox/green/tests/accu/stat/histo3d_hsl/Makefile.am delete mode 100644 milena/sandbox/green/tests/accu/stat/histo3d_hsl/histo3d_hsl.cc delete mode 100644 milena/sandbox/green/tests/accu/stat/histo3d_rgb/Makefile.am delete mode 100644 milena/sandbox/green/tests/accu/stat/histo3d_rgb/histo3d_rgb.cc delete mode 100644 milena/sandbox/green/tests/clustering/k_mean/Makefile.am delete mode 100644 milena/sandbox/green/tests/clustering/k_mean/k_mean.cc delete mode 100644 milena/sandbox/green/tests/clustering/kmean1d/Makefile.am delete mode 100644 milena/sandbox/green/tests/clustering/kmean1d/kmean1d.cc delete mode 100644 milena/sandbox/green/tests/io/plot/save_image_sh/Makefile.am delete mode 100644 milena/sandbox/green/tests/io/plot/save_image_sh/save_image_sh.cc delete mode 100644 milena/sandbox/green/tools/annotating/histo/Makefile.am delete mode 100644 milena/sandbox/green/tools/annotating/histo/histo.cc delete mode 100644 milena/sandbox/green/tools/annotating/iz/Makefile.am delete mode 100644 milena/sandbox/green/tools/annotating/iz/iz.cc delete mode 100644 milena/sandbox/green/tools/annotating/opening/Makefile.am delete mode 100644 milena/sandbox/green/tools/annotating/opening/opening.cc delete mode 100644 milena/sandbox/green/tools/annotating/regmax/Makefile.am delete mode 100644 milena/sandbox/green/tools/annotating/regmax/regmax.cc delete mode 100644 milena/sandbox/icdar/2009/README delete mode 100644 milena/sandbox/icdar/2009/dibco/binarization.cc delete mode 100644 milena/sandbox/icdar/2009/dibco/quasi.cc delete mode 100644 milena/sandbox/icdar/2009/dibco/svg.1.binarization.cc delete mode 100644 milena/sandbox/icdar/2009/dibco/svg.2.binarization.cc delete mode 100644 milena/sandbox/icdar/2009/dibco/svg.3.binarization.cc delete mode 100755 milena/sandbox/icdar/2009/dibco/wst-based.sh delete mode 100644 milena/sandbox/icdar/2009/hsc/clean_input.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/clean_input.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/clean_lines.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/dummy_input_to_words_dat.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/boxes.cc delete mode 100755 milena/sandbox/icdar/2009/hsc/first_attempts/dist.sh delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/exec/show_lines.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/exec/show_lines_pbm.cc delete mode 100755 milena/sandbox/icdar/2009/hsc/first_attempts/fuzzy.sh delete mode 100644 milena/sandbox/icdar/2009/hsc/first_attempts/main.cc delete mode 100755 milena/sandbox/icdar/2009/hsc/first_attempts/reduce.sh delete mode 100755 milena/sandbox/icdar/2009/hsc/first_attempts/words.sh delete mode 100755 milena/sandbox/icdar/2009/hsc/first_attempts/words_25p.sh delete mode 100644 milena/sandbox/icdar/2009/hsc/get_line_images.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/icdar2ppm.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/icdar2ppm.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/icdar_io.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/input_to_lines.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/input_to_lines_dat.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/input_to_words_dat.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/input_to_ws.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/input_to_wsl.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/io/icdar/load.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/io/icdar/save.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/label_maj.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/line_to_words.hh delete mode 100644 milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/lines_to_words.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/old_input_to_lines.cc delete mode 100644 milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh delete mode 100644 milena/sandbox/icdar/2009/pscomp/iz.cc delete mode 100644 milena/sandbox/icdar/2009/pscomp/rect_filter.cc delete mode 100644 milena/sandbox/igr/code/test.cc delete mode 100644 milena/sandbox/inim/2009/binarization/binarization.cc delete mode 100644 milena/sandbox/inim/2009/binarization/binarization.hh delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/ChangeLog delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/Makefile delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/build/Makefile delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/build/configure.in delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/check/Makefile delete mode 100755 milena/sandbox/inim/2009/binarization/proof-of-concept/check/graph.sh delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/check/histo.gp delete mode 100755 milena/sandbox/inim/2009/binarization/proof-of-concept/configure delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/configure.in delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/scripts/flower delete mode 100755 milena/sandbox/inim/2009/binarization/proof-of-concept/scripts/init_tar.sh delete mode 100755 milena/sandbox/inim/2009/binarization/proof-of-concept/scripts/todo.sh delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/src/basic.cc delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/src/gradient.cc delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/src/snake2d.hh delete mode 100644 milena/sandbox/inim/2009/binarization/proof-of-concept/src/util.hxx delete mode 100644 milena/sandbox/inim/2009/binarization/snake2d.cc delete mode 100644 milena/sandbox/inim/2009/binarization/snake2d.hh delete mode 100644 milena/sandbox/inim/2009/classif/Makefile delete mode 100644 milena/sandbox/inim/2009/classif/plotscript delete mode 100644 milena/sandbox/inim/2009/classif/src/display.hh delete mode 100644 milena/sandbox/inim/2009/classif/src/iccvg04.cc delete mode 100644 milena/sandbox/inim/2009/classif/src/max_tree.hh delete mode 100644 milena/sandbox/inim/2009/classif/src/proj.hh delete mode 100644 milena/sandbox/inim/2009/classif/src/v2.cc delete mode 100644 milena/sandbox/inim/2009/color/README delete mode 100644 milena/sandbox/inim/2009/color/laplacien.cc delete mode 100644 milena/sandbox/inim/2009/color/min_tree_area_filter.cc delete mode 100644 milena/sandbox/inim/2009/color/min_tree_color.cc delete mode 100644 milena/sandbox/inim/2009/color/min_tree_color_v2.cc delete mode 100644 milena/sandbox/inim/2009/color/min_tree_height_filter.cc delete mode 100644 milena/sandbox/inim/2009/color/min_tree_volume_filter.cc delete mode 100644 milena/sandbox/inim/2009/color/reference.cc delete mode 100644 milena/sandbox/inim/2009/color/reference2.cc delete mode 100644 milena/sandbox/inim/2009/color/src/convert.hh delete mode 100644 milena/sandbox/inim/2009/color/src/distance.hh delete mode 100644 milena/sandbox/inim/2009/color/src/graph.hh delete mode 100644 milena/sandbox/inim/2009/color/src/io.hh delete mode 100644 milena/sandbox/inim/2009/nature/Makefile delete mode 100644 milena/sandbox/inim/2009/nature/closing.cc delete mode 100644 milena/sandbox/inim/2009/nature/co_occurence.hh delete mode 100644 milena/sandbox/inim/2009/nature/erosion.cc delete mode 100644 milena/sandbox/inim/2009/nature/fft.cc delete mode 100644 milena/sandbox/inim/2009/nature/gradient.cc delete mode 100644 milena/sandbox/inim/2009/nature/histo_hsi.cc delete mode 100644 milena/sandbox/inim/2009/nature/hom.cc delete mode 100644 milena/sandbox/inim/2009/nature/mco.cc delete mode 100644 milena/sandbox/inim/2009/nature/nature.cc delete mode 100644 milena/sandbox/inim/2009/nature/opening.cc delete mode 100644 milena/sandbox/inim/2009/nature/proj.cc delete mode 100644 milena/sandbox/inim/2009/nature/proj.hh delete mode 100755 milena/sandbox/inim/2009/nature/test.sh delete mode 100644 milena/sandbox/inim/2009/ocr/Makefile delete mode 100755 milena/sandbox/inim/2009/ocr/check.sh delete mode 100644 milena/sandbox/inim/2009/ocr/check_simple_point.cc delete mode 100644 milena/sandbox/inim/2009/ocr/compute_local_configurations.cc delete mode 100644 milena/sandbox/inim/2009/ocr/enlarge.hh delete mode 100644 milena/sandbox/inim/2009/ocr/ocr_with_preprocess.cc delete mode 100644 milena/sandbox/inim/2009/ocr/ocr_without_preprocess.cc delete mode 100644 milena/sandbox/inim/2009/ocr/resize.hh delete mode 100644 milena/sandbox/inim/2009/ocr/simple_point.cc delete mode 100644 milena/sandbox/inim/2009/ocr/simple_point.hh delete mode 100644 milena/sandbox/inim/2009/ocr/skeleton.hh delete mode 100644 milena/sandbox/inim/2009/ocr/skeleton.old.cc delete mode 100644 milena/sandbox/inim/2009/ocr/skeleton.old.hh delete mode 100644 milena/sandbox/inim/2009/ocr/tesseract_wrap.hh delete mode 100644 milena/sandbox/inim/2010/blur/AUTHORS delete mode 100644 milena/sandbox/inim/2010/blur/Makefile delete mode 100644 milena/sandbox/inim/2010/blur/README delete mode 100644 milena/sandbox/inim/2010/blur/advance_iterator.hh delete mode 100644 milena/sandbox/inim/2010/blur/advance_iterator.hxx delete mode 100644 milena/sandbox/inim/2010/blur/cuttor.hh delete mode 100644 milena/sandbox/inim/2010/blur/cuttor.hxx delete mode 100644 milena/sandbox/inim/2010/blur/main.cc delete mode 100644 milena/sandbox/inim/2010/blur/vect_it.hh delete mode 100644 milena/sandbox/inim/2010/blur/vect_it.hxx delete mode 100644 milena/sandbox/inim/2010/blur/vect_it_OLD.hxx delete mode 100644 milena/sandbox/inim/2010/blur/vector.hh delete mode 100644 milena/sandbox/inim/2010/blur/vector.hxx delete mode 100644 milena/sandbox/inim/2010/boxes/Makefile delete mode 100644 milena/sandbox/inim/2010/boxes/boxes.cc delete mode 100755 milena/sandbox/inim/2010/boxes/configure delete mode 100644 milena/sandbox/inim/2010/cag/Makefile delete mode 100644 milena/sandbox/inim/2010/cag/README delete mode 100644 milena/sandbox/inim/2010/cag/get_lines.hh delete mode 100644 milena/sandbox/inim/2010/cag/graph.hh delete mode 100644 milena/sandbox/inim/2010/cag/main.cc delete mode 100644 milena/sandbox/inim/2010/cag/superpose.hh delete mode 100644 milena/sandbox/inim/2010/morpho/README delete mode 100755 milena/sandbox/inim/2010/morpho/configure delete mode 100644 milena/sandbox/inim/2010/morpho/dilation-n.hh delete mode 100644 milena/sandbox/inim/2010/morpho/erosion-n.hh delete mode 100644 milena/sandbox/inim/2010/morpho/main_dilation-n.cc delete mode 100644 milena/sandbox/inim/2010/morpho/morpho.cc delete mode 100755 milena/sandbox/inim/2010/morpho/run.sh delete mode 100644 milena/sandbox/inim/2010/page/AUTHORS delete mode 100644 milena/sandbox/inim/2010/page/Makefile delete mode 100644 milena/sandbox/inim/2010/page/README delete mode 100644 milena/sandbox/inim/2010/page/binarization/binarization.hh delete mode 100644 milena/sandbox/inim/2010/page/binarization/binarization.hxx delete mode 100644 milena/sandbox/inim/2010/page/binarization/functors.hh delete mode 100644 milena/sandbox/inim/2010/page/binarization/functors.hxx delete mode 100644 milena/sandbox/inim/2010/page/binarization/grayscale.hh delete mode 100644 milena/sandbox/inim/2010/page/binarization/grayscale.hxx delete mode 100644 milena/sandbox/inim/2010/page/binarization/integral-image.hh delete mode 100644 milena/sandbox/inim/2010/page/binarization/integral-image.hxx delete mode 100644 milena/sandbox/inim/2010/page/check_size_functor.hh delete mode 100644 milena/sandbox/inim/2010/page/main.cc delete mode 100644 milena/sandbox/inim/2010/page/white.hh delete mode 100644 milena/sandbox/inim/2010/page/white.hxx delete mode 100644 milena/sandbox/inim/2010/rag/Makefile delete mode 100644 milena/sandbox/inim/2010/rag/center_weight.hh delete mode 100644 milena/sandbox/inim/2010/rag/dijkstra.hh delete mode 100644 milena/sandbox/inim/2010/rag/p_vertices_with_accu.hh delete mode 100644 milena/sandbox/inim/2010/rag/rag.cc delete mode 100644 milena/sandbox/inim/2010/rag/rag.hh delete mode 100644 milena/sandbox/inim/2011/fredwin/Makefile delete mode 100755 milena/sandbox/inim/2011/fredwin/configure delete mode 100644 milena/sandbox/inim/2011/fredwin/inim.cc delete mode 100644 milena/sandbox/jardonnet/TODO delete mode 100644 milena/sandbox/jardonnet/array/Makefile delete mode 100644 milena/sandbox/jardonnet/array/array.cc delete mode 100644 milena/sandbox/jardonnet/array/array.hh delete mode 100644 milena/sandbox/jardonnet/array/old/1d.hh delete mode 100644 milena/sandbox/jardonnet/array/old/1d.hxx delete mode 100644 milena/sandbox/jardonnet/array/old/2d.hh delete mode 100644 milena/sandbox/jardonnet/array/old/2d.hxx delete mode 100644 milena/sandbox/jardonnet/array/old/3d.hh delete mode 100644 milena/sandbox/jardonnet/array/old/3d.hxx delete mode 100644 milena/sandbox/jardonnet/array/old/all.hh delete mode 100644 milena/sandbox/jardonnet/array/old/nd.hh delete mode 100644 milena/sandbox/jardonnet/array/old/objs.hh delete mode 100644 milena/sandbox/jardonnet/icc.txt delete mode 100644 milena/sandbox/jardonnet/igr/Makefile delete mode 100755 milena/sandbox/jardonnet/igr/check/check delete mode 100644 milena/sandbox/jardonnet/igr/check/s7.ppm delete mode 100644 milena/sandbox/jardonnet/igr/check/tiny.ppm delete mode 100644 milena/sandbox/jardonnet/igr/src/igr.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/Makefile delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/mg_ima.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/test.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/test2.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/test3.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/test4.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/check/tiny.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/diff_ref_fused_on_small delete mode 100644 milena/sandbox/jardonnet/n_cmpt/fused delete mode 100644 milena/sandbox/jardonnet/n_cmpt/fused_filter.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt2.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt2.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt3.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt3.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt4.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt4.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt5.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/nwst.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/nwst.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/prob.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/ref delete mode 100644 milena/sandbox/jardonnet/n_cmpt/ref_filter.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/seg15.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/test3.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/test_attribute_watershed.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/tikz.cc delete mode 100644 milena/sandbox/jardonnet/n_cmpt/tikz.hh delete mode 100644 milena/sandbox/jardonnet/n_cmpt/tiny_seg15.pgm delete mode 100644 milena/sandbox/jardonnet/n_cmpt/wst.cc delete mode 100755 milena/sandbox/jardonnet/perl/hxx.pl delete mode 100644 milena/sandbox/jardonnet/perl/test/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/c.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/cast.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/i2v/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/i2v/all_to.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/i2v/array.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/internal/selector.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/internal/x2x_linear_impl.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/ops.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2b/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2b/chess.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2b/has.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2v/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2v/elifs.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2v/iota.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/p2v/ternary.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2b/threshold.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/abs.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/cast.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/dec.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/enc.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/id.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/inc.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/linear.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/norm.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/rgb_to_hsi.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/v2v/saturate.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/vv2v/max.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/vv2v/min.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/all.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/geom/composed.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/geom/rotation.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/geom/translation.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/interpol/bilinear.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/interpol/linear.hh delete mode 100644 milena/sandbox/jardonnet/perl/test/x2x/interpol/test.cc delete mode 100644 milena/sandbox/jardonnet/registration/center.hh delete mode 100644 milena/sandbox/jardonnet/registration/chamfer.hh delete mode 100644 milena/sandbox/jardonnet/registration/cloud.hh delete mode 100644 milena/sandbox/jardonnet/registration/cov.hh delete mode 100644 milena/sandbox/jardonnet/registration/cross_cov.hh delete mode 100644 milena/sandbox/jardonnet/registration/exp_val.hh delete mode 100644 milena/sandbox/jardonnet/registration/final_qk.hh delete mode 100644 milena/sandbox/jardonnet/registration/frankel_young.hh delete mode 100644 milena/sandbox/jardonnet/registration/icp.hh delete mode 100644 milena/sandbox/jardonnet/registration/icp_ref.hh delete mode 100644 milena/sandbox/jardonnet/registration/interpolation.hh delete mode 100644 milena/sandbox/jardonnet/registration/jacobi.hh delete mode 100644 milena/sandbox/jardonnet/registration/misc.hh delete mode 100644 milena/sandbox/jardonnet/registration/multiscale.hh delete mode 100644 milena/sandbox/jardonnet/registration/power_it.hh delete mode 100644 milena/sandbox/jardonnet/registration/projection.hh delete mode 100644 milena/sandbox/jardonnet/registration/quat7.hh delete mode 100644 milena/sandbox/jardonnet/registration/registration.hh delete mode 100644 milena/sandbox/jardonnet/registration/rotation.hh delete mode 100644 milena/sandbox/jardonnet/registration/save.hh delete mode 100644 milena/sandbox/jardonnet/registration/tools.hh delete mode 100644 milena/sandbox/jardonnet/registration/update_qk.hh delete mode 100644 milena/sandbox/jardonnet/registration/variance.hh delete mode 100644 milena/sandbox/jardonnet/subsampling/gaussian_subsampling.hh delete mode 100644 milena/sandbox/jardonnet/subsampling/sub_sampled_image.hh delete mode 100644 milena/sandbox/jardonnet/test/Makefile delete mode 100644 milena/sandbox/jardonnet/test/bench delete mode 100755 milena/sandbox/jardonnet/test/bench.rb delete mode 100644 milena/sandbox/jardonnet/test/big_chess.cc delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk2_1.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk2_2.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk_1.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk_1_c1_x1.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk_2.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk_2_c1_x1.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/final_qk_3.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/no_final.ppm delete mode 100644 milena/sandbox/jardonnet/test/final/no_final_1_c1_x1.ppm delete mode 100644 milena/sandbox/jardonnet/test/gaussian.cc delete mode 100644 milena/sandbox/jardonnet/test/gaussian_subsampling.cc delete mode 100644 milena/sandbox/jardonnet/test/icp.cc delete mode 100644 milena/sandbox/jardonnet/test/icp_ref.cc delete mode 100644 milena/sandbox/jardonnet/test/img/c0.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c1.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c10.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c11.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c2.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c3.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c4.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c5.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c55.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c6.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c7.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c8.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/c9.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x0.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x1.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x10.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x11.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x2.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x3.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x4.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x5.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x6.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x7.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x8.pbm delete mode 100644 milena/sandbox/jardonnet/test/img/x9.pbm delete mode 100644 milena/sandbox/jardonnet/test/length.ppm delete mode 100644 milena/sandbox/jardonnet/test/no_final.ppm delete mode 100644 milena/sandbox/jardonnet/test/plotscript delete mode 100644 milena/sandbox/jardonnet/test/reduce.cc delete mode 100644 milena/sandbox/jardonnet/test/registration.cc delete mode 100644 milena/sandbox/jardonnet/test/script_latex.plot delete mode 100644 milena/sandbox/jardonnet/test/subsampling.cc delete mode 100644 milena/sandbox/jardonnet/test/test.cc delete mode 100644 milena/sandbox/jardonnet/test/test.rb delete mode 100644 milena/sandbox/jardonnet/test/type.cc delete mode 100644 milena/sandbox/jardonnet/virtual/Makefile delete mode 100644 milena/sandbox/jardonnet/virtual/access.cc delete mode 100644 milena/sandbox/jardonnet/virtual/access.hh delete mode 100644 milena/sandbox/jardonnet/virtual/bilinear.ppm delete mode 100644 milena/sandbox/jardonnet/virtual/lena.pgm delete mode 100644 milena/sandbox/jardonnet/virtual/lena.ppm delete mode 100644 milena/sandbox/jardonnet/virtual/nn.ppm delete mode 100644 milena/sandbox/laurent/ismm2009.cc delete mode 100644 milena/sandbox/laurent/ismm2009.hh delete mode 100644 milena/sandbox/laurent/memo/ismm2009.v0.cc delete mode 100644 milena/sandbox/laurent/memo/ismm2009.v1.cc delete mode 100644 milena/sandbox/laurent/memo/ismm2009.v2.cc delete mode 100644 milena/sandbox/laurent/playing_with_attributes.cc delete mode 100644 milena/sandbox/lazzara/afp/micro_films/Makefile delete mode 100755 milena/sandbox/lazzara/afp/micro_films/demat_mf_afp.sh delete mode 100644 milena/sandbox/lazzara/afp/micro_films/extract_mf.cc delete mode 100644 milena/sandbox/lazzara/afp/micro_films/keep_background.cc delete mode 100644 milena/sandbox/lazzara/afp/micro_films/split_image.cc delete mode 100644 milena/sandbox/lazzara/csv2vtk/csv2vtk.cc delete mode 100644 milena/sandbox/lazzara/fonctionnalites_milena.ods delete mode 100644 milena/sandbox/lazzara/igr/gui/Makefile.am delete mode 100644 milena/sandbox/lazzara/igr/gui/demo.pro delete mode 100644 milena/sandbox/lazzara/igr/gui/src/bak/mainwindow.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/bak/mainwindow.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/display.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/display.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/display_seg.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/display_seg.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/edit_seg.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/edit_seg.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/image_viewer.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/image_viewer.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/internal/interactive_scene.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/internal/interactive_scene.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/main.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/main_window.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/src/main_window.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/to_qimage.hh delete mode 100644 milena/sandbox/lazzara/igr/gui/src/widgets.cc delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/bak/mainwindow.ui delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/display.ui delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/display_seg.ui delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/edit_seg.ui delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/image_viewer.ui delete mode 100644 milena/sandbox/lazzara/igr/gui/ui/main_window.ui delete mode 100644 milena/sandbox/lazzara/igr/igr-biggest-comp.cc delete mode 100644 milena/sandbox/lazzara/igr/igr-cloud.cc delete mode 100644 milena/sandbox/lazzara/igr/igr.cc delete mode 100644 milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc delete mode 100644 milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc delete mode 100644 milena/sandbox/lazzara/igr/irm/wst_rag.cc delete mode 100644 milena/sandbox/lazzara/igr/irm/wst_rag_hsl.cc delete mode 100644 milena/sandbox/lazzara/igr/irm_seg_with_mm_and_rag.mine.cc delete mode 100644 milena/sandbox/lazzara/igr/registration_3d.cc delete mode 100644 milena/sandbox/lazzara/igr/tr_image.cc delete mode 100644 milena/sandbox/lazzara/scribo/binarization_naive/main.cc delete mode 100644 milena/sandbox/lazzara/scribo/binarization_naive/toto.cc delete mode 100644 milena/sandbox/lazzara/scribo/fill_holes/main.cc delete mode 100644 milena/sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc delete mode 100644 milena/sandbox/lazzara/scribo/skeleton_crest/main.cc delete mode 100644 milena/sandbox/markov/T_gen.hh delete mode 100644 milena/sandbox/markov/approx_exp.hh delete mode 100644 milena/sandbox/markov/markov.cc delete mode 100644 milena/sandbox/markov/markov.hh delete mode 100644 milena/sandbox/markov/random.hh delete mode 100644 milena/sandbox/markov/random.hxx delete mode 100644 milena/sandbox/modules/icdar/lines.cc delete mode 100644 milena/sandbox/modules/icdar/words.cc delete mode 100644 milena/sandbox/nivault/dmap.hh delete mode 100644 milena/sandbox/nivault/dmap.hxx delete mode 100644 milena/sandbox/nivault/dyn_line.hh delete mode 100644 milena/sandbox/nivault/extract_character.cc delete mode 100644 milena/sandbox/nivault/extract_score.cc delete mode 100644 milena/sandbox/nivault/log delete mode 100644 milena/sandbox/nivault/median.hh delete mode 100644 milena/sandbox/nivault/plugin-gimp/.gitignore delete mode 100644 milena/sandbox/nivault/plugin-gimp/AUTHORS delete mode 100644 milena/sandbox/nivault/plugin-gimp/COPYING delete mode 100644 milena/sandbox/nivault/plugin-gimp/ChangeLog delete mode 100644 milena/sandbox/nivault/plugin-gimp/HACKING delete mode 100644 milena/sandbox/nivault/plugin-gimp/INSTALL delete mode 100644 milena/sandbox/nivault/plugin-gimp/Makefile.am delete mode 100644 milena/sandbox/nivault/plugin-gimp/TODO delete mode 100755 milena/sandbox/nivault/plugin-gimp/autogen.sh delete mode 100644 milena/sandbox/nivault/plugin-gimp/configure.ac delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/Makefile.am delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/en/Makefile.am delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/en/gimp-help.xml delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/en/index.html delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/images/Makefile.am delete mode 100644 milena/sandbox/nivault/plugin-gimp/help/images/wilber.png delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/ChangeLog delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/az.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/de.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/fr.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/sk.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/sv.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/po/zh_TW.po delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/Makefile.am delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/build-image.hh delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/build-image.hxx delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/gimp-image.hh delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/interface.hh delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/interface.hxx delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/main.cc delete mode 100644 milena/sandbox/nivault/plugin-gimp/src/plugin-intl.hh delete mode 100644 milena/sandbox/nivault/rotation.cc delete mode 100644 milena/sandbox/nivault/tests/pouet.cc delete mode 100755 milena/sandbox/nivault/tests/test delete mode 100644 milena/sandbox/nivault/vec.hh delete mode 100644 milena/sandbox/pellegrin/Makefile delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/Makefile delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/concept/point_set.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/internal/multi_set.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/internal/point_set_base.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/internal/uni_set.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/p_array.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/p_set.hh delete mode 100644 milena/sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc delete mode 100644 milena/sandbox/pellegrin/first_test.cc delete mode 100644 milena/sandbox/pellegrin/set/core/concept/point_set.hh delete mode 100644 milena/sandbox/pellegrin/set/core/internal/multi_set.hh delete mode 100644 milena/sandbox/pellegrin/set/core/internal/uni_set.hh delete mode 100644 milena/sandbox/pellegrin/set/core/line2d.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_array.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_bgraph.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_graph.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_line_graph.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_priority_queue.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_priority_queue_fast.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_queue.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_queue_fast.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_run.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_runs.hh delete mode 100644 milena/sandbox/pellegrin/set/core/p_set.hh delete mode 100644 milena/sandbox/pellegrin/set/core/pset_if.hh delete mode 100644 milena/sandbox/pellegrin/set/test/Makefile delete mode 100755 milena/sandbox/pellegrin/set/test/detest.sh delete mode 100644 milena/sandbox/pellegrin/set/test/p_bgraph.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_priority_queue.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_priority_queue_fast.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_queue.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_queue_fast.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_runs.cc delete mode 100644 milena/sandbox/pellegrin/set/test/p_set.cc delete mode 100644 milena/sandbox/pellegrin/set/test/pset_if.cc delete mode 100755 milena/sandbox/pellegrin/set/test/test.sh delete mode 100644 milena/sandbox/pellegrin/set/trait/point_set.hh delete mode 100644 milena/sandbox/pellegrin/set/types_de_points.txt delete mode 100644 milena/sandbox/roland/.gitignore delete mode 100644 milena/sandbox/roland/Makefile delete mode 100644 milena/sandbox/roland/double.cc delete mode 100644 milena/sandbox/roland/min-max.cc delete mode 100644 milena/sandbox/roland/morpho/lower_completion.hh delete mode 100644 milena/sandbox/roland/morpho/shortest_path_watershed.hh delete mode 100644 milena/sandbox/theo/Rd/debase.union_find.hh delete mode 100644 milena/sandbox/theo/Rd/deco.cc delete mode 100644 milena/sandbox/theo/Rd/diff.cc delete mode 100644 milena/sandbox/theo/Rd/diff_pgm.cc delete mode 100644 milena/sandbox/theo/Rd/hybrid.cc delete mode 100644 milena/sandbox/theo/Rd/hybrid.hh delete mode 100644 milena/sandbox/theo/Rd/min.cc delete mode 100644 milena/sandbox/theo/Rd/parallel.cc delete mode 100644 milena/sandbox/theo/Rd/parallel.hh delete mode 100644 milena/sandbox/theo/Rd/parallel_wo.cc delete mode 100644 milena/sandbox/theo/Rd/queue_based.cc delete mode 100644 milena/sandbox/theo/Rd/queue_based.hh delete mode 100644 milena/sandbox/theo/Rd/sequential.cc delete mode 100644 milena/sandbox/theo/Rd/sequential.hh delete mode 100644 milena/sandbox/theo/Rd/sequential_bench.cc delete mode 100644 milena/sandbox/theo/Rd/sequential_bench.hh delete mode 100644 milena/sandbox/theo/Rd/svg.queue_based.hh delete mode 100644 milena/sandbox/theo/Rd/union_find.cc delete mode 100644 milena/sandbox/theo/Rd/union_find.hh delete mode 100644 milena/sandbox/theo/Rd/utils.hh delete mode 100644 milena/sandbox/theo/browsing/fwd.cc delete mode 100644 milena/sandbox/theo/browsing/fwd.hh delete mode 100644 milena/sandbox/theo/color/blen_pix.hh delete mode 100644 milena/sandbox/theo/color/change_attributes.hh delete mode 100644 milena/sandbox/theo/color/filter_blen_rgb_edges.cc delete mode 100644 milena/sandbox/theo/color/filter_meandist_rgb_pixels.cc delete mode 100644 milena/sandbox/theo/color/mean_rgb_pix.hh delete mode 100644 milena/sandbox/theo/color/segment.hh delete mode 100644 milena/sandbox/theo/color/segment_gl_pixels.cc delete mode 100644 milena/sandbox/theo/color/segment_rgb_edges.cc delete mode 100644 milena/sandbox/theo/color/segment_rgb_pixels.cc delete mode 100644 milena/sandbox/theo/color/sum_pix.hh delete mode 100644 milena/sandbox/theo/compute_parent_more.hh delete mode 100644 milena/sandbox/theo/cs2d/cs2d.cc delete mode 100644 milena/sandbox/theo/cs2d/cs2d.hh delete mode 100644 milena/sandbox/theo/cs2d/cs2d_morpho.hh delete mode 100644 milena/sandbox/theo/cs2d/cs2d_utils.hh delete mode 100644 milena/sandbox/theo/cs2d/dbl_neighb.hh delete mode 100644 milena/sandbox/theo/cs2d/kruskal.cc delete mode 100644 milena/sandbox/theo/cs2d/tuto.cc delete mode 100644 milena/sandbox/theo/csi/edwin.cc delete mode 100644 milena/sandbox/theo/csi/fred.cc delete mode 100644 milena/sandbox/theo/dead/inplace.hh delete mode 100644 milena/sandbox/theo/dead/instant.hh delete mode 100644 milena/sandbox/theo/dmap.cc delete mode 100644 milena/sandbox/theo/dmap.txt delete mode 100644 milena/sandbox/theo/esiee/jean/pfg2d.cc delete mode 100644 milena/sandbox/theo/esiee/jean/pfg3d.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/extinct_attributes.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/lca.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/main.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/main.ext.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/pseudo_tree.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/topo_wst.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/trash.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/ismm09/util.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/presentation/classif.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/presentation/segmentation.hh delete mode 100644 milena/sandbox/theo/esiee/laurent/presentation/wst2d.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/presentation/wst3d.cc delete mode 100644 milena/sandbox/theo/esiee/laurent/presentation/wst_edge.cc delete mode 100644 milena/sandbox/theo/esiee/slides_2009_may/dilation.hh delete mode 100644 milena/sandbox/theo/esiee/slides_2009_may/main.cc delete mode 100644 milena/sandbox/theo/estimate.hh delete mode 100644 milena/sandbox/theo/exec/clean_holes.cc delete mode 100644 milena/sandbox/theo/exec/closing_area.cc delete mode 100644 milena/sandbox/theo/exec/closing_height.cc delete mode 100644 milena/sandbox/theo/exec/closing_isotropic.cc delete mode 100644 milena/sandbox/theo/exec/closing_rectangle.cc delete mode 100644 milena/sandbox/theo/exec/closing_volume.cc delete mode 100644 milena/sandbox/theo/exec/color_internal_gradient.cc delete mode 100644 milena/sandbox/theo/exec/color_labeling_mean.cc delete mode 100644 milena/sandbox/theo/exec/diff_abs.cc delete mode 100644 milena/sandbox/theo/exec/distance_thick.cc delete mode 100644 milena/sandbox/theo/exec/dump2cloud.cc delete mode 100644 milena/sandbox/theo/exec/dump2pnm.cc delete mode 100644 milena/sandbox/theo/exec/dump_12bit_to_pgm.cc delete mode 100644 milena/sandbox/theo/exec/elementary_gradient.cc delete mode 100644 milena/sandbox/theo/exec/filetype.hh delete mode 100644 milena/sandbox/theo/exec/gaussian_directional_2d.cc delete mode 100644 milena/sandbox/theo/exec/gaussian_directional_2d.hh delete mode 100644 milena/sandbox/theo/exec/gaussian_directional_2d__float.cc delete mode 100644 milena/sandbox/theo/exec/opening_rectangle.cc delete mode 100644 milena/sandbox/theo/exec/pnms2dump.cc delete mode 100644 milena/sandbox/theo/exec/rank_rectangle.cc delete mode 100644 milena/sandbox/theo/exec/subsample.cc delete mode 100644 milena/sandbox/theo/exec/superpose.cc delete mode 100644 milena/sandbox/theo/exec/threshold_low.cc delete mode 100644 milena/sandbox/theo/exec/watershed_flooding.cc delete mode 100644 milena/sandbox/theo/exec/watershed_superpose.cc delete mode 100644 milena/sandbox/theo/experimental/depeche/col.cc delete mode 100644 milena/sandbox/theo/experimental/depeche/homogen.cc delete mode 100644 milena/sandbox/theo/experimental/depeche/row.cc delete mode 100644 milena/sandbox/theo/experimental/depeche/row_mm.cc delete mode 100644 milena/sandbox/theo/experimental/histo_image.cc delete mode 100644 milena/sandbox/theo/experimental/op_pw_value_pw_cst.cc delete mode 100644 milena/sandbox/theo/experimental/projected_histo.cc delete mode 100644 milena/sandbox/theo/fllt.cc delete mode 100644 milena/sandbox/theo/fllt.svg.6.cc delete mode 100644 milena/sandbox/theo/fllt.svg.7.hh delete mode 100644 milena/sandbox/theo/fllt/compute_fllt.cc delete mode 100644 milena/sandbox/theo/fllt/connected_filters/area_filter.cc delete mode 100644 milena/sandbox/theo/fllt/connected_filters/area_filter.hh delete mode 100644 milena/sandbox/theo/fllt/connected_filters/canonize_tree.hh delete mode 100644 milena/sandbox/theo/fllt/connected_filters/pseudo_flat_zones.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.hh delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.1.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.2.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.3.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.4.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.5.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.6.cc delete mode 100644 milena/sandbox/theo/fllt/fllt.svg.7.hh delete mode 100644 milena/sandbox/theo/fllt/fllt_test.hh delete mode 100644 milena/sandbox/theo/fllt/fllt_tree_to_image.hh delete mode 100644 milena/sandbox/theo/fllt/simple_tests.cc delete mode 100644 milena/sandbox/theo/igr/dump_cut.cc delete mode 100644 milena/sandbox/theo/igr/dump_to_dist.cc delete mode 100644 milena/sandbox/theo/igr/irm_anat_segm.cc delete mode 100644 milena/sandbox/theo/igr/irm_anat_segm__2D_ONLY.cc delete mode 100644 milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc delete mode 100644 milena/sandbox/theo/igr/melimage/irm_perf/dynaparam7.m delete mode 100644 milena/sandbox/theo/igr/pgms2pgm.cc delete mode 100644 milena/sandbox/theo/igr/segment_2d_t.cc delete mode 100644 milena/sandbox/theo/mln/browsing/window_sliding.cc delete mode 100644 milena/sandbox/theo/mln/core/concept/walue.hh delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/f_and_g.pbm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/g.pbm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/internal/find_root.hh delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/lena.pgm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/lena_blurred.pgm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/lena_min.pgm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/one_domain.cc delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/reconstruction_on_set.cc delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/reconstruction_on_set.hh delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/reconstruction_on_set_tiny.cc delete mode 100644 milena/sandbox/theo/mln/morpho/canvas/regminid.pbm.gz delete mode 100644 milena/sandbox/theo/mln/morpho/conditional/dilation.cc delete mode 100644 milena/sandbox/theo/mln/morpho/conditional/dilation.hh delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation.cc delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation.hh delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation_permissive.cc delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation_permissive.hh delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation_permissive_bench.cc delete mode 100644 milena/sandbox/theo/mln/morpho/geodesic/dilation_permissive_n.cc delete mode 100644 milena/sandbox/theo/mln/morpho/max.hh delete mode 100644 milena/sandbox/theo/mln/morpho/reconstruction/by_dilation.cc delete mode 100644 milena/sandbox/theo/mln/morpho/reconstruction/by_dilation.hh delete mode 100644 milena/sandbox/theo/mln/morpho/reconstruction/by_dilation_tiny.cc delete mode 100644 milena/sandbox/theo/mln/subsampling/debase.cc delete mode 100644 milena/sandbox/theo/mln/subsampling/debase.hh delete mode 100644 milena/sandbox/theo/mln/subsampling/in.pgm.gz delete mode 100644 milena/sandbox/theo/mln/subsampling/integral.cc delete mode 100644 milena/sandbox/theo/mln/subsampling/integral.hh delete mode 100644 milena/sandbox/theo/mln/subsampling/sizes.cc delete mode 100644 milena/sandbox/theo/mln/walue/approx_equal.hh delete mode 100644 milena/sandbox/theo/mln/walue/color.hh delete mode 100644 milena/sandbox/theo/mln/walue/gl.cc delete mode 100644 milena/sandbox/theo/mln/walue/gl.hh delete mode 100644 milena/sandbox/theo/mln/walue/gl16.hh delete mode 100644 milena/sandbox/theo/mln/walue/gl8.hh delete mode 100644 milena/sandbox/theo/mln/walue/glf.cc delete mode 100644 milena/sandbox/theo/mln/walue/glf.hh delete mode 100644 milena/sandbox/theo/mln/walue/int_u.cc delete mode 100644 milena/sandbox/theo/mln/walue/int_u.hh delete mode 100644 milena/sandbox/theo/mln/walue/internal/rgb_base.hh delete mode 100644 milena/sandbox/theo/mln/walue/rgb.hh delete mode 100644 milena/sandbox/theo/mln/walue/rgb_3x8.cc delete mode 100644 milena/sandbox/theo/mln/walue/rgb_3x8.hh delete mode 100644 milena/sandbox/theo/mln/walue/rgb_3xn.hh delete mode 100644 milena/sandbox/theo/mln/walue/rgb_t.hh delete mode 100644 milena/sandbox/theo/mln/walue/set_encoding.hh delete mode 100644 milena/sandbox/theo/p_runs__with_dedicated_piter.hh delete mode 100644 milena/sandbox/theo/publis/icip2009/compute_a.cc delete mode 100644 milena/sandbox/theo/publis/icip2009/regmin_count.cc delete mode 100644 milena/sandbox/theo/rush/exo2/Makefile delete mode 100644 milena/sandbox/theo/rush/exo2/exo2.cc delete mode 100755 milena/sandbox/theo/rush/exo2/exo2.sh delete mode 100644 milena/sandbox/theo/rush/exo2/propagate.hh delete mode 100644 milena/sandbox/theo/rush/exo3/Makefile delete mode 100644 milena/sandbox/theo/rush/exo3/assignable.cc delete mode 100644 milena/sandbox/theo/rush/exo3/exo3_fun_area.cc delete mode 100644 milena/sandbox/theo/rush/exo3/exo3_fun_generator.cc delete mode 100644 milena/sandbox/theo/skel.cc delete mode 100644 milena/sandbox/theo/test_attribute.cc delete mode 100644 milena/sandbox/theo/tufa_2008/closed_gradient.cc delete mode 100644 milena/sandbox/theo/tufa_2008/closing.cc delete mode 100644 milena/sandbox/theo/tufa_2008/experiment.cc delete mode 100644 milena/sandbox/theo/tufa_2008/filter.cc delete mode 100644 milena/sandbox/theo/tufa_2008/filter_n.cc delete mode 100644 milena/sandbox/theo/tufa_2008/fz_count.cc delete mode 100644 milena/sandbox/theo/tufa_2008/gradient.cc delete mode 100644 milena/sandbox/theo/tufa_2008/n_cmpt.cc delete mode 100644 milena/sandbox/theo/tufa_2008/opening.cc delete mode 100644 milena/sandbox/theo/tufa_2008/steps.0.cc delete mode 100644 milena/sandbox/theo/tufa_2008/steps.1.cc delete mode 100644 milena/sandbox/theo/tufa_2008/steps.2.cc delete mode 100644 milena/sandbox/theo/tufa_2008/steps.2b.cc delete mode 100644 milena/sandbox/theo/tufa_2008/steps.3.cc delete mode 100644 milena/sandbox/theo/tufa_2008/wst.cc delete mode 100644 milena/sandbox/theo/tufa_2008/wst_f_equal_wst_a.cc delete mode 100644 milena/sandbox/theo/win_fun.cc delete mode 100644 milena/sandbox/theo/win_fun.hh delete mode 100644 milena/sandbox/vigouroux/cmy/fun.hh delete mode 100644 milena/sandbox/vigouroux/cmy/get_blue.hh delete mode 100644 milena/sandbox/vigouroux/cmy/get_green.hh delete mode 100644 milena/sandbox/vigouroux/cmy/my_cmy.hh delete mode 100644 milena/sandbox/vigouroux/cmy/rgb_to_cmy.hh delete mode 100644 milena/sandbox/vigouroux/cmy/test.cc delete mode 100644 milena/sandbox/vigouroux/cmy/testfun.cc delete mode 100644 milena/sandbox/vigouroux/color.cc delete mode 100644 milena/sandbox/vigouroux/color.hh delete mode 100644 milena/sandbox/vigouroux/color/color.hh delete mode 100644 milena/sandbox/vigouroux/color/hsi.hh delete mode 100644 milena/sandbox/vigouroux/color/hsl.hh delete mode 100644 milena/sandbox/vigouroux/color/hsv.hh delete mode 100644 milena/sandbox/vigouroux/color/is_HSI.cc delete mode 100644 milena/sandbox/vigouroux/color/my_cmy.hh delete mode 100644 milena/sandbox/vigouroux/color/my_hsi.hh delete mode 100644 milena/sandbox/vigouroux/color/my_hsl.hh delete mode 100644 milena/sandbox/vigouroux/color/my_hsv.hh delete mode 100644 milena/sandbox/vigouroux/color/my_xyz.hh delete mode 100644 milena/sandbox/vigouroux/color/my_yiq.hh delete mode 100644 milena/sandbox/vigouroux/color/my_yuv.hh delete mode 100644 milena/sandbox/vigouroux/color/nrgb.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_cmy.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_hsi.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_hsl.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_hsv.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_xyz.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_yiq.hh delete mode 100644 milena/sandbox/vigouroux/color/rgb_to_yuv.hh delete mode 100644 milena/sandbox/vigouroux/color/tests.cc delete mode 100644 milena/sandbox/vigouroux/color/xyz.hh delete mode 100644 milena/sandbox/vigouroux/color/yiq.hh delete mode 100644 milena/sandbox/vigouroux/color/yuv.hh delete mode 100644 milena/sandbox/vigouroux/conv/getred.hh delete mode 100644 milena/sandbox/vigouroux/conv/rgbto.hh delete mode 100644 milena/sandbox/vigouroux/conv/test.cc delete mode 100644 milena/sandbox/vigouroux/conv/tored.hh delete mode 100644 milena/sandbox/vigouroux/conv/torgb.hh delete mode 100644 milena/sandbox/vigouroux/convert/abstract/colorconv.hh delete mode 100644 milena/sandbox/vigouroux/convert/abstract/conversion.hh delete mode 100644 milena/sandbox/vigouroux/convert/basics.hh delete mode 100644 milena/sandbox/vigouroux/convert/bound.hh delete mode 100644 milena/sandbox/vigouroux/convert/cast.hh delete mode 100644 milena/sandbox/vigouroux/convert/conversion.hh delete mode 100644 milena/sandbox/vigouroux/convert/conversion_ng_se.hh delete mode 100644 milena/sandbox/vigouroux/convert/force.hh delete mode 100644 milena/sandbox/vigouroux/convert/nrgbxyz.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbhsi.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbhsl.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbhsv.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbnrgb.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbxyz.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbyiq.hh delete mode 100644 milena/sandbox/vigouroux/convert/rgbyuv.hh delete mode 100644 milena/sandbox/vigouroux/convert/stretch.hh delete mode 100644 milena/sandbox/vigouroux/convert/value_to_point.hh delete mode 100644 milena/sandbox/vigouroux/function.hh delete mode 100644 milena/sandbox/vigouroux/gradation.hh delete mode 100644 milena/sandbox/vigouroux/hsi/get_blue.hh delete mode 100644 milena/sandbox/vigouroux/hsi/get_green.hh delete mode 100644 milena/sandbox/vigouroux/hsi/get_red.hh delete mode 100644 milena/sandbox/vigouroux/hsi/my_hsi.hh delete mode 100644 milena/sandbox/vigouroux/hsi/rgb_to_hsi.hh delete mode 100644 milena/sandbox/vigouroux/lap.cc delete mode 100644 milena/sandbox/vigouroux/lap.hh delete mode 100644 milena/sandbox/vigouroux/literal/black.hh delete mode 100644 milena/sandbox/vigouroux/literal/blue.hh delete mode 100644 milena/sandbox/vigouroux/literal/brown.hh delete mode 100644 milena/sandbox/vigouroux/literal/cyan.hh delete mode 100644 milena/sandbox/vigouroux/literal/darkgray.hh delete mode 100644 milena/sandbox/vigouroux/literal/gray.hh delete mode 100644 milena/sandbox/vigouroux/literal/green.hh delete mode 100644 milena/sandbox/vigouroux/literal/lightgray.hh delete mode 100644 milena/sandbox/vigouroux/literal/lime.hh delete mode 100644 milena/sandbox/vigouroux/literal/magenta.hh delete mode 100644 milena/sandbox/vigouroux/literal/olive.hh delete mode 100644 milena/sandbox/vigouroux/literal/orange.hh delete mode 100644 milena/sandbox/vigouroux/literal/pink.hh delete mode 100644 milena/sandbox/vigouroux/literal/purple.hh delete mode 100644 milena/sandbox/vigouroux/literal/red.hh delete mode 100644 milena/sandbox/vigouroux/literal/teal.hh delete mode 100644 milena/sandbox/vigouroux/literal/violet.hh delete mode 100644 milena/sandbox/vigouroux/literal/white.hh delete mode 100644 milena/sandbox/vigouroux/literal/yellow.hh delete mode 100644 milena/sandbox/vigouroux/load.cc delete mode 100644 milena/sandbox/vigouroux/moyenne.cc delete mode 100644 milena/sandbox/vigouroux/testfun.cc delete mode 100644 milena/sandbox/vigouroux/tests.cc delete mode 100644 milena/sandbox/vigouroux/xyz/get_blue.hh delete mode 100644 milena/sandbox/vigouroux/xyz/get_green.hh delete mode 100644 milena/sandbox/vigouroux/xyz/get_red.hh delete mode 100644 milena/sandbox/vigouroux/xyz/my_xyz.hh delete mode 100644 milena/sandbox/vigouroux/xyz/rgb_to_xyz.hh delete mode 100644 milena/sandbox/vigouroux/xyz/test.cc delete mode 100644 milena/sandbox/vigouroux/xyz/testfun.cc delete mode 100644 milena/sandbox/vigouroux/yiq/get_blue.hh delete mode 100644 milena/sandbox/vigouroux/yiq/get_green.hh delete mode 100644 milena/sandbox/vigouroux/yiq/get_red.hh delete mode 100644 milena/sandbox/vigouroux/yiq/my_yiq.hh delete mode 100644 milena/sandbox/vigouroux/yiq/rgb_to_yiq.hh delete mode 100644 milena/sandbox/vigouroux/yiq/test.cc delete mode 100644 milena/sandbox/vigouroux/yiq/testfun.cc delete mode 100644 milena/sandbox/vigouroux/yuv/get_blue.hh delete mode 100644 milena/sandbox/vigouroux/yuv/get_green.hh delete mode 100644 milena/sandbox/vigouroux/yuv/get_red.hh delete mode 100644 milena/sandbox/vigouroux/yuv/my_yuv.hh delete mode 100644 milena/sandbox/vigouroux/yuv/rgb_to_yuv.hh delete mode 100644 milena/sandbox/vigouroux/yuv/test.cc delete mode 100644 milena/sandbox/vigouroux/yuv/testfun.cc delete mode 100644 milena/tests/convert/to_hsl.cc delete mode 100644 milena/tests/extract/blue.cc delete mode 100644 milena/tests/extract/green.cc delete mode 100644 milena/tests/extract/hue.cc delete mode 100644 milena/tests/extract/lum.cc delete mode 100644 milena/tests/extract/red.cc delete mode 100644 milena/tests/extract/sat.cc delete mode 100644 milena/tests/fun/v2v/component.cc delete mode 100644 milena/tests/linear/gaussian/filter.cc delete mode 100644 milena/tests/registration/registration.cc delete mode 100644 milena/tests/value/stack.cc delete mode 100644 milena/vcs/milena.rb create mode 100644 scribo/common.mk create mode 100644 scribo/demo/viewer/BUGS create mode 100644 scribo/demo/viewer/GScribo.pro create mode 100644 scribo/demo/viewer/GScribo.pro.user create mode 100644 scribo/demo/viewer/GScribo.pro.user.1.3 create mode 100644 scribo/demo/viewer/PagesWidget/pagesdelegate.cc create mode 100644 scribo/demo/viewer/PagesWidget/pagesdelegate.hh create mode 100644 scribo/demo/viewer/PagesWidget/pagesmodel.cc create mode 100644 scribo/demo/viewer/PagesWidget/pagesmodel.hh create mode 100644 scribo/demo/viewer/PagesWidget/pageswidget.cc create mode 100644 scribo/demo/viewer/PagesWidget/pageswidget.hh create mode 100644 scribo/demo/viewer/Preferences/generaloptions.cc create mode 100644 scribo/demo/viewer/Preferences/generaloptions.hh create mode 100644 scribo/demo/viewer/Preferences/generaloptions.ui create mode 100644 scribo/demo/viewer/Preferences/ocroptions.cc create mode 100644 scribo/demo/viewer/Preferences/ocroptions.hh create mode 100644 scribo/demo/viewer/Preferences/ocroptions.ui create mode 100644 scribo/demo/viewer/Preferences/optionwidget.hh create mode 100644 scribo/demo/viewer/Preferences/preferencesdialog.cc create mode 100644 scribo/demo/viewer/Preferences/preferencesdialog.hh create mode 100644 scribo/demo/viewer/Preferences/preferencesdialog.ui create mode 100644 scribo/demo/viewer/Preferences/preprocessingoptions.cc create mode 100644 scribo/demo/viewer/Preferences/preprocessingoptions.hh create mode 100644 scribo/demo/viewer/Preferences/preprocessingoptions.ui create mode 100644 scribo/demo/viewer/Preferences/segmentationoptions.cc create mode 100644 scribo/demo/viewer/Preferences/segmentationoptions.hh create mode 100644 scribo/demo/viewer/Preferences/segmentationoptions.ui create mode 100644 scribo/demo/viewer/Processing/preprocess.cc create mode 100644 scribo/demo/viewer/Processing/preprocess.hh create mode 100644 scribo/demo/viewer/Processing/process.cc create mode 100644 scribo/demo/viewer/Processing/process.hh create mode 100644 scribo/demo/viewer/Processing/progressdialog.cc create mode 100644 scribo/demo/viewer/Processing/progressdialog.hh create mode 100644 scribo/demo/viewer/Processing/runner.cc create mode 100644 scribo/demo/viewer/Processing/runner.hh delete mode 100644 scribo/demo/viewer/README create mode 100644 scribo/demo/viewer/Rendering/abstractregionitem.hh create mode 100644 scribo/demo/viewer/Rendering/backgroundtexture.hh create mode 100644 scribo/demo/viewer/Rendering/graphicsview.cc create mode 100644 scribo/demo/viewer/Rendering/graphicsview.hh create mode 100644 scribo/demo/viewer/Rendering/regionitem.cc create mode 100644 scribo/demo/viewer/Rendering/regionitem.hh create mode 100644 scribo/demo/viewer/Rendering/rootgraphicsitem.cc create mode 100644 scribo/demo/viewer/Rendering/rootgraphicsitem.hh create mode 100644 scribo/demo/viewer/Rendering/scene.cc create mode 100644 scribo/demo/viewer/Rendering/scene.hh create mode 100644 scribo/demo/viewer/Rendering/selection.cc create mode 100644 scribo/demo/viewer/Rendering/selection.hh create mode 100644 scribo/demo/viewer/TODO create mode 100644 scribo/demo/viewer/XmlWidget/attributesmodel.cc create mode 100644 scribo/demo/viewer/XmlWidget/attributesmodel.hh create mode 100644 scribo/demo/viewer/XmlWidget/selectionproxy.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmlattributes.cc create mode 100644 scribo/demo/viewer/XmlWidget/xmlattributes.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmldelegate.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmlitem.cc create mode 100644 scribo/demo/viewer/XmlWidget/xmlitem.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmlmodel.cc create mode 100644 scribo/demo/viewer/XmlWidget/xmlmodel.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmlview.cc create mode 100644 scribo/demo/viewer/XmlWidget/xmlview.hh create mode 100644 scribo/demo/viewer/XmlWidget/xmlwidget.cc create mode 100644 scribo/demo/viewer/XmlWidget/xmlwidget.hh create mode 100644 scribo/demo/viewer/aboutdialog.cc create mode 100644 scribo/demo/viewer/aboutdialog.hh create mode 100644 scribo/demo/viewer/aboutdialog.ui create mode 100644 scribo/demo/viewer/configs.cc create mode 100644 scribo/demo/viewer/configs.hh create mode 100644 scribo/demo/viewer/dir.hh create mode 100644 scribo/demo/viewer/dockwidget.cc create mode 100644 scribo/demo/viewer/dockwidget.hh create mode 100644 scribo/demo/viewer/mainwindow.cc create mode 100644 scribo/demo/viewer/mainwindow.hh create mode 100644 scribo/demo/viewer/mainwindow.ui delete mode 100644 scribo/demo/viewer/preprocess.cc delete mode 100644 scribo/demo/viewer/preprocess.hh delete mode 100644 scribo/demo/viewer/process.cc delete mode 100644 scribo/demo/viewer/process.hh create mode 100644 scribo/demo/viewer/region.hh create mode 100644 scribo/demo/viewer/regionwidget.cc create mode 100644 scribo/demo/viewer/regionwidget.hh delete mode 100644 scribo/demo/viewer/runner.cc delete mode 100644 scribo/demo/viewer/runner.hh create mode 100644 scribo/demo/viewer/variantpointer.cc create mode 100644 scribo/demo/viewer/variantpointer.hh create mode 100644 scribo/demo/viewer/xml.cc create mode 100644 scribo/demo/viewer/xml.hh delete mode 100644 scribo/nodist-headers delete mode 100644 scribo/sandbox/ChangeLog delete mode 100644 scribo/sandbox/green/ChangeLog delete mode 100644 scribo/sandbox/green/README delete mode 100644 scribo/sandbox/green/README.green delete mode 100644 scribo/sandbox/green/README.img delete mode 100644 scribo/sandbox/green/README.result delete mode 100644 scribo/sandbox/green/bench/clustering/distance/Makefile.am delete mode 100644 scribo/sandbox/green/bench/clustering/distance/distance.cc delete mode 100644 scribo/sandbox/green/demo/annotating/bic/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/bic/bic.cc delete mode 100644 scribo/sandbox/green/demo/annotating/hsv/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/hsv/hsv.cc delete mode 100644 scribo/sandbox/green/demo/annotating/lep/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/lep/lep.cc delete mode 100644 scribo/sandbox/green/demo/annotating/nb_color/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/nb_color/nb_color.cc delete mode 100644 scribo/sandbox/green/demo/annotating/project/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/project/project.cc delete mode 100644 scribo/sandbox/green/demo/annotating/rgb_64/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/rgb_64/rgb_64.cc delete mode 100644 scribo/sandbox/green/demo/annotating/rgb_64_9/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc delete mode 100644 scribo/sandbox/green/demo/annotating/stddev_color/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/stddev_color/stddev_color.cc delete mode 100644 scribo/sandbox/green/demo/annotating/stddev_color_16/Makefile.am delete mode 100644 scribo/sandbox/green/demo/annotating/stddev_color_16/stddev_color_16.cc delete mode 100644 scribo/sandbox/green/demo/clustering/kmean1d/Makefile.am delete mode 100644 scribo/sandbox/green/demo/clustering/kmean1d/kmean1d.cc delete mode 100644 scribo/sandbox/green/demo/clustering/kmean2d/Makefile.am delete mode 100644 scribo/sandbox/green/demo/clustering/kmean2d/kmean2d.cc delete mode 100644 scribo/sandbox/green/demo/clustering/kmean3d/Makefile.am delete mode 100644 scribo/sandbox/green/demo/clustering/kmean3d/kmean3d.cc delete mode 100644 scribo/sandbox/green/demo/clustering/kmean_rgb/Makefile.am delete mode 100644 scribo/sandbox/green/demo/clustering/kmean_rgb/kmean_rgb.cc delete mode 100644 scribo/sandbox/green/demo/labeling/regional_maxima/Makefile.am delete mode 100644 scribo/sandbox/green/demo/labeling/regional_maxima/regional_maxima.cc delete mode 100644 scribo/sandbox/green/demo/labeling/regional_maxima/thresholds.txt delete mode 100644 scribo/sandbox/green/demo/labeling/watershed/Makefile.am delete mode 100755 scribo/sandbox/green/demo/labeling/watershed/gaussian.sh delete mode 100644 scribo/sandbox/green/demo/labeling/watershed/watershed.cc delete mode 100644 scribo/sandbox/green/doc/annotating/class.txt delete mode 100644 scribo/sandbox/green/doc/annotating/syntheseMillet2008.txt delete mode 100644 scribo/sandbox/green/doc/annotating/testMillet2008 delete mode 100644 scribo/sandbox/green/doc/examples/accu_color/accu_color.cc delete mode 100644 scribo/sandbox/green/doc/examples/frac/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/frac/frac.cc delete mode 100644 scribo/sandbox/green/doc/examples/frac/frac.hh delete mode 100644 scribo/sandbox/green/doc/examples/frac/gcd.hh delete mode 100644 scribo/sandbox/green/doc/examples/frac/sign_prod.hh delete mode 100644 scribo/sandbox/green/doc/examples/hello_milena/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/hello_milena/hello_milena.cc delete mode 100644 scribo/sandbox/green/doc/examples/hello_world/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/hello_world/hello_world.cc delete mode 100644 scribo/sandbox/green/doc/examples/hello_world/print.cc delete mode 100644 scribo/sandbox/green/doc/examples/io/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/io/io.cc delete mode 100644 scribo/sandbox/green/doc/examples/learn_milena/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/learn_milena/learn_milena.cc delete mode 100644 scribo/sandbox/green/doc/examples/otsu/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/otsu/otsu.cc delete mode 100644 scribo/sandbox/green/doc/examples/stats/Makefile.am delete mode 100644 scribo/sandbox/green/doc/examples/stats/stats.cc delete mode 100644 scribo/sandbox/green/doc/formulae/formulae.tex delete mode 100644 scribo/sandbox/green/doc/quick_tour/quick_tour.tex delete mode 100644 scribo/sandbox/green/exp/annotating/achromastism/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/achromastism/achromastism.cc delete mode 100644 scribo/sandbox/green/exp/annotating/achromastism/text-color.txt delete mode 100644 scribo/sandbox/green/exp/annotating/achromastism/text-img.txt delete mode 100644 scribo/sandbox/green/exp/annotating/achromastism/text-only.txt delete mode 100644 scribo/sandbox/green/exp/annotating/bench/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/bench/bench.cc delete mode 100644 scribo/sandbox/green/exp/annotating/error/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/error/error.cc delete mode 100644 scribo/sandbox/green/exp/annotating/histo/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/histo/histo.cc delete mode 100644 scribo/sandbox/green/exp/annotating/hsv/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/hsv/hsv.cc delete mode 100644 scribo/sandbox/green/exp/annotating/hue/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/hue/hue.cc delete mode 100644 scribo/sandbox/green/exp/annotating/hue/text-color.txt delete mode 100644 scribo/sandbox/green/exp/annotating/hue/text-img.txt delete mode 100644 scribo/sandbox/green/exp/annotating/hue/text-only.txt delete mode 100644 scribo/sandbox/green/exp/annotating/nb_color/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/nb_color/nb_color.cc delete mode 100644 scribo/sandbox/green/exp/annotating/saturation/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/saturation/saturation.cc delete mode 100644 scribo/sandbox/green/exp/annotating/saturation/text-color.txt delete mode 100644 scribo/sandbox/green/exp/annotating/saturation/text-img.txt delete mode 100644 scribo/sandbox/green/exp/annotating/saturation/text-only.txt delete mode 100644 scribo/sandbox/green/exp/annotating/stddev_color/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/stddev_color/stddev_color.cc delete mode 100644 scribo/sandbox/green/exp/annotating/stddev_color_16/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/stddev_color_16/stddev_color_16.cc delete mode 100644 scribo/sandbox/green/exp/annotating/value/Makefile.am delete mode 100644 scribo/sandbox/green/exp/annotating/value/text-color.txt delete mode 100644 scribo/sandbox/green/exp/annotating/value/text-img.txt delete mode 100644 scribo/sandbox/green/exp/annotating/value/text-only.txt delete mode 100644 scribo/sandbox/green/exp/annotating/value/value.cc delete mode 100644 scribo/sandbox/green/exp/regional_maxima/Makefile.am delete mode 100644 scribo/sandbox/green/exp/regional_maxima/regional_maxima.cc delete mode 100644 scribo/sandbox/green/exp/regional_maxima/thresholds.txt delete mode 100755 scribo/sandbox/green/gaussian.sh delete mode 100755 scribo/sandbox/green/gaussian2d.sh delete mode 100644 scribo/sandbox/green/mln/accu/stat/histo1d.hh delete mode 100644 scribo/sandbox/green/mln/accu/stat/histo2d.hh delete mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh delete mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh delete mode 100644 scribo/sandbox/green/mln/clustering/k_mean.hh delete mode 100644 scribo/sandbox/green/mln/clustering/kmean1d.hh delete mode 100644 scribo/sandbox/green/mln/clustering/kmean2d.hh delete mode 100644 scribo/sandbox/green/mln/clustering/kmean3d.hh delete mode 100644 scribo/sandbox/green/mln/clustering/kmean_rgb.hh delete mode 100644 scribo/sandbox/green/mln/display/display_histo.hh delete mode 100644 scribo/sandbox/green/mln/display/project_histo.hh delete mode 100644 scribo/sandbox/green/mln/fun/p2b/achromatic.hh delete mode 100644 scribo/sandbox/green/mln/fun/p2b/component_equals.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/achromatism.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/int_u16_to_int_u14.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/log.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rg_to_rgb.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh delete mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_value_map.hh delete mode 100644 scribo/sandbox/green/mln/img_path.hh delete mode 100644 scribo/sandbox/green/mln/io/plot/save_image_sh.hh delete mode 100644 scribo/sandbox/green/mln/math/ceil.hh delete mode 100644 scribo/sandbox/green/mln/math/floor.hh delete mode 100644 scribo/sandbox/green/mln/value/hsv.hh delete mode 100644 scribo/sandbox/green/mln/value/rg.hh delete mode 100644 scribo/sandbox/green/ok/mln/accu/histo/histo1d.hh delete mode 100644 scribo/sandbox/green/ok/mln/accu/histo/histo2d.hh delete mode 100644 scribo/sandbox/green/ok/mln/accu/histo/histo3d.hh delete mode 100644 scribo/sandbox/green/ok/mln/img_path.hh delete mode 100755 scribo/sandbox/green/ok/test/accu/histo/gaussian.sh delete mode 100755 scribo/sandbox/green/ok/test/accu/histo/histo1d delete mode 100644 scribo/sandbox/green/ok/test/accu/histo/histo1d.cc delete mode 100644 scribo/sandbox/green/test_labelling.cc delete mode 100644 scribo/sandbox/green/test_labelling_2.cc delete mode 100644 scribo/sandbox/green/test_labelling_3.cc delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/Makefile.am delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/histo1d.cc delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/Makefile.am delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/histo3d_hsl.cc delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/Makefile.am delete mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/histo3d_rgb.cc delete mode 100644 scribo/sandbox/green/tests/clustering/k_mean/Makefile.am delete mode 100644 scribo/sandbox/green/tests/clustering/k_mean/k_mean.cc delete mode 100644 scribo/sandbox/green/tests/clustering/kmean1d/Makefile.am delete mode 100644 scribo/sandbox/green/tests/clustering/kmean1d/kmean1d.cc delete mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/Makefile.am delete mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/save_image_sh.cc delete mode 100644 scribo/sandbox/green/tools/labeling/histo/Makefile.am delete mode 100644 scribo/sandbox/green/tools/labeling/histo/histo.cc delete mode 100644 scribo/sandbox/green/tools/labeling/iz/Makefile.am delete mode 100644 scribo/sandbox/green/tools/labeling/iz/iz.cc delete mode 100644 scribo/sandbox/green/tools/labeling/opening/Makefile.am delete mode 100644 scribo/sandbox/green/tools/labeling/opening/opening.cc delete mode 100644 scribo/sandbox/green/tools/labeling/regmax/Makefile.am delete mode 100644 scribo/sandbox/green/tools/labeling/regmax/regmax.cc delete mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/Makefile.am delete mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc delete mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/Makefile.am delete mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/histo2d.cc delete mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/Makefile.am delete mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc delete mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/Makefile.am delete mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc delete mode 100644 scribo/sandbox/green/use/clustering/k_mean/Makefile.am delete mode 100644 scribo/sandbox/green/use/clustering/k_mean/k_mean.cc delete mode 100644 scribo/sandbox/green/use/clustering/kmean1d/Makefile.am delete mode 100644 scribo/sandbox/green/use/clustering/kmean1d/kmean1d.cc delete mode 100644 scribo/sandbox/green/use/clustering/kmean2d/Makefile.am delete mode 100644 scribo/sandbox/green/use/clustering/kmean2d/kmean2d.cc delete mode 100644 scribo/sandbox/green/use/clustering/kmean3d/Makefile.am delete mode 100644 scribo/sandbox/green/use/clustering/kmean3d/kmean3d.cc delete mode 100644 scribo/sandbox/green/use/clustering/kmean_rgb/Makefile.am delete mode 100644 scribo/sandbox/green/use/clustering/kmean_rgb/kmean_rgb.cc delete mode 100644 scribo/sandbox/green/use/display/display_histo/Makefile.am delete mode 100644 scribo/sandbox/green/use/display/display_histo/display_histo.cc delete mode 100644 scribo/sandbox/green/use/fun/v2v/rg_to_rgb/Makefile.am delete mode 100644 scribo/sandbox/green/use/fun/v2v/rg_to_rgb/rg_to_rgb.cc delete mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/Makefile.am delete mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc delete mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/Makefile.am delete mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc delete mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/Makefile.am delete mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/save_image_sh.cc delete mode 100644 scribo/sandbox/green/use/value/rg/Makefile.am delete mode 100644 scribo/sandbox/green/use/value/rg/rg.cc delete mode 100644 scribo/sandbox/z/white_spaces/hom_sep.cc delete mode 100644 scribo/sandbox/z/white_spaces/white_space_closing.cc delete mode 100644 scribo/sandbox/z/white_spaces/white_spaces.cc delete mode 100644 scribo/vcs/scribo.rb create mode 100644 swilena/int_u24.i delete mode 100644 vcs/oln.rb hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/khalimsky updated: olena-2.0-195-g0bdc290
by git＠lrde.epita.fr 07 Mar '13

07 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 exp/khalimsky has been updated via 0bdc290d0ecc0b5a01e5b94b687ea035811bbcc5 (commit) from 15818fbcdb105f1f7eb01158735bd6a3b1f0be18 (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 ----------------------------------------------------------------- 0bdc290 mln/util/ztree_of_shapes.hh: Add area_2face attribute. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/mln/util/ztree_of_shapes.hh | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch unstable/scribo updated: olena-2.0-316-g3c0fa70
by git＠lrde.epita.fr 07 Mar '13

07 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 unstable/scribo has been updated via 3c0fa701a3b712e2a0a3f0461d1f949f7486ad3f (commit) from 1f8a77c5b18d43c65b56876a53753eed4f0a0435 (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 ----------------------------------------------------------------- 3c0fa70 Remove scribo/sandbox. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 44 + scribo/sandbox/ChangeLog | 303 - scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc | 52 - scribo/sandbox/z/sauvola_ms_rv/img/001.pgm | 7 - scribo/sandbox/z/sauvola_ms_rv/img/001_i.pgm |40532 --------- scribo/sandbox/z/sauvola_ms_rv/img/002.pgm | Bin 148231 -> 0 bytes scribo/sandbox/z/sauvola_ms_rv/img/002_i.pgm | 10 - scribo/sandbox/z/sauvola_ms_rv/img/003.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/003_i.pgm | 2708 - scribo/sandbox/z/sauvola_ms_rv/img/004.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/004_i.pgm | Bin 342355 -> 0 bytes scribo/sandbox/z/sauvola_ms_rv/img/005.pgm | 33 - scribo/sandbox/z/sauvola_ms_rv/img/005_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/006.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/006_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/007.pgm | 371 - scribo/sandbox/z/sauvola_ms_rv/img/007_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/008.pgm | 63 - scribo/sandbox/z/sauvola_ms_rv/img/008_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/009.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/009_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/010.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/010_i.pgm | 217 - scribo/sandbox/z/sauvola_ms_rv/img/011.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/011_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/012.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/012_i.pgm |26538 ------ scribo/sandbox/z/sauvola_ms_rv/img/013.pgm | Bin 31953 -> 0 bytes scribo/sandbox/z/sauvola_ms_rv/img/013_i.pgm | 6 - scribo/sandbox/z/sauvola_ms_rv/img/014.pgm | 13 - scribo/sandbox/z/sauvola_ms_rv/img/014_i.pgm |88533 -------------------- scribo/sandbox/z/sauvola_ms_rv/img/015.pgm | 19 - scribo/sandbox/z/sauvola_ms_rv/mp00082c_crop.pgm | Bin 2221782 -> 0 bytes scribo/sandbox/z/sauvola_ms_rv/pbm_color_diff.cc | 63 - scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc | 60 - scribo/sandbox/z/sauvola_ms_rv/pgm_local_mean.cc | 29 - .../z/sauvola_ms_rv/ppm_influence_zone_geodesic.cc | 24 - scribo/sandbox/z/sauvola_ms_rv/skewness.cc | 128 - .../sauvola_ms_rv/skewness/integral_browsing_rv.hh | 427 - .../sandbox/z/sauvola_ms_rv/skewness/skewness2.cc | 241 - 40 files changed, 44 insertions(+), 160455 deletions(-) delete mode 100644 scribo/sandbox/ChangeLog delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/dump_color_sign.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/001.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/001_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/002.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/002_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/003.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/003_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/004.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/004_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/005.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/005_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/006.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/006_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/007.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/007_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/008.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/008_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/009.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/009_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/010.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/010_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/011.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/011_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/012.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/012_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/013.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/013_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/014.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/014_i.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/img/015.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/mp00082c_crop.pgm delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/pbm_color_diff.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/pgm_color_diff.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/pgm_local_mean.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/ppm_influence_zone_geodesic.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/skewness.cc delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/skewness/integral_browsing_rv.hh delete mode 100644 scribo/sandbox/z/sauvola_ms_rv/skewness/skewness2.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0