May 2010 - Olena-patches

last-svn-commit-164-g7966b5a Add a Swilena meta-wrapper for PPM I/O.
by Roland Levillain 28 May '10

28 May '10

* ppm.ixx: New file. * Makefile.am (meta_wrappers): Add ppm.ixx. --- swilena/ChangeLog | 7 +++++++ swilena/Makefile.am | 1 + swilena/{pgm.ixx => ppm.ixx} | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) copy swilena/{pgm.ixx => ppm.ixx} (79%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index ac6fcdf..605c3d5 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena meta-wrapper for PPM I/O. + + * ppm.ixx: New file. + * Makefile.am (meta_wrappers): Add ppm.ixx. + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a setter in the mln::image2d<T> meta-wrapper. * image2d.ixx (mln::image2d<T>::set): New method (extension). diff --git a/swilena/Makefile.am b/swilena/Makefile.am index f6638b6..7e84230 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -32,6 +32,7 @@ meta_wrappers = \ intp.ixx \ morpho.ixx \ pgm.ixx \ + ppm.ixx \ println.ixx \ python-utils.ixx \ rgb.ixx diff --git a/swilena/pgm.ixx b/swilena/ppm.ixx similarity index 79% copy from swilena/pgm.ixx copy to swilena/ppm.ixx index 166903a..c66a577 100644 --- a/swilena/pgm.ixx +++ b/swilena/ppm.ixx @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,34 +24,34 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file pgm.ixx -/// \brief A wrapper of mln::io::pgm::load and mln::io::pgm::save +/// \file ppm.ixx +/// \brief A wrapper of mln::io::ppm::load and mln::io::ppm::save -%module pgm +%module ppm %include std_string.i %{ -#include "mln/io/pgm/load.hh" -#include "mln/io/pgm/save.hh" +#include "mln/io/ppm/load.hh" +#include "mln/io/ppm/save.hh" %} -// Wrap mln::io::pgm::load(const std::string&) by hand, to force swig +// Wrap mln::io::ppm::load(const std::string&) by hand, to force swig // to choose this overloading. namespace mln { namespace io { - namespace pgm + namespace ppm { template <typename V> mln::image2d<V> load(const std::string& filename); - } // end of namespace mln::io::pgm + } // end of namespace mln::io::ppm } // end of namespace mln::io } // end of namespace mln -%include "mln/io/pgm/save.hh" +%include "mln/io/ppm/save.hh" -- 1.5.6.5

1 0

last-svn-commit-163-gdfd0ad7 Add a setter in the mln::image2d<T> meta-wrapper.
by Roland Levillain 28 May '10

28 May '10

* image2d.ixx (mln::image2d<T>::set): New method (extension). --- swilena/ChangeLog | 6 ++++++ swilena/image2d.ixx | 23 +++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 9b948f7..ac6fcdf 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,11 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a setter in the mln::image2d<T> meta-wrapper. + + * image2d.ixx (mln::image2d<T>::set): New method (extension). + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::value::rgb8. * rgb8.i: New file. diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index 90532bc..702bc74 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -1,5 +1,6 @@ // -*- C++ -*- -// 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. // @@ -63,6 +64,24 @@ // FIXME: Doc. %define instantiate_image2d(I, T) + /* Add a setter, since Python does not seem to allow writings like + + ima(p) = 1 + + and will complain with this message: + + SyntaxError: can't assign to function call + + which is a real pain. How about adding an operator `[]'? Or a + method , like `at'? */ + %extend mln::image2d< T > + { + void set(const point2d& p, const T& v) + { + (*$self)(p) = v; + } + } + // Instantiate base classes of mln::image2d<T> so that Swig knows it // derives from mln::Image. %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; @@ -70,4 +89,4 @@ %template() mln::internal::image_checked_< mln::image2d< T > >; // Instantiate mln::image2d<T> %template(I) mln::image2d< T >; -%enddef +%enddef // !instantiate_image2d -- 1.5.6.5

1 0

last-svn-commit-162-g92b15aa Add a Swilena wrapper for mln::value::rgb8.
by Roland Levillain 28 May '10

28 May '10

* rgb8.i: New file. * Makefile.am (wrappers): Add rgb8.i. * python/swilena.py: Import the contents of module rgb8. * python/Makefile.am (pyexec_LTLIBRARIES): Add _rgb8.la. (nodist__rgb8_la_SOURCES, _rgb8_la_LIBADD): New. (CLEANFILES): Add $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co]. (nodist_python_PYTHON): Add rgb8.py. (rgb8-wrap.cc): Add dependencies. --- swilena/ChangeLog | 13 +++++++++++++ swilena/Makefile.am | 1 + swilena/python/Makefile.am | 11 +++++++++++ swilena/python/swilena.py | 4 +++- swilena/{println.ixx => rgb8.i} | 16 +++++++++++----- 5 files changed, 39 insertions(+), 6 deletions(-) copy swilena/{println.ixx => rgb8.i} (82%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 7d670b3..9b948f7 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,18 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::value::rgb8. + + * rgb8.i: New file. + * Makefile.am (wrappers): Add rgb8.i. + * python/swilena.py: Import the contents of module rgb8. + * python/Makefile.am (pyexec_LTLIBRARIES): Add _rgb8.la. + (nodist__rgb8_la_SOURCES, _rgb8_la_LIBADD): New. + (CLEANFILES): Add $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co]. + (nodist_python_PYTHON): Add rgb8.py. + (rgb8-wrap.cc): Add dependencies. + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena meta-wrapper for mln::value::rgb<n>. * rgb.ixx: New file. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index ea221a3..f6638b6 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -48,6 +48,7 @@ wrappers = \ int_u8.i \ neighb2d.i \ point2d.i \ + rgb8.i \ window2d.i \ \ dynamic_image2d.i diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 8f7faa9..13b17cc 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -144,6 +144,16 @@ CLEANFILES += $(nodist__neighb2d_la_SOURCES) neighb2d.py neighb2d.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_neighb2d-wrap.Pcc@am__quote@ nodist_python_PYTHON += neighb2d.py +## rgb8. +pyexec_LTLIBRARIES += _rgb8.la +nodist__rgb8_la_SOURCES = rgb8-wrap.cc +_rgb8_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_rgb8-wrap.Pcc@am__quote@ +nodist_python_PYTHON += rgb8.py + ## window2d. pyexec_LTLIBRARIES += _window2d.la nodist__window2d_la_SOURCES = window2d-wrap.cc @@ -208,6 +218,7 @@ morpho_ixx_deps = \ # Dependencies of wrappers not automatically computed (yet). int_u8-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) int_u32-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) +rgb8-wrap.cc: $(top_srcdir)/swilena/rgb.ixx $(rgb_ixx_deps) box2d-wrap.cc: $(top_srcdir)/swilena/box.ixx $(box_ixx_deps) box2d_piter-wrap.cc: $(top_srcdir)/swilena/box_piter.ixx diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 8cb695a..763bf40 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# 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. # @@ -31,6 +32,7 @@ from window2d import * from int_u8 import * from int_u32 import * +from rgb8 import * import image2d_int import image2d_int_u8 diff --git a/swilena/println.ixx b/swilena/rgb8.i similarity index 82% copy from swilena/println.ixx copy to swilena/rgb8.i index 5f56e63..bc6d313 100644 --- a/swilena/println.ixx +++ b/swilena/rgb8.i @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,11 +24,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file println.ixx -/// \brief A wrapper of mln::debug::println. +/// \file rgb8.i +/// \brief A wrapper of mln::value::rgb8. + +%module rgb8 + +%include "rgb.ixx" %{ - #include "mln/debug/println.hh" +#include "mln/value/rgb8.hh" %} -%include "mln/debug/println.hh" +%include "mln/value/rgb8.hh" + +%template (rgb8) mln::value::rgb<8>; -- 1.5.6.5

