Olena-patches August 2008

olena-patches@lrde.epita.fr

3 participants
79 discussions

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Wrap more morphological filters. * morpho.ixx: Wrap mln::morpho::closing, mln::morpho::opening mln::morpho::gradient_internal, mln::morpho::gradient_external, mln::morpho::opening_area. (instantiate_closing, instantiate_opening) (instantiate_gradient_internal, instantiate_gradient_external) (instantiate_opening_area): New macros. Use them... (instantiate_morpho): ...here. Deduce the previous `L' parameter from `mln_value(I)', and remove it from the list of parameters of the macro. * image2d_int_u8.i: Adjust. * image2d_int.i: Use macros instantiate_erosion and instantiate_dilation. * python/data.py: New. * python/test.py: Rename as... * python/image2d-misc.py: ...this. * python/lena.py: Rename as... * python/morpho-fun.py: ...this. Exercise more morphological filters. Move WST-based segmentation tests... * python/morpho-segm.py: ...here (new test). * python/swilena.py: Add documentation header. * python/Makefile.am (python_PYTHON): Add data.py. (TESTS): Add morpho-segm.py. s/test.py/image2d-misc.py/ s/lena.py/morpho-fun.py/ image2d_int.i | 7 +---- image2d_int_u8.i | 3 -- morpho.ixx | 67 +++++++++++++++++++++++++++++++++++++++----------- python/Makefile.am | 4 ++ python/data.py | 37 +++++++++++++++++++++++++++ python/morpho-fun.py | 50 +++++++++++++++++-------------------- python/morpho-segm.py | 60 ++++++++++++++++++++++++++++++++++++++++++++ python/swilena.py | 3 ++ 8 files changed, 183 insertions(+), 48 deletions(-) Index: python/data.py --- python/data.py (revision 0) +++ python/data.py (revision 0) @@ -0,0 +1,37 @@ +#! /usr/bin/env python + +# Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +# +# This file is part of the Olena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. +# +# As a special exception, you may use this file as part of a free +# software library without restriction. Specifically, if other files +# instantiate templates or use macros or inline functions from this +# file, or you compile this file and link it with other files to +# produce an executable, this file does not by itself cause the +# resulting executable to be covered by the GNU General Public +# License. +# reasons why the executable file might be covered by the GNU General +# Public License. + +# \file python/data.py +# \brief Access to the data of the distribution (images, meshes, etc.). + +import os + +top_srcdir = os.environ["top_srcdir"] +img_dir = os.path.join(top_srcdir, "milena", "img") +lena = os.path.join (img_dir, "lena.pgm") Index: python/morpho-fun.py --- python/morpho-fun.py (revision 2138) +++ python/morpho-fun.py (working copy) @@ -27,38 +27,36 @@ # reasons why the executable file might be covered by the GNU General # Public License. -import os -from swilena import * +# \file python/morpho-fun.py +# \brief Test on mathematical morphology on functions (scalar images). -# Factor this part in a shared test Python file. -top_srcdir = os.environ["top_srcdir"] -img_dir = os.path.join(top_srcdir, "milena", "img") -lena = os.path.join (img_dir, "lena.pgm") +import data +from swilena import * # Module alias. image = image2d_int_u8 -ima = image.load(lena) +ima = image.load(data.lena) + +dilated = image.dilation(ima, win_c4p()) +image.save(dilated, "dilation.pgm") eroded = image.erosion(ima, win_c4p()) -image.save(eroded, "eroded.pgm") +image.save(eroded, "erosion.pgm") -dilated = image.dilation(ima, win_c4p()) -image.save(dilated, "dilated.pgm") +image.save(image.opening(ima, win_c4p()), "opening.pgm") +image.save(image.closing(ima, win_c4p()), "closing.pgm") -# Gradient. -gradient = image.gradient(ima, win_c4p()) -# Area closing. -closed_gradient = image.image2d_int_u8(gradient.domain()) -image.closing_area(ima, c4(), 50, closed_gradient) -# Watershed transform. -nbasins = int_u8(); -ws = image.meyer_wst (closed_gradient, c4(), nbasins) -# FIXME: Actualy print the number of basins; for the moment, this -# statement outputs something like -# -# <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' -# at 0x816e160> > -# -print nbasins -image.save(ws, "ws.pgm") +image.save(image.gradient(ima, win_c4p()), "gradient.pgm") +image.save(image.gradient_internal(ima, win_c4p()), "gradient_internal.pgm") +image.save(image.gradient_external(ima, win_c4p()), "gradient_external.pgm") + +# FIXME: The interface of closing_area/opening_area is a pain: the +# output should be returned, not taken as argument. +closed_ima = image.image2d_int_u8(ima.domain()) +image.closing_area(ima, c4(), 50, closed_ima) +image.save(closed_ima, "closing_area.pgm") + +opened_ima = image.image2d_int_u8(ima.domain()) +image.closing_area(ima, c4(), 50, opened_ima) +image.save(opened_ima, "opening_area.pgm") Property changes on: python/morpho-fun.py ___________________________________________________________________ Added: svn:mergeinfo Index: python/morpho-segm.py --- python/morpho-segm.py (revision 0) +++ python/morpho-segm.py (revision 0) @@ -0,0 +1,60 @@ +#! /usr/bin/env python + +# Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +# +# This file is part of the Olena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. +# +# As a special exception, you may use this file as part of a free +# software library without restriction. Specifically, if other files +# instantiate templates or use macros or inline functions from this +# file, or you compile this file and link it with other files to +# produce an executable, this file does not by itself cause the +# resulting executable to be covered by the GNU General Public +# License. +# reasons why the executable file might be covered by the GNU General +# Public License. + +# \file python/morpho-segm.py +# \brief Test on watershed transform-based segmentation. + +import data +from swilena import * + +# Module alias. +image = image2d_int_u8 + +ima = image.load(data.lena) + +# Gradient. +gradient = image.gradient(ima, win_c4p()) +image.save(gradient, "gradient.pgm") +# Area closing of the gradient. +closed_gradient = image.image2d_int_u8(gradient.domain()) +image.closing_area(ima, c4(), 50, closed_gradient) +# Watershed transform. +nbasins = int_u8(); +ws = image.meyer_wst (closed_gradient, c4(), nbasins) +# FIXME: Actualy print the number of basins; for the moment, this +# statement outputs something like +# +# <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' +# at 0x816e160> > +# +print nbasins +image.save(ws, "segm.pgm") + +# FIXME: Also re-enable the naive segmentation with no gradient +# simplification, and an output on an image2d<int_u32>. Property changes on: python/image2d-misc.py ___________________________________________________________________ Added: svn:mergeinfo Index: python/Makefile.am --- python/Makefile.am (revision 2138) +++ python/Makefile.am (working copy) @@ -30,6 +30,8 @@ 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 ## ----------------- ## @@ -170,5 +172,5 @@ $(MAKE) $(AM_MAKEFLAGS) $(RUN) @mv -f $@.tmp $@ -TESTS = test.py lena.py +TESTS = image2d-misc.py morpho-fun.py morpho-segm.py EXTRA_DIST += $(TESTS) Index: python/swilena.py --- python/swilena.py (revision 2138) +++ python/swilena.py (working copy) @@ -27,6 +27,9 @@ # reasons why the executable file might be covered by the GNU General # Public License. +# \file swilena.py +# \brief The whole Swilena suite. + import ltihooks from point2d import * Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2138) +++ image2d_int_u8.i (working copy) @@ -68,8 +68,7 @@ then. */ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, mln::window2d, - mln::neighb2d, - mln::value::int_u<8>) + mln::neighb2d) /*---------------------------------------. | image2d<int_u8> and image2d<int_u32>. | Index: image2d_int.i --- image2d_int.i (revision 2138) +++ image2d_int.i (working copy) @@ -54,8 +54,5 @@ %} %include "morpho.ixx" -// Explicit instantiation of this trait for the return type of -// mln::morpho::dilation and mln::morpho::erosion. -%template() mln::trait::concrete< mln::image2d< int > >; -%template(dilation) mln::morpho::dilation< mln::image2d<int>, mln::window2d >; -%template(erosion) mln::morpho::erosion< mln::image2d<int>, mln::window2d >; +instantiate_erosion(erosion, mln::image2d<int>, mln::window2d) +instantiate_dilation(dilation, mln::image2d<int>, mln::window2d) Index: morpho.ixx --- morpho.ixx (revision 2138) +++ morpho.ixx (working copy) @@ -31,12 +31,13 @@ %module morpho +%include "concrete.ixx" +%include "ch_value.ixx" + /*-----------------------------------. | Morphological dilation & erosion. | `-----------------------------------*/ -%include "concrete.ixx" - %{ #include "mln/morpho/dilation.hh" #include "mln/morpho/erosion.hh" @@ -52,22 +53,39 @@ %enddef %define instantiate_erosion(Name, I, W) + // Explicit instantiation of this trait for the return type. %template() mln::trait::concrete; %template(Name) mln::morpho::erosion< I, W >; %enddef /*----------------------------------. -| Morphological opening & closing. | +| Morphological closing & opening. | `----------------------------------*/ -// FIXME: Add them. +%{ +#include "mln/morpho/closing.hh" +#include "mln/morpho/opening.hh" +%} + +%include "mln/morpho/closing.hh" +%include "mln/morpho/opening.hh" + +%define instantiate_closing(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::closing< I, W >; +%enddef + +%define instantiate_opening(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::opening< I, W >; +%enddef /*------------. | Gradients. | `------------*/ -// FIXME: Add other gradient. - %{ #include "mln/morpho/gradient.hh" %} @@ -80,28 +98,42 @@ %template(Name) mln::morpho::gradient< I, W >; %enddef +%define instantiate_gradient_internal(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient_internal< I, W >; +%enddef + +%define instantiate_gradient_external(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient_external< I, W >; +%enddef + /*-------------------------. | Area closing & opening. | `-------------------------*/ -// FIXME: Add area opening. - %{ #include "mln/morpho/closing_area.hh" +#include "mln/morpho/opening_area.hh" %} %include "mln/morpho/closing_area.hh" +%include "mln/morpho/opening_area.hh" %define instantiate_closing_area(Name, I, N) %template(Name) mln::morpho::closing_area< I, N, I >; %enddef +%define instantiate_opening_area(Name, I, N) + %template(Name) mln::morpho::opening_area< I, N, I >; +%enddef + /*------------------------------------. | Meyer's Watershed Transform (WST). | `------------------------------------*/ -%include "ch_value.ixx" - %{ #include "mln/morpho/meyer_wst.hh" %} @@ -118,12 +150,19 @@ | Instantiate everything. | `-------------------------*/ -%define instantiate_morpho(I, W, N, L) +%define instantiate_morpho(I, W, N) instantiate_dilation(dilation, I, W) instantiate_erosion(erosion, I, W) + + instantiate_closing(closing, I, W) + instantiate_opening(opening, I, W) + instantiate_gradient(gradient, I, W) + instantiate_gradient_internal(gradient_internal, I, W) + instantiate_gradient_external(gradient_external, I, W) + instantiate_closing_area(closing_area, I, N) - // FIXME: Could we used `typename I::value' instead of `L' here, and - // remove L from the list of arguments? - instantiate_meyer_wst(meyer_wst, L, I, N) + instantiate_opening_area(opening_area, I, N) + + instantiate_meyer_wst(meyer_wst, mln_value(I), I, N) %enddef

