Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Matthieu Garrigues <garrigues(a)lrde.epita.fr> A better test for io::pbm. * tests/io_pbm.cc: Take a pgm, binarise it, save it, read it, and check we we get the same pbm. --- io_pbm.cc | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) Index: trunk/milena/tests/io_pbm.cc =================================================================== --- trunk/milena/tests/io_pbm.cc (revision 1478) +++ trunk/milena/tests/io_pbm.cc (revision 1479) @@ -32,18 +32,44 @@ #include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/pw/all.hh> + +#include <mln/io/pgm/load.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/level/compare.hh> +#include <mln/level/fill.hh> + +#include <mln/border/thickness.hh> + int main() { using namespace mln; + using typename value::int_u8; + + border::thickness = 0; + image2d< int_u8 > + lena = io::pgm::load("../img/lena.pgm"); + - image2d< bool > - lena = io::pbm::load("../img/lena.pbm"); image2d<bool> out(lena.domain()); + level::fill(out, pw::value(lena) > pw::cst(127)); + io::pbm::save(out, "out.pbm"); - //level::transform(lena, binarise(), out); + { + image2d< bool > + lena = io::pbm::load("out.pbm"); + image2d<bool> out(lena.domain()); io::pbm::save(lena, "out.pbm"); + + image2d< bool > + lena2 = io::pbm::load("out.pbm"); + + io::pbm::save(lena2, "out2.pbm"); + + mln_assertion(lena == lena2); + } }

17 years, 2 months

milena r1478: Add function save and show for pratical using

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add function save and show for pratical using. * mln/display/save_and_show.hh: New function which saves and show an image. * tests/save_and_show.cc: New test for that. --- mln/display/save_and_show.hh | 91 +++++++++++++++++++++++++++++++++++++++++++ tests/save_and_show.cc | 74 ++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) Index: trunk/milena/tests/save_and_show.cc =================================================================== --- trunk/milena/tests/save_and_show.cc (revision 0) +++ trunk/milena/tests/save_and_show.cc (revision 1478) @@ -0,0 +1,74 @@ +// Copyright (C) 2007 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 +// 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/save_and_show.cc + * + * \brief Tests on mln::display::show. + */ + +# include <mln/core/image2d.hh> +# include <mln/io/pbm/load.hh> +# include <mln/make/win_chamfer.hh> +# include <mln/geom/chamfer.hh> +# include <mln/value/rgb8.hh> +# include <mln/core/sub_image.hh> +# include <mln/core/image_if_value.hh> +# include <mln/core/inplace.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/display/show.hh> +# include <mln/io/ppm/save.hh> +# include <mln/display/save_and_show.hh> + + +int main() +{ + using namespace mln; + + unsigned max = 51; + + + image2d<bool> input = io::pbm::load("../img/toto.pbm"); + + // Create a weighted windows : + // 0 2 0 + // 2 p 2 + // 0 2 0 + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); + + // Call chamfer for a distance image. + image2d<unsigned> tmp = geom::chamfer(input, w_win, max); + + // Call color_pretty for sub_image. + for (unsigned i = 2; i < 6; i += 2) + { + image_if_value<image2d<unsigned> > t = inplace (tmp | i); + display::save_and_show (t, "xv"); + } + +// image2d<value::rgb8> ima (100, 100); +// display::save_and_show (ima, "xv"); +} Index: trunk/milena/mln/display/save_and_show.hh =================================================================== --- trunk/milena/mln/display/save_and_show.hh (revision 0) +++ trunk/milena/mln/display/save_and_show.hh (revision 1478) @@ -0,0 +1,91 @@ +// Copyright (C) 2007 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 +// 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_DISPLAY_SAVE_AND_SHOW_HH +# define MLN_DISPLAY_SAVE_AND_SHOW_HH + +/*! \file mln/display/save_and_show.hh + * + * \brief Definition of function which saves and shows an image in the + * same call. + */ + +# include <mln/display/save.hh> +# include <mln/display/show.hh> + +namespace mln +{ + + namespace display + { + + template <typename I> + void + save_and_show(const Image& input_, std::string cmd); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + template <typename I> + void + save_and_show_(trait::value::kind::color, + const Image& input, std::string cmd) + { + save_color(input); + show(input, cmd); + } + + template <typename I> + void + save_and_show_(trait::value::kind::any, + const Image& input, + std::string cmd) + { + save(input); + show(input, cmd); + } + + } // end of namespace mln::display::impl + + /// Facade. + template <typename I> + void + save_and_show(const Image& input_, std::string cmd) + { + impl::save_and_show_(mln_trait_value_kind(mln_value(I)) (), + input_, cmd); + } + +# endif // !MLN_INCLUDE_ONLY + + } // end of namespace mln::display + +} // end of namespace mln + + +#endif // ! MLN_DISPLAY_SAVE_AND_SHOW_HH

17 years, 2 months

milena r1477: Fix differences between documented arguments and function arguments

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix differences between documented arguments and function arguments. * mln/labeling/estimate.hh, * mln/labeling/regional_maxima.hh, * mln/labeling/regional_minima.hh, * mln/level/memcpy_.hh, * mln/make/image2d.hh, * mln/make/point1d.hh, * mln/win/octagon2d.hh: Fix. --- labeling/estimate.hh | 1 + labeling/regional_maxima.hh | 1 + labeling/regional_minima.hh | 1 + level/memcpy_.hh | 2 +- make/image2d.hh | 2 +- make/point1d.hh | 3 +-- win/octagon2d.hh | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) Index: trunk/milena/mln/level/memcpy_.hh =================================================================== --- trunk/milena/mln/level/memcpy_.hh (revision 1476) +++ trunk/milena/mln/level/memcpy_.hh (revision 1477) @@ -49,7 +49,7 @@ * starting from pixel \p dest. * * \param[in,out] dest The destination pixel (to set values). - * \param[in] v The source pixel (to get values). + * \param[in] src The source pixel (to get values). * \param[in] n The number of pixels to copy. * * \pre FIXME: ! Index: trunk/milena/mln/make/image2d.hh =================================================================== --- trunk/milena/mln/make/image2d.hh (revision 1476) +++ trunk/milena/mln/make/image2d.hh (revision 1477) @@ -44,7 +44,7 @@ /*! \brief Create an image2d from an 2d array of values. * - * \param[in] 2d array. + * \param[in] values 2d array. * * \return A 2D image. */ Index: trunk/milena/mln/make/point1d.hh =================================================================== --- trunk/milena/mln/make/point1d.hh (revision 1476) +++ trunk/milena/mln/make/point1d.hh (revision 1477) @@ -44,8 +44,7 @@ /*! \brief Create an mln::point1d. * - * \param[in] ind Ind coordinate. - * \param[in] col Column coordinate. + * \param[in] ind Index. * * \return A 1D point. */ Index: trunk/milena/mln/win/octagon2d.hh =================================================================== --- trunk/milena/mln/win/octagon2d.hh (revision 1476) +++ trunk/milena/mln/win/octagon2d.hh (revision 1477) @@ -87,7 +87,7 @@ /*! \brief Constructor. * - * \param[in] lenght Length, of the octagon. + * \param[in] length Length, of the octagon. * * \pre \p length is such as length = 6*x + 1 where x >= 0. */ Index: trunk/milena/mln/labeling/regional_minima.hh =================================================================== --- trunk/milena/mln/labeling/regional_minima.hh (revision 1476) +++ trunk/milena/mln/labeling/regional_minima.hh (revision 1477) @@ -50,6 +50,7 @@ * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. * \param[out] output The label image. + * \param[out] nlabels The number of labels. * * \return The number of labels. */ Index: trunk/milena/mln/labeling/estimate.hh =================================================================== --- trunk/milena/mln/labeling/estimate.hh (revision 1476) +++ trunk/milena/mln/labeling/estimate.hh (revision 1477) @@ -47,6 +47,7 @@ * input with value \p val. * * \param[in] input The image. + * \param[in] val value. * \result The estimate value. */ template <typename A, typename I> Index: trunk/milena/mln/labeling/regional_maxima.hh =================================================================== --- trunk/milena/mln/labeling/regional_maxima.hh (revision 1476) +++ trunk/milena/mln/labeling/regional_maxima.hh (revision 1477) @@ -50,6 +50,7 @@ * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. * \param[out] output The label image. + * \param[out] nlabels The number of labeled regions. * * \return The number of labels. */