1 0

last-svn-commit-161-g79ddd68 Add a Swilena meta-wrapper for mln::value::rgb<n>.
by Roland Levillain 28 May '10

28 May '10

* rgb.ixx: New file. * Makefile.am (meta_wrappers): Add rgb.ixx. * python/Makefile.am (rgb_ixx_deps): New variable. --- swilena/ChangeLog | 8 ++ swilena/Makefile.am | 6 +- swilena/python/Makefile.am | 1 + swilena/rgb.ixx | 155 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 swilena/rgb.ixx diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 0860765..7d670b3 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,13 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena meta-wrapper for mln::value::rgb<n>. + + * rgb.ixx: New file. + * Makefile.am (meta_wrappers): Add rgb.ixx. + * python/Makefile.am (rgb_ixx_deps): New variable. + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Improve dependency management in Swilena/Python. * python/Makefile.am (int_u_ixx_deps, box_ixx_deps) diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 109fb2e..ea221a3 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -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. # @@ -32,7 +33,8 @@ meta_wrappers = \ morpho.ixx \ pgm.ixx \ println.ixx \ - python-utils.ixx + python-utils.ixx \ + rgb.ixx # Wrappers (generating actual modules). wrappers = \ diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index f6a834c..8f7faa9 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -197,6 +197,7 @@ nodist_python_PYTHON += dynamic_image2d.py # Dependencies pulled by the meta wrapper (.ixx) files. int_u_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx +rgb_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx box_ixx_deps = $(top_srcdir)/swilena/coord.ixx diff --git a/swilena/rgb.ixx b/swilena/rgb.ixx new file mode 100644 index 0000000..c5607f3 --- /dev/null +++ b/swilena/rgb.ixx @@ -0,0 +1,155 @@ +// -*- C++ -*- +// 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. + +/// \file rgb.i +/// \brief A wrapper of mln::value::rgb. + +%module rgb + +%{ +#include "mln/value/rgb.hh" +%} + +// FIXME: Wrap mln::rgb by hand, for Milena macros disturb swig. +// Annotate the original source code instead? +namespace mln +{ + + namespace value + { + + /*! \brief Unsigned integer value class. + * + * The parameter is \c n the number of encoding bits. + */ + template <unsigned n> + struct rgb + : + public Vectorial< rgb<n> > + , + public internal::value_like_< algebra::vec< 3, int_u<n> >, // Equivalent. + algebra::vec< 3, int_u<n> >, // Encoding. + algebra::vec< 3, int >, // Interoperation. + rgb<n> > // Exact. + { + public: + + typedef int_u<n> red_t; + typedef int_u<n> green_t; + typedef int_u<n> blue_t; + + /// Acces to red/green/blue component. + /// \{ + mln::value::int_u<n> red() const; + mln::value::int_u<n>& red(); + + mln::value::int_u<n> green() const; + mln::value::int_u<n>& green(); + + mln::value::int_u<n> blue() const; + mln::value::int_u<n>& blue(); + + mln::value::int_u<n> comp(unsigned k); + mln::value::int_u<n>& comp(unsigned k); + /// \} + + /// Constructor without argument. + rgb<n>(); + + /// Constructor from component values. + rgb<n>(int r, int g, int b); + + /// Constructor from a algebra::vec. + rgb<n>(const mln::algebra::vec<3, int>& rhs); + rgb<n>(const mln::algebra::vec<3, unsigned>& rhs); + rgb<n>(const mln::algebra::vec<3, mln::value::int_u<n> >& rhs); + rgb<n>(const mln::algebra::vec<3, float>& rhs); + + // Conversion to the interoperation type. + operator mln::algebra::vec<3, int>() const; + // Conversion to the sum type. + operator mln::algebra::vec<3, float>() const; + + /// Constructors with literals. + /// \{ + rgb<n>(const mln::literal::white_t&); + rgb<n>(const mln::literal::black_t&); + + rgb<n>(const mln::literal::light_gray_t&); + rgb<n>(const mln::literal::medium_gray_t&); + rgb<n>(const mln::literal::dark_gray_t&); + + rgb<n>(const mln::literal::red_t&); + rgb<n>(const mln::literal::blue_t&); + rgb<n>(const mln::literal::green_t&); + rgb<n>(const mln::literal::brown_t&); + rgb<n>(const mln::literal::lime_t&); + rgb<n>(const mln::literal::orange_t&); + rgb<n>(const mln::literal::pink_t&); + rgb<n>(const mln::literal::purple_t&); + rgb<n>(const mln::literal::teal_t&); + rgb<n>(const mln::literal::violet_t&); + rgb<n>(const mln::literal::cyan_t&); + rgb<n>(const mln::literal::magenta_t&); + rgb<n>(const mln::literal::yellow_t&); + rgb<n>(const mln::literal::olive_t&); + /// \} + + /// Assignment. + rgb<n>& operator=(const rgb<n>& rhs); + + /// Zero value. + static const rgb<n> zero; + }; + + + /*! \brief Print an unsigned integer \p i into the output stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] i An unsigned integer. + * + * \return The modified output stream \p ostr. + */ + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const rgb<n>& i); + + // FIXME: Doc! + template <unsigned n> + std::istream& operator>>(std::istream& istr, rgb<n>& i); + + } // end of namespace mln::value + +} // end of namespace mln + + +/*--------------------------------. +| Conversion helpers for Python. | +`--------------------------------*/ + +#if SWIGPYTHON +%include python-utils.ixx +generate__str__(mln::value::rgb) +#endif // !SWIGPYTHON -- 1.5.6.5