16 years, 4 months

2138: Provide instantiation macros for module `morpho'.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Provide instantiation macros for module `morpho'. * morpho.ixx (instantiate_dilation, instantiate_erosion) (instantiate_gradient, instantiate_closing_area) (instantiate_meyer_wst): New SWIG macros. (instantiate_morpho): Likewise. Use it... * image2d_int_u8.i: ...here, to simplify the wrapping of morpho routines. image2d_int_u8.i | 39 +++++++++------------------------------ morpho.ixx | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 58 insertions(+), 34 deletions(-) Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2137) +++ image2d_int_u8.i (working copy) @@ -60,46 +60,25 @@ %include "morpho.ixx" -// Explicit instantiation of this trait for the return type of -// mln::morpho::dilation, mln::morpho::erosion and mln::morpho::gradient. -%template() mln::trait::concrete< mln::image2d< mln::value::int_u<8> > >; - -/* FIXME: Can't we use `mln::value::int8' directlt here (as we can +/* FIXME: Can't we use `mln::value::int8' directly here (as we can use `mln::window2d', which is a really just typedef for - `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ -%template(dilation) mln::morpho::dilation< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; -%template(erosion) mln::morpho::erosion< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; - -%template(gradient) mln::morpho::gradient< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; + `mln::window< mln::dpoint_<mln::grid::square, int> >')? -%template(closing_area) -mln::morpho::closing_area< mln::image2d< mln::value::int_u<8> >, + 2008-08-11: Probably, but we should %include "mln/value/int_u8.hh" + then. */ +instantiate_morpho(mln::image2d< mln::value::int_u<8> >, + mln::window2d, mln::neighb2d, - mln::image2d< mln::value::int_u<8> > >; - -%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<8> >; -%template(meyer_wst) mln::morpho::meyer_wst< - mln::value::int_u<8>, - mln::image2d< mln::value::int_u<8> >, - mln::neighb2d - >; + mln::value::int_u<8>) /*---------------------------------------. | image2d<int_u8> and image2d<int_u32>. | `---------------------------------------*/ -// Explicit instantiation of this trait for the return type of meyer_wst32. -%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<32> >; -%template(meyer_wst32) mln::morpho::meyer_wst< +instantiate_meyer_wst(meyer_wst32, mln::value::int_u<32>, mln::image2d< mln::value::int_u<8> >, - mln::neighb2d - >; + mln::neighb2d) // FIXME: Rearrange and move this elsewhere. instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) Index: morpho.ixx --- morpho.ixx (revision 2137) +++ morpho.ixx (working copy) @@ -31,9 +31,9 @@ %module morpho -/*---------------------. -| Dilation & erosion. | -`---------------------*/ +/*-----------------------------------. +| Morphological dilation & erosion. | +`-----------------------------------*/ %include "concrete.ixx" @@ -45,7 +45,22 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" -// FIXME: Add morphological opening & closing. +%define instantiate_dilation(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::dilation< I, W >; +%enddef + +%define instantiate_erosion(Name, I, W) + %template() mln::trait::concrete; + %template(Name) mln::morpho::erosion< I, W >; +%enddef + +/*----------------------------------. +| Morphological opening & closing. | +`----------------------------------*/ + +// FIXME: Add them. /*------------. | Gradients. | @@ -59,6 +74,12 @@ %include "mln/morpho/gradient.hh" +%define instantiate_gradient(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient< I, W >; +%enddef + /*-------------------------. | Area closing & opening. | `-------------------------*/ @@ -71,6 +92,10 @@ %include "mln/morpho/closing_area.hh" +%define instantiate_closing_area(Name, I, N) + %template(Name) mln::morpho::closing_area< I, N, I >; +%enddef + /*------------------------------------. | Meyer's Watershed Transform (WST). | `------------------------------------*/ @@ -82,3 +107,23 @@ %} %include "mln/morpho/meyer_wst.hh" + +%define instantiate_meyer_wst(Name, L, I, N) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::ch_value< I, L >; + %template(Name) mln::morpho::meyer_wst< L, I, N >; +%enddef + +/*-------------------------. +| Instantiate everything. | +`-------------------------*/ + +%define instantiate_morpho(I, W, N, L) + instantiate_dilation(dilation, I, W) + instantiate_erosion(erosion, I, W) + instantiate_gradient(gradient, I, W) + instantiate_closing_area(closing_area, I, N) + // FIXME: Could we used `typename I::value' instead of `L' here, and + // remove L from the list of arguments? + instantiate_meyer_wst(meyer_wst, L, I, N) +%enddef