17 years, 2 months

milena r1476: Exclude sandbox and *spe.hh from documentation

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Exclude sandbox and *spe.hh from documentation. * doc/Doxyfile.in: Set EXCLUDE and EXCLUDE_PATTERNS. --- Doxyfile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: trunk/milena/doc/Doxyfile.in =================================================================== --- trunk/milena/doc/Doxyfile.in (revision 1475) +++ trunk/milena/doc/Doxyfile.in (revision 1476) @@ -501,7 +501,7 @@ # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = @top_srcdir@/milena/sandbox # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -515,7 +515,7 @@ # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = *spe.hh # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol # names (namespaces, classes, functions, etc.) that should be excluded

17 years, 2 months

milena r1475: Remove debug in display/save

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove debug in display/save. * mln/display/save.hh: Remove debug. --- save.hh | 2 -- 1 file changed, 2 deletions(-) Index: trunk/milena/mln/display/save.hh =================================================================== --- trunk/milena/mln/display/save.hh (revision 1474) +++ trunk/milena/mln/display/save.hh (revision 1475) @@ -79,7 +79,6 @@ io::ppm::save(out, path_tmp); - std::cout << input.id_ () << " = " << path_tmp << std::endl; map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; } @@ -98,7 +97,6 @@ io::ppm::save(input, path_tmp); - std::cout << input.id_ () << " = " << path_tmp << std::endl; map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; }

17 years, 2 months

milena r1473: Add fast priority queue with array

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add fast priority queue with array. * mln/core/p_priority_queue_fast_with_array.hh: New kind of fast priority queue based on std::vector. * tests/core_p_priority_queue_fast_with_array.cc: New test for that. --- mln/core/p_priority_queue_fast_with_array.hh | 323 +++++++++++++++++++++++++ tests/core_p_priority_queue_fast_with_array.cc | 105 ++++++++ 2 files changed, 428 insertions(+) Index: trunk/milena/tests/core_p_priority_queue_fast_with_array.cc =================================================================== --- trunk/milena/tests/core_p_priority_queue_fast_with_array.cc (revision 0) +++ trunk/milena/tests/core_p_priority_queue_fast_with_array.cc (revision 1473) @@ -0,0 +1,105 @@ +// Copyright (C) 2007 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 +// 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/p_priority_queue_fast_with_array.cc + * + * \brief Tests on mln::p_priority_queue_fast_with_array. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue_fast_with_array.hh> + +int main () +{ + using namespace mln; + + p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 1); + + q.push_force (p1, 3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 2); + + q.push_force (p2, 5); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 3); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/mln/core/p_priority_queue_fast_with_array.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 0) +++ trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1473) @@ -0,0 +1,323 @@ +// Copyright (C) 2007 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 +// 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_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +# define MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH + +/*! \file mln/core/p_priority_queue_fast_with_array.hh + * + * \brief Definition of a point set class based on p_queue with + * priority features. + */ + +# include <vector> +# include <deque> +# include <map> +# include <algorithm> +# include <iterator> + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/p_array_piter.hh> +# include <mln/accu/bbox.hh> +# include <mln/core/p_queue_fast.hh> + +namespace mln +{ + + // Fwd decls. + template <typename P> struct p_array_fwd_piter_; + template <typename P> struct p_array_bkd_piter_; + + + /*! \brief Point queue class (based on std::deque). + * + * This is a mathematical set of points (unique insertion). + * + * \todo Make it work with P being a Point_Site. + * \todo Add a parameter flag to choose another policy for "push" + * (i.e., no-op if multiple or allow multiple insertions). + * + * \warning We have some troubles with point set comparison based on + * a call to npoints() when this container is multiple. + */ + template <typename P, typename T, unsigned S> + class p_priority_queue_fast_with_array : public internal::point_set_base_< P, p_priority_queue_fast_with_array<P, T, S> > + { + public: + + /// Forward Point_Iterator associated type. + typedef p_array_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef p_array_bkd_piter_ bkd_piter; + + /// Constructor. + p_priority_queue_fast_with_array(); + + /// Test is \p p belongs to this point set. + bool has(const P& p) const; + + /// Test if queue is empty or not. + bool is_empty() const; + + /// Give the number of points. + unsigned npoints() const; + + /// Give the exact bounding box. + const box_& bbox() const; + + /// Push force a point \p p in the queue. + p_priority_queue_fast_with_array<P, T, S>& push_force(const P& p, T prio = 0); + + /// Push a point \p p in the queue. + p_priority_queue_fast_with_array<P, T, S>& push(const P& p, T prio = 0); + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point. + void pop(); + + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point. + const P& front() const; + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point and give the front point \p p of + /// the queue; \p p is the least recently inserted point. + const P& pop_front(); + + /// Clear the queue. + void clear(); + + /// Return the corresponding std::vector of points. + const std::vector& vect() const; + + /// Return the \p i-th point. + const P& operator[](unsigned i) const; + + protected: + + std::vector<p_queue_fast > q_; + + mutable std::vector vect_; + mutable bool vect_needs_update_; + void vect_update_() const; + + mutable accu::bbox bb_; + mutable bool bb_needs_update_; + void bb_update_() const; + + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, typename T, unsigned S> + p_priority_queue_fast_with_array<P, T, S>::p_priority_queue_fast_with_array() + { + vect_needs_update_ = false; + bb_needs_update_ = false; + q_.reserve(S); + std::copy(q_.begin(), q_.end(), + std::back_inserter(q_)); + for (unsigned i = 0; i < S; ++i) + q_[i].clear (); + } + + template <typename P, typename T, unsigned S> + void + p_priority_queue_fast_with_array<P, T, S>::vect_update_() const + { + vect_.clear(); + vect_.reserve(npoints()); + + for (unsigned i = 0; i < S; ++i) + std::copy(q_[i].vect().begin(), q_[i].vect().end(), + std::back_inserter(vect_)); + vect_needs_update_ = false; + } + + template <typename P, typename T, unsigned S> + void + p_priority_queue_fast_with_array<P, T, S>::bb_update_() const + { + bb_.init(); + + for (unsigned i = 0; i < S; ++i) + for (unsigned j = 0; j < q_[i].npoints (); ++j) + bb_.take(q_[i][j]); + bb_needs_update_ = false; + } + + + template <typename P, typename T, unsigned S> + bool + p_priority_queue_fast_with_array<P, T, S>::has(const P& p) const + { + for (unsigned i = 0; i < S; ++i) + if (q_[i].has (p)) + return true; + return false; + } + + template <typename P, typename T, unsigned S> + bool + p_priority_queue_fast_with_array<P, T, S>::is_empty() const + { + for (unsigned i = 0; i < S; ++i) + if (!q_[i].is_empty ()) + return false; + return true; + } + + template <typename P, typename T, unsigned S> + unsigned + p_priority_queue_fast_with_array<P, T, S>::npoints() const + { + unsigned res = 0; + + for (unsigned i = 0; i < S; ++i) + if (!q_[i].is_empty ()) + res += q_[i].npoints(); + + return res; + } + + template <typename P, typename T, unsigned S> + const box_& + p_priority_queue_fast_with_array<P, T, S>::bbox() const + { + mln_precondition(npoints() != 0); + if (bb_needs_update_) + bb_update_(); + return bb_.to_result(); + } + + template <typename P, typename T, unsigned S> + p_priority_queue_fast_with_array<P, T, S>& + p_priority_queue_fast_with_array<P, T, S>::push_force(const P& p, T prio) + { + q_[prio].push_force (p); + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + mln_assertion(!q_[prio].is_empty ()); + return *this; + } + + template <typename P, typename T, unsigned S> + p_priority_queue_fast_with_array<P, T, S>& + p_priority_queue_fast_with_array<P, T, S>::push(const P& p, T prio) + { + if (! has(p)) + return this->push_force(p, prio); + else + return *this; + } + + template <typename P, typename T, unsigned S> + void + p_priority_queue_fast_with_array<P, T, S>::pop() + { + for (unsigned i = S - 1; i != UINT_MAX; --i) + if (!q_[i].is_empty ()) + return q_[i].pop (); + + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + } + + template <typename P, typename T, unsigned S> + const P& + p_priority_queue_fast_with_array<P, T, S>::front() const + { + mln_precondition(! is_empty()); + + for (unsigned i = S - 1; i != UINT_MAX; --i) + if (!q_[i].is_empty ()) + return q_[i].front (); + return q_[0].front (); + } + + template <typename P, typename T, unsigned S> + const P& + p_priority_queue_fast_with_array<P, T, S>::pop_front() + { + const P& res = this->front(); + + this->pop(); + return res; + } + + template <typename P, typename T, unsigned S> + void + p_priority_queue_fast_with_array<P, T, S>::clear() + { + for (unsigned i = 0; i < S; ++i) + q_[i].clear (); + q_.clear(); + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T, unsigned S> + const std::vector& + p_priority_queue_fast_with_array<P, T, S>::vect() const + { + if (vect_needs_update_) + vect_update_(); + return vect_; + } + + template <typename P, typename T, unsigned S> + const P& + p_priority_queue_fast_with_array<P, T, S>::operator[](unsigned n) const + { + mln_precondition(n < npoints()); + unsigned i = S - 1; + unsigned cpt = 0; + + for (; i != UINT_MAX; --i) + if (!q_[i].is_empty ()) + for (cpt = 0; cpt < q_[i].npoints (); ++cpt, --n) + if (n == 0) + return q_[i][cpt]; + mln_assertion (false); + return q_[i][cpt]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH

17 years, 2 months

milena r1472: Fix doxygen expressions

by nivaul_s＠lrde.epita.fr

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Simon Nivault <simon.nivault(a)lrde.epita.fr> Fix doxygen expressions. * mln/core/a_point_of.hh, * mln/core/mesh_psite.hh, * mln/core/p_priority_queue.hh, * mln/fun/p2b/all.hh, * mln/trait/op/all.hh, * mln/trait/op/preinc.hh, * mln/trait/value/print.hh, * mln/util/branch_iter.hh, * mln/util/branch_iter_ind.hh, * mln/value/gray.hh, * mln/value/graylevel.hh, * mln/value/int_s.hh, * mln/value/int_u.hh, * mln/value/rgb.hh, * sandbox/duhamel/color_sub.cc, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/labeling_level.hh, * sandbox/duhamel/labeling_level_fast.cc, * sandbox/duhamel/labeling_level_fast_10000x1000.cc, * sandbox/duhamel/labeling_level_generic_10000x1000.cc, * sandbox/garrigues/fllt2.hh, * tests/convert_to_p_vec.cc, * tests/core_p_priority_queue.cc, * tests/core_p_priority_queue_fast.cc, * tests/core_p_queue.cc, * tests/core_p_queue_fast.cc, * tests/core_p_set.cc, * tests/core_pset_if.cc, * tests/norm/l1.cc, * tests/norm/l2.cc, * tests/norm/linfty.cc, * tests/pset_if.cc: Remove. * tests/tree_fast_to_image.cc: Fix. --- mln/core/a_point_of.hh | 2 - mln/core/mesh_psite.hh | 2 - mln/core/p_priority_queue.hh | 6 +-- mln/fun/p2b/all.hh | 2 - mln/trait/op/all.hh | 2 - mln/trait/op/preinc.hh | 2 - mln/trait/value/print.hh | 2 - mln/util/branch_iter.hh | 7 ++- mln/util/branch_iter_ind.hh | 35 +++++++++---------- mln/value/gray.hh | 15 +++++++- mln/value/graylevel.hh | 6 ++- mln/value/int_s.hh | 14 ++++++- mln/value/int_u.hh | 14 ++++++- mln/value/rgb.hh | 4 +- sandbox/duhamel/color_sub.cc | 4 +- sandbox/duhamel/labeling_algo.cc | 2 - sandbox/duhamel/labeling_level.hh | 2 - sandbox/duhamel/labeling_level_fast.cc | 2 - sandbox/duhamel/labeling_level_fast_10000x1000.cc | 2 - sandbox/duhamel/labeling_level_generic_10000x1000.cc | 2 - sandbox/garrigues/fllt2.hh | 12 +++--- tests/convert_to_p_vec.cc | 2 - tests/core_p_priority_queue.cc | 2 - tests/core_p_priority_queue_fast.cc | 2 - tests/core_p_queue.cc | 2 - tests/core_p_queue_fast.cc | 2 - tests/core_p_set.cc | 2 - tests/core_pset_if.cc | 2 - tests/norm/l1.cc | 6 ++- tests/norm/l2.cc | 6 ++- tests/norm/linfty.cc | 6 ++- tests/tree_fast_to_image.cc | 4 +- 32 files changed, 108 insertions(+), 67 deletions(-) Index: trunk/milena/tests/pset_if.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_queue.cc =================================================================== --- trunk/milena/tests/core_p_queue.cc (revision 1471) +++ trunk/milena/tests/core_p_queue.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/p_queue.cc +/*! \file tests/core_p_queue.cc * * \brief Tests on mln::p_queue. */ Index: trunk/milena/tests/core_p_priority_queue.cc =================================================================== --- trunk/milena/tests/core_p_priority_queue.cc (revision 1471) +++ trunk/milena/tests/core_p_priority_queue.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/p_priority_queue.cc +/*! \file tests/core_p_priority_queue.cc * * \brief Tests on mln::p_priority_queue. */ Index: trunk/milena/tests/core_p_set.cc =================================================================== --- trunk/milena/tests/core_p_set.cc (revision 1471) +++ trunk/milena/tests/core_p_set.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/p_set.cc +/*! \file tests/core_p_set.cc * * \brief Tests on mln::p_set. */ Index: trunk/milena/tests/convert_to_p_vec.cc =================================================================== --- trunk/milena/tests/convert_to_p_vec.cc (revision 1471) +++ trunk/milena/tests/convert_to_p_vec.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/convert_to_vec_p.cc +/*! \file tests/convert_to_p_vec.cc * * \brief Tests on mln::convert::to_vec_p. */ Index: trunk/milena/tests/core_pset_if.cc =================================================================== --- trunk/milena/tests/core_pset_if.cc (revision 1471) +++ trunk/milena/tests/core_pset_if.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pset_if.cc +/*! \file tests/core_pset_if.cc * * \brief Tests on mln::pset_if. */ Index: trunk/milena/tests/core_p_priority_queue_fast.cc =================================================================== --- trunk/milena/tests/core_p_priority_queue_fast.cc (revision 1471) +++ trunk/milena/tests/core_p_priority_queue_fast.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/p_priority_queue_fast.cc +/*! \file tests/core_p_priority_queue_fast.cc * * \brief Tests on mln::p_priority_queue_fast. */ Index: trunk/milena/tests/tree_fast_to_image.cc =================================================================== --- trunk/milena/tests/tree_fast_to_image.cc (revision 1471) +++ trunk/milena/tests/tree_fast_to_image.cc (revision 1472) @@ -26,9 +26,9 @@ // Public License. /*! - * \file tests/tree_to_image.cc + * \file tests/tree_fast_to_image.cc * - * \brief test of mln::util::tree_to_image + * \brief test of mln::util::tree_fast_to_image * */ Index: trunk/milena/tests/norm/l1.cc =================================================================== --- trunk/milena/tests/norm/l1.cc (revision 1471) +++ trunk/milena/tests/norm/l1.cc (revision 1472) @@ -25,8 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/l1.hh -/// \brief Test the L1-norm. +/*! \file tests/norm/l1.hh + * + * \brief Test the L1-norm. + */ #include <cassert> Index: trunk/milena/tests/norm/l2.cc =================================================================== --- trunk/milena/tests/norm/l2.cc (revision 1471) +++ trunk/milena/tests/norm/l2.cc (revision 1472) @@ -25,8 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/l2.hh -/// \brief Test the L2-norm. +/*! \file tests/norm/l2.hh + * + * \brief Test the L2-norm. + */ #include <cmath> #include <cassert> Index: trunk/milena/tests/norm/linfty.cc =================================================================== --- trunk/milena/tests/norm/linfty.cc (revision 1471) +++ trunk/milena/tests/norm/linfty.cc (revision 1472) @@ -25,8 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/linfty.hh -/// \brief Test the L-infinity-norm. +/*! \file tests/norm/linfty.hh + * + * \brief Test the L-infinity-norm. + */ #include <cmath> #include <cassert> Index: trunk/milena/tests/core_p_queue_fast.cc =================================================================== --- trunk/milena/tests/core_p_queue_fast.cc (revision 1471) +++ trunk/milena/tests/core_p_queue_fast.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/p_queue_fast.cc +/*! \file tests/core_p_queue_fast.cc * * \brief Tests on mln::p_queue_fast. */ Index: trunk/milena/mln/trait/value/print.hh =================================================================== --- trunk/milena/mln/trait/value/print.hh (revision 1471) +++ trunk/milena/mln/trait/value/print.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef MLN_TRAIT_VALUE_PRINT_HH # define MLN_TRAIT_VALUE_PRINT_HH -/*! \file mln/trait/values/print.hh +/*! \file mln/trait/value/print.hh * * \brief Print the collection of traits for an value type. */ Index: trunk/milena/mln/trait/op/all.hh =================================================================== --- trunk/milena/mln/trait/op/all.hh (revision 1471) +++ trunk/milena/mln/trait/op/all.hh (revision 1472) @@ -29,7 +29,7 @@ # define MLN_TRAIT_OP_ALL_HH /*! - * \file all.hh + * \file mln/trait/op/all.hh * * \brief FIXME * Index: trunk/milena/mln/trait/op/preinc.hh =================================================================== --- trunk/milena/mln/trait/op/preinc.hh (revision 1471) +++ trunk/milena/mln/trait/op/preinc.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef MLN_TRAIT_OP_PREINC_HH # define MLN_TRAIT_OP_PREINC_HH -/*! \file mln/trait/op/predec.hh +/*! \file mln/trait/op/preinc.hh * * \brief Declaration of the "unary pre-decrementation" operator trait. */ Index: trunk/milena/mln/core/mesh_psite.hh =================================================================== --- trunk/milena/mln/core/mesh_psite.hh (revision 1471) +++ trunk/milena/mln/core/mesh_psite.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef MLN_MESH_PSITE_HH # define MLN_MESH_PSITE_HH -/*! \file mln/core/mesh_p.hh +/*! \file mln/core/mesh_psite.hh * * \brief Definition of a graph-based point site. * Index: trunk/milena/mln/core/p_priority_queue.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue.hh (revision 1471) +++ trunk/milena/mln/core/p_priority_queue.hh (revision 1472) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_QUEUE_P_PRIORITY_HH -# define MLN_CORE_QUEUE_P_PRIORITY_HH +#ifndef MLN_CORE_P_PRIORITY_QUEUE_HH +# define MLN_CORE_P_PRIORITY_QUEUE_HH /*! \file mln/core/p_priority_queue.hh * @@ -334,4 +334,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_QUEUE_P_PRIORITY_HH +#endif // ! MLN_CORE_P_PRIORITY_QUEUE_HH Index: trunk/milena/mln/core/a_point_of.hh =================================================================== --- trunk/milena/mln/core/a_point_of.hh (revision 1471) +++ trunk/milena/mln/core/a_point_of.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_A_POINT_OF_HH # define MLN_CORE_A_POINT_OF_HH -/*! \file mln/core/a_point_oft.hh +/*! \file mln/core/a_point_of.hh * * \brief Give a point of an image. */ Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1471) +++ trunk/milena/mln/value/graylevel.hh (revision 1472) @@ -50,20 +50,22 @@ namespace mln { - /// \{ Fwd decls. namespace literal { + /// \{ Fwd decls. struct black_t; struct medium_gray_t; struct white_t; + /// \} } namespace value { + /// \{ Fwd decls. class gray; template <unsigned n> struct graylevel; struct float01_f; - } /// \} + } Index: trunk/milena/mln/value/gray.hh =================================================================== --- trunk/milena/mln/value/gray.hh (revision 1471) +++ trunk/milena/mln/value/gray.hh (revision 1472) @@ -43,10 +43,21 @@ namespace mln { + namespace literal + { + /// \{ Fwd decls. + struct black_t; + struct white_t; + /// \} + } + + namespace value + { /// \{ Fwd decls. - namespace literal { struct black_t; struct white_t; } - namespace value { template <unsigned N> class graylevel; class gray; } + template <unsigned N> class graylevel; + class gray; /// \} + } namespace trait Index: trunk/milena/mln/value/int_s.hh =================================================================== --- trunk/milena/mln/value/int_s.hh (revision 1471) +++ trunk/milena/mln/value/int_s.hh (revision 1472) @@ -48,10 +48,20 @@ { + namespace value + { + /// \{ Fwd decls. + template <unsigned n> struct int_s; + /// \} + } + + namespace literal + { /// \{ Fwd decls. - namespace value { template <unsigned n> struct int_s; } - namespace literal { struct zero_t; struct one_t; } + struct zero_t; + struct one_t; /// \} + } Index: trunk/milena/mln/value/int_u.hh =================================================================== --- trunk/milena/mln/value/int_u.hh (revision 1471) +++ trunk/milena/mln/value/int_u.hh (revision 1472) @@ -49,10 +49,20 @@ namespace mln { + namespace value + { + /// \{ Fwd decls. + template <unsigned n> struct int_u; + /// \} + } + + namespace literal + { /// \{ Fwd decls. - namespace value { template <unsigned n> struct int_u; } - namespace literal { struct zero_t; struct one_t; } + struct zero_t; + struct one_t; /// \} + } namespace trait Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1471) +++ trunk/milena/mln/value/rgb.hh (revision 1472) @@ -44,17 +44,17 @@ namespace mln { - /// \{ Fwd decls. namespace literal { + /// \{ Fwd decls. struct black_t; struct white_t; struct red_t; struct blue_t; struct green_t; - } /// \} + } namespace value Index: trunk/milena/mln/fun/p2b/all.hh =================================================================== --- trunk/milena/mln/fun/p2b/all.hh (revision 1471) +++ trunk/milena/mln/fun/p2b/all.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef MLN_FUN_P2B_ALL_HH # define MLN_FUN_P2B_ALL_HH -/*! \file mln/fun_p2b/all.hh +/*! \file mln/fun/p2b/all.hh * * \brief File that includes all functions from point to boolean. */ Index: trunk/milena/mln/util/branch_iter_ind.hh =================================================================== --- trunk/milena/mln/util/branch_iter_ind.hh (revision 1471) +++ trunk/milena/mln/util/branch_iter_ind.hh (revision 1472) @@ -25,18 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_UTIL_BRANCH_ITER_HH -# define MLN_UTIL_BRANCH_ITER_HH +#ifndef MLN_UTIL_BRANCH_ITER_IND_HH +# define MLN_UTIL_BRANCH_ITER_IND_HH -# include <stack> -# include <mln/util/tree.hh> /*! - * \file mln/util/branch.hh + * \file mln/util/branch_iter_ind.hh * * \brief Definition of a iterator on branch. * */ +# include <stack> +# include <mln/util/tree.hh> + namespace mln { @@ -59,14 +60,14 @@ /*! \brief Basic 2D image class. * - * The parameter \c T is the type of node's data. branch_iter is used to pre-order walk a branch. + * The parameter \c T is the type of node's data. branch_iter_ind is used to pre-order walk a branch. */ template <typename T> - class branch_iter + class branch_iter_ind { public: - branch_iter(branch<T> branch); + branch_iter_ind(branch<T> branch); /// Convertion to node. operator util::node<T>&() const; @@ -100,14 +101,14 @@ template <typename T> - branch_iter<T>::branch_iter(branch<T> branch) + branch_iter_ind<T>::branch_iter_ind(branch<T> branch) : branch_(branch) { invalidate(); } template <typename T> - branch_iter<T>::operator node<T>&() const + branch_iter_ind<T>::operator node<T>&() const { mln_assertion(n_); return *n_; @@ -115,7 +116,7 @@ template <typename T> util::node<T>& - branch_iter<T>::operator*() + branch_iter_ind<T>::operator*() { mln_assertion(n_); return *n_; @@ -123,7 +124,7 @@ template <typename T> unsigned - branch_iter<T>::deepness() const + branch_iter_ind<T>::deepness() const { mln_assertion(is_valid()); unsigned i = 0; @@ -138,14 +139,14 @@ template <typename T> bool - branch_iter<T>::is_valid() const + branch_iter_ind<T>::is_valid() const { return n_ != 0; } template <typename T> void - branch_iter<T>::invalidate() + branch_iter_ind<T>::invalidate() { n_ = 0; } @@ -153,7 +154,7 @@ template <typename T> void - branch_iter<T>::start() + branch_iter_ind<T>::start() { s_.push(bi_elt<T>(&branch_.apex().children())); @@ -162,7 +163,7 @@ template <typename T> void - branch_iter<T>::next() + branch_iter_ind<T>::next() { // First : list of children. // Second : i; @@ -218,4 +219,4 @@ } // end of namespace mln -#endif // !MLN_UTIL_BRANCH_HH +#endif // !MLN_UTIL_BRANCH_ITER_IND_HH Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1471) +++ trunk/milena/mln/util/branch_iter.hh (revision 1472) @@ -28,15 +28,16 @@ #ifndef MLN_UTIL_BRANCH_ITER_HH # define MLN_UTIL_BRANCH_ITER_HH -# include <stack> -# include <mln/util/tree.hh> /*! - * \file mln/util/branch.hh + * \file mln/util/branch_iter.hh * * \brief Definition of a iterator on branch. * */ +# include <stack> +# include <mln/util/tree.hh> + namespace mln { Index: trunk/milena/sandbox/duhamel/labeling_level_generic_10000x1000.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_level_generic_10000x1000.cc (revision 1471) +++ trunk/milena/sandbox/duhamel/labeling_level_generic_10000x1000.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file sandbox/duhamel/labeling_level_generic_10000x1000.cc * * \brief Test on mln::labeling::foreground. */ Index: trunk/milena/sandbox/duhamel/labeling_algo.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_algo.cc (revision 1471) +++ trunk/milena/sandbox/duhamel/labeling_algo.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file sandbox/duhamel/labeling_algo.cc * * \brief Test on mln::labeling::foreground. */ Index: trunk/milena/sandbox/duhamel/color_sub.cc =================================================================== --- trunk/milena/sandbox/duhamel/color_sub.cc (revision 1471) +++ trunk/milena/sandbox/duhamel/color_sub.cc (revision 1472) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/sub_image.cc +/*! \file sandbox/duhamel/color_sub.cc * - * \brief Tests on mln::sub_image. + * \brief Tests on mln::color_sub. */ # include <mln/core/image2d_b.hh> Index: trunk/milena/sandbox/duhamel/labeling_level_fast_10000x1000.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_level_fast_10000x1000.cc (revision 1471) +++ trunk/milena/sandbox/duhamel/labeling_level_fast_10000x1000.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file sandbox/duhamel/labeling_level_fast_10000x1000.cc * * \brief Test on mln::labeling::foreground. */ Index: trunk/milena/sandbox/duhamel/labeling_level_fast.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_level_fast.cc (revision 1471) +++ trunk/milena/sandbox/duhamel/labeling_level_fast.cc (revision 1472) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file sandbox/duhamel/labeling_level_fast.cc * * \brief Test on mln::labeling::foreground. */ Index: trunk/milena/sandbox/duhamel/labeling_level.hh =================================================================== --- trunk/milena/sandbox/duhamel/labeling_level.hh (revision 1471) +++ trunk/milena/sandbox/duhamel/labeling_level.hh (revision 1472) @@ -28,7 +28,7 @@ #ifndef SANDBOX_MLN_LABELING_LEVEL_HH # define SANDBOX_MLN_LABELING_LEVEL_HH -/*! \file mln/labeling/level.hh +/*! \file sandbox/duhamel/labeling_level.hh * * \brief Connected component labeling of the image objects at a given * level. Index: trunk/milena/sandbox/garrigues/fllt2.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt2.hh (revision 1471) +++ trunk/milena/sandbox/garrigues/fllt2.hh (revision 1472) @@ -99,7 +99,7 @@ # define fllt_tree(P, V) util::tree< fllt_node_elt<P, V> > # define fllt_node(P, V) util::node< fllt_node_elt<P, V> > # define fllt_branch(P, V) util::branch< fllt_node_elt<P, V> > -# define fllt_branch_iter(P, V) util::branch_iter< fllt_node_elt<P, V> > +# define fllt_branch_iter_ind(P, V) util::branch_iter_ind< fllt_node_elt<P, V> > // # define fllt_node(P, V) typename fllt_tree(P, V)::node_t @@ -690,7 +690,7 @@ { std::cout << "[Merge first tree]------------" << std::endl; - fllt_branch_iter(P, V) p(lower_tree.main_branch()); + fllt_branch_iter_ind(P, V) p(lower_tree.main_branch()); for_all(p) { fllt_node(P, V)& n(p); @@ -704,7 +704,7 @@ { std::cout << "[Merge second tree]------------" << std::endl; - fllt_branch_iter(P, V) p(upper_tree.main_branch()); + fllt_branch_iter_ind(P, V) p(upper_tree.main_branch()); for_all(p) { fllt_node(P, V)& n(p); @@ -739,7 +739,7 @@ visualize_deepness(image2d<value::int_u8>& output, fllt_tree(P, V)& tree) { - fllt_branch_iter(P, V) p(tree.main_branch()); + fllt_branch_iter_ind(P, V) p(tree.main_branch()); level::fill(output, 0); for_all(p) { @@ -760,7 +760,7 @@ fllt_tree(P, V)& tree, unsigned limit) { - fllt_branch_iter(P, V) p(tree.main_branch()); + fllt_branch_iter_ind(P, V) p(tree.main_branch()); level::fill(output, 255); for_all(p) { @@ -786,7 +786,7 @@ draw_tree(const image2d<V>& ima, fllt_tree(P, V)& tree) { - fllt_branch_iter(P, V) p(tree.main_branch()); + fllt_branch_iter_ind(P, V) p(tree.main_branch()); for_all(p) { std::cout << "region mere : " << (*p).parent() << std::endl;

