[Olena-patches] [PATCH 24/31] Inim project review.

* edwin/inim/inim.cc: Fix include. * edwin/tests/sharp.cc: New. * edwin/tree/sharp.cc: Remove. --- milena/sandbox/ChangeLog | 7 +++++++ milena/sandbox/edwin/inim/Makefile | 4 +--- milena/sandbox/edwin/inim/inim.cc | 6 +++--- milena/sandbox/edwin/{tree => tests}/sharp.cc | 24 +++++++++++++----------- 4 files changed, 24 insertions(+), 17 deletions(-) rename milena/sandbox/edwin/{tree => tests}/sharp.cc (94%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 880ff36..0c91510 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2009-05-12 Edwin Carlinet &lt;carlinet(a)lrde.epita.fr&gt; + + Inim project review. + * edwin/inim/inim.cc: Fix include. + * edwin/tests/sharp.cc: New. + * edwin/tree/sharp.cc: Remove. + 2009-05-11 Fabien Freling &lt;fabien.freling(a)lrde.epita.fr&gt; Plot labels in fixed watershed. diff --git a/milena/sandbox/edwin/inim/Makefile b/milena/sandbox/edwin/inim/Makefile index 3e4f0dc..2a24166 100644 --- a/milena/sandbox/edwin/inim/Makefile +++ b/milena/sandbox/edwin/inim/Makefile @@ -7,7 +7,7 @@ inim_OBJS=${inim_SRC:.cc=.o} OLENADIR=$(MLN_DIR)/.. MILENADIR=$(OLENADIR)/milena -CXXFLAGS=-I$(MILENADIR) -I./ -W -Wall +CXXFLAGS=-I$(MILENADIR) -I$(MILENADIR)/sandbox/edwin -W -Wall CXXFLAGS += $(if $(DEBUG), -g -ggdb, -DNDEBUG\ @@ -26,8 +26,6 @@ $(TARGET): $($(TARGET)_OBJS) $($(TARGET)_SRC) %.o: %.cc $(CXX) $(CXXFLAGS) -c $< -%.o: %.hh - $(CXX) $(CXXFLAGS) -c $< depend: makedepend -- $(CXXFLAGS) -- -v $($(TARGET)_SRC) diff --git a/milena/sandbox/edwin/inim/inim.cc b/milena/sandbox/edwin/inim/inim.cc index 5dca4bd..f38130d 100644 --- a/milena/sandbox/edwin/inim/inim.cc +++ b/milena/sandbox/edwin/inim/inim.cc @@ -18,12 +18,12 @@ /* Component trees */ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include "../tree/propagate.hh" -#include "../tree/components.hh" +#include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/components.hh> /* Attributes */ #include <mln/transform/distance_front.hh> -#include "../attributes/bbox.hh" +#include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> #include <mln/make/w_window2d_int.hh> diff --git a/milena/sandbox/edwin/tree/sharp.cc b/milena/sandbox/edwin/tests/sharp.cc similarity index 94% rename from milena/sandbox/edwin/tree/sharp.cc rename to milena/sandbox/edwin/tests/sharp.cc index 58933b5..6b97f94 100644 --- a/milena/sandbox/edwin/tree/sharp.cc +++ b/milena/sandbox/edwin/tests/sharp.cc @@ -12,8 +12,9 @@ /* Component trees */ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include "components.hh" -#include "propagate.hh" +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/filter.hh> +#include <mln/morpho/tree/propagate.hh> /* Attributes */ #include <mln/morpho/attribute/sharpness.hh> @@ -327,12 +328,13 @@ int main(int argc, char* argv[]) // labeling typedef mln_ch_value_(I, bool) M; - typedef mln_ch_value_(I, value::label<16>) L; M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); - value::label<16> nlabel; - L label = labeling::blobs(mask, c4(), nlabel); - io::pgm::save(label, "label.pgm"); + + //typedef mln_ch_value_(I, value::label<16>) L; + //value::label<16> nlabel; + //L label = labeling::blobs(mask, c4(), nlabel); + //io::pgm::save(label, "label.pgm"); if (mydebug) { @@ -342,11 +344,11 @@ int main(int argc, char* argv[]) // /* Now store output image */ -// I out; -// initialize(out, input); -// data::fill(out, 0); -// data::paste(input | pw::value(mask), out); -// io::pgm::save(out, "output.pgm"); + I out; + initialize(out, input); + data::fill(out, 0); + data::paste(input | pw::value(mask), out); + io::pgm::save(out, "output.pgm"); } -- 1.6.1.2