16 years, 4 months

[Olena] #154: Revive Swilena in Olena 1.0

by Olena

#154: Revive Swilena in Olena 1.0 ---------------------------------------------------+------------------------ Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Swilena | Version: 1.0 Keywords: dynamic interpreter shell interactive | ---------------------------------------------------+------------------------ Start with a very small test (e.g., a single image type + some morphological filters + a (topological) watershed transform). BTW, we might want to promote [https://svn.lrde.epita.fr/svn/clspr/trunk/ clspr] (C++-Libtool-SWIG-Python-Ruby) as a reusable component (but this is just an idea; it might not be usable as-is practically). (N.B. : Some future users of Olena have requested this (fast) reintroduction of Swilena; we should work on the distribution of the project in parallel as well, to have something usable for them.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/154> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years, 4 months

2137: Wrap morphological gradient and area closing.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Wrap morphological gradient and area closing. * morpho.ixx: Wrap mln::morpho::gradient and mln::morpho::closing_area. * image2d_int_u8.i (meyer_wst): Rename as... (meyer_wst32): ...this. (gradient, closing_area, meyer_wst): New wrappings. * python/lena.py: Exercise gradient and area closing (along with Meyer's watershed transform). image2d_int_u8.i | 31 +++++++++++++++++++++++-------- morpho.ixx | 31 ++++++++++++++++++++++++++++--- python/lena.py | 18 ++++++++++-------- 3 files changed, 61 insertions(+), 19 deletions(-) Index: python/lena.py --- python/lena.py (revision 2136) +++ python/lena.py (working copy) @@ -46,17 +46,19 @@ dilated = image.dilation (ima, win_c4p()) image.save(dilated, "dilated.pgm") -# Watershed Transform. -# FIXME: Run a gradient and an area closing first. -nbasins = int_u32(); -ws = image.meyer_wst (ima, c4(), nbasins) -print (type (ws)) -# FIXME: Ugly name; move int_u32 methods outside image2d_int_u8. -image.println32(ws) -# FIXME: Actualy print the number of basins; for the moment, thus +# Gradient. +gradient = image.gradient(ima, win_c4p()) +# Area closing. +closed_gradient = image.image2d_int_u8(gradient.domain()) +image.closing_area(ima, c4(), 50, closed_gradient) +# Watershed transform. +nbasins = int_u8(); +ws = image.meyer_wst (closed_gradient, c4(), nbasins) +# FIXME: Actualy print the number of basins; for the moment, this # statement outputs something like # # <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' # at 0x816e160> > # print nbasins +image.save(ws, "ws.pgm") Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2136) +++ image2d_int_u8.i (working copy) @@ -61,8 +61,9 @@ %include "morpho.ixx" // Explicit instantiation of this trait for the return type of -// mln::morpho::dilation and mln::morpho::erosion. +// mln::morpho::dilation, mln::morpho::erosion and mln::morpho::gradient. %template() mln::trait::concrete< mln::image2d< mln::value::int_u<8> > >; + /* FIXME: Can't we use `mln::value::int8' directlt here (as we can use `mln::window2d', which is a really just typedef for `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ @@ -71,20 +72,34 @@ %template(erosion) mln::morpho::erosion< mln::image2d< mln::value::int_u<8> >, mln::window2d >; -// Explicit instantiation of this trait for the return type of -// mln::morpho::meyer_wst. +%template(gradient) mln::morpho::gradient< mln::image2d< mln::value::int_u<8> >, + mln::window2d >; + +%template(closing_area) +mln::morpho::closing_area< mln::image2d< mln::value::int_u<8> >, + mln::neighb2d, + mln::image2d< mln::value::int_u<8> > >; + %template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<32> >; + mln::value::int_u<8> >; %template(meyer_wst) mln::morpho::meyer_wst< - mln::value::int_u<32>, + mln::value::int_u<8>, mln::image2d< mln::value::int_u<8> >, mln::neighb2d >; +/*---------------------------------------. +| image2d<int_u8> and image2d<int_u32>. | +`---------------------------------------*/ -/*-------------------. -| image2d<int_u32>. | -`-------------------*/ +// Explicit instantiation of this trait for the return type of meyer_wst32. +%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, + mln::value::int_u<32> >; +%template(meyer_wst32) mln::morpho::meyer_wst< + mln::value::int_u<32>, + mln::image2d< mln::value::int_u<8> >, + mln::neighb2d + >; // FIXME: Rearrange and move this elsewhere. instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) Index: morpho.ixx --- morpho.ixx (revision 2136) +++ morpho.ixx (working copy) @@ -31,9 +31,9 @@ %module morpho -/*-----------------------. -| Dilation and erosion. | -`-----------------------*/ +/*---------------------. +| Dilation & erosion. | +`---------------------*/ %include "concrete.ixx" @@ -45,6 +45,31 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" +// FIXME: Add morphological opening & closing. + +/*------------. +| Gradients. | +`------------*/ + +// FIXME: Add other gradient. + +%{ +#include "mln/morpho/gradient.hh" +%} + +%include "mln/morpho/gradient.hh" + +/*-------------------------. +| Area closing & opening. | +`-------------------------*/ + +// FIXME: Add area opening. + +%{ +#include "mln/morpho/closing_area.hh" +%} + +%include "mln/morpho/closing_area.hh" /*------------------------------------. | Meyer's Watershed Transform (WST). |

16 years, 4 months

2136: Simplify the wrappings of mln::neighb2d and mln::window2d.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Simplify the wrappings of mln::neighb2d and mln::window2d. * neighb2d.i, window2d.i: Wrap the classes directly, instead of using simplified, inlined declarations. * box2d.i: Aesthetic changes. box2d.i | 12 +++----- neighb2d.i | 91 +++++++------------------------------------------------------ window2d.i | 77 +++++++-------------------------------------------- 3 files changed, 27 insertions(+), 153 deletions(-) Index: window2d.i --- window2d.i (revision 2135) +++ window2d.i (working copy) @@ -37,75 +37,20 @@ #include "mln/core/window2d.hh" %} -// FIXME: Move mln::window to its own file. +%include "mln/core/macros.hh" %include "mln/core/concept/window.hh" - -// FIXME: Wrap mln::window by hand, for Milena macros disturb swig. -// Annotate the original source code instead? -namespace mln -{ - template <typename D> - class window : public Window< window<D> >, - public internal::dpoints_base_<D, window<D> > - { - typedef internal::dpoints_base_<D, window<D> > super_; - public: - - /*! \brief Point_Iterator type to browse the points of a generic window - * w.r.t. the ordering of delta-points. - */ - typedef dpoints_fwd_piter<D> fwd_qiter; - - /*! \brief Point_Iterator type to browse the points of a generic window - * w.r.t. the reverse ordering of delta-points. - */ - typedef dpoints_bkd_piter<D> bkd_qiter; - - - /*! \brief Constructor without argument. - * - * The constructed window is empty. - */ - window(); - - - /*! \brief Test if the window is symmetric. - */ - bool is_symmetric() const; - - /// Insert a delta-point \p dp. - window<D>& insert(const D& dp); - -// FIXME: Swig tries to wrap everything by default; prevent it from wrapping -// invalid methods (1D and 3D ctors for a point2d). - /// \{ Insertion of a delta-point with different numbers of - /// arguments (coordinates) w.r.t. the dimension. -// window<D>& insert(const mln_coord(D)& dind); // For 1D. - -// FIXME: The macro mln_coord disturbs swig. -// window<D>& insert(const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 2D. - window<D>& insert(const typename D::coord& drow, - const typename D::coord& dcol); // For 2D. - -// window<D>& insert(const mln_coord(D)& dsli, -// const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 3D. -// /// \} - - /// Apply a central symmetry to the target window. - window<D>& sym(); - - protected: - -// FIXME: The macro used here disturbs swig. -// box_<mln_point(D)> b_; - box_<typename D::point> b_; - }; - -} // end of namespace mln +%include "mln/core/window.hh" %include "mln/core/window2d.hh" +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D insertions for a window2d). +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&); +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&); + %template(window2d) mln::window< mln::dpoint_<mln::grid::square, int > >; Index: box2d.i --- box2d.i (revision 2135) +++ box2d.i (working copy) @@ -45,13 +45,11 @@ // invalid methods (1D and 3D ctors for a box2d). /* FIXME: Can't we simplify these directives, i.e. use `point2d' and `int' directly? */ -%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( - typename mln::point_<mln::grid::square, int>::coord -); -%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( +%ignore mln::box_< mln::point_<mln::grid::square, int> >:: +box_(typename mln::point_<mln::grid::square, int>::coord); +%ignore mln::box_< mln::point_<mln::grid::square, int> >:: +box_(typename mln::point_<mln::grid::square, int>::coord, typename mln::point_<mln::grid::square, int>::coord, - typename mln::point_<mln::grid::square, int>::coord, - typename mln::point_<mln::grid::square, int>::coord -); + typename mln::point_<mln::grid::square, int>::coord); %template(box2d) mln::box_< mln::point_<mln::grid::square, int> >; Index: neighb2d.i --- neighb2d.i (revision 2135) +++ neighb2d.i (working copy) @@ -37,89 +37,20 @@ #include "mln/core/neighb2d.hh" %} -// FIXME: Move mln::neighb_ to its own file. +%include "mln/core/macros.hh" %include "mln/core/concept/neighborhood.hh" - -// FIXME: Wrap mln::neighb by hand, for Milena macros disturb swig. -// Annotate the original source code instead? -namespace mln -{ - - // fwd decls - template <typename D> class dpoints_fwd_piter; - template <typename D> class dpoints_bkd_piter; - - - /*! \brief Generic neighborhood class. - * - * This neighborhood of window is just like a set of delta-points. - * The parameter is \c D, type of delta-point. - */ - template <typename D> - struct neighb_ : public Neighborhood< neighb_<D> >, - public internal::dpoints_base_<D, neighb_<D> > - { - /// Dpoint associated type. - typedef D dpoint; - -// FIXME: The macro mln_point disturbs swig. -// /// Point associated type. -// typedef mln_point(D) point; - typedef typename D::point point; - - /*! \brief Point_Iterator type to browse the points of a generic - * neighborhood w.r.t. the ordering of delta-points. - */ - typedef dpoints_fwd_piter<D> fwd_niter; - - /*! \brief Point_Iterator type to browse the points of a generic - * neighborhood w.r.t. the reverse ordering of delta-points. - */ - typedef dpoints_bkd_piter<D> bkd_niter; - - /*! \brief Same as fwd_niter. - */ - typedef fwd_niter niter; - - /*! \brief Constructor without argument. - * - * The constructed neighborhood is empty. You have to use insert() - * to proceed to the neighborhood definition. - */ - neighb_(); - - /*! \brief Insert a delta-point \p dp in the neighborhood - * definition. - * - * \param[in] dp The delta-point to insert. - * - * This method also insert the symmetrical delta-point, - \p dp, - * in the neighborhood definition; thus the client has not to - * ensure the symmetry property; that is automatic. - */ - neighb_<D>& insert(const D& dp); - -// FIXME: Swig tries to wrap everything by default; prevent it from wrapping -// invalid methods (1D and 3D ctors for a point2d). - /// \{ Insertion of a delta-point with different numbers of - /// arguments (coordinates) w.r.t. the dimension. -// neighb_<D>& insert(const mln_coord(D)& dind); // For 1D. - -// FIXME: The macro mln_coord disturbs swig. -// neighb_<D>& insert(const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 2D. - neighb_<D>& insert(const typename D::coord& drow, - const typename D::coord& dcol); // For 2D. - -// neighb_<D>& insert(const mln_coord(D)& dsli, -// const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 3D. - /// \} - }; - -} // end of namespace mln +%include "mln/core/neighb.hh" %include "mln/core/neighb2d.hh" +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D insertions for a neighb2d). +%ignore mln::neighb_< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&); +%ignore mln::neighb_< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&); + %template(neighb2d) mln::neighb_< mln::dpoint_<mln::grid::square, int > >;

16 years, 4 months

2134: Clean up Swilena a bit.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Clean up Swilena a bit. * box2d.i, dpoint2d.i: Remove dead code. * image2d.ixx: Likewise. (instantiate_image2d): Indent. * intp.ixx: Add missing `module' statement. * fill.ixx: Use macro mln_value() in fill()'s signature, as in the original one. * ch_value.ixx (ch_value< image2d< int_u<8> >, int_u<32> >): Turn into... (ch_value< image2d< int_u<8> >, V >): ...this. Adjust documentation. * image2d_int.i: Add a FIXME. * point2d.i: Aesthetic change. box2d.i | 5 ----- ch_value.ixx | 15 +++++++-------- dpoint2d.i | 17 +---------------- fill.ixx | 9 ++++++--- image2d.ixx | 6 ------ image2d_int.i | 5 +++++ intp.ixx | 4 +++- point2d.i | 1 + 8 files changed, 23 insertions(+), 39 deletions(-) Index: box2d.i --- box2d.i (revision 2134) +++ box2d.i (working copy) @@ -38,11 +38,6 @@ %include "mln/core/macros.hh"; -// %include "mln/core/grids.hh"; - -// %include "mln/core/point.hh"; -// %include "mln/core/point2d.hh"; - %include "mln/core/box.hh"; %include "mln/core/box2d.hh"; Index: dpoint2d.i --- dpoint2d.i (revision 2134) +++ dpoint2d.i (working copy) @@ -38,24 +38,9 @@ %include "mln/core/dpoint.hh"; %include "mln/core/dpoint2d.hh"; -/* FIXME: Ignore `mln::dpoint_<M,C>::origin' to circumvent a swig bug. - Without this ignore clause, the generated code would trigger this - error : - image2d-wrap.cc:3115:144: error: macro "SWIG_as_voidptr" passed 2 - arguments, but takes just 1 - image2d-wrap.cc: In function 'PyObject* dpoint2d_origin_get()': - image2d-wrap.cc:3115: error: 'SWIG_as_voidptr' was not declared in this - scope - - Check whether this bug has been fixed in a recent release of SWIG - or if it has been reported. */ -// %ignore mln::dpoint_<mln::grid::square,int>::origin; -// Ignoring to_h_vec saves us the wrapping of h_vec. -// %ignore mln::dpoint_<mln::grid::square,int>::to_h_vec; // Swig tries to wrap everything by default; prevent it from wrapping -// invalid methods (1D and 3D ctors for a dpoint2d). -// %ignore mln::dpoint_<mln::grid::square,int>::dpoint_(const literal::zero_t&); +// invalid methods (1D and 3D ctors for a point2d). %ignore mln::dpoint_<mln::grid::square,int>::dpoint_(const literal::one_t&); %ignore mln::dpoint_<mln::grid::square,int>::operator=(const literal::one_t&); %ignore mln::dpoint_<mln::grid::square,int>::dpoint_(int); Index: image2d.ixx --- image2d.ixx (revision 2134) +++ image2d.ixx (working copy) @@ -42,19 +42,13 @@ // Shortcuts macros. %include "mln/core/macros.hh" -// Associated types. -// %include "mln/core/box2d.hh" -// %include "mln/core/dpoint2d.hh" - // Meta-expressions used in traits. -// %include "mln/metal/bexpr.hh" %include "mln/metal/equal.hh" %include "mln/metal/if.hh" %include "mln/metal/is_const.hh" // Traits. %include "mln/trait/value_.hh" -// %include "mln/trait/image/props.hh" %include "mln/trait/images.hh" // Concept. Index: intp.ixx --- intp.ixx (revision 2134) +++ intp.ixx (working copy) @@ -26,9 +26,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file intp.i +/// \file intp.ixx /// \brief A wrapper of int pointers. +%module intp + %include "cpointer.i" // Wrap a class interface around an "int *" (see // // http://www.swig.org/Doc1.3/Library.html#Library_nn4). Index: fill.ixx --- fill.ixx (revision 2134) +++ fill.ixx (working copy) @@ -35,15 +35,18 @@ #include "mln/level/fill.hh" %} -// FIXME: Wrap mln::level::fill by hand, for mln_value(I) disturbs -// swig. Annotate the original source code instead? +%include "mln/core/macros.hh" + +/* FIXME: Wrap mln::level::fill by hand to help swig choose the right + overload of the algorithm. We might just try to use %ignore + statements instead. */ namespace mln { namespace level { template <typename I> - void fill(mln::Image& ima, const typename I::value& v); + void fill(mln::Image& ima, const mln_value(I)& v); } // end of namespace mln::level Index: ch_value.ixx --- ch_value.ixx (revision 2134) +++ ch_value.ixx (working copy) @@ -52,8 +52,8 @@ // Nothing by default. }; - /* Swig is not powerful enough to parse difficult templates. For - instance, it won't match this specialization. + /* Swig is not powerful enough to parse difficult templates (yet). + For instance, it won't match this specialization: template <typename T, typename U> struct ch_value< mln::image2d< T >, U > @@ -61,16 +61,15 @@ typedef mln::image2d ret; }; - (which is even simpler than what mln/trait/ch_value.hh contains!) + which is even simpler than what mln/trait/ch_value.hh contains. - So we just give it simple ``inlined'' equivalent traits that + Hence we just give it simple ``inlined'' equivalent traits that are compatible with the ones in mln/trait/ch_value.hh. */ - template <> - struct ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<32> > + template <typename V> + struct ch_value< mln::image2d< mln::value::int_u<8> >, V > { - typedef mln::image2d< mln::value::int_u<32> > ret; + typedef mln::image2d< V > ret; }; } // end of namespace mln::morpho Index: image2d_int.i --- image2d_int.i (revision 2134) +++ image2d_int.i (working copy) @@ -32,6 +32,11 @@ %module image2d_int +/* FIXME: Shouldn't it be + + %include "intp.i" + + instead? After all, module `intp' generates wrappers too. */ %include "intp.ixx" %include "image2d.ixx" instantiate_image2d(image2d_int, int) Index: point2d.i --- point2d.i (revision 2134) +++ point2d.i (working copy) @@ -38,6 +38,7 @@ %include "mln/core/point.hh"; %include "mln/core/point2d.hh"; + /* FIXME: Ignore `mln::point_<M,C>::origin' to circumvent a swig bug. Without this ignore clause, the generated code would trigger this error :

