February 2010 - Olena-patches

last-svn-commit-11-g852fd7f Rename image3d<>::nslices to image3d<>::nslis.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/core/image/image3d.hh, * mln/debug/slices_2d.hh, * tests/io/pbms/load.cc, * tests/io/pgms/load.cc, * tests/io/ppms/load.cc: Rename nslices to nslis. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/image/image3d.hh | 7 ++++--- milena/mln/debug/slices_2d.hh | 13 +++++++------ milena/tests/io/pbms/load.cc | 2 +- milena/tests/io/pgms/load.cc | 2 +- milena/tests/io/ppms/load.cc | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 04b9146..f76dc74 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename image3d<>::nslices to image3d<>::nslis. + + * mln/core/image/image3d.hh, + * mln/debug/slices_2d.hh, + * tests/io/pbms/load.cc, + * tests/io/pgms/load.cc, + * tests/io/ppms/load.cc: Rename nslices to nslis. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. * doc/tutorial/tutorial.tex: Add more contacts. diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 6c4afe0..dc2b6c3 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -208,7 +209,7 @@ namespace mln /// Give the number of slices. - unsigned nslices() const; + unsigned nslis() const; /// Give the number of rows. unsigned nrows() const; @@ -511,7 +512,7 @@ namespace mln template <typename T> inline unsigned - image3d<T>::nslices() const + image3d<T>::nslis() const { mln_precondition(this->is_valid()); return this->data_->b_.len(0); diff --git a/milena/mln/debug/slices_2d.hh b/milena/mln/debug/slices_2d.hh index 79aaa99..165e79c 100644 --- a/milena/mln/debug/slices_2d.hh +++ b/milena/mln/debug/slices_2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -86,11 +87,11 @@ namespace mln mln_precondition(input.is_valid()); mln_precondition(n_horizontal > 0 && n_vertical > 0); - mln_precondition(input.nslices() <= n_horizontal * n_vertical); + mln_precondition(input.nslis() <= n_horizontal * n_vertical); image2d<mln_value(I)> output(input.nrows() * n_vertical, input.ncols() * n_horizontal); - if (input.nslices() != n_horizontal * n_vertical) + if (input.nslis() != n_horizontal * n_vertical) data::fill(output, bg); const point3d& p_min = input.domain().pmin(); @@ -152,7 +153,7 @@ namespace mln n_vertical = internal::round_up(n_v); } } - + } // end of namespace mln::debug::internal @@ -170,10 +171,10 @@ namespace mln mln_precondition(ratio_hv > 0.f); unsigned n_horizontal, n_vertical; - internal::slices2d_helper(input.nslices(), input.nrows(), input.ncols(), + internal::slices2d_helper(input.nslis(), input.nrows(), input.ncols(), ratio_hv, n_horizontal, n_vertical); - mln_assertion(n_horizontal * n_vertical >= input.nslices()); + mln_assertion(n_horizontal * n_vertical >= input.nslis()); image2d<mln_value(I)> output = slices_2d(input, n_horizontal, n_vertical, bg); diff --git a/milena/tests/io/pbms/load.cc b/milena/tests/io/pbms/load.cc index 7712590..e95bc4d 100644 --- a/milena/tests/io/pbms/load.cc +++ b/milena/tests/io/pbms/load.cc @@ -54,7 +54,7 @@ int main() image3d<bool> ima3d; io::pbms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == pic); mln_assertion(slice(ima3d, 1) == pic2); diff --git a/milena/tests/io/pgms/load.cc b/milena/tests/io/pgms/load.cc index 8380506..d0b5c75 100644 --- a/milena/tests/io/pgms/load.cc +++ b/milena/tests/io/pgms/load.cc @@ -61,7 +61,7 @@ int main() image3d<int_u8> ima3d; io::pgms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == lena); mln_assertion(slice(ima3d, 1) == lena2); } diff --git a/milena/tests/io/ppms/load.cc b/milena/tests/io/ppms/load.cc index d5149cf..ad8d813 100644 --- a/milena/tests/io/ppms/load.cc +++ b/milena/tests/io/ppms/load.cc @@ -63,7 +63,7 @@ int main() image3d<rgb8> ima3d; io::ppms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == ima); mln_assertion(slice(ima3d, 1) == ima2); } -- 1.5.6.5

1 0

