* apps/statues/mesh-complex-max-curv-segm.cc, * apps/statues/mesh-complex-max-curv.cc, * apps/statues/mesh-complex-segm.cc, * apps/statues/trimesh/misc.hh: Adjust to the new interface of mln::morpho::closing_area and the renaming of mln::level as mln::data. * apps/statues/Makefile.am: Adjust comments. --- milena/ChangeLog | 12 ++++++++++++ milena/apps/statues/Makefile.am | 6 +++++- milena/apps/statues/mesh-complex-max-curv-segm.cc | 7 +++---- milena/apps/statues/mesh-complex-max-curv.cc | 8 ++++---- milena/apps/statues/mesh-complex-segm.cc | 5 ++--- milena/apps/statues/trimesh/misc.hh | 10 ++++++---- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a33b571..7ffa783 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2009-02-11 Roland Levillain <roland@lrde.epita.fr> + Update apps/statues/ to catch up with recent changes of interface. + + * apps/statues/mesh-complex-max-curv-segm.cc, + * apps/statues/mesh-complex-max-curv.cc, + * apps/statues/mesh-complex-segm.cc, + * apps/statues/trimesh/misc.hh: + Adjust to the new interface of mln::morpho::closing_area and the + renaming of mln::level as mln::data. + * apps/statues/Makefile.am: Adjust comments. + +2009-02-11 Roland Levillain <roland@lrde.epita.fr> + Add a shortcut for planar 1-complex-based images. * mln/core/alias/complex_image.hh (mln::int_u8_1complex_image2d): diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index b0225c8..e132895 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -68,12 +68,16 @@ TESTS += test-mesh-max-curv noinst_HEADERS = trimesh/misc.hh EXTRA_DIST = trimesh/README -# A small test exercising the curvature computation routines ported +# A small program exercising the curvature computation routines ported # from Trimesh to Milena. bin_PROGRAMS += mesh-complex-max-curv mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv +# FIXME: Write a program showing the local minima (and maxima) of +# scalar-valued complex-based mesh (to see the curvature extrema). +# ... + # Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc diff --git a/milena/apps/statues/mesh-complex-max-curv-segm.cc b/milena/apps/statues/mesh-complex-max-curv-segm.cc index 8a0537e..e52d990 100644 --- a/milena/apps/statues/mesh-complex-max-curv-segm.cc +++ b/milena/apps/statues/mesh-complex-max-curv-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -131,8 +131,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input(input.domain()); - mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); /*------. | WST. | @@ -168,7 +167,7 @@ int main(int argc, char* argv[]) `---------*/ mln::rgb8_2complex_image3df output(wshed.domain()); - mln::level::fill(output, mln::literal::white); + mln::data::fill(output, mln::literal::white); // FIXME: Use a colorize functor instead. // Choose random colors for each basin number. diff --git a/milena/apps/statues/mesh-complex-max-curv.cc b/milena/apps/statues/mesh-complex-max-curv.cc index 0a75da5..5c93d7d 100644 --- a/milena/apps/statues/mesh-complex-max-curv.cc +++ b/milena/apps/statues/mesh-complex-max-curv.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -42,7 +42,7 @@ #include <mln/morpho/closing_area.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/literal/zero.hh> #include <mln/math/max.hh> @@ -103,7 +103,7 @@ int main(int argc, char* argv[]) // Compute the max curvature at each vertex. ima_t max_curv(input.domain()); - mln::level::fill(max_curv, mln::literal::zero); + mln::data::fill(max_curv, mln::literal::zero); mln::p_n_faces_fwd_piter<D, G> v(max_curv.domain(), 0); for_all(v) max_curv(v) = mln::math::max(mln::math::sqr(curv.first(v)), @@ -141,7 +141,7 @@ int main(int argc, char* argv[]) the only values accepted a an RGB floating-point component in the OFF file format. */ ima_t output(max_curv.domain()); - mln::level::fill(output, mln::literal::zero); + mln::data::fill(output, mln::literal::zero); std::pair<float, float> min_max(acc); // FIXME: Taken from mln/level/stretch.hh (this should be factored). float min = min_max.first; diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc index 80f87a1..b67d7f6 100644 --- a/milena/apps/statues/mesh-complex-segm.cc +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -106,8 +106,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input(input.domain()); - mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/trimesh/misc.hh b/milena/apps/statues/trimesh/misc.hh index 78af913..a9f0fce 100644 --- a/milena/apps/statues/trimesh/misc.hh +++ b/milena/apps/statues/trimesh/misc.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -39,6 +39,8 @@ # include <mln/norm/l2.hh> +# include <mln/data/fill.hh> + /** See http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Other-Builtins.html for a definition of __builtin_expect. @@ -166,7 +168,7 @@ namespace mln typedef complex_image< D, G, vec3f > normal_t; normal_t normal(mesh); - level::fill(normal, literal::zero); + data::fill(normal, literal::zero); mln::p_n_faces_fwd_piter<D, G> f(mesh, 2); // A neighborhood where neighbors are the set of 0-faces @@ -263,8 +265,8 @@ namespace mln output_t output(mesh, mesh); corner_area_t& corner_area = output.first; point_area_t& point_area = output.second; - level::fill(corner_area, literal::zero); - level::fill(point_area, literal::zero); + data::fill(corner_area, literal::zero); + data::fill(point_area, literal::zero); mln::p_n_faces_fwd_piter<D, G> f(mesh, 2); // A neighborhood where neighbors are the set of 0-faces -- 1.6.1.2