1 0

last-svn-commit-160-g1d94b30 Improve dependency management in Swilena/Python.
by Roland Levillain 28 May '10

28 May '10

* python/Makefile.am (int_u_ixx_deps, box_ixx_deps) (morpho_ixx_deps): New variables. (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): Add dependencies. --- swilena/ChangeLog | 12 ++++++++++++ swilena/python/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f6a3e78..0860765 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,15 @@ +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + + Improve dependency management in Swilena/Python. + + * python/Makefile.am (int_u_ixx_deps, box_ixx_deps) + (morpho_ixx_deps): + New variables. + (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) + (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) + (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): + Add dependencies. + 2009-11-17 Roland Levillain <roland(a)lrde.epita.fr> * python/morpho-segm.py: Remove a superfluous semi-colon. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 0ad96da..f6a834c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -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. # @@ -188,6 +189,46 @@ CLEANFILES += $(nodist__dynamic_image2d_la_SOURCES) dynamic_image2d.py dynamic_i nodist_python_PYTHON += dynamic_image2d.py +## -------------------- ## +## Extra dependencies. ## +## -------------------- ## + +# FIXME: It would be cool to have them generated automatically. + +# Dependencies pulled by the meta wrapper (.ixx) files. +int_u_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx + +box_ixx_deps = $(top_srcdir)/swilena/coord.ixx + +morpho_ixx_deps = \ + $(top_srcdir)/swilena/concrete.ixx \ + $(top_srcdir)/swilena/ch_value.ixx + +# Dependencies of wrappers not automatically computed (yet). +int_u8-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) +int_u32-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) + +box2d-wrap.cc: $(top_srcdir)/swilena/box.ixx $(box_ixx_deps) +box2d_piter-wrap.cc: $(top_srcdir)/swilena/box_piter.ixx + +point2d-wrap.cc: $(top_srcdir)/swilena/concat.ixx +point2d-wrap.cc: $(top_srcdir)/swilena/python-utils.ixx + +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/println.ixx + +image2d_int-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps) + +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/pgm.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps) + + ## ---------------------------- ## ## Swilena Python Shell (sps). ## ## ---------------------------- ## -- 1.5.6.5