17 years, 2 months

milena r1471: Plugin gimp support the undo system

by nivaul_s＠lrde.epita.fr

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Simon Nivault <simon.nivault(a)lrde.epita.fr> Plugin gimp support the undo system. * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/plugin-gimp/src/build-image.hxx, * sandbox/nivault/plugin-gimp/src/main.cc: Use two image for reading and writing. --- build-image.hh | 3 ++- build-image.hxx | 15 +++++++++------ main.cc | 27 ++++++++++++++++----------- 3 files changed, 27 insertions(+), 18 deletions(-) Index: trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx (revision 1470) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx (revision 1471) @@ -45,9 +45,10 @@ } }; -void build_milena_image(GimpPixelRgn *region) +void build_milena_image(GimpPixelRgn *in, + GimpPixelRgn *out) { - I tmp(region); + I tmp(in); // g_message(region->dirty ? "saaale" : "pas saaale"); // g_message(region->shadow ? "shadoooow" : "pas shadoooow"); ima = tmp; @@ -65,13 +66,15 @@ mln::level::transform(ima, fun, tmp2); mln::border::resize(tmp2, 0); - gimp_pixel_rgn_set_rect(region, + gimp_pixel_rgn_set_rect(out, (const guchar *) tmp2.buffer(), 0, 0, - region->w, - region->h); - gimp_displays_flush (); + out->w, + out->h); + + gimp_drawable_flush (out->drawable); + gimp_drawable_merge_shadow (out->drawable->drawable_id, TRUE); } gboolean draw_milena_image(GtkWidget* area, Index: trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 1470) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 1471) @@ -96,8 +96,10 @@ { static GimpParam values[1]; GimpDrawable *drawable; - GimpPixelRgn region; + GimpPixelRgn in, out; gint32 image_ID; + gint x1, y1, x2, y2; + gint width, height; GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; @@ -107,18 +109,16 @@ run_mode = (GimpRunMode) param[0].data.d_int32; image_ID = param[1].data.d_int32; drawable = gimp_drawable_get (param[2].data.d_drawable); - gimp_image_undo_enable(image_ID); - gimp_pixel_rgn_init(&region, - drawable, - 0, - 0, - drawable->width, - drawable->height, - FALSE, - FALSE); + gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - build_milena_image(&region); + width = drawable->width; + height = drawable->height; + + gimp_pixel_rgn_init(&in, drawable, 0, 0, width, height, FALSE, FALSE); + gimp_pixel_rgn_init(&out, drawable, 0, 0, width, height, TRUE, TRUE); + + build_milena_image(&in, & out); if (strcmp (name, PROCEDURE_NAME) == 0) { @@ -143,6 +143,11 @@ status = GIMP_PDB_CALLING_ERROR; } + gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1)); + + gimp_displays_flush (); + gimp_drawable_detach (drawable); + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; } Index: trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh (revision 1470) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh (revision 1471) @@ -43,7 +43,8 @@ # include <mln/io/ppm/save.hh> -void build_milena_image(GimpPixelRgn *region); +void build_milena_image(GimpPixelRgn *in, + GimpPixelRgn *out); gboolean draw_milena_image(GtkWidget* area, GdkEventExpose *event,

17 years, 2 months

milena r1470: Fix queue : rename empty in is_empty and add method pop_front

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-13 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix queue : rename empty in is_empty and add method pop_front. Rename empty in is_empty and add method pop_front, which return the front element and pop the queue. * mln/core/p_priority_queue.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/p_queue.hh, * mln/core/p_queue_fast.hh: Update this modification. Update with these modifications. * mln/geom/seeds2tiling.hh, * mln/geom/seeds2tiling_with_chamfer.hh, * tests/core_p_priority_queue.cc, * tests/core_p_priority_queue_fast.cc: Update. --- mln/core/p_priority_queue.hh | 69 ++++++++++++++++++++-------------- mln/core/p_priority_queue_fast.hh | 29 ++++++++++---- mln/core/p_queue.hh | 19 ++++++++- mln/core/p_queue_fast.hh | 22 +++++++++- mln/geom/seeds2tiling.hh | 4 - mln/geom/seeds2tiling_with_chamfer.hh | 2 tests/core_p_priority_queue.cc | 10 ++-- tests/core_p_priority_queue_fast.cc | 8 +-- 8 files changed, 112 insertions(+), 51 deletions(-) Index: trunk/milena/tests/core_p_priority_queue.cc =================================================================== --- trunk/milena/tests/core_p_priority_queue.cc (revision 1469) +++ trunk/milena/tests/core_p_priority_queue.cc (revision 1470) @@ -37,12 +37,12 @@ { using namespace mln; - mln::p_priority_queue<point2d, unsigned> q; + p_priority_queue<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); mln_assertion (q.npoints () == 0); @@ -53,7 +53,7 @@ std::cout << q.bbox () << std::endl; std::cout << q << std::endl; - mln_assertion (!q.empty ()); + mln_assertion (!q.is_empty ()); mln_assertion (q.has (p1)); mln_assertion (q.has (p2)); @@ -84,7 +84,7 @@ mln_assertion (!q.has (p3)); mln_assertion (q.npoints () == 0); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); q.push_force (p3); q.push_force (p2, 5); @@ -94,5 +94,5 @@ mln_assertion (q[1] == p1); mln_assertion (q[0] == p2); q.clear (); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); } Index: trunk/milena/tests/core_p_priority_queue_fast.cc =================================================================== --- trunk/milena/tests/core_p_priority_queue_fast.cc (revision 1469) +++ trunk/milena/tests/core_p_priority_queue_fast.cc (revision 1470) @@ -42,7 +42,7 @@ point2d p2 (5, 1); point2d p3 (4, 2); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); mln_assertion (q.npoints () == 0); @@ -53,7 +53,7 @@ std::cout << q.bbox () << std::endl; std::cout << q << std::endl; - mln_assertion (!q.empty ()); + mln_assertion (!q.is_empty ()); mln_assertion (q.has (p1)); mln_assertion (q.has (p2)); @@ -84,7 +84,7 @@ mln_assertion (!q.has (p3)); mln_assertion (q.npoints () == 0); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); q.push_force (p3); q.push_force (p2, 5); @@ -94,5 +94,5 @@ mln_assertion (q[1] == p1); mln_assertion (q[0] == p2); q.clear (); - mln_assertion (q.empty ()); + mln_assertion (q.is_empty ()); } Index: trunk/milena/mln/core/p_queue.hh =================================================================== --- trunk/milena/mln/core/p_queue.hh (revision 1469) +++ trunk/milena/mln/core/p_queue.hh (revision 1470) @@ -80,7 +80,7 @@ bool has(const P& p) const; /// Test if queue is empty or not. - bool empty() const; + bool is_empty() const; /// Give the number of points. std::size_t npoints() const; @@ -102,6 +102,11 @@ /// recently inserted point. const P& front() const; + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point and pop (remove) the front point \p p + /// from the queue; \p p is the least recently inserted point. + const P& pop_front(); + /// Clear the queue. void clear(); @@ -169,7 +174,7 @@ template <typename P> bool - p_queue::empty() const + p_queue::is_empty() const { return (q_.empty()); } @@ -234,6 +239,16 @@ } template <typename P> + const P& + p_queue::pop_front() + { + const P& res = this->front(); + + this->pop(); + return res; + } + + template <typename P> void p_queue::clear() { Index: trunk/milena/mln/core/p_priority_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1469) +++ trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1470) @@ -82,7 +82,7 @@ bool has(const P& p) const; /// Test if queue is empty or not. - bool empty() const; + bool is_empty() const; /// Give the number of points. unsigned npoints() const; @@ -104,6 +104,11 @@ /// recently inserted point. const P& front() const; + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point and give the front point \p p of + /// the queue; \p p is the least recently inserted point. + const P& pop_front(); + /// Clear the queue. void clear(); @@ -182,12 +187,12 @@ template <typename P, typename T> bool - p_priority_queue_fast<P, T>::empty() const + p_priority_queue_fast<P, T>::is_empty() const { typename std::map<T, p_queue_fast >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) return false; return true; } @@ -201,7 +206,7 @@ typename std::map<T, p_queue_fast >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) res += (*it).second.npoints(); return res; } @@ -246,7 +251,7 @@ typename std::map<T, p_queue_fast >::reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) return (*it).second.pop (); if (! vect_needs_update_) @@ -265,12 +270,22 @@ typename std::map<T, p_queue_fast >::const_reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) break; return (*it).second.front (); } template <typename P, typename T> + const P& + p_priority_queue_fast<P, T>::pop_front() + { + const P& res = this->front(); + + this->pop(); + return res; + } + + template <typename P, typename T> void p_priority_queue_fast<P, T>::clear() { @@ -303,7 +318,7 @@ for (; it != q_.rend (); ++it) { - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) for (cpt = 0; cpt < (*it).second.npoints (); ++cpt) { if (i == 0) Index: trunk/milena/mln/core/p_priority_queue.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue.hh (revision 1469) +++ trunk/milena/mln/core/p_priority_queue.hh (revision 1470) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_QUEUE_P_PRIORITY_HH # define MLN_CORE_QUEUE_P_PRIORITY_HH -/*! \file mln/core/p_queue_priority.hh +/*! \file mln/core/p_priority_queue.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -65,7 +65,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class p_queue_priority : public internal::point_set_base_< P, p_queue_priority<P, T> > + class p_priority_queue : public internal::point_set_base_< P, p_priority_queue<P, T> > { public: @@ -76,13 +76,13 @@ typedef p_array_bkd_piter_ bkd_piter; /// Constructor. - p_queue_priority(); + p_priority_queue(); /// Test is \p p belongs to this point set. bool has(const P& p) const; /// Test if queue is empty or not. - bool empty() const; + bool is_empty() const; /// Give the number of points. unsigned npoints() const; @@ -91,10 +91,10 @@ const box_& bbox() const; /// Push force a point \p p in the queue. - p_queue_priority<P, T>& push_force(const P& p, T prio = 0); + p_priority_queue<P, T>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_queue_priority<P, T>& push(const P& p, T prio = 0); + p_priority_queue<P, T>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -104,6 +104,11 @@ /// recently inserted point. const P& front() const; + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point and give the front point \p p of + /// the queue; \p p is the least recently inserted point. + const P& pop_front(); + /// Clear the queue. void clear(); @@ -132,7 +137,7 @@ # ifndef MLN_INCLUDE_ONLY template <typename P, typename T> - p_queue_priority<P, T>::p_queue_priority() + p_priority_queue<P, T>::p_priority_queue() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -140,7 +145,7 @@ template <typename P, typename T> void - p_queue_priority<P, T>::vect_update_() const + p_priority_queue<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -155,7 +160,7 @@ template <typename P, typename T> void - p_queue_priority<P, T>::bb_update_() const + p_priority_queue<P, T>::bb_update_() const { bb_.init(); @@ -170,7 +175,7 @@ template <typename P, typename T> bool - p_queue_priority<P, T>::has(const P& p) const + p_priority_queue<P, T>::has(const P& p) const { typename std::map<T, p_queue >::const_iterator it = q_.begin (); @@ -182,33 +187,33 @@ template <typename P, typename T> bool - p_queue_priority<P, T>::empty() const + p_priority_queue<P, T>::is_empty() const { typename std::map<T, p_queue >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) return false; return true; } template <typename P, typename T> unsigned - p_queue_priority<P, T>::npoints() const + p_priority_queue<P, T>::npoints() const { unsigned res = 0; typename std::map<T, p_queue >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) res += (*it).second.npoints(); return res; } template <typename P, typename T> const box_& - p_queue_priority<P, T>::bbox() const + p_priority_queue<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -217,8 +222,8 @@ } template <typename P, typename T> - p_queue_priority<P, T>& - p_queue_priority<P, T>::push_force(const P& p, T prio) + p_priority_queue<P, T>& + p_priority_queue<P, T>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -230,8 +235,8 @@ } template <typename P, typename T> - p_queue_priority<P, T>& - p_queue_priority<P, T>::push(const P& p, T prio) + p_priority_queue<P, T>& + p_priority_queue<P, T>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -241,12 +246,12 @@ template <typename P, typename T> void - p_queue_priority<P, T>::pop() + p_priority_queue<P, T>::pop() { typename std::map<T, p_queue >::reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) return (*it).second.pop (); if (! vect_needs_update_) @@ -258,21 +263,31 @@ template <typename P, typename T> const P& - p_queue_priority<P, T>::front() const + p_priority_queue<P, T>::front() const { mln_precondition(! q_.empty()); typename std::map<T, p_queue >::const_reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) break; return (*it).second.front (); } template <typename P, typename T> + const P& + p_priority_queue<P, T>::pop_front() + { + const P& res = this->front(); + + this->pop(); + return res; + } + + template <typename P, typename T> void - p_queue_priority<P, T>::clear() + p_priority_queue<P, T>::clear() { typename std::map<T, p_queue >::iterator it = q_.begin (); @@ -285,7 +300,7 @@ template <typename P, typename T> const std::vector& - p_queue_priority<P, T>::vect() const + p_priority_queue<P, T>::vect() const { if (vect_needs_update_) vect_update_(); @@ -294,7 +309,7 @@ template <typename P, typename T> const P& - p_queue_priority<P, T>::operator[](unsigned i) const + p_priority_queue<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); @@ -303,7 +318,7 @@ for (; it != q_.rend (); ++it) { - if (!(*it).second.empty ()) + if (!(*it).second.is_empty ()) for (cpt = 0; cpt < (*it).second.npoints (); ++cpt) { if (i == 0) Index: trunk/milena/mln/core/p_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_queue_fast.hh (revision 1469) +++ trunk/milena/mln/core/p_queue_fast.hh (revision 1470) @@ -81,7 +81,7 @@ bool has(const P& p) const; /// Test if queue is empty or not. - bool empty() const; + bool is_empty() const; /// Give the number of points. std::size_t npoints() const; @@ -103,6 +103,11 @@ /// recently inserted point. const P& front() const; + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point and give the front point \p p of + /// the queue; \p p is the least recently inserted point. + const P& pop_front(); + /// Clear the queue. void clear(); @@ -173,7 +178,7 @@ template <typename P> bool - p_queue_fast::empty() const + p_queue_fast::is_empty() const { return (this->begin_ == this->end_); } @@ -236,11 +241,22 @@ const P& p_queue_fast::front() const { - mln_precondition(! this->empty()); + mln_precondition(! this->is_empty()); return q_[begin_]; } template <typename P> + const P& + p_queue_fast::pop_front() + { + const P& res = this->front(); + + this->pop(); + return res; + } + + + template <typename P> void p_queue_fast::clear() { Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 1469) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1470) @@ -78,7 +78,7 @@ // // Body. // { -// while (! q.empty()) +// while (! q.is_empty()) // { // mln_psite(I) p = q.front(); // q.pop(); @@ -96,7 +96,7 @@ // Body: alternative version. { - while (! q.empty()) + while (! q.is_empty()) { mln_psite(I) p = q.front(); q.pop(); Index: trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 1469) +++ trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 1470) @@ -80,7 +80,7 @@ // Body: alternative version. { - while (! q.empty()) + while (! q.is_empty()) { mln_psite(I) p = q.front(); q.pop();

