- Olena-patches

3461: Print dimension in op<<(win::ball).
by Thierry Geraud 03 Mar '09

03 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Print dimension in op<<(win::ball). * mln/win/ball.hh (print_): Print dimension. * tests/win/ball.cc: Inactivate echo. mln/win/ball.hh | 2 +- tests/win/ball.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) Index: mln/win/ball.hh --- mln/win/ball.hh (revision 3460) +++ mln/win/ball.hh (working copy) @@ -136,7 +136,7 @@ void ball<G,C>::print_(std::ostream& ostr) const { - ostr << "[ball: diameter=" << diameter_ << ']'; + ostr << "[" << G::dim << "D ball: diameter=" << diameter_ << ']'; } # endif // ! MLN_INCLUDE_ONLY Index: tests/win/ball.cc --- tests/win/ball.cc (revision 3460) +++ tests/win/ball.cc (working copy) @@ -30,6 +30,7 @@ /// Tests on mln::win::ball. #include <mln/win/ball.hh> + #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> @@ -41,8 +42,11 @@ win::ball<grid::square, def::coord> b(7); mln_assertion(b.delta() == 3); mln_assertion(b.size() == 29); + mln_assertion(b.diameter() == 7); + + // std::cout << b << std::endl; - debug::println(convert::to_image(b)); + // debug::println(convert::to_image(b)); // - - - | - - - // - | | | | | - // - | | | | | -

1 0

3460: Rename win::ball3d into win::sphere3d.
by Thierry Geraud 02 Mar '09

02 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename win::ball3d into win::sphere3d. * fabien/igr/seg_vol_irm.cc, * theo/exec/closing_isotropic.cc: Update. fabien/igr/seg_vol_irm.cc | 4 ++-- theo/exec/closing_isotropic.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: fabien/igr/seg_vol_irm.cc --- fabien/igr/seg_vol_irm.cc (revision 3459) +++ fabien/igr/seg_vol_irm.cc (working copy) @@ -86,7 +86,7 @@ #include <mln/morpho/erosion.hh> #include <mln/win/disk2d.hh> -#include <mln/win/ball3d.hh> +#include <mln/win/sphere3d.hh> #include <mln/math/diff_abs.hh> @@ -137,7 +137,7 @@ I close_threshold(const Image& input, metal::int_<3>) { - return morpho::erosion(morpho::dilation(input, win::ball3d(5)), win::ball3d(7)); + return morpho::erosion(morpho::dilation(input, win::sphere3d(5)), win::sphere3d(7)); } Index: theo/exec/closing_isotropic.cc --- theo/exec/closing_isotropic.cc (revision 3459) +++ theo/exec/closing_isotropic.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/morpho/closing.hh> #include <mln/win/disk2d.hh> -#include <mln/win/ball3d.hh> +#include <mln/win/sphere3d.hh> @@ -50,7 +50,7 @@ { image3d<bool> ima, out; io::dump::load(ima, argv[1]); - out = morpho::closing(ima, win::ball3d(2 * r + 1)); + out = morpho::closing(ima, win::sphere3d(2 * r + 1)); io::dump::save(out, argv[3]); } break;

1 0

3459: Have win::disk2d and win::sphere3d (new) rely on win::ball.
by Thierry Geraud 02 Mar '09

