This is a merge commit message of the following branches: Merge: b252515 ea3a438 Conflicts: milena/ChangeLog ChangeLog | 125 ++++++- GScribo/BUGS | 1 - GScribo/GScribo.pro | 83 ---- GScribo/GScribo.pro.user | 405 -------------------- GScribo/GScribo.pro.user.1.3 | 283 -------------- GScribo/PagesWidget/pagesdelegate.cpp | 20 - GScribo/PagesWidget/pagesdelegate.h | 18 - GScribo/PagesWidget/pagesmodel.cpp | 55 --- GScribo/PagesWidget/pagesmodel.h | 43 --- GScribo/PagesWidget/pageswidget.cpp | 49 --- GScribo/PagesWidget/pageswidget.h | 55 --- GScribo/Preferences/generaloptions.cpp | 44 --- GScribo/Preferences/generaloptions.h | 34 -- GScribo/Preferences/generaloptions.ui | 100 ----- GScribo/Preferences/ocroptions.cpp | 53 --- GScribo/Preferences/ocroptions.h | 33 -- GScribo/Preferences/ocroptions.ui | 62 --- GScribo/Preferences/optionwidget.h | 15 - GScribo/Preferences/preferencesdialog.cpp | 98 ----- GScribo/Preferences/preferencesdialog.h | 42 -- GScribo/Preferences/preferencesdialog.ui | 121 ------ GScribo/Preferences/preprocessingoptions.cpp | 45 --- GScribo/Preferences/preprocessingoptions.h | 32 -- GScribo/Preferences/preprocessingoptions.ui | 76 ---- GScribo/Preferences/segmentationoptions.cpp | 33 -- GScribo/Preferences/segmentationoptions.h | 31 -- GScribo/Preferences/segmentationoptions.ui | 52 --- GScribo/Processing/preprocess.cpp | 11 - GScribo/Processing/preprocess.h | 26 -- GScribo/Processing/process.cpp | 21 - GScribo/Processing/process.h | 29 -- GScribo/Processing/progressdialog.cpp | 16 - GScribo/Processing/progressdialog.h | 22 -- GScribo/Processing/runner.cpp | 183 --------- GScribo/Processing/runner.h | 58 --- GScribo/Rendering/abstractregionitem.h | 13 - GScribo/Rendering/backgroundtexture.h | 12 - GScribo/Rendering/graphicsview.cpp | 150 -------- GScribo/Rendering/graphicsview.h | 43 --- GScribo/Rendering/regionitem.cpp | 59 --- GScribo/Rendering/regionitem.h | 80 ---- GScribo/Rendering/rootgraphicsitem.h | 30 -- GScribo/Rendering/scene.cpp | 273 -------------- GScribo/Rendering/scene.h | 118 ------ GScribo/Rendering/selection.cpp | 36 -- GScribo/Rendering/selection.h | 20 - GScribo/TODO | 100 ----- GScribo/XmlWidget/attributesmodel.cpp | 69 ---- GScribo/XmlWidget/attributesmodel.h | 48 --- GScribo/XmlWidget/selectionproxy.h | 47 --- GScribo/XmlWidget/xmlattributes.cpp | 23 -- GScribo/XmlWidget/xmlattributes.h | 33 -- GScribo/XmlWidget/xmldelegate.h | 30 -- GScribo/XmlWidget/xmlitem.cpp | 43 --- GScribo/XmlWidget/xmlitem.h | 90 ----- GScribo/XmlWidget/xmlmodel.cpp | 87 ----- GScribo/XmlWidget/xmlmodel.h | 44 --- GScribo/XmlWidget/xmlview.cpp | 88 ----- GScribo/XmlWidget/xmlview.h | 79 ---- GScribo/XmlWidget/xmlwidget.cpp | 34 -- GScribo/XmlWidget/xmlwidget.h | 54 --- GScribo/aboutdialog.h | 25 -- GScribo/aboutdialog.ui | 136 ------- GScribo/configs.h | 134 ------- GScribo/dir.h | 7 - GScribo/dockwidget.h | 22 -- GScribo/main.cpp | 23 -- GScribo/mainwindow.cpp | 415 --------------------- GScribo/mainwindow.h | 120 ------ GScribo/mainwindow.ui | 35 -- GScribo/region.h | 56 --- GScribo/regionwidget.cpp | 70 ---- GScribo/regionwidget.h | 40 -- GScribo/variantpointer.h | 19 - GScribo/xml.cpp | 206 ---------- GScribo/xml.h | 93 ----- Makefile.am | 28 +- configure.ac | 14 +- distrib/macports/Portfile.in | 4 +- doc/Makefile.am | 4 +- milena/ChangeLog | 252 +++++++++++++ milena/apps/mesh-segm-skel/Makefile.am | 2 +- milena/doc/Doxyfile.in | 31 +- milena/doc/Makefile.am | 9 +- milena/doc/examples/multi_files_f1.cc.raw | 6 + milena/doc/examples/multi_files_f2.cc.raw | 6 + milena/doc/examples/multi_files_main.cc.raw | 16 + milena/doc/examples/multiple_def.cc.raw | 9 + milena/doc/examples/split/tuto3_rw_image-3.cc.raw | 6 +- milena/doc/examples/split/tuto3_rw_image-4.cc.raw | 2 +- milena/doc/examples/split/tuto3_rw_image-5.cc.raw | 5 +- milena/doc/examples/split/tuto3_rw_image-6.cc.raw | 3 +- milena/doc/examples/split/tuto3_rw_image-7.cc.raw | 2 +- milena/doc/examples/split/tuto3_rw_image-8.cc.raw | 1 + milena/doc/examples/tuto3_rw_image.cc | 6 + milena/doc/examples/typenametemplate.cc.raw | 1 + milena/doc/examples/undef_global_vars.cc.raw | 1 + milena/doc/examples/wrongvaluetype.cc.raw | 2 + milena/doc/mln/convert.dox | 169 ++++++++- milena/doc/mln/geom/geom.dox | 7 + milena/doc/mln/labeling/labeling.dox | 6 + milena/doc/mln/main.dox | 7 + milena/doc/mln/transformation.dox | 41 ++ milena/doc/ref-guide.tex | 69 +++- milena/doc/tutorial.tex | 31 +- milena/mln/algebra/h_mat.hh | 9 +- milena/mln/algebra/quat.hh | 13 +- milena/mln/algebra/vec.hh | 32 ++- milena/mln/binarization/threshold.hh | 2 +- milena/mln/convert/from_to.hh | 40 ++- milena/mln/convert/impl/from_double_to_value.hh | 15 +- milena/mln/convert/impl/from_float_to_value.hh | 20 +- milena/mln/convert/impl/from_unsigned_to_value.hh | 14 +- milena/mln/convert/to.hh | 19 +- milena/mln/convert/to_image.hh | 28 ++- milena/mln/convert/to_p_array.hh | 21 +- milena/mln/convert/to_p_set.hh | 35 ++- milena/mln/convert/to_qimage.hh | 18 +- milena/mln/convert/to_qimage_nocopy.hh | 24 ++- milena/mln/convert/to_upper_window.hh | 14 +- milena/mln/convert/to_window.hh | 23 +- milena/mln/core/alias/neighb2d.hh | 10 +- milena/mln/core/alias/neighb3d.hh | 5 +- milena/mln/core/alias/window1d.hh | 9 +- milena/mln/core/alias/window2d.hh | 12 +- milena/mln/core/alias/window3d.hh | 5 +- milena/mln/core/concept/function.hh | 160 ++++++-- milena/mln/core/concept/gpoint.hh | 10 +- milena/mln/core/image/#image2d# | 1 + milena/mln/core/image/image1d.hh | 280 +++++++------- milena/mln/core/image/image2d.hh | 292 ++++++++-------- milena/mln/core/image/image3d.hh | 292 ++++++++-------- milena/mln/core/mixed_neighb.hh | 12 +- milena/mln/core/neighb.hh | 12 +- milena/mln/core/w_window.hh | 12 +- milena/mln/data/convert.hh | 38 ++- milena/mln/fun/i2v/array.hh | 17 +- milena/mln/fun/v2v/convert.hh | 16 +- milena/mln/fun/v2v/hsl_to_rgb.hh | 13 +- milena/mln/fun/v2v/qt_rgb_to_int_u.hh | 8 +- milena/mln/fun/v2v/rgb8_to_rgbn.hh | 31 +- milena/mln/fun/v2v/rgb_to_hsl.hh | 27 ++- milena/mln/fun/v2v/rgb_to_int_u.hh | 20 +- milena/mln/fun/v2v/rgb_to_luma.hh | 18 +- milena/mln/geom/crop.hh | 6 +- milena/mln/geom/crop_without_localization.hh | 6 +- milena/mln/geom/horizontal_symmetry.hh | 6 +- milena/mln/geom/rotate.hh | 10 +- milena/mln/geom/translate.hh | 12 +- milena/mln/geom/vertical_symmetry.hh | 6 +- milena/mln/histo/array.hh | 11 +- milena/mln/labeling/background.hh | 4 +- milena/mln/labeling/colorize.hh | 42 ++- milena/mln/labeling/compute.hh | 100 +++--- milena/mln/labeling/compute_image.hh | 74 ++-- milena/mln/labeling/flat_zones.hh | 18 +- milena/mln/labeling/foreground.hh | 8 +- milena/mln/labeling/mean_values.hh | 11 +- milena/mln/labeling/n_max.hh | 77 ++-- milena/mln/labeling/pack.hh | 34 ++- milena/mln/labeling/regional_maxima.hh | 19 +- milena/mln/labeling/regional_minima.hh | 19 +- milena/mln/labeling/relabel.hh | 71 ++-- milena/mln/labeling/superpose.hh | 5 +- milena/mln/labeling/value.hh | 24 +- milena/mln/labeling/value_and_compute.hh | 22 +- milena/mln/labeling/wrap.hh | 35 +- milena/mln/registration/icp.hh | 3 + milena/mln/subsampling/antialiased.hh | 12 +- milena/mln/topo/complex.hh | 44 ++-- milena/mln/trait/ch_value.hh | 66 ++++- milena/mln/trait/concrete.hh | 65 +++- milena/mln/upscaling/art/scale2x.hh | 6 +- milena/mln/upscaling/art/scale3x.hh | 6 +- milena/mln/util/array.hh | 23 +- milena/mln/util/object_id.hh | 5 +- milena/mln/value/hsl.hh | 40 ++- milena/mln/value/int_u.hh | 30 ++- milena/mln/value/label.hh | 25 +- milena/mln/value/qt/rgb32.hh | 10 +- milena/mln/value/rgb.hh | 20 +- milena/mln/win/rectangle2d.hh | 13 +- milena/tests/labeling/n_max.cc | 5 +- milena/tests/unit_test/unit-tests.mk | 2 + scribo/ChangeLog | 67 ++++ scribo/doc/Doxyfile.in | 16 +- scribo/doc/Makefile.am | 2 +- scribo/doc/scribo/core/component_set.dox | 90 ----- scribo/scribo/core/component_set.hh | 102 +++++- scribo/scribo/core/line_set.hh | 4 +- scribo/scribo/core/object_links.hh | 53 +++- scribo/scribo/debug/logger.hh | 2 +- scribo/scribo/util/component_precise_outline.hh | 9 +- scribo/src/primitive/extract/lines_pattern.cc | 2 +- swilena/ChangeLog | 280 ++++++++++++++ swilena/Makefile.am | 11 +- swilena/box.ixx | 2 +- swilena/box2d.i | 7 +- swilena/box_piter.ixx | 3 +- swilena/complex.ixx | 330 ++++++++++++++++ swilena/complex2.i | 111 ++++++ swilena/concat.ixx | 4 +- swilena/image2d.ixx | 30 ++- swilena/image2d_int.i | 5 +- swilena/image2d_int_u8.i | 4 +- swilena/image2d_point2d.i | 53 +++ swilena/image2d_rgb8.i | 63 +++ swilena/int_u.ixx | 24 +- swilena/morpho.ixx | 23 ++- swilena/ppm.ixx | 57 +++ swilena/python-utils.ixx | 3 +- swilena/python/Makefile.am | 192 +++++++++- swilena/python/complex2-misc.py | 99 +++++ swilena/python/data.py | 26 -- swilena/python/data.py.in | 26 ++ swilena/python/installcheck.mk | 116 ++++++ swilena/python/ltihooks.py | 60 --- swilena/python/max-tree.py | 57 +++ swilena/python/morpho-segm.py | 2 +- swilena/python/sps-gdb-local.in | 6 + swilena/python/sps-local.in | 2 +- swilena/python/swilena.py | 10 +- swilena/rgb.ixx | 159 ++++++++ swilena/rgb8.i | 40 ++ swilena/run.in | 50 ++-- 225 files changed, 4377 insertions(+), 6665 deletions(-) diff --cc milena/ChangeLog index 2f20d83,4b7d2c5..1d8ef7c --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,51 -1,232 +1,280 @@@ 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + * mln/core/concept/function.hh: Document function interface for + each concept. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: Fix compilation issues. + +2013-04-18 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: Enable fastest access. + +2013-04-18 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: New image type for ffmpeg frames. + +2013-04-18 Guillaume Lazzara <z@lrde.epita.fr> + + Add support for graylevel images in labeling::blobs. + + * mln/canvas/labeling/blobs.hh: Add a fastest version and make it + support graylevel images. + + * mln/labeling/blobs.hh, + * mln/labeling/blobs_and_compute.hh: Add support for graylevel images. + + * tests/labeling/blobs.cc, + * tests/labeling/blobs_and_compute.cc: Add a test for graylevel images. + + * tests/labeling/Makefile.am: Remove all_blobs target. + + * mln/labeling/all_blobs.hh, + * tests/labeling/all_blobs.cc: Remove. + +2013-04-18 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/core/internal/pixel_impl.hh: Add change_offset(). + +2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + Add a labeling routine working on grayscale images. + + * mln/canvas/labeling/blobs.hh, + * mln/labeling/blobs.hh, + * mln/labeling/blobs_and_compute.hh: Introduce a new functor + method handles(). + + * tests/labeling/Makefile.am: Add target. + + * mln/labeling/all_blobs.hh, + * tests/labeling/all_blobs.cc: New. + ++2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> ++ + Kill Doxygen warnings. + + * mln/data/convert.hh: Add a missing \overload. + + * mln/value/qt/rgb32.hh: Do not force autolink. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Specify conversion formulas for rgb to integer conversion + functions. + + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/fun/v2v/rgb_to_luma.hh: Here. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Create sub-modules in image geometry module. + + * doc/mln/geom/geom.dox: Add cropping sub-module. + + * doc/mln/transformation.dox: Add new sub-modules. + + * mln/binarization/threshold.hh: Move to conversion module. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh, + * mln/geom/horizontal_symmetry.hh, + * mln/geom/rotate.hh, + * mln/geom/translate.hh, + * mln/geom/vertical_symmetry.hh, + * mln/registration/icp.hh, + * mln/subsampling/antialiased.hh, + * mln/upscaling/art/scale2x.hh, + * mln/upscaling/art/scale3x.hh: Move to newly created sub-modules. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + * doc/mln/convert.dox: Fix typos. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Add documentation about image conversions. + + * doc/mln/convert.dox: Add examples and explanations. + + * mln/convert/from_to.hh, + * mln/convert/to.hh, + * mln/convert/to_image.hh, + * mln/convert/to_p_array.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_qimage.hh, + * mln/convert/to_qimage_nocopy.hh, + * mln/convert/to_upper_window.hh, + * mln/convert/to_window.hh, + * mln/data/convert.hh, + * mln/fun/v2v/convert.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/fun/v2v/qt_rgb_to_int_u.hh, + * mln/fun/v2v/rgb8_to_rgbn.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/fun/v2v/rgb_to_luma.hh: Add to conversion module. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/data/convert.hh: Introduce a new overload taking a + conversion function as parameter. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Add references to from_to_ overloads in documentation. + + * mln/algebra/h_mat.hh, + * mln/algebra/quat.hh, + * mln/algebra/vec.hh, + * mln/convert/from_to.hh, + * mln/convert/impl/from_double_to_value.hh, + * mln/convert/impl/from_float_to_value.hh, + * mln/convert/impl/from_unsigned_to_value.hh, + * mln/core/alias/neighb2d.hh, + * mln/core/alias/neighb3d.hh, + * mln/core/alias/window1d.hh, + * mln/core/alias/window2d.hh, + * mln/core/alias/window3d.hh, + * mln/core/concept/gpoint.hh, + * mln/core/image/#image2d#, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/mixed_neighb.hh, + * mln/core/neighb.hh, + * mln/core/w_window.hh, + * mln/fun/i2v/array.hh, + * mln/histo/array.hh, + * mln/util/array.hh, + * mln/util/object_id.hh, + * mln/value/hsl.hh, + * mln/value/int_u.hh, + * mln/value/label.hh, + * mln/value/qt/rgb32.hh, + * mln/value/rgb.hh: Add to from_to_ group. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Explain how to iterate over an image in tutorial. + + * doc/examples/split/tuto3_rw_image-3.cc.raw, + * doc/examples/split/tuto3_rw_image-4.cc.raw, + * doc/examples/split/tuto3_rw_image-5.cc.raw, + * doc/examples/split/tuto3_rw_image-6.cc.raw, + * doc/examples/split/tuto3_rw_image-7.cc.raw, + * doc/examples/split/tuto3_rw_image-8.cc.raw: Regen. + + * doc/examples/tuto3_rw_image.cc: Add an example with iterators. + + * doc/tutorial.tex: Add more explanations on iterators. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Introduce image transformation module in documentation. + + * doc/mln/main.dox: Create new group. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh, + * mln/geom/horizontal_symmetry.hh, + * mln/geom/rotate.hh, + * mln/geom/translate.hh, + * mln/geom/vertical_symmetry.hh, + * mln/registration/icp.hh, + * mln/subsampling/antialiased.hh, + * mln/upscaling/art/scale2x.hh, + * mln/upscaling/art/scale3x.hh: move to this new group. + + 2013-04-19 Guillaume Lazzara <z@lrde.epita.fr> + + Make template parameter name more consistant with naming + conventions. + + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh: Here. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + * doc/mln/convert.dox: Fix from_to_ module name. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + Move internal code to namespace internal. + + * mln/labeling/n_max.hh: Move internal function to namespace + internal. + + * tests/labeling/n_max.cc: Update function namespaces. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/win/rectangle2d.hh: Hide internal API. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + Add labeling module in documentation. + + * doc/mln/labeling/labeling.dox: New. Introduce labeling module. + + * mln/labeling/background.hh, + * mln/labeling/colorize.hh, + * mln/labeling/compute.hh, + * mln/labeling/compute_image.hh, + * mln/labeling/flat_zones.hh, + * mln/labeling/foreground.hh, + * mln/labeling/mean_values.hh, + * mln/labeling/pack.hh, + * mln/labeling/regional_maxima.hh, + * mln/labeling/regional_minima.hh, + * mln/labeling/relabel.hh, + * mln/labeling/superpose.hh, + * mln/labeling/value.hh, + * mln/labeling/value_and_compute.hh, + * mln/labeling/wrap.hh: Set documentation as part of the labeling + group. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + Add documentation for mln_concrete and mln_ch_value. + + * mln/trait/ch_value.hh, + * mln/trait/concrete.hh: Here. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + Add explanations on compilation with multiple files. + + * doc/examples/multi_files_f1.cc.raw, + * doc/examples/multi_files_f2.cc.raw, + * doc/examples/multi_files_main.cc.raw, + * doc/examples/multiple_def.cc.raw, + * doc/examples/typenametemplate.cc.raw, + * doc/examples/undef_global_vars.cc.raw, + * doc/examples/wrongvaluetype.cc.raw: New. + + * doc/ref-guide.tex: Add a new section. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + * doc/Doxyfile.in: Expand more macros. + + 2013-04-17 Guillaume Lazzara <z@lrde.epita.fr> + + * doc/Doxyfile.in: Exclude internal symbols. + + 2013-04-16 Roland Levillain <roland@lrde.epita.fr> + + * tests/unit_test/unit-tests.mk: Regen. + + 2013-04-16 Roland Levillain <roland@lrde.epita.fr> + + Fix build issues in Milena's documentation. + + * doc/Makefile.am ($(srcdir)/img/small.png): New rule. + 2013-04-12 Guillaume Lazzara <z@lrde.epita.fr> * doc/Makefile.am: Remove duplicate '/' in path. hooks/post-receive -- Olena, a generic and efficient image processing platform