16 years, 4 months

2134: Simplify the wrapping of mln::image2d and make it (more) generic.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Simplify the wrapping of mln::image2d and make it (more) generic. * box2d.i: New. * image2d.ixx: Import dpoint2d.i and box2d.i. Wrap mln::image2d directly, instead of using a simplified, inlined declaration. (instantiate_image2d): New macro. Use it... * image2d_int.i, image2d_int_u8.i: ...here. * Makefile.am (wrappers): Add box2d.i. * python/swilena.py: Import box2d. * python/Makefile.am: Build module box2d. Makefile.am | 2 box2d.i | 62 +++++++++++++++++++++ image2d.ixx | 153 +++++++++++++---------------------------------------- image2d_int.i | 2 image2d_int_u8.i | 10 --- python/Makefile.am | 30 ++++++---- python/swilena.py | 1 7 files changed, 126 insertions(+), 134 deletions(-) Index: image2d.ixx --- image2d.ixx (revision 2133) +++ image2d.ixx (working copy) @@ -32,125 +32,50 @@ %module image2d %import "point2d.i" +%import "dpoint2d.i" +%import "box2d.i" %{ #include "mln/core/image2d.hh" %} -%include "mln/core/box2d.hh" -%include "mln/core/dpoint2d.hh" +// Shortcuts macros. +%include "mln/core/macros.hh" -%include "mln/core/concept/image.hh" - -// FIXME: Wrap mln::image2d by hand, for Milena macros disturb swig. -// Annotate the original source code instead? -namespace mln -{ - template <typename T> - struct image2d - /* FIXME: Cheat, so that generic algorithms can use mln::image2d. */ - // : public internal::image_primary_< box2d, image2d<T> > - : public Image< image2d<T> > - { - // Warning: just to make effective types appear in Doxygen: - typedef box2d pset; - typedef point2d psite; - typedef point2d point; - typedef dpoint2d dpoint; -// FIXME: Those typedefs disturb swig. -// typedef mln_fwd_piter(box2d) fwd_piter; -// typedef mln_bkd_piter(box2d) bkd_piter; - typedef line_piter_<point> line_piter; - // End of warning. - - - /// Value associated type. - typedef T value; - - /// Return type of read-only access. - typedef const T& rvalue; - - /// Return type of read-write access. - typedef T& lvalue; - - - /// Skeleton. - typedef image2d< tag::value_<T> > skeleton; - - - /// Value_Set associated type. - typedef mln::value::set<T> vset; - - - /// Constructor without argument. - image2d(); - - /// Constructor with the numbers of rows and columns and the - /// border thickness. - image2d(int nrows, int ncols, unsigned bdr = border::thickness); - - /// Constructor with a box and the border thickness (default is - /// 3). - image2d(const box2d& b, unsigned bdr = border::thickness); - - - /// Initialize an empty image. - void init_(const box2d& b, unsigned bdr = border::thickness); - - - /// Test if \p p is valid. - bool owns_(const point2d& p) const; +// Associated types. +// %include "mln/core/box2d.hh" +// %include "mln/core/dpoint2d.hh" + +// Meta-expressions used in traits. +// %include "mln/metal/bexpr.hh" +%include "mln/metal/equal.hh" +%include "mln/metal/if.hh" +%include "mln/metal/is_const.hh" + +// Traits. +%include "mln/trait/value_.hh" +// %include "mln/trait/image/props.hh" +%include "mln/trait/images.hh" - /// Give the set of values of the image. - const vset& values() const; - - /// Give the definition domain. - const box2d& domain() const; - - /// Give the border thickness. - unsigned border() const; - - /// Give the number of cells (points including border ones). - std::size_t ncells() const; - - /// Read-only access to the image value located at point \p p. - const T& operator()(const point2d& p) const; - - /// Read-write access to the image value located at point \p p. - T& operator()(const point2d& p); - -// FIXME: swig won't wrap this operator. -// /// Read-only access to the image value located at offset \p o. -// const T& operator[](unsigned o) const; - -// FIXME: swig won't wrap this operator. -// /// Read-write access to the image value located at offset \p o. -// T& operator[](unsigned o); - - /// Read-only access to the image value located at (\p row, \p col). - const T& at(int row, int col) const; - - /// Read-write access to the image value located at (\p row, \p col). - T& at(int row, int col); - - - /// Fast Image method - - /// Give the offset corresponding to the delta-point \p dp. - int offset(const dpoint2d& dp) const; - - /// Give the point corresponding to the offset \p o. - point2d point_at_offset(unsigned o) const; - - /// Give a hook to the value buffer. - const T* buffer() const; - - /// Give a hook to the value buffer. - T* buffer(); - - - /// Resize image border with new_border. - void resize_(unsigned new_border); - }; +// Concept. +%include "mln/core/concept/image.hh" -} // end of namespace mln +// Base classes. +%include "mln/core/internal/check/image_fastest.hh" +%include "mln/core/internal/check/image_all.hh" +%include "mln/core/internal/image_base.hh" +%include "mln/core/internal/image_primary.hh" + +// mln::image2d definition. +%include "mln/core/image2d.hh" + +// FIXME: Doc. +%define instantiate_image2d(I, T) +// Instantiate base classes of mln::image2d<T> so that swig knows it +// derives from mln::Image. +%template() mln::internal::image_primary_< mln::box2d, mln::image2d< T > >; +%template() mln::internal::image_base_< mln::box2d, mln::image2d< T > >; +%template() mln::internal::image_checked_< mln::image2d< T > >; +// Instantiate mln::image2d<T> +%template(I) mln::image2d< T >; +%enddef Index: python/Makefile.am --- python/Makefile.am (revision 2133) +++ python/Makefile.am (working copy) @@ -52,6 +52,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_point2d-wrap.Pcc@am__quote@ nodist_python_PYTHON += point2d.py +## dpoint2d. +pyexec_LTLIBRARIES += _dpoint2d.la +nodist__dpoint2d_la_SOURCES = dpoint2d-wrap.cc +_dpoint2d_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__dpoint2d_la_SOURCES) dpoint2d.py dpoint2d.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_dpoint2d-wrap.Pcc@am__quote@ +nodist_python_PYTHON += dpoint2d.py + +## box2d. +pyexec_LTLIBRARIES += _box2d.la +nodist__box2d_la_SOURCES = box2d-wrap.cc +_box2d_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__box2d_la_SOURCES) box2d.py box2d.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_box2d-wrap.Pcc@am__quote@ +nodist_python_PYTHON += box2d.py + ## int_u8. pyexec_LTLIBRARIES += _int_u8.la nodist__int_u8_la_SOURCES = int_u8-wrap.cc @@ -72,16 +92,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u32-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u32.py -## dpoint2d. -pyexec_LTLIBRARIES += _dpoint2d.la -nodist__dpoint2d_la_SOURCES = dpoint2d-wrap.cc -_dpoint2d_la_LIBADD = $(AM_LIBADD) -CLEANFILES += $(nodist__dpoint2d_la_SOURCES) dpoint2d.py dpoint2d.py[co] -## Include the dependency files. Copied from Automake's generated -## case for C++. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_dpoint2d-wrap.Pcc@am__quote@ -nodist_python_PYTHON += dpoint2d.py - ## neighb2d. pyexec_LTLIBRARIES += _neighb2d.la nodist__neighb2d_la_SOURCES = neighb2d-wrap.cc Index: python/swilena.py --- python/swilena.py (revision 2133) +++ python/swilena.py (working copy) @@ -31,6 +31,7 @@ from point2d import * from dpoint2d import * +from box2d import * from neighb2d import * from window2d import * Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2133) +++ image2d_int_u8.i (working copy) @@ -33,13 +33,8 @@ %module image2d_int_u8 %import "int_u8.i" -// FIXME: The import directive does not include the `%{ ... %}' clauses. -// %{ -// #include "mln/value/int_u8.hh" -// %} -// %include "image2d.ixx" -%template(image2d_int_u8) mln::image2d< mln::value::int_u<8> >; +instantiate_image2d(image2d_int_u8, mln::value::int_u<8>) %include "pgm.ixx" %template(load) mln::io::pgm::load< mln::value::int_u<8> >; @@ -92,8 +87,7 @@ `-------------------*/ // FIXME: Rearrange and move this elsewhere. - -%template(image2d_int_u32) mln::image2d< mln::value::int_u<32> >; +instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) %template(println32) mln::debug::println< mln::image2d< mln::value::int_u<32> > Index: box2d.i --- box2d.i (revision 0) +++ box2d.i (revision 0) @@ -0,0 +1,62 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file box2d.i +/// \brief A wrapper of mln::box2d. + +%module box2d + +%{ +#include "mln/core/box.hh" +#include "mln/core/box2d.hh" +%} + +%include "mln/core/macros.hh"; + +// %include "mln/core/grids.hh"; + +// %include "mln/core/point.hh"; +// %include "mln/core/point2d.hh"; + +%include "mln/core/box.hh"; +%include "mln/core/box2d.hh"; + +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D ctors for a box2d). +/* FIXME: Can't we simplify these directives, i.e. use `point2d' and + `int' directly? */ +%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( + typename mln::point_<mln::grid::square, int>::coord +); +%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( + typename mln::point_<mln::grid::square, int>::coord, + typename mln::point_<mln::grid::square, int>::coord, + typename mln::point_<mln::grid::square, int>::coord +); + +%template(box2d) mln::box_< mln::point_<mln::grid::square, int> >; Index: image2d_int.i --- image2d_int.i (revision 2133) +++ image2d_int.i (working copy) @@ -34,7 +34,7 @@ %include "intp.ixx" %include "image2d.ixx" -%template(image2d_int) mln::image2d<int>; +instantiate_image2d(image2d_int, int) %include "fill.ixx" %template(fill) mln::level::fill< mln::image2d<int> >; Index: Makefile.am --- Makefile.am (revision 2133) +++ Makefile.am (working copy) @@ -10,7 +10,7 @@ # Wrappers (generating actual modules). wrappers = \ - dpoint2d.i image2d_int.i image2d_int_u8.i int_u8.i \ + box2d.i dpoint2d.i image2d_int.i image2d_int_u8.i int_u8.i \ int_u32.i neighb2d.i point2d.i window2d.i EXTRA_DIST = $(meta_wrappers) $(wrappers)

16 years, 4 months

2132: Use fully qualified type names to help swig wrap box2d and image2d.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/core/box2d.hh, mln/core/image2d.hh: Use fully qualified type names to help swig wrap these types. box2d.hh | 2 +- image2d.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: mln/core/box2d.hh --- mln/core/box2d.hh (revision 2132) +++ mln/core/box2d.hh (working copy) @@ -46,7 +46,7 @@ * * \see mln::win::rectangle2d. */ - typedef box_<point2d> box2d; + typedef box_<mln::point2d> box2d; } // end of namespace mln Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 2132) +++ mln/core/image2d.hh (working copy) @@ -112,7 +112,7 @@ * thickness around data. */ template <typename T> - struct image2d : public internal::image_primary_< box2d, image2d<T> > + struct image2d : public internal::image_primary_< mln::box2d, image2d<T> > { // Warning: just to make effective types appear in Doxygen: typedef box2d pset;