1 0

last-svn-commit-159-g482ceb4 python/morpho-segm.py: Remove a superfluous semi-colon.
by Roland Levillain 28 May '10

28 May '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

last-svn-commit-158-g4741d18 Clean up Swilena Makefiles.
by Roland Levillain 28 May '10

28 May '10

* Makefile.am: Here. * python/Makefile.am: Likewise. (python_PYTHON): Move data.py... (EXTRA_DIST): ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/Makefile.am | 3 --- swilena/python/Makefile.am | 13 ++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..3232f15 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up Swilena Makefiles. + + * Makefile.am: Here. + * python/Makefile.am: Likewise. + (python_PYTHON): Move data.py... + (EXTRA_DIST): ...here. + 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> * neighb2d.i: Aesthetic changes. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index c6fd023..109fb2e 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. - -## Process this file through Automake to produce Makefile.in. - SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..0ad96da 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -13,9 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# -## Process this file through Automake to produce Makefile.in. ## ------------------ ## ## Generic material. ## @@ -28,11 +26,11 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -## We build modules, not plain libs. +# We build modules, not plain libs. AM_LDFLAGS = -avoid-version -module -shared -## Run Swig to create the C++ wrapper files, the Python interface -## files, and the dependency Makefile snippets. +# Run Swig to create the C++ wrapper files, the Python interface +# files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ @@ -45,8 +43,9 @@ AM_LDFLAGS = -avoid-version -module -shared python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py + # data.py: Access to the data of the distribution (images, meshes, etc.) -python_PYTHON += data.py +EXTRA_DIST = data.py ## ----------------- ## @@ -218,7 +217,7 @@ $(TESTS): $(srcdir)/run.stamp # The dependency is on `run.in' and not `run', since `run' is # regenerated at distribution time, and voids the time stamps (which # we don't want!). -EXTRA_DIST = $(srcdir)/run.stamp +EXTRA_DIST += $(srcdir)/run.stamp $(srcdir)/run.stamp: $(RUN_IN) @rm -f $@ @rm -f $@.tmp -- 1.5.6.5

