* println.ixx: Include std_string.i to help SWIG wrap mln::debug::println(const std::string&, const Image<I>&) and use it... * python/max-tree.py: ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/println.ixx | 6 +++++- swilena/python/max-tree.py | 8 +------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6778779..fc6f0b1 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2014-05-23 Roland Levillain <roland@lrde.epita.fr> + Improve Swilena's max-tree.py output. + + * println.ixx: Include std_string.i to help SWIG wrap + mln::debug::println(const std::string&, const Image<I>&) and use + it... + * python/max-tree.py: ...here. + +2014-05-23 Roland Levillain <roland@lrde.epita.fr> + Make Swilena's max-tree.py test fully work with SWIG 2.0.7. * morpho.ixx: Give names to wrapped traits, to let SWIG properly diff --git a/swilena/println.ixx b/swilena/println.ixx index 5f56e63..04ed710 100644 --- a/swilena/println.ixx +++ b/swilena/println.ixx @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -27,6 +27,10 @@ /// \file println.ixx /// \brief A wrapper of mln::debug::println. +%module println + +%include std_string.i + %{ #include "mln/debug/println.hh" %} diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index 345d966..ee8d249 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -40,10 +40,4 @@ image.println("ima =", ima) max_tree_parent = image.max_tree(ima, c4()) -# FIXME: Overloading issue: Why can't we use -# -# image2d_point2d.println("max_tree_parent =", max_tree_parent) -# -# ? -## 2013-04-09: Disabled, until a solution is found. -par_image.println(max_tree_parent) +par_image.println("max_tree_parent =", max_tree_parent) -- 1.7.10.4