last-svn-commit-10-g749308a Various small fixes.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* doc/tutorial/tutorial.tex: Add more contacts. * mln/accu/label_used.hh: Do not use label<>::next(). * mln/draw/line.hh: Add a fixme. * mln/io/dump/save.hh: Close the file. * mln/io/plot/save.hh: Fix an invalid prototype. * mln/io/pnm/load.hh: Fix an invalid static check. * mln/io/raw/get_header.hh: Fix comment. * mln/labeling/pack.hh: Disable a static check on symbolic values. * mln/math/diff_abs.hh: Add a fixme. * mln/world/inter_pixel/full2image.hh: Use mln_concrete(). * mln/data/fill_with_value.hh, * mln/io/raw/load.hh, * mln/io/raw/save.hh, * mln/labeling/compute.hh, * mln/registration/icp.hh: Aesthetic changes. --- milena/ChangeLog | 30 ++++++++++++++++++++++++++++ milena/doc/tutorial/tutorial.tex | 4 +++ milena/mln/accu/label_used.hh | 5 ++- milena/mln/data/fill_with_value.hh | 3 +- milena/mln/draw/line.hh | 1 + milena/mln/io/dump/save.hh | 3 ++ milena/mln/io/plot/save.hh | 5 ++- milena/mln/io/pnm/load.hh | 3 +- milena/mln/io/raw/get_header.hh | 2 +- milena/mln/io/raw/load.hh | 2 +- milena/mln/io/raw/save.hh | 2 +- milena/mln/labeling/compute.hh | 10 ++++---- milena/mln/labeling/pack.hh | 2 +- milena/mln/math/diff_abs.hh | 5 +++- milena/mln/registration/icp.hh | 3 +- milena/mln/world/inter_pixel/full2image.hh | 4 +- 16 files changed, 65 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7171949..04b9146 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. + + * doc/tutorial/tutorial.tex: Add more contacts. + + * mln/accu/label_used.hh: Do not use label<>::next(). + + * mln/draw/line.hh: Add a fixme. + + * mln/io/dump/save.hh: Close the file. + + * mln/io/plot/save.hh: Fix an invalid prototype. + + * mln/io/pnm/load.hh: Fix an invalid static check. + + * mln/io/raw/get_header.hh: Fix comment. + + * mln/labeling/pack.hh: Disable a static check on symbolic values. + + * mln/math/diff_abs.hh: Add a fixme. + + * mln/world/inter_pixel/full2image.hh: Use mln_concrete(). + + * mln/data/fill_with_value.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh, + * mln/labeling/compute.hh, + * mln/registration/icp.hh: Aesthetic changes. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component edge sites. diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 7ddbb60..5a61461 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -545,6 +545,10 @@ If you want to reach us directly, you can contact one of the following people: \begin{itemize} \item Thierry Geraud - Project Manager - thierry.geraud(a)lrde.epita.fr + \item Jonathan Fabrizio - jonathan.fabrizio(a)lrde.epita.fr + \item Yann Jacquelet - yann.jacquelet(a)lrde.epita.fr + \item Guillaume Lazzara - guillaume.lazzara(a)lrde.epita.fr + \item Roland Levillain - roland.levillain(a)lrde.epita.fr \end{itemize} diff --git a/milena/mln/accu/label_used.hh b/milena/mln/accu/label_used.hh index af82cd2..d6d2b20 100644 --- a/milena/mln/accu/label_used.hh +++ b/milena/mln/accu/label_used.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -116,7 +117,7 @@ namespace mln label_used<L>::take(const argument& l) { if (label_used_.size() <= l) - label_used_.resize(l.next(), false); + label_used_.resize(unsigned(l) + 1, false); label_used_(l) = true; } diff --git a/milena/mln/data/fill_with_value.hh b/milena/mln/data/fill_with_value.hh index 8ab0a66..5688ed1 100644 --- a/milena/mln/data/fill_with_value.hh +++ b/milena/mln/data/fill_with_value.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/draw/line.hh b/milena/mln/draw/line.hh index f5cbffb..528dce3 100644 --- a/milena/mln/draw/line.hh +++ b/milena/mln/draw/line.hh @@ -30,6 +30,7 @@ /// \file /// /// Draw a line in an image. +/// \fixme Add specializations for horizontal lines (use pointers/memset). # include <mln/core/concept/image.hh> # include <mln/core/site_set/p_line2d.hh> diff --git a/milena/mln/io/dump/save.hh b/milena/mln/io/dump/save.hh index a361856..7043948 100644 --- a/milena/mln/io/dump/save.hh +++ b/milena/mln/io/dump/save.hh @@ -144,6 +144,9 @@ namespace mln internal::save_header(ima, file); internal::save_data(ima, file); + + file.close(); + trace::exiting("mln::io::dump::save"); } diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index 8010afa..9f38f4b 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -60,7 +61,7 @@ namespace mln template <typename T> void save(util::array<T>& arr, const std::string& filename, - int start_value = 0); + int start_value); # ifndef MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pnm/load.hh b/milena/mln/io/pnm/load.hh index a48737a..46587df 100644 --- a/milena/mln/io/pnm/load.hh +++ b/milena/mln/io/pnm/load.hh @@ -197,7 +197,8 @@ namespace mln inline void load_raw_2d(std::ifstream& file, I& ima) { - if (sizeof(value::int_u8) == 1) + typedef mln_value(I) V; + if (sizeof(V) == 1) load_raw_2d_contiguous(file, ima); else load_raw_2d_uncontiguous(file, ima); diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/raw/get_header.hh index fa5dbf3..c263cff 100644 --- a/milena/mln/io/raw/get_header.hh +++ b/milena/mln/io/raw/get_header.hh @@ -28,7 +28,7 @@ /// \file /// -/// Load a Milena image rawed into a file. +/// Load a raw image header. # include <iostream> # include <fstream> diff --git a/milena/mln/io/raw/load.hh b/milena/mln/io/raw/load.hh index 7715740..57ca64c 100644 --- a/milena/mln/io/raw/load.hh +++ b/milena/mln/io/raw/load.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// Copyright (C) 2010 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. diff --git a/milena/mln/io/raw/save.hh b/milena/mln/io/raw/save.hh index f526e57..8e927f7 100644 --- a/milena/mln/io/raw/save.hh +++ b/milena/mln/io/raw/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 0e74fd7..d29242f 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -38,11 +38,11 @@ /// and change 'input' from Image to Site_Set! /// ==> NO, see below. (Z) /// -/// The overload not taking 'input' as argument works on sites and would be a good -/// candidate for set::compute. However, the fact that this version of compute -/// is in the namespace 'labeling' means that it produces several results at the -/// same time for each labels which is not the case of other implementations of -/// compute. +/// The overload not taking 'input' as argument works on sites and +/// would be a good candidate for set::compute. However, the fact that +/// this version of compute is in the namespace 'labeling' means that +/// it produces several results at the same time for each labels which +/// is not the case of other implementations of compute. # include <mln/core/concept/image.hh> # include <mln/core/concept/accumulator.hh> diff --git a/milena/mln/labeling/pack.hh b/milena/mln/labeling/pack.hh index c5e766e..ebf9bb1 100644 --- a/milena/mln/labeling/pack.hh +++ b/milena/mln/labeling/pack.hh @@ -100,7 +100,7 @@ namespace mln pack_tests(const Image& label, mln_value(I)& new_nlabels) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); + //mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) new_nlabels; diff --git a/milena/mln/math/diff_abs.hh b/milena/mln/math/diff_abs.hh index f5559ff..e0d8edd 100644 --- a/milena/mln/math/diff_abs.hh +++ b/milena/mln/math/diff_abs.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,8 @@ /// \file /// /// Define diff_abs routine. +/// +/// \fixme Do we want a specific version for vectorial types? namespace mln diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index ac80fa3..13f9231 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/world/inter_pixel/full2image.hh b/milena/mln/world/inter_pixel/full2image.hh index c861a10..db3bcf3 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/milena/mln/world/inter_pixel/full2image.hh @@ -52,7 +52,7 @@ namespace mln /// \return A classical image without inter-pixel data. // template <typename I> - I + mln_concrete(I) full2image(const Image& input); @@ -60,7 +60,7 @@ namespace mln template <typename I> - I + mln_concrete(I) full2image(const Image& input_) { trace::entering("world::inter_pixel::full2image"); -- 1.5.6.5

1 0

last-svn-commit-9-g4976230 * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component edge sites.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