17 years, 2 months

milena r1469: Plug-in gimp works and compute images

by nivaul_s＠lrde.epita.fr

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> Plug-in gimp works and compute images. * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/plugin-gimp/src/build-image.hxx, * sandbox/nivault/plugin-gimp/src/gimp-image.hh, * sandbox/nivault/plugin-gimp/src/main.cc: Update. * mln/level/transform.hh: Add the "out algo(in)" form. --- mln/level/transform.hh | 17 ++++++++++++ sandbox/nivault/plugin-gimp/src/build-image.hh | 12 +++++--- sandbox/nivault/plugin-gimp/src/build-image.hxx | 33 +++++++++++++++++++++++- sandbox/nivault/plugin-gimp/src/gimp-image.hh | 21 +++++++++++---- sandbox/nivault/plugin-gimp/src/main.cc | 1 5 files changed, 74 insertions(+), 10 deletions(-) Index: trunk/milena/mln/level/transform.hh =================================================================== --- trunk/milena/mln/level/transform.hh (revision 1468) +++ trunk/milena/mln/level/transform.hh (revision 1469) @@ -64,6 +64,11 @@ void transform(const Image& input, const Function_v2v<F>& f, Image<O>& output); + template <typename I, typename F> + mln_ch_value(I, mln_result(F)) + transform(const Image& input, const Function_v2v<F>& f); + + # ifndef MLN_INCLUDE_ONLY namespace impl @@ -131,6 +136,18 @@ } + template <typename I, typename F> + mln_ch_value(I, mln_result(F)) + transform(const Image& input, const Function_v2v<F>& f) + { + mln_precondition(exact(input).has_data()); + mln_ch_value(I, mln_result(F)) output; + initialize(output, input); + transform(input, f, output); + return output; + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::level Index: trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx (revision 1468) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hxx (revision 1469) @@ -36,11 +36,42 @@ return ima; } +struct toto : mln::Function_v2v<toto> +{ + typedef mln::value::rgb8 result; + mln::value::rgb8 operator()(const mln::value::rgb8& c) const + { + return mln::value::rgb8(255 - c.red(), 255 - c.green(), 255 - c.blue()); + } +}; + void build_milena_image(GimpPixelRgn *region) { I tmp(region); +// g_message(region->dirty ? "saaale" : "pas saaale"); +// g_message(region->shadow ? "shadoooow" : "pas shadoooow"); ima = tmp; - mln::level::fill(ima, mln::literal::blue); + mln::point2d p1(0,0); + mln::point2d p2(0,5); + mln::point2d p3(20,50); +// mln::io::ppm::save(ima, "/goinfre/out.ppm"); + std::cout << p1 << " : " << ima(p1) << std::endl; + std::cout << p2 << " : " << ima(p2) << std::endl; + std::cout << p3 << " : " << ima(p3) << std::endl; +// mln::level::fill(ima, mln::literal::blue); + + toto fun; + mln::image2d<mln::value::rgb8> tmp2(ima.domain()); + mln::level::transform(ima, fun, tmp2); + mln::border::resize(tmp2, 0); + + gimp_pixel_rgn_set_rect(region, + (const guchar *) tmp2.buffer(), + 0, + 0, + region->w, + region->h); + gimp_displays_flush (); } gboolean draw_milena_image(GtkWidget* area, Index: trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 1468) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 1469) @@ -107,6 +107,7 @@ run_mode = (GimpRunMode) param[0].data.d_int32; image_ID = param[1].data.d_int32; drawable = gimp_drawable_get (param[2].data.d_drawable); + gimp_image_undo_enable(image_ID); gimp_pixel_rgn_init(&region, drawable, Index: trunk/milena/sandbox/nivault/plugin-gimp/src/gimp-image.hh =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 1468) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 1469) @@ -37,6 +37,10 @@ # include <mln/value/set.hh> # include <mln/value/rgb8.hh> # include <mln/core/line_piter.hh> +# include <mln/literal/all.hh> + +# include <iostream> +# include <sstream> namespace mln { @@ -265,8 +269,8 @@ mln_assertion(rgn != NULL); buffer_ = (typename gimp_image<t>::value*) rgn->data; b_ = make::box2d(rgn->y, rgn->x, - rgn->y + rgn->h, - rgn->x + rgn->w); + rgn->y + rgn->h - 1, + rgn->x + rgn->w - 1); allocate_(); } @@ -408,8 +412,12 @@ { // mln_precondition(this->owns_(p)); // FIXME HERE value*) this->data_->rgn->data - static mln::value::rgb8 c(200,200,200); - return c; // this->data_->array_[p.row()][p.col()]; + + static mln::value::rgb8 c; + gimp_pixel_rgn_get_pixel(this->data_->rgn_, + (guchar *) &c, + p[1], p[0]); + return c; } template <GimpImageType t> @@ -417,7 +425,10 @@ gimp_image<t>::operator()(const point& p) { // mln_precondition(this->owns_(p)); - static mln::value::rgb8 c(0,0,0); + static mln::value::rgb8 c; + gimp_pixel_rgn_get_pixel(this->data_->rgn_, + (guchar *) &c, + p[1], p[0]); return c; // this->data_->array_[p.row()][p.col()]; // return this->data_->array_[p.row()][p.col()]; } Index: trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh (revision 1468) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/build-image.hh (revision 1469) @@ -32,12 +32,16 @@ # include <libgimp/gimpui.h> # include <src/gimp-image.hh> +# include <mln/core/point2d.hh> # include <mln/level/fill.hh> -// # include <mln/core/image2d.hh> -// # include <mln/value/rgb8.hh> +# include <mln/core/image2d.hh> +# include <mln/value/rgb8.hh> # include <mln/literal/all.hh> -// # include <mln/display/show.hh> -// # include <mln/display/remove.hh> +# include <mln/core/concept/function.hh> +# include <mln/level/transform.hh> +# include <mln/border/resize.hh> + +# include <mln/io/ppm/save.hh> void build_milena_image(GimpPixelRgn *region);

17 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches