[Olena-patches] [PATCH 4/5] Wrap morpho::watershed::flooding instead of morpho::meyer_wst.

* morpho.ixx: Here. * image2d_int_u8.i, * python/morpho-segm.py: Adjust. --- swilena/ChangeLog | 9 +++++++++ swilena/image2d_int_u8.i | 8 ++++---- swilena/morpho.ixx | 11 +++++------ swilena/python/morpho-segm.py | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index e751084..58577e6 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2010-04-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Wrap morpho::watershed::flooding instead of morpho::meyer_wst. + + * morpho.ixx: Here. + * image2d_int_u8.i, + * python/morpho-segm.py: + Adjust. + +2010-04-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Clean up Swilena a bit. * python-utils.ixx (generate__str__): diff --git a/swilena/image2d_int_u8.i b/swilena/image2d_int_u8.i index 18b4f84..ae96049 100644 --- a/swilena/image2d_int_u8.i +++ b/swilena/image2d_int_u8.i @@ -78,10 +78,10 @@ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, | image2d<int_u8> and image2d<int_u32>. | `---------------------------------------*/ -instantiate_meyer_wst(meyer_wst32, - mln::value::int_u<32>, - mln::image2d< mln::value::int_u<8> >, - mln::neighb2d) +instantiate_watershed_flooding(watershed_flooding32, + 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>) diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index d917ac0..bf84d2d 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -154,16 +154,15 @@ namespace mln `------------------------------------*/ %{ -#include "mln/morpho/meyer_wst.hh" +#include "mln/morpho/watershed/flooding.hh" %} -%include "mln/morpho/meyer_wst.hh" +%include "mln/morpho/watershed/flooding.hh" -// FIXME: Wrap mln::morpho::watershed::flooding instead. -%define instantiate_meyer_wst(Name, L, I, N) +%define instantiate_watershed_flooding(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 >; + %template(Name) mln::morpho::watershed::flooding< L, I, N >; %enddef /*-----------. @@ -200,7 +199,7 @@ namespace mln instantiate_closing_area(closing_area, I, N) instantiate_opening_area(opening_area, I, N) - instantiate_meyer_wst(meyer_wst, mln_value(I), I, N) + instantiate_watershed_flooding(watershed_flooding, mln_value(I), I, N) instantiate_max_tree(max_tree, I, N) %enddef diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 654aa95..f8176a2 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -34,7 +34,7 @@ image.save(gradient, "gradient.pgm") closed_gradient = image.closing_area(ima, c4(), 50) # Watershed transform. nbasins = int_u8() -ws = image.meyer_wst (closed_gradient, c4(), nbasins) +ws = image.watershed_flooding(closed_gradient, c4(), nbasins) print nbasins image.save(ws, "segm.pgm") -- 1.7.0.4