--- milena/ChangeLog | 5 ++++ milena/mln/topo/skeleton/crest.hh | 48 +++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 21d7ddc..7171949 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component + edge sites. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to read dump files header. * mln/io/dump/all.hh: Include a new file. diff --git a/milena/mln/topo/skeleton/crest.hh b/milena/mln/topo/skeleton/crest.hh index f1501bf..7910a1f 100644 --- a/milena/mln/topo/skeleton/crest.hh +++ b/milena/mln/topo/skeleton/crest.hh @@ -34,7 +34,6 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/data/fill.hh> - namespace mln { @@ -47,10 +46,13 @@ namespace mln /// Compute skeletization constraints. /// - /// \param[in] input_ A binary image. - /// \param[in] dist_map_ A distance map of \p input. Contains the - /// inner object distance map. - /// \param[in] nbh_ A neighborhood. + /// \param[in] input A binary image. + /// \param[in] dist_map A distance map of \p input. Contains the + /// inner object distance map. + /// \param[in] nbh A neighborhood. + /// \param[in] psi_threshold Keep sites having a Point + /// Superiority Index greated or equal + /// to \p psi_threshold. /// /// \result A binary image. // @@ -77,7 +79,7 @@ namespace mln * p.val(). * * This algorithm keeps sites having their pixel superiority index - * greater than 5. + * greater than \p psi_threshold (6 by default). * * For good results with 2D images, we advice you to use c8() as * neighborhood. @@ -85,18 +87,24 @@ namespace mln */ template <typename I, typename D, typename N> mln_concrete(I) - crest(const Image& input_, const Image<D>& dist_map_, - const Neighborhood<N>& nbh_); + crest(const Image& input, const Image<D>& dist_map, + const Neighborhood<N>& nbh, unsigned psi_threshold); + + /// \overload + /// psi_threshold is set to 6. + template <typename I, typename D, typename N> + mln_concrete(I) + crest(const Image& input, const Image<D>& dist_map, + const Neighborhood<N>& nbh); # ifndef MLN_INCLUDE_ONLY - template <typename I, typename D, typename N> mln_concrete(I) crest(const Image& input_, const Image<D>& dist_map_, - const Neighborhood<N>& nbh_) + const Neighborhood<N>& nbh_, unsigned psi_threshold) { trace::entering("topo::skeleton::crest"); const I& input = exact(input_); @@ -120,20 +128,22 @@ namespace mln continue; unsigned nb_eq = 0; - unsigned nb_gt = 0; unsigned nb_lt = 0; for_all(n) - if (input.domain().has(n)) + if (input.domain().has(n) + // We want to only consider sites which are part of + // the skeleton. If this test is removed, sometimes + // edge sites are considered as sites with a high PSI + // which is wrong. + && dist_map(n) > static_cast<mln_value(D)>(0)) { if (dist_map(n) == dist_map(p)) ++nb_eq; - else if (dist_map(n) > dist_map(p)) - ++nb_gt; else ++nb_lt; } - if ((nb_lt + nb_eq) > 5) // Pixel Superiority index + if ((nb_lt + nb_eq) >= psi_threshold) // Pixel Superiority index is_crest(p) = true; } @@ -142,6 +152,14 @@ namespace mln } + template <typename I, typename D, typename N> + mln_concrete(I) + crest(const Image& input, const Image<D>& dist_map, + const Neighborhood<N>& nbh) + { + return crest(input, dist_map, nbh, 6); + } + # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

last-svn-commit-8-g7395d15 Add a routine to read dump files header.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/io/dump/all.hh: Include a new file. * mln/io/dump/get_header.hh: New. --- milena/ChangeLog | 8 ++++ milena/mln/io/dump/all.hh | 1 + milena/mln/io/{raw => dump}/get_header.hh | 66 +++++++++++++---------------- 3 files changed, 38 insertions(+), 37 deletions(-) copy milena/mln/io/{raw => dump}/get_header.hh (65%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 05234c0..21d7ddc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to read dump files header. + + * mln/io/dump/all.hh: Include a new file. + + * mln/io/dump/get_header.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to read DICOM files header. * mln/io/dicom/all.hh: Include a new file. diff --git a/milena/mln/io/dump/all.hh b/milena/mln/io/dump/all.hh index ae405e8..69d465b 100644 --- a/milena/mln/io/dump/all.hh +++ b/milena/mln/io/dump/all.hh @@ -41,6 +41,7 @@ namespace mln } +# include <mln/io/dump/get_header.hh> # include <mln/io/dump/load.hh> # include <mln/io/dump/save.hh> diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/dump/get_header.hh similarity index 65% copy from milena/mln/io/raw/get_header.hh copy to milena/mln/io/dump/get_header.hh index fa5dbf3..2cfb4cb 100644 --- a/milena/mln/io/raw/get_header.hh +++ b/milena/mln/io/dump/get_header.hh @@ -23,12 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_RAW_GET_HEADER_HH -# define MLN_IO_RAW_GET_HEADER_HH +#ifndef MLN_IO_DUMP_GET_HEADER_HH +# define MLN_IO_DUMP_GET_HEADER_HH /// \file /// -/// Load a Milena image rawed into a file. +/// Load a Milena image dumped into a file. # include <iostream> # include <fstream> @@ -45,11 +45,11 @@ namespace mln namespace io { - namespace raw + namespace dump { - /// Store raw file header. - struct raw_header + /// Store dump file header. + struct dump_header { unsigned dim; std::string value_type; @@ -57,79 +57,71 @@ namespace mln }; - /// Retrieve header in a raw file. - raw_header get_header(const std::string& filename); + /// Retrieve header in a dump file. + dump_header get_header(const std::string& filename); # ifndef MLN_INCLUDE_ONLY - raw_header get_header(const std::string& filename) + dump_header get_header(const std::string& filename) { - trace::entering("mln::io::raw::get_header"); + trace::entering("mln::io::dump::get_header"); - raw_header header; + dump_header header; - std::string info_filename = filename + ".info"; - - std::ifstream info_file(info_filename.c_str()); - if (! info_file) + std::ifstream file(filename.c_str()); + if (! file) { - std::cerr << "io::raw::get_header - Error: cannot open file '" + std::cerr << "io::dump::get_header - Error: cannot open file '" << filename << "'!" << std::endl; abort(); } + + // Milena's file type ? std::string file_type; - info_file >> file_type; - if (file_type != "milena/raw") + file >> file_type; + if (file_type != "milena/dump") { - std::cerr << "io::raw::load - Error: invalid file type. '" + std::cerr << "io::dump::load - Error: invalid file type. '" << filename - << "' is NOT a valid milena/raw info file!" + << "' is NOT a valid milena/dump file!" << std::endl; abort(); } - char dev_null[30]; - - // Dimension ? - // Reading line title "Dim: " - info_file.read(dev_null, 5); - info_file >> header.dim; + // Dimension + file >> header.dim; // Size information - Skip it, useless. header.size.resize(header.dim); for (unsigned i = 0; i < header.dim; ++i) - info_file >> header.size[i]; + file >> header.size[i]; + // Skipping endline. char c; - info_file.get(c); - + file.get(c); // Value type name ? - // Reading line title "data type: " - info_file.read(dev_null, 11); // WARNING: value type name limited to 255 characters... char value_type[255]; - info_file.getline(value_type, 255); + file.getline(value_type, 255); header.value_type = value_type; - info_file.close(); - - trace::exiting("mln::io::raw::get_header"); + trace::exiting("mln::io::dump::get_header"); return header; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::raw + } // end of namespace mln::io::dump } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_RAW_GET_HEADER_HH +#endif // ! MLN_IO_DUMP_GET_HEADER_HH -- 1.5.6.5

1 0

last-svn-commit-7-g1875111 Add a routine to read DICOM files header.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/io/dicom/all.hh: Include a new file. * mln/io/dicom/get_header.hh: New. * mln/io/dicom/load.hh: Add more doc. --- milena/ChangeLog | 10 +++ milena/mln/io/dicom/all.hh | 4 +- .../mln/io/{cloud/save.hh => dicom/get_header.hh} | 83 ++++++++++---------- milena/mln/io/dicom/load.hh | 17 +++- 4 files changed, 66 insertions(+), 48 deletions(-) copy milena/mln/io/{cloud/save.hh => dicom/get_header.hh} (54%) diff --git a/milena/ChangeLog b/milena/ChangeLog index b0cc268..05234c0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to read DICOM files header. + + * mln/io/dicom/all.hh: Include a new file. + + * mln/io/dicom/get_header.hh: New. + + * mln/io/dicom/load.hh: Add more doc. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add A new routine to draw plain boxes. * mln/draw/all.hh: Include new file. diff --git a/milena/mln/io/dicom/all.hh b/milena/mln/io/dicom/all.hh index c6d9256..1aa3d8c 100644 --- a/milena/mln/io/dicom/all.hh +++ b/milena/mln/io/dicom/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -41,6 +42,7 @@ namespace mln } +# include <mln/io/dicom/get_header.hh> # include <mln/io/dicom/load.hh> #endif // ! MLN_IO_DICOM_ALL_HH diff --git a/milena/mln/io/cloud/save.hh b/milena/mln/io/dicom/get_header.hh similarity index 54% copy from milena/mln/io/cloud/save.hh copy to milena/mln/io/dicom/get_header.hh index 7d0ef7b..6d85850 100644 --- a/milena/mln/io/cloud/save.hh +++ b/milena/mln/io/dicom/get_header.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,18 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_CLOUD_SAVE_HH -# define MLN_IO_CLOUD_SAVE_HH +#ifndef MLN_IO_DICOM_GET_HEADER_HH +# define MLN_IO_DICOM_GET_HEADER_HH /// \file /// -/// Save an image as a cloud of points. +/// Load a DICOM file header. # include <iostream> # include <fstream> # include <mln/core/concept/image.hh> -# include <mln/core/site_set/p_array.hh> +# include <mln/core/routine/initialize.hh> +# include <mln/core/box_runstart_piter.hh> +# include <mln/core/pixel.hh> +# include <mln/data/memcpy_.hh> namespace mln { @@ -42,67 +45,63 @@ namespace mln namespace io { - namespace cloud + namespace dicom { - /// Load a cloud of points - /// - /// \param[in] arr the cloud of points to save. - /// \param[in] filename the destination. - template <typename P> - void save(const p_array& arr, const std::string& filename); - + /// Store dicom file header. + struct dicom_header + { + // The number of dimensions. + unsigned dim; -# ifndef MLN_INCLUDE_ONLY + // The size in each dimension. + util::array<unsigned> size; + }; - namespace internal - { - template <typename P> - inline - void save_data(const p_array& arr, std::ofstream& file) - { - mln_piter(p_array) p(arr); - for_all(p) - { - std::ostringstream sline; - algebra::vec<P::dim,float> v = p.to_site().to_vec(); - sline << v[0]; - for (unsigned i = 1; i < P::dim; ++i) - sline << ' ' << v[i]; - sline << std::endl; - file << sline.str(); - } - } + /// Retrieve header in a dicom file. + dicom_header get_header(const std::string& filename); - } // end of namespace mln::io::cloud::internal +# ifndef MLN_INCLUDE_ONLY - template <typename P> - void save(const p_array& arr, const std::string& filename) + dicom_header get_header(const std::string& filename) { - trace::entering("mln::io::cloud::save"); + trace::entering("mln::io::dicom::get_header"); + + dicom_header header; - std::ofstream file(filename.c_str()); - if (! file) + gdcm::ImageReader r; + r.SetFileName(filename.c_str()); + if (!r.Read()) { std::cerr << "error: cannot open file '" << filename << "'!"; abort(); } - internal::save_data(arr, file); + gdcm::Image& image = r.GetImage(); + + header.dim = image.GetNumberOfDimensions(); + const unsigned int* dims = image.GetDimensions(); - trace::exiting("mln::io::cloud::save"); + for (unsigned i = 2; i < header.dim; ++i) + header.size.append(dims[i]); // sli, ... + for (unsigned i = 0; i < 2; ++i) + header.size.append(dims[i]); // row, col + + trace::exiting("mln::io::dicom::get_header"); + return header; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::cloud + } // end of namespace mln::io::dicom } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_CLOUD_SAVE_HH +#endif // ! MLN_IO_DICOM_GET_HEADER_HH + diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index 360c87f..f250a16 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -50,11 +50,18 @@ namespace mln namespace dicom { - /// Load a DICOM file in a Milena image. - /// - /// \param[out] ima A reference to the image which will receive - /// data. - /// \param[in] filename The source. + /*! Load a DICOM file in a Milena image. + + \param[out] ima A reference to the image which will receive + data. + \param[in] filename The source. + + + Common compilation flags to link to gdcm if this file is used: + + -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib + + */ template <typename I> void load(Image& ima, const std::string& filename); -- 1.5.6.5