16 years, 4 months

2132: Add support for mln_concrete in Swilena.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add support for mln_concrete in Swilena. * concrete.ixx: New. Use it... * morpho.ixx: ...here. Wrap mln::morpho::dilation.hh and mln::morpho::erosion directly, instead of using a simplified declaration (previously used to circumvent the lack of support of mln_concrete). Fix documentation. * image2d_int.i, image2d_int_u8.i: Instantiate mln::trait::concrete to have swig understand the return types of mln::morpho::dilation.hh and mln::morpho::erosion. * ch_value.ixx: Adjust documentation. * Makefile.am (meta_wrappers, wrappers): New variables. Use them... (EXTRA_DIST): ...here. (meta_wrappers): Add concrete.ixx. Makefile.am | 10 +++++--- ch_value.ixx | 6 ++--- concrete.ixx | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ image2d_int.i | 3 ++ image2d_int_u8.i | 4 +++ morpho.ixx | 41 ++++++----------------------------- 6 files changed, 88 insertions(+), 40 deletions(-) Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2131) +++ image2d_int_u8.i (working copy) @@ -64,6 +64,10 @@ %} %include "morpho.ixx" + +// Explicit instantiation of this trait for the return type of +// mln::morpho::dilation and mln::morpho::erosion. +%template() mln::trait::concrete< mln::image2d< mln::value::int_u<8> > >; /* FIXME: Can't we use `mln::value::int8' directlt here (as we can use `mln::window2d', which is a really just typedef for `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ Index: ch_value.ixx --- ch_value.ixx (revision 2131) +++ ch_value.ixx (working copy) @@ -28,12 +28,12 @@ /// \file ch_value.i /// \brief A wrapper of mln::trait::ch_value. +/// +/// This is a very limited workaround for the difficult wrapping of +/// mln::trait::ch_value (or even of a subset of it). %module ch_value -/* FIXME: Use this very limited workaround instead of - mln/trait/ch_value.hh or even a subset of it for the moment. */ - %{ #include "mln/trait/ch_value.hh" %} Index: image2d_int.i --- image2d_int.i (revision 2131) +++ image2d_int.i (working copy) @@ -49,5 +49,8 @@ %} %include "morpho.ixx" +// Explicit instantiation of this trait for the return type of +// mln::morpho::dilation and mln::morpho::erosion. +%template() mln::trait::concrete< mln::image2d< int > >; %template(dilation) mln::morpho::dilation< mln::image2d<int>, mln::window2d >; %template(erosion) mln::morpho::erosion< mln::image2d<int>, mln::window2d >; Index: Makefile.am --- Makefile.am (revision 2131) +++ Makefile.am (working copy) @@ -4,13 +4,15 @@ # Meta-wrappers (templates), not generating a module, but factoring # common parts. -EXTRA_DIST = \ - ch_value.ixx fill.ixx image2d.ixx intp.ixx int_u.ixx \ - morpho.ixx pgm.ixx println.ixx +meta_wrappers = \ + ch_value.ixx concrete.ixx fill.ixx image2d.ixx intp.ixx \ + int_u.ixx morpho.ixx pgm.ixx println.ixx # Wrappers (generating actual modules). -EXTRA_DIST += \ +wrappers = \ dpoint2d.i image2d_int.i image2d_int_u8.i int_u8.i \ int_u32.i neighb2d.i point2d.i window2d.i +EXTRA_DIST = $(meta_wrappers) $(wrappers) + check_SCRIPTS = run Index: concrete.ixx --- concrete.ixx (revision 0) +++ concrete.ixx (revision 0) @@ -0,0 +1,64 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file concrete.i +/// \brief A wrapper of mln::trait::concrete. +/// +/// This is a very limited workaround for the difficult wrapping of +/// mln::trait::concrete. + +%module concrete + +%{ +#include "mln/trait/concrete.hh" +%} + +# define mln_concrete(I) typename mln::trait::concrete::ret + +namespace mln +{ + namespace trait + { + /* Swig is not powerful enough to parse difficult templates. For + instance, it won't match this specialization. + + mln::trait::concrete depends on mln::trait::ch_value.ixx that + swig cannot wrap yet (see ch_value.ixx). So we just give it + simple ``inlined'' equivalent traits that are compatible with + the ones in mln/trait/ch_value.hh. */ + + // By default, assume the concrete type is the paramater itself. + template <typename I> + struct concrete + { + typedef I ret; + }; + + } // end of namespace mln::morpho + +} // end of namespace mln Index: morpho.ixx --- morpho.ixx (revision 2131) +++ morpho.ixx (working copy) @@ -26,49 +26,24 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file fill.i +/// \file morpho.i /// \brief Wrappers of morphological algorithms from mln::morpho. %module morpho -/*---------------------------. -| Dilation and erxrebosion. | -`---------------------------*/ +/*-----------------------. +| Dilation and erosion. | +`-----------------------*/ + +%include "concrete.ixx" %{ #include "mln/morpho/dilation.hh" #include "mln/morpho/erosion.hh" %} -// FIXME: Wrap mln::morpho::erosion by hand, for mln_concrete(I) -// disturbs swig. Annotate the original source code instead? -namespace mln -{ - namespace morpho - { - - /* FIXME: How can we handle concrete in Swilena? Simplify this - for the moment, and use I directly as return type. - - 2008-08-08: Actualy, it's very simple: just ask swig to wrap - the macro `mln_concrete'. See how we did it with - `mln_ch_value'. - - We should apply this to as many wrappers as we can: we have - inlined many `mln_*' macros so far, and it is a pain to - maintain. */ - - template <typename I, typename W> - I - dilation(const Image& input, const Window<W>& win); - - template <typename I, typename W> - I - erosion(const Image& input, const Window<W>& win); - - } // end of namespace mln::morpho - -} // end of namespace mln +%include "mln/morpho/dilation.hh" +%include "mln/morpho/erosion.hh" /*------------------------------------.

16 years, 4 months

2130: Remove overloads of morpho::dilation taking their output as argument.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Remove overloads of mln::morpho::dilation taking their output as argument. * mln/morpho/dilation.hh (mln::morpho::dilation<I, O>) (mln::morpho::dilation<I, W, O>): Remove. (mln::morpho::dilation): Adjust. Disable. (mln::morpho::dilation<I, W>): Adjust. * tests/morpho/dilation.cc: Adjust test. mln/morpho/dilation.hh | 90 ++++++++++++----------------------------------- tests/morpho/dilation.cc | 4 +- 2 files changed, 26 insertions(+), 68 deletions(-) Index: mln/morpho/dilation.hh --- mln/morpho/dilation.hh (revision 2130) +++ mln/morpho/dilation.hh (working copy) @@ -43,21 +43,10 @@ /// Morphological dilation using the neighborhood bound to an image. /// /// \{ - - /* FIXME: We'll probably get rid of the neighborhood-based - versions for Olena 1.0, and try to re-introduce them for - Olena 1.1. */ - - /* FIXME: Unless there's a good reason, we should get rid of this - version. */ -// /// Perform a morphological dilation of \a input using its -// /// neighborhood and store the result into \a output. -// /// -// /// \pre \a input must be an image with a neighborhood. -// template <typename I, typename O> -// void -// dilation(const Image& input, Image<O>& output); - + /* FIXME: Re-enable this routine for Olena 1.1, when associated + neighborhoods (i.e., the neighb::image morpher) are supported + and shipped. */ +#if 0 /// Perform a morphological dilation of \a input using its /// neighborhood and return the result. /// @@ -66,6 +55,7 @@ mln_concrete(I) dilation(const Image& input); /// \} +#endif /// Morphological dilation using windows. /// @@ -73,14 +63,6 @@ /// images. /// /// \{ - /* FIXME: Unless there's a good reason, we should get rid of this - version. */ -// /// Perform a morphological dilation of \a input using \a win and -// /// store the result into \a output. -// template <typename I, typename W, typename O> -// void -// dilation(const Image& input, const Window<W>& win, Image<O>& output); - /// Perform a morphological dilation of \a input using \a win and /// return the result. template <typename I, typename W> @@ -248,6 +230,8 @@ | Neighborhood-based. | `---------------------*/ + // FIXME: Disabled (see above). +#if 0 /* FIXME: We might want to move this function into the body of the facade (see at the bottom of the file. */ // Sole case. Convert the neighborhood into a window, and @@ -267,6 +251,7 @@ dpoint-set-based neighborhood. */ dilation_wrt_win(input, convert::to_window(nbh), output); } +#endif } // end of namespace mln::morpho::impl @@ -275,62 +260,33 @@ | Facades. | `----------*/ - // ------------------------------------------------ // - // Facades for neighborhood-based implementations. // - // ------------------------------------------------ // - - template <typename I, typename O> - void - dilation(const Image& input, Image<O>& output) - { - trace::entering("morpho::dilation"); - - metal::has_neighborhood::check(); - - mln_precondition(exact(output).domain() == exact(input).domain()); - - typedef mln_neighb(I) neighb; - - impl::dilation_wrt_nbh(input, exact(input).neighborhood(), output); - - trace::exiting("morpho::dilation"); - } + // ----------------------------------------------- // + // Facade for neighborhood-based implementations. // + // ----------------------------------------------- // + // FIXME: Disabled (see above). +#if 0 template <typename I> mln_concrete(I) dilation(const Image& input) { trace::entering("morpho::dilation"); + metal::has_neighborhood::check(); + typedef mln_neighb(I) neighb; + mln_concrete(I) output; initialize(output, input); - dilation(input, output); + impl::dilation_wrt_nbh(input, exact(input).neighborhood(), output); trace::exiting("morpho::dilation"); return output; } +#endif - - // ------------------------------------------ // - // Facades for window-based implementations. // - // ------------------------------------------ // - - template <typename I, typename W, typename O> - void - dilation(const Image& input, const Window<W>& win, Image<O>& output) - { - trace::entering("morpho::dilation"); - - mln_precondition(exact(output).domain() == exact(input).domain()); - mln_precondition(! exact(win).is_empty()); - - impl::dilation_wrt_win(input, exact(win), output); - - if (exact(win).is_centered()) - mln_postcondition(output >= input); - - trace::exiting("morpho::dilation"); - } + // ----------------------------------------- // + // Facade for window-based implementations. // + // ----------------------------------------- // template <typename I, typename W> mln_concrete(I) @@ -342,8 +298,10 @@ mln_concrete(I) output; initialize(output, input); - dilation(input, win, output); + impl::dilation_wrt_win(input, exact(win), output); + if (exact(win).is_centered()) + mln_postcondition(output >= input); trace::exiting("morpho::dilation"); return output; } Index: tests/morpho/dilation.cc --- tests/morpho/dilation.cc (revision 2130) +++ tests/morpho/dilation.cc (working copy) @@ -78,9 +78,9 @@ } { - image2d<bool> bin(lena.domain()), out(lena.domain()); + image2d<bool> bin(lena.domain()); level::fill(bin, pw::value(lena) > pw::cst(127u)); - morpho::dilation(bin, rec, out); + image2d<bool> out = morpho::dilation(bin, rec); image2d<int_u8> test(lena.domain()); image2d<int_u8>::fwd_piter p(lena.domain());

16 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches August 2008