1 0

branch swilena updated: last-svn-commit-175-g0581226
by git＠lrde.epita.fr 28 May '10

28 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch swilena has been updated discards 73974fe42a15adde2468c772e0dd7a6a03a1fff8 (commit) discards 4ed825b9cf384da7bd4d2387f0e75d07f2dc06d5 (commit) discards 3115990843b93c00abe3e34e0d6ccfb32881512b (commit) discards 27bd08387c8a03d297d8b0f303d454e70df06fa3 (commit) discards 1cd233abc2454ffabd75fe381ff592f8a4582cd2 (commit) discards 750037f5afd5e3763154629f5bcbad61445c89e6 (commit) discards 45f7819a65278f4092f00f7d2795256e55294a64 (commit) discards 25eca5a30f5e3d9a9ecbdee14eb528b5fefe0c8e (commit) discards 7b138bf9d60291820e50b08e0122e79e460ce567 (commit) discards 1c8af3df2e759f1ced3eaa1b93af31448527810b (commit) discards f779a3630b9af6de464001c08bcaa1f075358ad7 (commit) discards 9d56c7ec85be27c49fd8b55f7ae60bb4ea0f181d (commit) discards 8f7d423143d3eeeec8fb91cdd6ca27a38243b27a (commit) discards dce6468999855b1b6d2b71082bf70b6af053decb (commit) discards ab1256d0e7bf0e819d79ffc39228c5ee9d0ec1d1 (commit) discards 796ae83111fff8e0b9dacd82d8f8bdf996eedd9a (commit) discards 1ac17a4c8a6da019f324706bdef6ee9b38a5753c (commit) via 0581226dd9b4f0e35235ca763e7f7940cfba9945 (commit) via 8ff5d79d09c0501863a0a9c6f49aa65911acaec1 (commit) via af1aa84bd03e4182596ab6149a53abe6bdcf8d07 (commit) via 7bb76ffe70835e377d40ffc7303b092bb6634420 (commit) via e6852b76e1c07beb05b89a7908b1bda67c765f2f (commit) via 7c28140e3e3e757b2304e0c10afac18dc85ff0aa (commit) via 3b2fa4c6fb168af425ec63b5fc69f621c75d1f2a (commit) via 102284f15cbc7b3399fa2f686d9976266372e1ed (commit) via b527c96d2b62dc357f1a2c366c2a7130b7139b14 (commit) via 61f88e474406e96b7e4be140fd73e2e302a61285 (commit) via 774fe254310102c65be2b1f332f1d06b605b7ade (commit) via 7966b5abc37f46899507ad2fa8b3aef9d5d6be25 (commit) via dfd0ad73501d49017f454aae985f5a9f5e51b5fe (commit) via 92b15aa48254515c5da080cab653179cedba21dd (commit) via 79ddd68f6fc669f6fbd61dcfbd21bbf99839ffb0 (commit) via 1d94b3000eadc914c7f5fcc0835fde575560f5d3 (commit) via 482ceb4c95c671b15d68e28ce9f3ae5302a075c0 (commit) via 4741d18229f0a8b8fe32359b41fa7b7ca32dc254 (commit) via 9ced0495ec829f942f3abffe7077d472efff96f6 (commit) via d53b4271ddc93c8fa098f4ef4c2fc7432f808357 (commit) via 17734ea5b269b3a71fc2138a270454a80b0ed6ae (commit) via 4c42b800077d0dda5fde111d0e4761661c9a52c3 (commit) via 68d80d9e1c6f2b66a45e6bb107c7697871386426 (commit) via e30e6d746ca7e83560ad0e2a52324f0af553255d (commit) via d843b6cdad0df4b25e11da900abe87f67153ab65 (commit) via 81ebf3143f310e04f99738afb8b5ad9cbc39eaa7 (commit) via 04e7d8027ac1a88bc151aa0174a3b1ee572c4e4b (commit) via c260d597d0718762ff60972c3a9834f5f1a9db8f (commit) via 7b351ecac19fd1c42ae0382ef7179496a1e565c8 (commit) via ab8bd495b70c9c78f8fc13f1df545d487fc94217 (commit) via 5ba9288148acd3aecef5df8ec260e51887375d87 (commit) via 72a1d9cca4425b195b9132e2bd645274f52c765a (commit) via 62982aae637e6591a4f4ae8f52f04f507691ab80 (commit) via 2891ae779a6ddf363a34ad8188fdda31b8e06849 (commit) via 8d9ad1b2347654f006683e0779bffd5c5fde7734 (commit) via 24633b4c8980ac4c3f2dd7a0befbed515c3c6f48 (commit) via 8c7a1809a808addffc3ae397f0d0f1e21d242fbc (commit) via c8a3721c86de58f063888f0aeedd6197530d1ce0 (commit) via 8e148a2f3b871d60de12d627f02fc01ed7ac4331 (commit) via f1a7757aa73b3bac1c64ecb1e124633a055f4752 (commit) via 153c751d590f7825fb11427de07c890ad3dd95eb (commit) via afefd84215fa6e4c673fd0b1a3a8311ac8ea82ff (commit) via 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit) via 68b860f7623d03ea9815fd652300bee661351bdc (commit) via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit) via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit) via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit) via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit) via 25eb4fe6f1b8d6217dcfded1ba138b1abb0e4b07 (commit) via 77c420e02087c7499fa59caaa8c2c6cf8b27e84c (commit) via 103e1e747ab4e16f95f94e3742b3d21b9d637354 (commit) via 5a5ceb89dd3811caae3296fce041a47c5a45564d (commit) via 03908bb38ac692efdb3ce76c8e56bc86a2ee2334 (commit) via a1b86103434c66825a1a089e7bc039f62761b692 (commit) via 10c5d398cd691716db99d2ab6f78d48f7762a75d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (73974fe42a15adde2468c772e0dd7a6a03a1fff8) \ N -- N -- N (0581226dd9b4f0e35235ca763e7f7940cfba9945) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 0581226 Generate python/data.py. 8ff5d79 Simplify python/max-tree.py using Python's itertools. af1aa84 Wrap morpho::watershed::flooding instead of morpho::meyer_wst. 7bb76ff Clean up Swilena a bit. e6852b7 Wrap a subset of complexes' features. 7c28140 Help Swilena wrap mln::complex<D>. 3b2fa4c Wrap function mln::morpho::tree::max<I, N>. 102284f Add a Swilena wrapper for mln::image2d<mln::point2d>. b527c96 Have Make generate the Swilena Python Shell (sps). 61f88e4 Stop configuring swilena/python/sps and swilena/python/sps-local. 774fe25 Add a Swilena wrapper for mln::image2d<mln::value::rgb8>. 7966b5a Add a Swilena meta-wrapper for PPM I/O. dfd0ad7 Add a setter in the mln::image2d<T> meta-wrapper. 92b15aa Add a Swilena wrapper for mln::value::rgb8. 79ddd68 Add a Swilena meta-wrapper for mln::value::rgb<n>. 1d94b30 Improve dependency management in Swilena/Python. 482ceb4 python/morpho-segm.py: Remove a superfluous semi-colon. 4741d18 Clean up Swilena Makefiles. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 104 +++++++++++++++++ bootstrap | 13 ++- configure.ac | 69 +++++++++--- lrde-upload.sh | 114 ++++++++++++++----- m4/with-swilena.m4 | 129 ---------------------- milena/ChangeLog | 122 ++++++++++++++++++++ milena/Makefile.am | 2 +- milena/apps/graph-morpho/Makefile.am | 4 +- milena/apps/graph-morpho/convert.hh | 7 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 5 +- milena/mesh/Makefile.am | 2 +- milena/mln/accu/compute.hh | 6 +- milena/mln/core/image/edge_image.hh | 8 +- milena/mln/core/image/imorph/labeled_image.hh | 4 +- milena/mln/core/image/vertex_image.hh | 8 +- milena/mln/io/fld/save.hh | 10 +- milena/mln/io/fld/write_header.hh | 16 ++-- milena/mln/make/edge_image.hh | 27 ++--- milena/mln/util/edge.hh | 30 ++--- milena/mln/util/graph.hh | 25 +++-- milena/mln/util/line_graph.hh | 20 ++- milena/mln/util/vertex.hh | 26 +++-- milena/tests/core/other/box_runend_piter.cc | 2 +- milena/tests/morpho/line_graph_image_morpho.cc | 4 +- milena/tests/morpho/watershed/Makefile.am | 2 +- milena/tests/unit_test/Makefile.am | 7 +- milena/tests/util/Makefile.am | 2 + scribo/test.cc => milena/tests/util/ord.cc | 4 +- scribo/ChangeLog | 48 ++++++++ scribo/src/binarization/sauvola_ms.cc | 6 +- scribo/tests/preprocessing/Makefile.am | 4 +- scribo/tests/unit_test/Makefile.am | 20 +++- scribo/tests/unit_test/build_unit_test.sh | 42 +++++-- scribo/tests/unit_test/disabled_tests | 5 + scribo/tests/unit_test/unit-tests.mk | 8 +- scribo/text/clean.hh | 2 +- swilena/ChangeLog | 18 +++ swilena/python/Makefile.am | 48 ++++++--- swilena/python/complex2-misc.py | 1 - swilena/python/{data.py => data.py.in} | 4 +- swilena/python/max-tree.py | 1 - 41 files changed, 651 insertions(+), 328 deletions(-) delete mode 100644 m4/with-swilena.m4 rename scribo/test.cc => milena/tests/util/ord.cc (95%) create mode 100644 scribo/tests/unit_test/disabled_tests rename swilena/python/{data.py => data.py.in} (88%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-175-g0581226 Generate python/data.py.
by Roland Levillain 28 May '10

28 May '10

* python/data.py: Rename as... * python/data.py.in: ...this. Adjust. Turn top_srcdir into a variable substituted by configure. * python/Makefile.am (EXTRA_DIST): s/data.py/data.py.in/. * python/Makefile.am (all-local): New rule. Depend on data.py. (edit): Substitute top_srcdir. (data.py): New rule. (CLEANFILES): Add data.py. (TESTS_ENVIRONMENT): No longer set top_srcdir and top_builddir. * python/complex2-misc.py, python/max-tree.py: Do not import `data', as it is not used. --- swilena/ChangeLog | 18 ++++++++++++ swilena/python/Makefile.am | 48 +++++++++++++++++++++---------- swilena/python/complex2-misc.py | 1 - swilena/python/{data.py => data.py.in} | 4 +- swilena/python/max-tree.py | 1 - 5 files changed, 52 insertions(+), 20 deletions(-) rename swilena/python/{data.py => data.py.in} (88%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f39ebab..c6fd900 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,21 @@ +2010-05-28 Roland Levillain <roland(a)lrde.epita.fr> + + Generate python/data.py. + + * python/data.py: Rename as... + * python/data.py.in: ...this. + Adjust. + Turn top_srcdir into a variable substituted by configure. + * python/Makefile.am (EXTRA_DIST): s/data.py/data.py.in/. + * python/Makefile.am (all-local): New rule. + Depend on data.py. + (edit): Substitute top_srcdir. + (data.py): New rule. + (CLEANFILES): Add data.py. + (TESTS_ENVIRONMENT): No longer set top_srcdir and top_builddir. + * python/complex2-misc.py, python/max-tree.py: + Do not import `data', as it is not used. + 2010-04-08 Roland Levillain <roland(a)lrde.epita.fr> Simplify python/max-tree.py using Python's itertools. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 3e5937d..cd02746 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -22,7 +22,6 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. -CLEANFILES = AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) @@ -40,13 +39,42 @@ AM_LDFLAGS = -avoid-version -module -shared fi +# Use Make to generate `data.py' and shell scripts (`sps' and +# `sps-local') instead of `configure', as advised by Autoconf's manual +# (see section ``Installation Directory Variables''). +edit = sed \ + -e 's|@top_srcdir[@]|$(top_srcdir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ + -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@libdir[@]|$(libdir)|g' \ + -e 's|@pythondir[@]|$(pythondir)|g' \ + -e 's|@PYTHON[@]|$(PYTHON)|g' + + # ltihooks.py: Python import hooks that understand Libtool libraries. python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py -# data.py: Access to the data of the distribution (images, meshes, etc.) -EXTRA_DIST = data.py +# data.py: Access to the data of the distribution (images, meshes, +# etc.). +# +# Use the all-local hook instead of the nodist_noinst_PYTHON variable, +# since ``[...] byte-compilation occurs at install time, any files +# listed in `noinst_PYTHON' will not be compiled'' (and therefore +# generated, in our case), according to Automake's manual, +all-local: data.py +EXTRA_DIST = data.py.in +data.py: data.py.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$< || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$< >>$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = data.py ## ----------------- ## @@ -297,17 +325,6 @@ noinst_SCRIPTS = sps-local EXTRA_DIST += sps-common.in sps.in sps-local.in -# Use Make to generate shell scripts (`sps' and `sps-local') instead -# of `configure', as advised by Autoconf's manual (see section -# ``Installation Directory Variables''). -edit = sed \ - -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ - -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ - -e 's|@pythondir[@]|$(pythondir)|g' \ - -e 's|@PYTHON[@]|$(PYTHON)|g' - sps sps-local: Makefile $(srcdir)/sps-common.in rm -f $@ $@.tmp srcdir=''; \ @@ -330,8 +347,7 @@ CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) include $(top_srcdir)/swilena/run.mk -TESTS_ENVIRONMENT = \ - top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" $(RUN) +TESTS_ENVIRONMENT = $(RUN) # Ensure `run' is rebuilt before the tests are run. $(TESTS): $(srcdir)/run.stamp # The dependency is on `run.in' and not `run', since `run' is diff --git a/swilena/python/complex2-misc.py b/swilena/python/complex2-misc.py index 87fb27a..77332e9 100644 --- a/swilena/python/complex2-misc.py +++ b/swilena/python/complex2-misc.py @@ -22,7 +22,6 @@ # # See also Milena's tests/topo/complex.cc. -import data from swilena import * # A 2-d (simplicial) complex and its adjacency graph. diff --git a/swilena/python/data.py b/swilena/python/data.py.in similarity index 88% rename from swilena/python/data.py rename to swilena/python/data.py.in index 4a162d9..01f0a7f 100644 --- a/swilena/python/data.py +++ b/swilena/python/data.py.in @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2008, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -21,6 +21,6 @@ import os -top_srcdir = os.environ["top_srcdir"] +top_srcdir = "@top_srcdir@" img_dir = os.path.join(top_srcdir, "milena", "img") lena = os.path.join (img_dir, "lena.pgm") diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index 7f09eff..05dd32a 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -19,7 +19,6 @@ # \file python/max-tree.py # \brief Test on the max-tree. -import data from swilena import * import itertools -- 1.5.6.5

1 0

branch next updated: last-svn-commit-157-g9ced049
by git＠lrde.epita.fr 28 May '10

28 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 9ced0495ec829f942f3abffe7077d472efff96f6 (commit) via d53b4271ddc93c8fa098f4ef4c2fc7432f808357 (commit) via 17734ea5b269b3a71fc2138a270454a80b0ed6ae (commit) from 4c42b800077d0dda5fde111d0e4761661c9a52c3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 9ced049 Add `swilena' to the branches to be uploaded. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++ lrde-upload.sh | 33 ++++++++++++++++++----- milena/ChangeLog | 28 ++++++++++++++++++++ milena/mln/core/image/edge_image.hh | 8 +++--- milena/mln/core/image/vertex_image.hh | 8 +++--- milena/mln/make/edge_image.hh | 27 +++++++++---------- milena/mln/util/edge.hh | 30 +++++++++------------ milena/mln/util/graph.hh | 25 +++++++++++------- milena/mln/util/line_graph.hh | 20 +++++++++----- milena/mln/util/vertex.hh | 26 +++++++++++++------ milena/tests/morpho/line_graph_image_morpho.cc | 4 +- 11 files changed, 143 insertions(+), 73 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0