1 0

last-svn-commit-6-gf08ca6b Add A new routine to draw plain boxes.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* milena/mln/draw/all.hh: Include new file. * milena/mln/draw/box.hh: Add a fixme. * milena/mln/draw/box_plain.hh: New. --- milena/ChangeLog | 10 +++++++ milena/mln/draw/all.hh | 1 + milena/mln/draw/box.hh | 5 +++- milena/mln/draw/{box.hh => box_plain.hh} | 40 ++++++++++++----------------- 4 files changed, 32 insertions(+), 24 deletions(-) copy milena/mln/draw/{box.hh => box_plain.hh} (72%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e5c034c..b0cc268 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add A new routine to draw plain boxes. + + * mln/draw/all.hh: Include new file. + + * mln/draw/box.hh: Add a fixme. + + * mln/draw/box_plain.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more implementations for box specializations. * mln/core/internal/box_impl.hh: Add width, height and depth. diff --git a/milena/mln/draw/all.hh b/milena/mln/draw/all.hh index 847d560..60bcca0 100644 --- a/milena/mln/draw/all.hh +++ b/milena/mln/draw/all.hh @@ -41,6 +41,7 @@ namespace mln # include <mln/draw/box.hh> +# include <mln/draw/box_plain.hh> # include <mln/draw/line.hh> # include <mln/draw/plot.hh> diff --git a/milena/mln/draw/box.hh b/milena/mln/draw/box.hh index d7236a8..8032172 100644 --- a/milena/mln/draw/box.hh +++ b/milena/mln/draw/box.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,8 @@ /*! \file * * \brief Draw a box in an image. + * + * \fixme Rename as box_frame.hh */ # include <mln/core/concept/image.hh> diff --git a/milena/mln/draw/box.hh b/milena/mln/draw/box_plain.hh similarity index 72% copy from milena/mln/draw/box.hh copy to milena/mln/draw/box_plain.hh index d7236a8..ec5b865 100644 --- a/milena/mln/draw/box.hh +++ b/milena/mln/draw/box_plain.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,17 +23,19 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DRAW_BOX_HH -# define MLN_DRAW_BOX_HH +#ifndef MLN_DRAW_BOX_PLAIN_HH +# define MLN_DRAW_BOX_PLAIN_HH /*! \file * - * \brief Draw a box in an image. + * \brief Draw a plain box in an image. + * + * \fixme Rename as box.hh */ # include <mln/core/concept/image.hh> # include <mln/core/alias/box2d.hh> -# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/draw/line.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> @@ -45,10 +47,10 @@ namespace mln namespace draw { - /*! Draw a box at value \p v in image \p ima + /*! Draw a plain box at value \p v in image \p ima * * \param[in,out] ima The image to be drawn. - * \param[in] b the boxto draw. + * \param[in] b the box to draw. * \param[in] v The value to assign to all drawn pixels. * * \pre \p ima has to be initialized. @@ -57,18 +59,18 @@ namespace mln * */ template <typename I, typename B> - void box(Image& ima, - const Box& b, - const mln_value(I)& v); + void box_plain(Image& ima, + const Box& b, + const mln_value(I)& v); # ifndef MLN_INCLUDE_ONLY template <typename I, typename B> inline - void box(Image& ima, - const Box& b, - const mln_value(I)& v) + void box_plain(Image& ima, + const Box& b, + const mln_value(I)& v) { mln_precondition(exact(ima).is_valid()); @@ -77,15 +79,7 @@ namespace mln mln_precondition(exact(ima).has(pmin) && exact(ima).has(pmax)); - mln_psite(I) p1 (pmin[0], pmin[1]); - mln_psite(I) p2 (pmax[0], pmin[1]); - mln_psite(I) p3 (pmin[0], pmax[1]); - mln_psite(I) p4 (pmax[0], pmax[1]); - - draw::line (ima, p1, p2, v); - draw::line (ima, p2, p4, v); - draw::line (ima, p4, p3, v); - draw::line (ima, p3, p1, v); + data::fill((ima | b).rw(), v); } # endif // ! MLN_INCLUDE_ONLY @@ -95,4 +89,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DRAW_BOX_HH +#endif // ! MLN_DRAW_BOX_PLAIN_HH -- 1.5.6.5

1 0

last-svn-commit-3-ga7dd8e8 Add new 3D neighborhoods and windows.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* milena/mln/core/alias/neighb3d.hh, * milena/mln/win/sline3d.hh: New. --- milena/ChangeLog | 7 +++++ milena/mln/core/alias/neighb3d.hh | 42 +++++++++++++++++++++++++++++ milena/mln/win/{vline2d.hh => sline3d.hh} | 36 ++++++++++++++++--------- 3 files changed, 72 insertions(+), 13 deletions(-) copy milena/mln/win/{vline2d.hh => sline3d.hh} (71%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 83cfdd7..8d21753 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new 3D neighborhoods and windows. + + * milena/mln/core/alias/neighb3d.hh, + * milena/mln/win/sline3d.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new rgb32 type for Qt compatibility. * milena/mln/convert/from_to.hxx: Declare conversion routines. diff --git a/milena/mln/core/alias/neighb3d.hh b/milena/mln/core/alias/neighb3d.hh index a50798e..a5dead7 100644 --- a/milena/mln/core/alias/neighb3d.hh +++ b/milena/mln/core/alias/neighb3d.hh @@ -49,6 +49,33 @@ namespace mln // typedef neighb<window3d> neighb3d; + + /// \brief depth 2-connectivity neighborhood on the 3D grid. + /*! + \verbatim + + . . . + . o . + . . . + + . . . + . x . + . . . + + . . . + . o . + . . . + + \endverbatim + + + \return A neighb3d. + + \ingroup modneighb3d + */ + const neighb3d& c2_3d_sli(); + + /// \brief 4-connectivity neighborhood on the 3D grid. /*! \verbatim @@ -196,6 +223,21 @@ namespace mln # ifndef MLN_INCLUDE_ONLY inline + const neighb3d& c2_3d_sli() + { + static neighb3d it; + if (it.size() == 0) + { + window3d& win = it.hook_win_(); + win + .insert(-1, 0, 0) + .insert(1, 0, 0); + } + return it; + } + + + inline const neighb3d& c4_3d() { static neighb3d it; diff --git a/milena/mln/win/vline2d.hh b/milena/mln/win/sline3d.hh similarity index 71% copy from milena/mln/win/vline2d.hh copy to milena/mln/win/sline3d.hh index c971b2b..2d7731f 100644 --- a/milena/mln/win/vline2d.hh +++ b/milena/mln/win/sline3d.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,12 +23,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_WIN_VLINE2D_HH -# define MLN_WIN_VLINE2D_HH +#ifndef MLN_WIN_SLINE3D_HH +# define MLN_WIN_SLINE3D_HH /// \file /// -/// Definition of the mln::win::vline2d window. +/// Definition of the mln::win::sline3d window. + # include <mln/win/line.hh> # include <mln/core/grids.hh> @@ -40,22 +41,31 @@ namespace mln namespace win { - /*! \brief Vertical line window defined on the 2D square grid. + /*! \brief Depth line window defined on the 3D cubic grid. - An vline2d is centered and symmetric; so its width is 1 and - its height (length) is odd. + An sline3d is centered and symmetric; so its height and its + width are 1 and its depth is odd. For instance: \verbatim - o - x - o + . . . + . o . + . . . + + . . . + . x . + . . . + + . . . + . o . + . . . + \endverbatim is defined with length = 3. - \ingroup modwin2d + \ingroup modwin3d */ - typedef line<grid::square, 0, def::coord> vline2d; + typedef line<grid::cube, 0, def::coord> sline3d; } // end of namespace mln::win @@ -63,4 +73,4 @@ namespace mln -#endif // ! MLN_WIN_VLINE2D_HH +#endif // ! MLN_WIN_SLINE3D_HH -- 1.5.6.5

1 0

last-svn-commit-2-g0a2727d Add a new rgb32 type for Qt compatibility.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* milena/mln/convert/from_to.hxx: Declare conversion routines. * milena/mln/value/qt/rgb32.hh: New. --- milena/ChangeLog | 8 + milena/mln/convert/from_to.hxx | 21 + milena/mln/value/qt/rgb32.hh | 786 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 815 insertions(+), 0 deletions(-) create mode 100644 milena/mln/value/qt/rgb32.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b5cba3..83cfdd7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new rgb32 type for Qt compatibility. + + * milena/mln/convert/from_to.hxx: Declare conversion routines. + + * milena/mln/value/qt/rgb32.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix invalid value type names in dump format. * milena/mln/value/internal/make_generic_name.hh: New. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index ebc30cd..c6d8fc6 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -86,6 +86,7 @@ namespace mln } namespace value { + namespace qt { struct rgb32; } template <unsigned n> struct rgb; template <typename H, typename S, typename L> class hsl_; template <unsigned n> struct int_u; @@ -162,14 +163,31 @@ namespace mln void from_to_(bool from, value::rgb<m>& to); + void + from_to_(const value::qt::rgb32& from, bool& to); + // int_u -> rgb. template <unsigned m> void from_to_(const value::int_u<m>& from, value::rgb<m>& to); + // int_u -> qt::rgb32. + template <unsigned m> + void from_to_(const value::int_u<m>& from, value::qt::rgb32& to); + // int_u -> label template <unsigned n> void from_to_(const value::int_u<n>& from, value::label<n>& to_); + // int_u -> unsigned + template <unsigned n> + void from_to_(const value::int_u<n>& from, unsigned& to_); + + // label -> int_u. + template <unsigned n> + void + from_to_(const value::label<n>& from, value::int_u<n>& to_); + + // label -> bool template <unsigned n> void from_to_(const value::label<n>& from, bool& to_); @@ -186,6 +204,9 @@ namespace mln template <typename H, typename S, typename L> void from_to_(const value::hsl_<H,S,L>&, value::rgb<16>& to); + // hsl -> qt::rgb32. + template <typename H, typename S, typename L> + void from_to_(const value::hsl_<H,S,L>&, value::qt::rgb32& to); // rgb to hsl void diff --git a/milena/mln/value/qt/rgb32.hh b/milena/mln/value/qt/rgb32.hh new file mode 100644 index 0000000..f0f4dbf --- /dev/null +++ b/milena/mln/value/qt/rgb32.hh @@ -0,0 +1,786 @@ +// 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 MLN_VALUE_QT_RGB32_HH +# define MLN_VALUE_QT_RGB32_HH + + +# include <mln/value/ops.hh> + +# include <mln/value/concept/vectorial.hh> +# include <mln/value/int_u.hh> +# include <mln/algebra/vec.hh> + +# include <mln/value/rgb8.hh> + +# include <mln/literal/zero.hh> +# include <mln/literal/black.hh> + +namespace mln +{ + + // Forward declaration. + namespace value { namespace qt { struct rgb32; } } + + + + namespace literal + { + /// \{ Forward declarations. + struct black_t; + struct white_t; + + struct light_gray_t; + struct medium_gray_t; + struct dark_gray_t; + + struct red_t; + struct green_t; + struct blue_t; + struct brown_t; + struct lime_t; + struct orange_t; + struct pink_t; + struct purple_t; + struct teal_t; + struct violet_t; + struct cyan_t; + struct magenta_t; + struct yellow_t; + struct olive_t; + /// \} + } + + + namespace convert + { + + namespace over_load + { + + // int_u -> rgb. + template <unsigned m> + void from_to_(const value::int_u<m>& from, value::qt::rgb32& to); + + // hsl -> rgb8. + template <typename H, typename S, typename L> + void from_to_(const value::hsl_<H,S,L>&, value::qt::rgb32& to); + + // rgb8 -> bool. + void from_to_(const value::qt::rgb32& from, bool& to); + + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + + + namespace trait + { + template <> + struct set_precise_binary_< op::plus, mln::value::qt::rgb32, mln::value::qt::rgb32 > + { + typedef mln::value::qt::rgb32 ret; + }; + + template <> + struct set_precise_binary_< op::minus, mln::value::qt::rgb32, mln::value::qt::rgb32 > + { + typedef mln::value::qt::rgb32 ret; + }; + + template < typename S > + struct set_precise_binary_< op::times, mln::value::qt::rgb32, mln::value::scalar_<S> > + { + typedef mln::value::qt::rgb32 ret; + }; + + template < typename S > + struct set_precise_binary_< op::div, mln::value::qt::rgb32, mln::value::scalar_<S> > + { + typedef mln::value::qt::rgb32 ret; + }; + + + // FIXME : Is there any way more generic? a way to factor + // set_precise_binary_< op::div, mln::value::qt::rgb32, mln::value::scalar_<S> > + // and + // set_precise_binary_< op::div, mln::value::qt::rgb32, mln::value::int_u<m> > + // as for op::times. + + template < unsigned m > + struct set_precise_binary_< op::times, mln::value::qt::rgb32, mln::value::int_u<m> > + { + typedef mln::value::qt::rgb32 ret; + }; + + template < unsigned m > + struct set_precise_binary_< op::div, mln::value::qt::rgb32, mln::value::int_u<m> > + { + typedef mln::value::qt::rgb32 ret; + }; + + + template <> + struct value_< mln::value::qt::rgb32 > + { + enum { + dim = 3, + nbits = 32, + card = mln_value_card_from_(nbits) + }; + + typedef trait::value::nature::vectorial nature; + typedef trait::value::kind::color kind; + typedef trait::value::quant::high /*mln_value_quant_from_(card)*/ quant; + + typedef void comp; + typedef mln::value::int_u<8> comp_0; + typedef mln::value::int_u<8> comp_1; + typedef mln::value::int_u<8> comp_2; + + template <typename V> static comp_0 get_comp_0(const V& v) { return v.red(); } + template <typename V> static comp_1 get_comp_1(const V& v) { return v.green(); } + template <typename V> static comp_2 get_comp_2(const V& v) { return v.blue(); } + + typedef algebra::vec<dim, float> sum; + + static const char* name() + { + static std::string s = std::string("rgb32").append(1, 8 + '0'); + return s.c_str(); + } + + }; + + } // end of namespace trait + + + + namespace value + { + + namespace qt + { + + /// Color class for red-green-blue where every component is + /// n-bit encoded. + + struct rgb32 + : + public Vectorial< rgb32 >, + public internal::value_like_< algebra::vec< 3, int_u<8> >, // Equivalent. + algebra::vec< 3, int_u<8> >, // Encoding. + algebra::vec< 3, int >, // Interoperation. + rgb32 > // Exact. + { + public: + + typedef int_u<8> red_t; + typedef int_u<8> green_t; + typedef int_u<8> blue_t; + + /// \{ Acces to red/green/blue component. + int_u<8> red() const { return this->v_[2]; } + int_u<8>& red() { return this->v_[2]; } + + int_u<8> green() const { return this->v_[1]; } + int_u<8>& green() { return this->v_[1]; } + + int_u<8> blue() const { return this->v_[0]; } + int_u<8>& blue() { return this->v_[0]; } + + int_u<8> comp(unsigned k) const { return this->v_[k]; } + int_u<8>& comp(unsigned k) { return this->v_[k]; } + /// \} + + /// Constructor without argument. + rgb32(); + + /// Constructor from component values. + rgb32(int r, int g, int b); + + /// Constructor from a algebra::vec. + rgb32(const algebra::vec<3, int>& rhs); + rgb32(const algebra::vec<3, unsigned>& rhs); + rgb32(const algebra::vec<3, int_u<8> >& rhs); + rgb32(const algebra::vec<3, float>& rhs); + + // Conversion to the interoperation type. + operator algebra::vec<3, int>() const; + // Conversion to the sum type. + operator algebra::vec<3, float>() const; + + /// \{ Constructors with literals. + rgb32(const mln::literal::zero_t&); + + rgb32(const mln::literal::white_t&); + rgb32(const mln::literal::black_t&); + + rgb32(const mln::literal::light_gray_t&); + rgb32(const mln::literal::medium_gray_t&); + rgb32(const mln::literal::dark_gray_t&); + + rgb32(const mln::literal::red_t&); + rgb32(const mln::literal::blue_t&); + rgb32(const mln::literal::green_t&); + rgb32(const mln::literal::brown_t&); + rgb32(const mln::literal::lime_t&); + rgb32(const mln::literal::orange_t&); + rgb32(const mln::literal::pink_t&); + rgb32(const mln::literal::purple_t&); + rgb32(const mln::literal::teal_t&); + rgb32(const mln::literal::violet_t&); + rgb32(const mln::literal::cyan_t&); + rgb32(const mln::literal::magenta_t&); + rgb32(const mln::literal::yellow_t&); + rgb32(const mln::literal::olive_t&); + /// \} + + /// Assignment. + rgb32& operator=(const rgb32& rhs); + + /// Zero value. + static const rgb32 zero; + + + /// Alpha value (unused). + int_u<8> alpha_; + }; + + + + /// Print an rgb32 \p c into the output stream \p ostr. + /// + /// \param[in,out] ostr An output stream. + /// \param[in] c An rgb32. + /// + /// \return The modified output stream \p ostr. + + std::ostream& operator<<(std::ostream& ostr, const rgb32& c); + + + std::istream& operator>>(std::istream& istr, rgb32& c); + + + /* FIXME: We should not need to define these operators, thanks to + Milena's global operator resolution mechanism based on + mln::Object. See what prevent us to use this mechanism. */ + + /* FIXME: Cannot work for i negative; add traits! (2008-02-16, + Roland: What does this comment mean?) */ + + /// Addition. + /// { + + rgb32::interop + operator+(const rgb32& lhs, const rgb32& rhs); + + + rgb32::interop + operator+(const rgb32::interop& lhs, const rgb32& rhs); + + + rgb32::interop + operator+(const rgb32& lhs, const rgb32::interop& rhs); + /// \} + + /// Subtraction. + /// \{ + + rgb32::interop + operator-(const rgb32& lhs, const rgb32& rhs); + + + rgb32::interop + operator-(const rgb32::interop& lhs, const rgb32& rhs); + + + rgb32::interop + operator-(const rgb32& lhs, const rgb32::interop& rhs); + /// \} + + /// Product. + /// \{ + template <typename S> + inline + rgb32::interop + operator*(const rgb32& lhs, const mln::value::scalar_<S>& s); + + template <typename S> + inline + rgb32::interop + operator*(const mln::value::scalar_<S>& s, const rgb32& lhs); + /// \} + + /// Division. + /// \{ + template <typename S> + inline + rgb32::interop + operator/(const rgb32& lhs, const mln::value::scalar_<S>& s); + /// \} + + + } // end of namespace mln::value::qt + + } // end of namespace mln::value + +} // end of namespace mln + + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace value + { + + namespace qt + { + + /*---------------. + | Construction. | + `---------------*/ + + + inline + rgb32::rgb32() + { + } + + + inline + rgb32::rgb32(const algebra::vec<3, int>& v) + { + this->v_[0] = v[2]; + this->v_[1] = v[1]; + this->v_[2] = v[0]; + } + + + inline + rgb32::rgb32(const algebra::vec<3, unsigned>& v) + { + this->v_[0] = v[2]; + this->v_[1] = v[1]; + this->v_[2] = v[0]; + } + + + inline + rgb32::rgb32(const algebra::vec<3, int_u<8> >& v) + { + this->v_[0] = v[2]; + this->v_[1] = v[1]; + this->v_[2] = v[0]; + } + + + inline + rgb32::rgb32(const algebra::vec<3, float>& v) + { + this->v_[0] = v[2]; + this->v_[1] = v[1]; + this->v_[2] = v[0]; + } + + + inline + rgb32::rgb32(int r, int g, int b) + { + mln_precondition(r >= 0); + mln_precondition(g >= 0); + mln_precondition(b >= 0); + mln_precondition(unsigned(r) <= mln_max(int_u<8>)); + mln_precondition(unsigned(g) <= mln_max(int_u<8>)); + mln_precondition(unsigned(b) <= mln_max(int_u<8>)); + this->v_[0] = b; + this->v_[1] = g; + this->v_[2] = r; + } + + + inline + rgb32::rgb32(const mln::literal::zero_t&) + { + this->v_[0] = 0; + this->v_[1] = 0; + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::white_t&) + { + this->v_[0] = mln_max(int_u<8>); + this->v_[1] = mln_max(int_u<8>); + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::black_t&) + { + this->v_[0] = 0; + this->v_[1] = 0; + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::light_gray_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.75; + this->v_[1] = mln_max(int_u<8>) * 0.75; + this->v_[2] = mln_max(int_u<8>) * 0.75; + } + + + inline + rgb32::rgb32(const mln::literal::medium_gray_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.50; + this->v_[1] = mln_max(int_u<8>) * 0.50; + this->v_[2] = mln_max(int_u<8>) * 0.50; + } + + + inline + rgb32::rgb32(const mln::literal::dark_gray_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.25; + this->v_[1] = mln_max(int_u<8>) * 0.25; + this->v_[2] = mln_max(int_u<8>) * 0.25; + } + + + inline + rgb32::rgb32(const mln::literal::red_t&) + { + this->v_[0] = 0; + this->v_[1] = 0; + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::green_t&) + { + this->v_[0] = 0; + this->v_[1] = mln_max(int_u<8>); + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::blue_t&) + { + this->v_[0] = mln_max(int_u<8>); + this->v_[1] = 0; + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::brown_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.25; + this->v_[1] = mln_max(int_u<8>) * 0.50; + this->v_[2] = mln_max(int_u<8>) * 0.75; + } + + + inline + rgb32::rgb32(const mln::literal::lime_t&) + { + this->v_[0] = 0; + this->v_[1] = mln_max(int_u<8>); + this->v_[2] = mln_max(int_u<8>) * 0.75; + } + + + inline + rgb32::rgb32(const mln::literal::orange_t&) + { + this->v_[0] = 0; + this->v_[1] = mln_max(int_u<8>) * 0.50; + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::pink_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.75; + this->v_[1] = mln_max(int_u<8>) * 0.75; + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::purple_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.25; + this->v_[1] = 0; + this->v_[2] = mln_max(int_u<8>) * 0.75; + } + + + inline + rgb32::rgb32(const mln::literal::teal_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.50; + this->v_[1] = mln_max(int_u<8>) * 0.50; + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::violet_t&) + { + this->v_[0] = mln_max(int_u<8>) * 0.50; + this->v_[1] = 0; + this->v_[2] = mln_max(int_u<8>) * 0.50; + } + + + inline + rgb32::rgb32(const mln::literal::cyan_t&) + { + this->v_[0] = mln_max(int_u<8>); + this->v_[1] = mln_max(int_u<8>); + this->v_[2] = 0; + } + + + inline + rgb32::rgb32(const mln::literal::magenta_t&) + { + this->v_[0] = mln_max(int_u<8>); + this->v_[1] = 0; + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::yellow_t&) + { + this->v_[0] = 0; + this->v_[1] = mln_max(int_u<8>); + this->v_[2] = mln_max(int_u<8>); + } + + + inline + rgb32::rgb32(const mln::literal::olive_t&) + { + this->v_[0] = 0; + this->v_[1] = mln_max(int_u<8>) * 0.50; + this->v_[2] = mln_max(int_u<8>) * 0.50; + } + + + inline + rgb32& + rgb32::operator=(const rgb32& rhs) + { + if (& rhs == this) + return *this; + this->v_ = rhs.v_; + return *this; + } + + + inline + rgb32::operator algebra::vec<3, int>() const + { + algebra::vec<3, int> out; + out[0] = this->v_[2]; + out[1] = this->v_[1]; + out[2] = this->v_[0]; + return out; + } + + inline + rgb32::operator algebra::vec<3, float>() const + { + algebra::vec<3, float> out; + out[0] = this->v_[2]; + out[1] = this->v_[1]; + out[2] = this->v_[0]; + return out; + } + + + const rgb32 rgb32::zero(0,0,0); + + /*------------. + | Operators. | + `------------*/ + + + inline + rgb32::interop + operator+(const rgb32& lhs, const rgb32& rhs) + { + rgb32::interop tmp(lhs.to_interop() + rhs.to_interop()); + return tmp; + } + + + inline + rgb32::interop + operator+(const rgb32& lhs, const rgb32::interop& rhs) + { + rgb32::interop tmp(lhs.to_interop() + rhs); + return tmp; + } + + + inline + rgb32::interop + operator+(const rgb32::interop& lhs, const rgb32& rhs) + { + rgb32::interop tmp(lhs + rhs.to_interop()); + return tmp; + } + + + inline + rgb32::interop + operator-(const rgb32& lhs, const rgb32& rhs) + { + rgb32::interop tmp(lhs.to_interop() - rhs.to_interop()); + return tmp; + } + + + inline + rgb32::interop + operator-(const rgb32& lhs, const rgb32::interop& rhs) + { + rgb32::interop tmp(lhs.to_interop() - rhs); + return tmp; + } + + + inline + rgb32::interop + operator-(const rgb32::interop& lhs, const rgb32& rhs) + { + rgb32::interop tmp(lhs - rhs.to_interop()); + return tmp; + } + + template <typename S> + inline + rgb32::interop + operator*(const rgb32& lhs, const mln::value::scalar_<S>& s) + { + rgb32::interop tmp(lhs.to_interop() * s.to_equiv()); + return tmp; + } + + template <typename S> + inline + rgb32::interop + operator*(const mln::value::scalar_<S>& s, const rgb32& lhs) + { + rgb32::interop tmp(s.to_equiv() * lhs.to_interop()); + return tmp; + } + + template <typename S> + inline + rgb32::interop + operator/(const rgb32& lhs, const mln::value::scalar_<S>& s) + { + rgb32::interop tmp(lhs.to_interop() / s.to_equiv()); + return tmp; + } + + + inline + std::ostream& operator<<(std::ostream& ostr, const rgb32& v) + { + return ostr << '(' << debug::format(v.red()) + << ',' << debug::format(v.green()) + << ',' << debug::format(v.blue()) + << ')'; + } + + + inline + std::istream& operator>>(std::istream& istr, rgb32& c) + { + return istr >> c.red() >> c.green() >> c.blue(); + } + + } // end of namespace mln::value::qt + + } // end of namespace mln::value + + + namespace convert + { + + namespace over_load + { + + template <unsigned m> + void + from_to_(const value::int_u<m>& from, value::qt::rgb32& to) + { + mlc_bool(m <= 8)::check(); + to = value::qt::rgb32(from, from, from); + } + + // hsl -> rgb8. + template <typename H, typename S, typename L> + void from_to_(const value::hsl_<H,S,L>& from, value::qt::rgb32& to) + { + value::rgb8 v = fun::v2v::f_hsl_to_rgb_3x8(from); + to = v.to_equiv(); + } + + void from_to_(const value::qt::rgb32& from, bool& to) + { + to = ((from == literal::black) ? false : true); + } + + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + +} // end of namespace mln + +# endif // ! MLN_INCLUDE_ONLY + + +#endif // ! MLN_VALUE_QT_RGB32_HH -- 1.5.6.5

1 0

last-svn-commit-1-g5c414c5 Fix invalid value type names in dump format.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* milena/mln/value/internal/make_generic_name.hh: New. * milena/mln/value/int_u.hh, * milena/mln/value/label.hh, * milena/mln/value/rgb.hh: Make use of the new routine to print a correct type names in dump format. --- milena/ChangeLog | 11 ++++ milena/mln/value/int_u.hh | 53 ++++++++++++++++++-- .../internal/{integer.hh => make_generic_name.hh} | 40 ++++++++------- milena/mln/value/label.hh | 22 +++++++- milena/mln/value/rgb.hh | 8 ++- 5 files changed, 108 insertions(+), 26 deletions(-) copy milena/mln/value/internal/{integer.hh => make_generic_name.hh} (67%) diff --git a/milena/ChangeLog b/milena/ChangeLog index b3cd42e..5b5cba3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid value type names in dump format. + + * milena/mln/value/internal/make_generic_name.hh: New. + + * milena/mln/value/int_u.hh, + * milena/mln/value/label.hh, + * milena/mln/value/rgb.hh: Make use of the new routine to print a + correct type names in dump format. + 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/white_paper/white_paper.tex: Fix an invalid URL. diff --git a/milena/mln/value/int_u.hh b/milena/mln/value/int_u.hh index 7f12c75..906dc29 100644 --- a/milena/mln/value/int_u.hh +++ b/milena/mln/value/int_u.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -41,6 +42,7 @@ # include <mln/trait/value_.hh> # include <mln/debug/format.hh> +# include <mln/value/internal/make_generic_name.hh> namespace mln @@ -98,7 +100,8 @@ namespace mln static const char* name() { - static std::string s = std::string("int_u").append(1, n + '0'); + static std::string + s = mln::value::internal::make_generic_name("int_u", n); return s.c_str(); } @@ -107,6 +110,23 @@ namespace mln } // end of namespace mln::trait + namespace convert + { + + namespace over_load + { + + // int_u -> unsigned. + template <unsigned n> + void + from_to_(const value::int_u<n>& from, unsigned& to_); + + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + + namespace value { @@ -178,9 +198,33 @@ namespace mln template <unsigned n> std::istream& operator>>(std::istream& istr, int_u<n>& i); + } // end of namespace mln::value # ifndef MLN_INCLUDE_ONLY + namespace convert + { + + namespace over_load + { + + // int_u -> unsigned. + template <unsigned n> + inline + void + from_to_(const value::int_u<n>& from, unsigned& to_) + { + to_ = from; + } + + } // end of namespace mln::convert::over_load + + } // end of namespace mln::convert + + + namespace value + { + template <unsigned n> inline int_u<n>::int_u() @@ -277,11 +321,12 @@ namespace mln return istr >> i.handle_(); } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::value +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln #endif // ! MLN_VALUE_INT_U_HH + diff --git a/milena/mln/value/internal/integer.hh b/milena/mln/value/internal/make_generic_name.hh similarity index 67% copy from milena/mln/value/internal/integer.hh copy to milena/mln/value/internal/make_generic_name.hh index 7925139..a48c04e 100644 --- a/milena/mln/value/internal/integer.hh +++ b/milena/mln/value/internal/make_generic_name.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,34 +23,39 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_INTERNAL_INTEGER_HH -# define MLN_VALUE_INTERNAL_INTEGER_HH +#ifndef MLN_VALUE_INTERNAL_MAKE_GENERIC_NAME_HH +# define MLN_VALUE_INTERNAL_MAKE_GENERIC_NAME_HH -/*! \file - * - * \brief Define a generic class for integer values. - */ +/// \file +/// +/// Construct a type name as string. -# include <mln/value/concept/scalar.hh> +# include <cstring> +# include <sstream> namespace mln { - namespace trait - { - // FIXME - } // end of namespace mln::trait - namespace value { namespace internal { - template <typename E> - struct Integer : public Scalar<E> + /// Construct a type name as string. + std::string make_generic_name(const char *name, int quantification); + +# ifndef MLN_INCLUDE_ONLY + + std::string make_generic_name(const char *name, int quantification) { - }; + std::stringstream out; + out << name; + out << quantification; + return out.str(); + } + +# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::value::internal @@ -58,5 +63,4 @@ namespace mln } // end of namespace mln - -#endif // ! MLN_VALUE_INTERNAL_INTEGER_HH +#endif // ! MLN_VALUE_INTERNAL_MAKE_GENERIC_NAME_HH diff --git a/milena/mln/value/label.hh b/milena/mln/value/label.hh index a88d4a3..7491ae5 100644 --- a/milena/mln/value/label.hh +++ b/milena/mln/value/label.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -38,6 +39,7 @@ # include <mln/value/internal/convert.hh> # include <mln/value/internal/encoding.hh> +# include <mln/value/internal/make_generic_name.hh> namespace mln { @@ -79,7 +81,8 @@ namespace mln static const char* name() { - static std::string s = std::string("label_").append(1, n + '0'); + static std::string + s = mln::value::internal::make_generic_name("label_", n); return s.c_str(); } @@ -100,6 +103,12 @@ namespace mln void from_to_(const value::int_u<n>& from, value::label<n>& to_); + // label -> int_u. + template <unsigned n> + void + from_to_(const value::label<n>& from, value::int_u<n>& to_); + + // int_u -> label. template <unsigned n, unsigned m> void @@ -204,6 +213,15 @@ namespace mln to_ = from; } + // label -> int_u. + template <unsigned n> + void + from_to_(const value::label<n>& from, value::int_u<n>& to_) + { + to_ = from; + } + + // int_u<n> -> label<m> with n < m. template <unsigned n, unsigned m> inline diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 4a41577..d63a558 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -34,6 +35,8 @@ # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> +# include <mln/value/internal/make_generic_name.hh> + namespace mln { @@ -220,7 +223,8 @@ namespace mln static const char* name() { - static std::string s = std::string("rgb").append(1, n + '0'); + static std::string + s = mln::value::internal::make_generic_name("rgb", n); return s.c_str(); } -- 1.5.6.5

1 0

last-svn-commit-3-g59a68eb python/morpho-segm.py: Remove a superfluous semi-colon.
by Roland Levillain 15 Feb '10

15 Feb '10

--- swilena/ChangeLog | 4 ++++ swilena/python/morpho-segm.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 3232f15..f6a3e78 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,7 @@ +2009-11-17 Roland Levillain <roland(a)lrde.epita.fr> + + * python/morpho-segm.py: Remove a superfluous semi-colon. + 2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> Clean up Swilena Makefiles. diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 021f91a..654aa95 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -33,7 +33,7 @@ image.save(gradient, "gradient.pgm") # Area closing of the gradient. closed_gradient = image.closing_area(ima, c4(), 50) # Watershed transform. -nbasins = int_u8(); +nbasins = int_u8() ws = image.meyer_wst (closed_gradient, c4(), nbasins) print nbasins image.save(ws, "segm.pgm") -- 1.5.6.5

1 0