02 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Have win::disk2d and win::sphere3d (new) rely on win::ball. * mln/win/ball.hh: New. (diameter): New method; replace both... (disk2d::length): ...this and... (ball3d::length): ...this. * mln/win/ball3d.hh: Rename as... * mln/win/sphere3d.hh: ...this. (ball3d): Remove; replace by... (sphere3d): ...this new typedef. * mln/win/disk2d.hh (disk2d): Remove; replace by... (disk2d): ...this new typedef. * mln/win/all.hh (Copyright): Fix. (include): Update. * tests/win/ball.cc: New. * tests/win/sphere3d.cc: New. * tests/win/disk2d.cc: Remove echo. * tests/win/Makefile.am: Update. mln/win/all.hh | 5 + mln/win/ball.hh | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ mln/win/disk2d.hh | 78 ++------------------------ mln/win/sphere3d.hh | 86 +++------------------------- tests/win/Makefile.am | 4 + tests/win/ball.cc | 53 +++++++++++++++++ tests/win/disk2d.cc | 9 --- tests/win/sphere3d.cc | 42 ++++++++++++++ 8 files changed, 271 insertions(+), 156 deletions(-) Index: mln/win/all.hh --- mln/win/all.hh (revision 3458) +++ mln/win/all.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA, 2009 Research and Development +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Olena Library. This library is free @@ -46,7 +46,7 @@ // Types. # include <mln/win/backdiag2d.hh> -# include <mln/win/ball3d.hh> +# include <mln/win/ball.hh> # include <mln/win/cube3d.hh> # include <mln/win/cuboid3d.hh> # include <mln/win/diag2d.hh> @@ -58,6 +58,7 @@ # include <mln/win/octagon2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/segment1d.hh> +# include <mln/win/sphere3d.hh> # include <mln/win/vline2d.hh> // Routines. Index: mln/win/ball.hh --- mln/win/ball.hh (revision 0) +++ mln/win/ball.hh (revision 0) @@ -0,0 +1,150 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_WIN_BALL_HH +# define MLN_WIN_BALL_HH + +/// \file mln/win/ball.hh +/// +/// Definition of the mln::win::ball window. + +# include <mln/core/internal/classical_window_base.hh> +# include <mln/core/dpoint.hh> +# include <mln/core/site_set/box.hh> +# include <mln/fun/i2v/all_to.hh> + + +namespace mln +{ + + // Forward declaration. + namespace win { template <typename G, typename C> struct ball; } + + + namespace trait + { + + template <typename G, typename C> + struct window_< mln::win::ball<G,C> > : classical_window_ + { + }; + + } // end of namespace trait + + + + namespace win + { + + /*! \brief Generic ball window defined on a given grid. + * + * A ball is centered and symmetric; so its diameter is odd. + * + * G is the given grid on which the ball is defined and C is the + * type of coordinates. + */ + template <typename G, typename C> + struct ball : public internal::classical_window_base< dpoint<G,C>, ball<G,C> > + { + + /// Constructor. + /// \param[in] diameter Diameter of the ball. + /// \pre \p diameter is odd. + ball(unsigned diameter); + + /// Give the ball diameter. + unsigned diameter() const; + + /// Give the maximum coordinate gap between the window + /// center and a window point. + unsigned delta_() const; + + void print_(std::ostream& ostr) const; + + protected: + unsigned diameter_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename G, typename C> + inline + ball<G,C>::ball(unsigned diameter) + : diameter_(diameter) + { + mln_precondition(diameter % 2 == 1); + int + radius = diameter / 2, + sqr_radius = radius * radius; + typedef point<G,C> P; + box b(all_to(-radius), all_to(+radius)); + P O = literal::origin; + mln_piter(box) p(b); + for_all(p) + { + unsigned d = 0; + for (unsigned i = 0; i < P::dim; ++i) + d += p[i] * p[i]; + if (d <= sqr_radius) + this->insert(p - O); + } + } + + template <typename G, typename C> + inline + unsigned ball<G,C>::diameter() const + { + return diameter_; + } + + template <typename G, typename C> + inline + unsigned ball<G,C>::delta_() const + { + return diameter_ / 2; + } + + template <typename G, typename C> + inline + void + ball<G,C>::print_(std::ostream& ostr) const + { + ostr << "[ball: diameter=" << diameter_ << ']'; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_WIN_BALL_HH Index: mln/win/sphere3d.hh --- mln/win/sphere3d.hh (revision 3457) +++ mln/win/sphere3d.hh (working copy) @@ -26,94 +26,28 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_WIN_BALL3D_HH -# define MLN_WIN_BALL3D_HH +#ifndef MLN_WIN_SPHERE3D_HH +# define MLN_WIN_SPHERE3D_HH -/// \file mln/win/ball3d.hh +/// \file mln/win/sphere3d.hh /// -/// Definition of the mln::win::ball3d window. +/// Definition of the mln::win::sphere3d window. -# include <mln/core/internal/classical_window_base.hh> +# include <mln/win/ball.hh> # include <mln/core/alias/dpoint3d.hh> namespace mln { - mln_internal_add_classical_window_trait(ball3d); - - namespace win { - /*! \brief Ball (sphere) window defined on the 3D square grid. - * - * A ball3d is centered and symmetric. - * - */ - struct ball3d : public internal::classical_window_base< dpoint3d, ball3d > - { - /*! \brief Constructor. - * - * \param[in] length Length, thus diameter. - * - */ - ball3d(unsigned length); - - /*! \brief Give the disk diameter. - */ - unsigned length() const; - - /*! \brief Give the maximum coordinate gap between the window - * center and a window point. - */ - unsigned delta_() const; - - void print_(std::ostream& ostr) const; - - protected: - unsigned length_; - }; - - - -# ifndef MLN_INCLUDE_ONLY - - inline - ball3d::ball3d(unsigned length) - : length_(length) - { - mln_precondition(length % 2 == 1); - const def::coord - r = static_cast<def::coord>(length / 2), - minus_r = static_cast<def::coord>(-r), - r2 = static_cast<def::coord>(r * r); - for (def::coord a = minus_r; a <= r; ++a) - for (def::coord b = minus_r; b <= r; ++b) - for (def::coord c = minus_r; c <= r; ++c) - if (a * a + b * b + c * c <= r2) - insert(dpoint3d(a, b, c)); - } - - inline - unsigned ball3d::length() const - { - return length_; - } - - inline - unsigned ball3d::delta_() const - { - return length_ / 2; - } - - inline - void ball3d::print_(std::ostream& ostr) const - { - ostr << "[ball3d: length=" << length_ << ']'; - } + /// 3D sphere window; precisely, ball-shaped window defined on the + /// 3D cubic grid. + // + typedef ball<grid::cube, def::coord> sphere3d; -# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::win @@ -121,4 +55,4 @@ -#endif // ! MLN_WIN_BALL3D_HH +#endif // ! MLN_WIN_SPHERE3D_HH Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 3458) +++ mln/win/disk2d.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 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 @@ -33,86 +33,22 @@ /// /// Definition of the mln::win::disk2d window. -# include <mln/core/internal/classical_window_base.hh> +# include <mln/win/ball.hh> # include <mln/core/alias/dpoint2d.hh> namespace mln { - mln_internal_add_classical_window_trait(disk2d); - namespace win { - /*! \brief Disk window defined on the 2D square grid. - * - * A disk2d is centered and symmetric. - * - */ - struct disk2d : public internal::classical_window_base< dpoint2d, disk2d > - { - /*! \brief Constructor. - * - * \param[in] length Length, thus diameter. - * - */ - disk2d(unsigned length); - - /*! \brief Give the disk diameter. - */ - unsigned length() const; - - /*! \brief Give the maximum coordinate gap between the window - * center and a window point. - */ - unsigned delta_() const; - - void print_(std::ostream& ostr) const; - - protected: - unsigned length_; - }; - - - -# ifndef MLN_INCLUDE_ONLY - - inline - disk2d::disk2d(unsigned length) - : length_(length) - { - mln_precondition(length % 2 == 1); - const def::coord - r = static_cast<def::coord>(length / 2), - minus_r = static_cast<def::coord>(-r), - r2 = static_cast<def::coord>(r * r); - for (def::coord a = minus_r; a <= r; ++a) - for (def::coord b = minus_r; b <= r; ++b) - if (a * a + b * b <= r2) - insert(dpoint2d(a, b)); - } - - inline - unsigned disk2d::length() const - { - return length_; - } - - inline - unsigned disk2d::delta_() const - { - return length_ / 2; - } - - inline - void disk2d::print_(std::ostream& ostr) const - { - ostr << "[disk2d: length=" << length_ << ']'; - } + /// 2D disk window; precisely, ball-shaped window defined on the + /// 2D square grid. + // + typedef ball<grid::square, def::coord> disk2d; -# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::win Index: tests/win/ball.cc --- tests/win/ball.cc (revision 0) +++ tests/win/ball.cc (revision 0) @@ -0,0 +1,53 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/// \file tests/win/ball.cc +/// +/// Tests on mln::win::ball. + +#include <mln/win/ball.hh> +#include <mln/convert/to_image.hh> +#include <mln/debug/println.hh> + + +int main() +{ + using namespace mln; + + win::ball<grid::square, def::coord> b(7); + mln_assertion(b.delta() == 3); + mln_assertion(b.size() == 29); + + debug::println(convert::to_image(b)); + // - - - | - - - + // - | | | | | - + // - | | | | | - + // | | | | | | | + // - | | | | | - + // - | | | | | - + // - - - | - - - +} Index: tests/win/sphere3d.cc --- tests/win/sphere3d.cc (revision 0) +++ tests/win/sphere3d.cc (revision 0) @@ -0,0 +1,42 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/// \file tests/win/sphere3d.cc +/// +/// Tests on mln::win::sphere3d. + +#include <mln/win/sphere3d.hh> + + +int main() +{ + using namespace mln; + + win::sphere3d s(3); + mln_assertion(s.delta() == 1); + mln_assertion(s.size() == 7); +} Index: tests/win/disk2d.cc --- tests/win/disk2d.cc (revision 3458) +++ tests/win/disk2d.cc (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 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 @@ -31,10 +31,7 @@ /// Tests on mln::win::disk2d. #include <cmath> - #include <mln/win/disk2d.hh> -#include <mln/convert/to_image.hh> -#include <mln/debug/println.hh> int main() @@ -56,6 +53,4 @@ std::abs(x) > 27 || std::abs(y) > 27); } - - debug::println(convert::to_image(disk)); } Index: tests/win/Makefile.am --- tests/win/Makefile.am (revision 3458) +++ tests/win/Makefile.am (working copy) @@ -4,6 +4,7 @@ check_PROGRAMS = \ backdiag2d \ + ball \ cube3d \ cuboid3d \ diag2d \ @@ -15,10 +16,12 @@ rectangle2d \ segment1d \ shift \ + sphere3d \ sym \ vline2d backdiag2d_SOURCES = backdiag2d.cc +ball_SOURCES = ball.cc cube3d_SOURCES = cube3d.cc cuboid3d_SOURCES = cuboid3d.cc diag2d_SOURCES = diag2d.cc @@ -30,6 +33,7 @@ rectangle2d_SOURCES = rectangle2d.cc segment1d_SOURCES = segment1d.cc shift_SOURCES = shift.cc +sphere3d_SOURCES = sphere3d.cc sym_SOURCES = sym.cc vline2d_SOURCES = vline2d.cc

1 0

r3458: Update working file
by Fabien Freling 02 Mar '09

02 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-02 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update working file. * fabien/igr/Makefile: Update. * fabien/igr/seg_vol_irm.cc: Update. --- Makefile | 2 seg_vol_irm.cc | 183 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 107 insertions(+), 78 deletions(-) Index: trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc (revision 3457) +++ trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc (revision 3458) @@ -71,6 +71,7 @@ #include <mln/accu/count.hh> #include <mln/accu/center.hh> #include <mln/accu/max.hh> +#include <mln/accu/sum.hh> #include <mln/histo/compute.hh> @@ -80,13 +81,21 @@ #include <mln/pw/all.hh> #include <mln/morpho/elementary/gradient_internal.hh> -#include <mln/morpho/opening_area.hh> +#include <mln/morpho/closing.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> + +#include <mln/win/disk2d.hh> +#include <mln/win/ball3d.hh> + +#include <mln/math/diff_abs.hh> #include <mln/convert/from_to.hh> -//FIXME: remove -#include <mln/essential/2d.hh> +#include <mln/metal/int.hh> + #include <iostream> +#include <fstream> #include <mln/debug/println.hh> using namespace mln; @@ -117,32 +126,114 @@ template <typename I> +I +close_threshold(const Image& input, metal::int_<2>) +{ + return morpho::erosion(morpho::dilation(input, win::disk2d(5)), win::disk2d(7)); +} + + +template <typename I> +I +close_threshold(const Image& input, metal::int_<3>) +{ + return morpho::erosion(morpho::dilation(input, win::ball3d(5)), win::ball3d(7)); +} + + +template <typename I> unsigned find_threshold_value(const Image& input_) { const I& input = exact(input_); + int bg_thres = 30; + mln_ch_value(I, bool) ima_bg; + initialize(ima_bg, input); + data::fill(ima_bg, false); + int obj_thres = 50; + mln_ch_value(I, bool) ima_obj; + initialize(ima_obj, input); + data::fill(ima_obj, false); + unsigned result = 0; histo::array<mln_value(I)> arr_histo = histo::compute(input); image1d<unsigned> ima_histo; convert::from_to(arr_histo, ima_histo); + // We remove the 0 value because it is not part of the image. ima_histo(point1d(0)) = 0; - //ima_histo = morpho::opening_area(ima_histo, c2(), 5); - //mln_fwd_piter(image1d<unsigned>) p(ima_histo.domain()); for (unsigned int i = 1; i < ima_histo.nelements(); ++i) { ima_histo(point1d(i)) += ima_histo(point1d(i - 1)); } accu::max<unsigned> max_accu; unsigned max = level::compute(max_accu, ima_histo); + bool low_done = false; + bool high_done = false; for (unsigned int i = 0; i < ima_histo.nelements(); ++i) { - //std::cout << "[" < " << ((ima_histo(point1d(i)) * 100) / max) << std::endl; - if (((ima_histo(point1d(i)) * 100) / max) > 70) - return i; + if (!low_done && ((ima_histo(point1d(i)) * 100) / max) > bg_thres) + { + data::fill((ima_bg | pw::value(input) < pw::cst(i)).rw(), true); + low_done = true; } + if (!high_done && ((ima_histo(point1d(i)) * 100) / max) > (100 - obj_thres)) + { + data::fill((ima_obj | pw::value(input) > pw::cst(i)).rw(), true); + high_done = true; + } + } + + io::dump::save(ima_bg, "bg.pbm"); + io::dump::save(ima_obj, "obj.pbm"); + + ima_bg = close_threshold(ima_bg, metal::int_<I::site::dim>()); + ima_obj = close_threshold(ima_obj, metal::int_<I::site::dim>()); + + io::dump::save(ima_bg, "bg_closed.pbm"); + io::dump::save(ima_obj, "obj_closed.pbm"); + + histo::array<mln_value(I)> bg_histo = histo::compute(input | pw::value(ima_bg) == true); + histo::array<mln_value(I)> obj_histo = histo::compute(input | pw::value(ima_obj) == true); + + accu::sum<unsigned> sum_accu; + image1d<unsigned> ima_bg_histo; + convert::from_to(bg_histo, ima_bg_histo); + ima_bg_histo(point1d(0)) = 0; + unsigned bg_sum = level::compute(sum_accu, ima_bg_histo); + // We remove the 0 value because it is not part of the image. + std::ofstream fout_bg("bg_histo_norm.plot"); + for (unsigned int i = 0; i < ima_bg_histo.nelements(); ++i) + { + ima_bg_histo(point1d(i)) *= 10000; + ima_bg_histo(point1d(i)) /= bg_sum; + fout_bg < ima_obj_histo; + convert::from_to(obj_histo, ima_obj_histo); + unsigned obj_sum = level::compute(sum_accu, ima_obj_histo); + std::ofstream fout_obj("obj_histo_norm.plot"); + for (unsigned int i = 0; i < ima_obj_histo.nelements(); ++i) + { + ima_obj_histo(point1d(i)) *= 10000; + ima_obj_histo(point1d(i)) /= obj_sum; + fout_obj <(ima_bg_histo(point1d(1)), ima_obj_histo(point1d(1))); + for (unsigned int i = 1; i < ima_bg_histo.nelements(); ++i) + { + if (math::diff_abs<unsigned>(ima_bg_histo(point1d(i)), ima_obj_histo(point1d(i))) < min) + { + min = math::diff_abs<unsigned>(ima_bg_histo(point1d(i)), ima_obj_histo(point1d(i))); + result = i; + } + } + + return result; } @@ -155,85 +246,23 @@ // Threshold. - unsigned threshold_value = find_threshold_value(input_); mln_ch_value(I, bool) ima_thres; initialize(ima_thres, input); + data::fill(ima_thres, false); + unsigned threshold_value = find_threshold_value(input); data::fill((ima_thres | pw::value(input) < pw::cst(threshold_value)).rw(), true); return ima_thres; - - // Labeling. - - /*mln_ch_value(I, L) labels = labeling::flat_zones(threshold, nbh, nlabels); - accu::count<int_u8> a_; - util::array<unsigned> a = labeling::compute(a_, threshold, labels, nlabels); - - // We keep the third and second biggest object. - - mln_ch_value(I, bool) big_second; - initialize(big_second, input); - data::fill(big_second, false); - - util::array<L> arr_big = labeling::n_max<L>(a, 3); - data::fill((big_second | (pw::value(labels) == arr_big[2])).rw(), true); - mln_VAR(big_third, threshold | pw::value(labels) == arr_big[3]); - - // Fill holes. - - big_second = labeling::fill_holes(big_second, nbh, nlabels); - - // Gradient. - - mln_ch_value(I, bool) gradient = morpho::elementary::gradient_internal(big_second, nbh); - mln_VAR(gradient_map, gradient | pw::value(gradient) == true); - - mln_ch_value(I, rgb8) result = level::convert(rgb8(), input); - data::fill((result | gradient_map.domain()).rw(), literal::red); - - // Center. - - accu::center<mln_site(I)> center_; - mln_site(I) center = set::compute(center_, big_third.domain()); - result(center) = literal::blue; - - // Distance. - - mln_fwd_piter(gradient_map_t) p(gradient_map.domain()); - p_array<mln_site(I)> arr; - for_all(p) - { - if (mln::norm::l1_distance(p.to_site().to_vec(), center.to_vec()) < 200) - { - result(p) = literal::green; - - arr.append(p); - } } - // Save the cloud in a file. - - io::cloud::save(arr, "cloud.txt"); - return result;*/ -} - -int main() +int main(int argc, char* argv[]) { //trace::quiet = false; label_16 nlabels; - std::cout << "Processing IM_0043..." << std::endl; - image3d<int_u12> im43; - io::dicom::load(im43, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0043.dcm"); - io::dump::save(igr(im43, c6(), nlabels), "IM_0043.dump"); - - std::cout << "Processing IM_0046..." << std::endl; - image3d<int_u12> im46; - io::dicom::load(im46, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0046.dcm"); - io::dump::save(igr(im46, c6(), nlabels), "IM_0046.dump"); - - std::cout << "Processing IM_0049..." << std::endl; + /*std::cout << "Processing IM_0049..." << std::endl; image2d<int_u12> im49; io::dicom::load(im49, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0049.dcm"); io::pbm::save(igr(im49, c6(), nlabels), "IM_0049.pbm"); @@ -246,17 +275,17 @@ std::cout << "Processing IM_0055..." << std::endl; image2d<int_u12> im55; io::dicom::load(im55, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0055.dcm"); - io::pbm::save(igr(im55, c6(), nlabels), "IM_0055.pbm"); + io::pbm::save(igr(im55, c4(), nlabels), "IM_0055.pbm"); std::cout << "Processing IM_0058..." << std::endl; image2d<int_u12> im58; io::dicom::load(im58, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0058.dcm"); - io::pbm::save(igr(im58, c6(), nlabels), "IM_0058.pbm"); + io::pbm::save(igr(im58, c4(), nlabels), "IM_0058.pbm"); std::cout << "Processing IM_0061..." << std::endl; image3d<int_u12> im61; io::dicom::load(im61, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0061.dcm"); - io::dump::save(igr(im61, c6(), nlabels), "IM_0061.dump"); + io::dump::save(igr(im61, c6(), nlabels), "IM_0061.dump");*/ std::cout << "Processing IM_0064..." << std::endl; image3d<int_u12> im64; Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 3457) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 3458) @@ -8,7 +8,7 @@ -L/Users/HiSoKa/Downloads/gdcmbin/bin \ -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib \ -framework CoreFoundation \ - -g \ + -DNDEBUG -O1 \ seg_vol_irm.cc -o seg_vol_irm clean:

1 0

Re: [Olena-patches] [Olena] #49: Determine the use of trace in basics algos.
by Olena Trac 02 Mar '09

02 Mar '09

#49: Determine the use of trace in basics algos. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => fixed Comment: Fixed with revision r3455. -- Ticket URL: <https://trac.lrde.org/olena/ticket/49#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

3457: Fix window3d.
by Guillaume Lazzara 02 Mar '09

02 Mar '09

* mln/core/alias/window3d.hh: add slice coordinate.. --- milena/ChangeLog | 6 ++++++ milena/mln/core/alias/window3d.hh | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8d754e2..dc9cd2a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix window3d. + + * mln/core/alias/window3d.hh: add slice coordinate.. + +2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add more window aliases. * mln/core/alias/neighb3d.hh: add c8_3d. diff --git a/milena/mln/core/alias/window3d.hh b/milena/mln/core/alias/window3d.hh index fe197f8..5489fbd 100644 --- a/milena/mln/core/alias/window3d.hh +++ b/milena/mln/core/alias/window3d.hh @@ -110,11 +110,11 @@ namespace mln if (it.size() == 0) { it - .insert( 0, -1) - .insert(-1, 0) - .insert( 0, 0) - .insert(+1, 0) - .insert( 0, +1); + .insert(0, 0, -1) + .insert(0, -1, 0) + .insert(0, 0, 0) + .insert(0, +1, 0) + .insert(0, 0, +1); } return it; } @@ -126,15 +126,15 @@ namespace mln if (it.size() == 0) { it - .insert(-1, -1) - .insert( 0, -1) - .insert(+1, -1) - .insert(-1, 0) - .insert( 0, 0) - .insert(+1, 0) - .insert(-1, +1) - .insert( 0, +1) - .insert(+1, +1); + .insert(0, -1, -1) + .insert(0, 0, -1) + .insert(0, +1, -1) + .insert(0, -1, 0) + .insert(0, 0, 0) + .insert(0, +1, 0) + .insert(0, -1, +1) + .insert(0, 0, +1) + .insert(0, +1, +1); } return it; } -- 1.5.6.5

1 0

3456: Add more window aliases.
by Guillaume Lazzara 02 Mar '09

02 Mar '09

* mln/core/alias/neighb3d.hh: add c8_3d. * mln/core/alias/window2d.hh: add win_c8p. * mln/core/alias/window3d.hh: add win_c4p_3d and win_c8p_3d. --- milena/ChangeLog | 10 +++++ milena/mln/core/alias/neighb3d.hh | 33 ++++++++++++++++ milena/mln/core/alias/window2d.hh | 30 +++++++++++++++ milena/mln/core/alias/window3d.hh | 74 +++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9de7f13..8d754e2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add more window aliases. + + * mln/core/alias/neighb3d.hh: add c8_3d. + + * mln/core/alias/window2d.hh: add win_c8p. + + * mln/core/alias/window3d.hh: add win_c4p_3d and win_c8p_3d. + +2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add missing traces in basic routines in geom/* (ticket #49). * mln/geom/bbox.hh, diff --git a/milena/mln/core/alias/neighb3d.hh b/milena/mln/core/alias/neighb3d.hh index 59d72bb..ad0545d 100644 --- a/milena/mln/core/alias/neighb3d.hh +++ b/milena/mln/core/alias/neighb3d.hh @@ -68,6 +68,25 @@ namespace mln /// const neighb3d& c4_3d(); + /// 8-connectivity neighborhood on the 3D grid. + /// + /// . . . + /// . . . + /// . . . + /// + /// o o o + /// o x o + /// o o o + /// + /// . . . + /// . . . + /// . . . + /// + /// \return A neighb3d. + /// + const neighb3d& c8_3d(); + + /*! \brief 6-connectivity neighborhood on the 3D grid. * * . . . @@ -159,6 +178,20 @@ namespace mln } inline + const neighb3d& c8_3d() + { + static neighb3d it; + if (it.size() == 0) + { + static const bool vals[] = { 1, 1, 1, + 1, 0, 1, + 1, 1, 1 }; + convert::from_to(vals, it); + } + return it; + } + + inline const neighb3d& c6() { static neighb3d it; diff --git a/milena/mln/core/alias/window2d.hh b/milena/mln/core/alias/window2d.hh index cd66a79..f1acabe 100644 --- a/milena/mln/core/alias/window2d.hh +++ b/milena/mln/core/alias/window2d.hh @@ -59,6 +59,16 @@ namespace mln /// \return A window2d. const window2d& win_c4p(); + /// \brief 8-connectivity window on the 2D grid, including the + /// center. + /// + /// o o o + /// o x o + /// o o o + /// + /// \return A window2d. + const window2d& win_c8p(); + namespace convert { @@ -96,6 +106,26 @@ namespace mln return it; } + inline const window2d& + win_c8p() + { + static window2d it; + if (it.size() == 0) + { + it + .insert(-1, -1) + .insert( 0, -1) + .insert(+1, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert(-1, +1) + .insert( 0, +1) + .insert(+1, +1); + } + return it; + } + namespace convert { diff --git a/milena/mln/core/alias/window3d.hh b/milena/mln/core/alias/window3d.hh index 04484fb..fe197f8 100644 --- a/milena/mln/core/alias/window3d.hh +++ b/milena/mln/core/alias/window3d.hh @@ -47,6 +47,44 @@ namespace mln /// the 3D square grid with integer coordinates. typedef window<mln::dpoint3d> window3d; + /// \brief 4-connectivity window on the 3D grid, including the + /// center. + /// + /// - - - + /// - - - + /// - - - + /// + /// - o - + /// o x o + /// - o - + /// + /// - - - + /// - - - + /// - - - + /// + /// + /// \return A window3d. + const window3d& win_c4p_3d(); + + /// \brief 8-connectivity window on the 3D grid, including the + /// center. + /// + /// - - - + /// - - - + /// - - - + /// + /// o o o + /// o x o + /// o o o + /// + /// - - - + /// - - - + /// - - - + /// + /// \return A window3d. + const window3d& win_c8p_3d(); + + namespace convert { @@ -65,6 +103,42 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline const window3d& + win_c4p_3d() + { + static window3d it; + if (it.size() == 0) + { + it + .insert( 0, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert( 0, +1); + } + return it; + } + + inline const window3d& + win_c8p_3d() + { + static window3d it; + if (it.size() == 0) + { + it + .insert(-1, -1) + .insert( 0, -1) + .insert(+1, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert(-1, +1) + .insert( 0, +1) + .insert(+1, +1); + } + return it; + } + namespace convert { -- 1.5.6.5

1 0

3455: Add missing traces in basic routines in geom/* (ticket #49).
by Guillaume Lazzara 02 Mar '09

02 Mar '09

* mln/geom/bbox.hh, * mln/geom/max_col.hh, * mln/geom/max_ind.hh, * mln/geom/max_row.hh, * mln/geom/max_sli.hh, * mln/geom/min_col.hh, * mln/geom/min_ind.hh, * mln/geom/min_row.hh, * mln/geom/min_sli.hh, * mln/geom/ncols.hh, * mln/geom/ninds.hh, * mln/geom/nrows.hh, * mln/geom/nslis.hh: add missing traces. --- milena/ChangeLog | 18 ++++++++++++++++++ milena/mln/geom/bbox.hh | 18 ++++++++++++++++-- milena/mln/geom/max_col.hh | 16 +++++++++++++--- milena/mln/geom/max_ind.hh | 9 +++++++-- milena/mln/geom/max_row.hh | 16 +++++++++++++--- milena/mln/geom/max_sli.hh | 9 +++++++-- milena/mln/geom/min_col.hh | 16 +++++++++++++--- milena/mln/geom/min_ind.hh | 9 +++++++-- milena/mln/geom/min_row.hh | 16 +++++++++++++--- milena/mln/geom/min_sli.hh | 9 +++++++-- milena/mln/geom/ncols.hh | 23 ++++++++++++++++------- milena/mln/geom/ninds.hh | 9 +++++++-- milena/mln/geom/nrows.hh | 23 ++++++++++++++++------- milena/mln/geom/nslis.hh | 16 ++++++++++------ 14 files changed, 163 insertions(+), 44 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 438bfe2..9de7f13 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add missing traces in basic routines in geom/* (ticket #49). + + * mln/geom/bbox.hh, + * mln/geom/max_col.hh, + * mln/geom/max_ind.hh, + * mln/geom/max_row.hh, + * mln/geom/max_sli.hh, + * mln/geom/min_col.hh, + * mln/geom/min_ind.hh, + * mln/geom/min_row.hh, + * mln/geom/min_sli.hh, + * mln/geom/ncols.hh, + * mln/geom/ninds.hh, + * mln/geom/nrows.hh, + * mln/geom/nslis.hh: add missing traces. + +2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Cleanup scribo sandbox. * sandbox/scribo/Makefile: add new rules. diff --git a/milena/mln/geom/bbox.hh b/milena/mln/geom/bbox.hh index 9a7d5bc..32d8377 100644 --- a/milena/mln/geom/bbox.hh +++ b/milena/mln/geom/bbox.hh @@ -135,27 +135,41 @@ namespace mln template <typename I> box<mln_site(I)> bbox(const Image& ima_) { + trace::entering("geom::bbox"); + const I& ima = exact(ima_); mln_precondition(ima.is_valid()); - return geom::bbox(ima.domain()); + box<mln_site(I)> b = geom::bbox(ima.domain()); + + trace::exiting("geom::bbox"); + return b; } template <typename W> box<mln_psite(W)> bbox(const Window<W>& win) { + trace::entering("geom::bbox"); + typedef mln_psite(W) P; accu::bbox b; P O = literal::origin; mln_qiter(W) q(exact(win), O); for_all(q) b.take(q); + + trace::exiting("geom::bbox"); return b; } template <typename W> box<mln_psite(W)> bbox(const Weighted_Window<W>& win) { - return bbox(exact(win).win()); + trace::entering("geom::bbox"); + + box<mln_psite(W)> b = bbox(exact(win).win()); + + trace::exiting("geom::bbox"); + return b; } diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index 6152e5d..561810e 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -57,8 +57,13 @@ namespace mln inline mln_deduce(I, site, coord) max_col(const Image& ima) { + trace::entering("mln::geom::max_col"); + mln_precondition(exact(ima).is_valid()); - return geom::bbox(ima).pmax().col(); + mln_deduce(I, site, coord) maxcol = geom::bbox(ima).pmax().col(); + + trace::exiting("mln::geom::max_col"); + return maxcol; } @@ -66,8 +71,13 @@ namespace mln inline mln_deduce(B, point, coord) max_col(const Box& b) { + trace::entering("mln::geom::max_col"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return exact(b).pmax().col(); + mln_deduce(B, point, coord) maxcol = exact(b).pmax().col(); + + trace::exiting("mln::geom::max_col"); + return maxcol; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/max_ind.hh b/milena/mln/geom/max_ind.hh index 6d5baf0..15bcc86 100644 --- a/milena/mln/geom/max_ind.hh +++ b/milena/mln/geom/max_ind.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -53,8 +53,13 @@ namespace mln inline mln_deduce(I, site, coord) max_ind(const Image& ima) { + trace::entering("mln::geom::max_ind"); + mln_precondition(exact(ima).is_valid()); - return exact(ima).bbox().pmax().ind(); + mln_deduce(I, site, coord) maxind = exact(ima).bbox().pmax().ind(); + + trace::exiting("mln::geom::max_ind"); + return maxind; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index cf33984..db49bb9 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -58,8 +58,13 @@ namespace mln inline mln_deduce(I, site, coord) max_row(const Image& ima) { + trace::entering("mln::geom::max_row"); + mln_precondition(exact(ima).is_valid()); - return geom::bbox(ima).pmax().row(); + mln_deduce(I, site, coord) maxrow = geom::bbox(ima).pmax().row(); + + trace::exiting("mln::geom::max_row"); + return maxrow; } @@ -67,8 +72,13 @@ namespace mln inline mln_deduce(B, point, coord) max_row(const Box& b) { + trace::entering("mln::geom::max_row"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return exact(b).pmax().row(); + mln_deduce(B, point, coord) maxrow = exact(b).pmax().row(); + + trace::exiting("mln::geom::max_row"); + return maxrow; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/max_sli.hh b/milena/mln/geom/max_sli.hh index 07920d6..18f9aad 100644 --- a/milena/mln/geom/max_sli.hh +++ b/milena/mln/geom/max_sli.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -53,8 +53,13 @@ namespace mln inline mln_deduce(I, site, coord) max_sli(const Image& ima) { + trace::entering("mln::geom::max_sli"); + mln_precondition(exact(ima).is_valid()); - return exact(ima).bbox().pmax().sli(); + mln_deduce(I, site, coord) maxsli = exact(ima).bbox().pmax().sli(); + + trace::exiting("mln::geom::max_sli"); + return maxsli; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index cf66a3d..631d989 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -58,8 +58,13 @@ namespace mln inline mln_deduce(I, site, coord) min_col(const Image& ima) { + trace::entering("mln::geom::min_col"); + mln_precondition(exact(ima).is_valid()); - return geom::bbox(ima).pmin().col(); + mln_deduce(I, site, coord) mincol = geom::bbox(ima).pmin().col(); + + trace::exiting("mln::geom::min_col"); + return mincol; } @@ -67,8 +72,13 @@ namespace mln inline mln_deduce(B, point, coord) min_col(const Box& b) { + trace::entering("mln::geom::min_col"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return exact(b).pmin().col(); + mln_deduce(B, point, coord) mincol = exact(b).pmin().col(); + + trace::exiting("mln::geom::min_col"); + return mincol; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/min_ind.hh b/milena/mln/geom/min_ind.hh index 892b2fc..65e5721 100644 --- a/milena/mln/geom/min_ind.hh +++ b/milena/mln/geom/min_ind.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -53,8 +53,13 @@ namespace mln inline mln_deduce(I, site, coord) min_ind(const Image& ima) { + trace::entering("mln::geom::min_ind"); + mln_precondition(exact(ima).is_valid()); - return exact(ima).bbox().pmin().ind(); + mln_deduce(I, site, coord) minind = exact(ima).bbox().pmin().ind(); + + trace::exiting("mln::geom::min_ind"); + return minind; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index 0d991ca..05ee4cb 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -61,8 +61,13 @@ namespace mln inline mln_deduce(I, site, coord) min_row(const Image& ima) { + trace::entering("mln::geom::min_row"); + mln_precondition(exact(ima).is_valid()); - return geom::bbox(ima).pmin().row(); + mln_deduce(I, site, coord) minrow = geom::bbox(ima).pmin().row(); + + trace::exiting("mln::geom::min_row"); + return minrow; } @@ -70,8 +75,13 @@ namespace mln inline mln_deduce(B, point, coord) min_row(const Box& b) { + trace::entering("mln::geom::min_row"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return exact(b).pmin().row(); + mln_deduce(B, point, coord) minrow = exact(b).pmin().row(); + + trace::exiting("mln::geom::min_row"); + return minrow; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/min_sli.hh b/milena/mln/geom/min_sli.hh index 9d186fe..182fe15 100644 --- a/milena/mln/geom/min_sli.hh +++ b/milena/mln/geom/min_sli.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -53,8 +53,13 @@ namespace mln inline mln_deduce(I, site, coord) min_sli(const Image& ima) { + trace::entering("mln::geom::min_sli"); + mln_precondition(exact(ima).is_valid()); - return exact(ima).bbox().pmin().sli(); + mln_deduce(I, site, coord) minsli = exact(ima).bbox().pmin().sli(); + + trace::exiting("mln::geom::min_sli"); + return minsli; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/ncols.hh b/milena/mln/geom/ncols.hh index 76c2d5a..6aa3742 100644 --- a/milena/mln/geom/ncols.hh +++ b/milena/mln/geom/ncols.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_GEOM_NCOLS_HH # define MLN_GEOM_NCOLS_HH -/*! \file mln/geom/ncols.hh - * - * \brief Give the number of columns of an image. - */ +/// \file mln/geom/ncols.hh +/// +/// Give the number of columns of an image. # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> @@ -58,16 +57,26 @@ namespace mln inline unsigned ncols(const Image& ima) { + trace::entering("mln::geom::ncols"); + mln_precondition(exact(ima).is_valid()); - return geom::max_col(ima) - geom::min_col(ima) + 1; + unsigned ncols = geom::max_col(ima) - geom::min_col(ima) + 1; + + trace::exiting("mln::geom::ncols"); + return ncols; } template <typename B> unsigned ncols(const Box& b) { + trace::entering("mln::geom::ncols"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return geom::max_col(b) - geom::min_col(b) + 1; + unsigned ncols = geom::max_col(b) - geom::min_col(b) + 1; + + trace::exiting("mln::geom::ncols"); + return ncols; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/ninds.hh b/milena/mln/geom/ninds.hh index a331748..47026ed 100644 --- a/milena/mln/geom/ninds.hh +++ b/milena/mln/geom/ninds.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -54,8 +54,13 @@ namespace mln inline unsigned ninds(const Image& ima) { + trace::entering("mln::geom::ninds"); + mln_precondition(exact(ima).is_valid()); - return geom::max_ind(ima) - geom::min_ind(ima) + 1; + unsigned ninds = geom::max_ind(ima) - geom::min_ind(ima) + 1; + + trace::exiting("mln::geom::ninds"); + return ninds; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/nrows.hh b/milena/mln/geom/nrows.hh index c7f3e9a..01e9969 100644 --- a/milena/mln/geom/nrows.hh +++ b/milena/mln/geom/nrows.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_GEOM_NROWS_HH # define MLN_GEOM_NROWS_HH -/*! \file mln/geom/nrows.hh - * - * \brief Give the number of rows of an image. - */ +/// \file mln/geom/nrows.hh +/// +/// Give the number of rows of an image. # include <mln/geom/min_row.hh> # include <mln/geom/max_row.hh> @@ -58,15 +57,25 @@ namespace mln inline unsigned nrows(const Image& ima) { + trace::entering("mln::geom::nrows"); + mln_precondition(exact(ima).is_valid()); - return geom::max_row(ima) - geom::min_row(ima) + 1; + unsigned nrows = geom::max_row(ima) - geom::min_row(ima) + 1; + + trace::exiting("mln::geom::nrows"); + return nrows; } template <typename B> unsigned nrows(const Box& b) { + trace::entering("mln::geom::nrows"); + metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - return geom::max_row(b) - geom::min_row(b) + 1; + unsigned nrows = geom::max_row(b) - geom::min_row(b) + 1; + + trace::exiting("mln::geom::nrows"); + return nrows; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/geom/nslis.hh b/milena/mln/geom/nslis.hh index 3e6aa77..5ce4e6b 100644 --- a/milena/mln/geom/nslis.hh +++ b/milena/mln/geom/nslis.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_GEOM_NSLIS_HH # define MLN_GEOM_NSLIS_HH -/*! \file mln/geom/nslis.hh - * - * \brief Give the number of slices of an image. - */ +/// \file mln/geom/nslis.hh +/// +/// Give the number of slices of an image. # include <mln/geom/min_sli.hh> # include <mln/geom/max_sli.hh> @@ -54,8 +53,13 @@ namespace mln inline unsigned nslis(const Image& ima) { + trace::entering("mln::geom::nslis"); + mln_precondition(exact(ima).is_valid()); - return geom::max_sli(ima) - geom::min_sli(ima) + 1; + unsigned nslis = geom::max_sli(ima) - geom::min_sli(ima) + 1; + + trace::exiting("mln::geom::nslis"); + return nslis; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

Re: [Olena-patches] [Olena] #30: Result images missing in reference documentation
by Olena Trac 02 Mar '09

02 Mar '09

#30: Result images missing in reference documentation -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: closed Priority: major | Milestone: Olena 0.11.1 Component: other | Version: 0.11 Resolution: wontfix | Keywords: ref doc doxygen images -----------------------+---------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => wontfix Comment: This task is obsolete. New documentation for Olena 1.0 does include all generated images. -- Ticket URL: <https://trac.lrde.org/olena/ticket/30#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #3: Migrate Olena 0.11 (and previous revisions) from PRCS to Subversion
by Olena Trac 02 Mar '09

02 Mar '09

#3: Migrate Olena 0.11 (and previous revisions) from PRCS to Subversion --------------------------+------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: closed Priority: blocker | Milestone: Olena 0.11.1 Component: other | Version: 0.11 Resolution: wontfix | Keywords: prcs subversion svn --------------------------+------------------------------------------------- Changes (by lazzara): * status: assigned => closed * resolution: => wontfix Comment: This task is obsolete. -- Ticket URL: <https://trac.lrde.org/olena/ticket/3#comment:7> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0