- Olena-patches

[PATCH 09/10] Update milena/doc/.gitignore.
by Roland Levillain 13 Jul '09

13 Jul '09

--- milena/doc/.gitignore | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 63de7da..277fe84 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -6,8 +6,16 @@ /user /ref_guide/ref_guide.haux /ref_guide/ref_guide.hh +/ref_guide/ref_guide.hh-e /ref_guide/ref_guide.html /ref_guide/ref_guide.htoc +/ref_guide/ref_guide.pdf /tutorial/tutorial.haux /tutorial/tutorial.hh +/tutorial/tutorial.hh-e /tutorial/tutorial.html +/tutorial/tutorial.pdf +/user-refman-html +/user-refman.pdf +/white_paper/white_paper_html/index.html +/white_paper/white_paper.pdf -- 1.6.1.2

1 0

[PATCH 08/10] Makefile.am: Add a FIXME.
by Roland Levillain 13 Jul '09

13 Jul '09

--- ChangeLog | 4 ++++ Makefile.am | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0353a6..9ed3dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + * Makefile.am: Add a FIXME. + 2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * lrde-upload.sh: Call chmod before copying files. diff --git a/Makefile.am b/Makefile.am index 9cd8b57..8982f66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,21 @@ LRDE_NODIST_FILES = \ $(distdir)/milena/tests/value/stack.cc \ $(distdir)/scribo +## FIXME: Running `build-aux/build_unit_test.sh' just to update +## `milena/tests/unit_test/unit-tests.mk' is overkill: +## +## 1. It recreates *all* the sources (more than 1200 `.cc' files!). +## => We should just regen `unit-tests.mk', not the `.cc' files. +## +## 2. It visits (almost) all the directories and files under +## milena/mln/ (which admittedly a smaller issue compared to the +## previous one) +## => Prune `unit-tests.mk' instead of regenerating it. The +## simplest solution is probably to equip `unit-tests.mk' in the +## first place with `<<lrde'/`>>' tags, then prune it with +## dist-strip. +## + # Do not distribute parts tagged `lrde' (see build-aux/strip-lrde). dist-hook: for f in $(LRDE_STRIPPED_DIST_FILES); do \ -- 1.6.1.2

1 0

[PATCH 07/10] src/preprocessing/Makefile.am: Remove a trailing blank line.
by Roland Levillain 13 Jul '09

13 Jul '09

--- scribo/ChangeLog | 4 ++++ scribo/src/preprocessing/Makefile.am | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 22f4c02..ba7f8c1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + * src/preprocessing/Makefile.am: Remove a trailing blank line. + 2009-07-08 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Bug fix. diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index e0c0d03..f6d877c 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -23,4 +23,3 @@ bin_PROGRAMS = \ unskew unskew_SOURCES = unskew.cc - -- 1.6.1.2

1 0

[PATCH 06/10] Fix the Swilena distribution.
by Roland Levillain 13 Jul '09

13 Jul '09

* python/Makefile.am (nodist__dynamic_image2d_la_SOURCES): Add dynamic_image2d-wrap.h. (CLEANFILES): Add closing.pgm, closing_area.pgm, dilation.pgm, erosion.pgm, gradient.pgm, gradient_external.pgm, gradient_internal.pgm, opening.pgm, opening_area.pgm and segm.pgm. --- swilena/ChangeLog | 10 ++++++++++ swilena/python/Makefile.am | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 945c8b9..3c34236 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Swilena distribution. + + * python/Makefile.am (nodist__dynamic_image2d_la_SOURCES): Add + dynamic_image2d-wrap.h. + (CLEANFILES): Add closing.pgm, closing_area.pgm, dilation.pgm, + erosion.pgm, gradient.pgm, gradient_external.pgm, + gradient_internal.pgm, opening.pgm, opening_area.pgm and segm.pgm. + 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am (wrappers): Add config.i. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 24eff65..aec8a05 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -176,7 +176,11 @@ nodist_python_PYTHON += image2d_int_u8.py ## dynamic_image2d. pyexec_LTLIBRARIES += _dynamic_image2d.la -nodist__dynamic_image2d_la_SOURCES = dynamic_image2d-wrap.cc +# Swig also generates a header for this module, since it makes use of +# directors. +nodist__dynamic_image2d_la_SOURCES = \ + dynamic_image2d-wrap.h \ + dynamic_image2d-wrap.cc _dynamic_image2d_la_LIBADD = $(AM_LIBADD) CLEANFILES += $(nodist__dynamic_image2d_la_SOURCES) dynamic_image2d.py dynamic_image2d.py[co] ## Include the dependency files. Copied from Automake's generated @@ -232,3 +236,16 @@ TESTS = \ image2d-misc.py morpho-fun.py morpho-segm.py dynamic-image2d-misc.py EXTRA_DIST += $(TESTS) + +# Images generated by tests. +CLEANFILES += \ + closing.pgm \ + closing_area.pgm \ + dilation.pgm \ + erosion.pgm \ + gradient.pgm \ + gradient_external.pgm \ + gradient_internal.pgm \ + opening.pgm \ + opening_area.pgm \ + segm.pgm -- 1.6.1.2

1 0

[PATCH 05/10] headers.mk, tests/unit_test/unit-tests.mk: Regen.
by Roland Levillain 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dfe9c00..6d7a281 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk, tests/unit_test/unit-tests.mk: Regen. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Distribute missing meshes. * mesh/Makefile.am (more_meshes): New variable. diff --git a/milena/headers.mk b/milena/headers.mk index 23c2368..4af9e99 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -667,6 +667,7 @@ mln/labeling/background.hh \ mln/labeling/blobs.hh \ mln/labeling/colorize.hh \ mln/labeling/compute.hh \ +mln/labeling/compute_image.hh \ mln/labeling/essential.hh \ mln/labeling/fill_holes.hh \ mln/labeling/flat_zones.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 9751e03..00d39de 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -683,6 +683,7 @@ mln_labeling_background \ mln_labeling_blobs \ mln_labeling_colorize \ mln_labeling_compute \ +mln_labeling_compute_image \ mln_labeling_essential \ mln_labeling_fill_holes \ mln_labeling_flat_zones \ @@ -1943,6 +1944,7 @@ mln_labeling_background_SOURCES = mln_labeling_background.cc mln_labeling_blobs_SOURCES = mln_labeling_blobs.cc mln_labeling_colorize_SOURCES = mln_labeling_colorize.cc mln_labeling_compute_SOURCES = mln_labeling_compute.cc +mln_labeling_compute_image_SOURCES = mln_labeling_compute_image.cc mln_labeling_essential_SOURCES = mln_labeling_essential.cc mln_labeling_fill_holes_SOURCES = mln_labeling_fill_holes.cc mln_labeling_flat_zones_SOURCES = mln_labeling_flat_zones.cc -- 1.6.1.2

1 0

[PATCH 04/10] Distribute missing meshes.
by Roland Levillain 13 Jul '09

13 Jul '09

* mesh/Makefile.am (more_meshes): New variable. (dist_mesh_DATA): Append $(more_meshes). --- milena/ChangeLog | 7 +++++++ milena/mesh/Makefile.am | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 527b08f..dfe9c00 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Distribute missing meshes. + + * mesh/Makefile.am (more_meshes): New variable. + (dist_mesh_DATA): Append $(more_meshes). + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Fix the installation of the Doxygen HTML user documentation. * doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index a8baaa5..e023f4d 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -41,6 +41,13 @@ meshes = \ $(srcdir)/tetrahedron.off dist_mesh_DATA += $(meshes) +# These meshes does not have curvature-valued versions. +more_meshes = \ + one-triangle.off \ + two-triangles.off \ + three-triangles.off +dist_mesh_DATA += $(more_meshes) + ## ------------------------------------ ## ## Pseudo-inverse curvature of meshes. ## ## ------------------------------------ ## -- 1.6.1.2

1 0

[PATCH 03/10] Fix the installation of the Doxygen HTML user documentation.
by Roland Levillain 13 Jul '09

13 Jul '09

* doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... (EXTRA_DIST): ...here. (install-data-local, uninstall-local): New rules. Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 27 ++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 223d1d8..527b08f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Fix the installation of the Doxygen HTML user documentation. + + * doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... + (EXTRA_DIST): ...here. + (install-data-local, uninstall-local): New rules. + Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Build the reference documentation in the source dir. * doc/Makefile.am (USER_REFMAN_PDF): Set to user-refman.pdf. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index a7d4647..1580c1f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -238,9 +238,30 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk -dist_doc_DATA = \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) +dist_doc_DATA = $(USER_REFMAN_PDF) + +# Installing a directory located in the source dir is not supported by +# Automake by default, so we cannot add `USER_REFMAN_HTML' to +# `dist_doc_DATA'. The following two rules are are workaround from +# the Vaucanson project. +EXTRA_DIST += $(USER_REFMAN_HTML) + +# We install by hand, otherwise Automake produces "install .../srcdoc +# .../srcdoc", which installs our dir into the previous one, instead +# of replacing it. +install-data-local: + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + $(mkdir_p) $(DESTDIR)$(htmldir) + cp -r $(srcdir)/$(USER_REFMAN_HTML) $(DESTDIR)$(htmldir) +## Try GNU chmod's X mode before resorting to something slower but +## more standard. + chmod -R a+rX $(DESTDIR)$(htmldir) || \ + find $(DESTDIR)$(htmldir) $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; + +uninstall-local: + chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) EXTRA_DIST += \ -- 1.6.1.2

1 0

[PATCH 02/10] Build the reference documentation in the source dir.
by Roland Levillain 13 Jul '09

13 Jul '09

* doc/Makefile.am (USER_REFMAN_PDF): Set to user-refman.pdf. (USER_REFMAN_HTML): Set to user-refman-html. (DEVEL_REFMAN_PDF): Set to devel/latex/refman.pdf. (DEVEL_REFMAN_HTML): Set to devel/html. (ref-doc-pdf, $(srcdir)/$(USER_REFMAN_PDF)) (ref-doc-html, $(srcdir)/$(USER_REFMAN_HTML)) (ref-doc-devel-pdf, $(srcdir)/$(DEVEL_REFMAN_PDF)) (ref-doc-devel-html, $(srcdir)/$(DEVEL_REFMAN_HTML)) (fake-doc): Adjust. * doc/ref_guide/Makefile.am (REF_GUIDE_HH): Set to $(srcdir)/ref_guide.hh. (REF_GUIDE_PDF): Set to $(srcdir)/ref_guide.pdf ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)): Adjust. * doc/tutorial/Makefile.am (TUTORIAL_HH): Set to $(srcdir)/tutorial.hh. (TUTORIAL_PDF): Set to $(srcdir)/tutorial.pdf. ($(TUTORIAL_HH), $(TUTORIAL_PDF)): Adjust. * doc/white_paper/Makefile.am (WHITE_PAPER_HTML): Set to $(srcdir)/white_paper_html/index.html. (WHITE_PAPER_PDF): Set to $(srcdir)/white_paper.pdf. ($(WHITE_PAPER_HTML), $(WHITE_PAPER_PDF), fake-doc): Adjust rules. --- milena/ChangeLog | 26 +++++++++++++++++++++ milena/doc/Makefile.am | 44 +++++++++++++++++++++-------------- milena/doc/ref_guide/Makefile.am | 33 +++++++++++++++++++++++--- milena/doc/tutorial/Makefile.am | 34 ++++++++++++++++++++++++--- milena/doc/white_paper/Makefile.am | 34 +++++++++++++++++++++++++-- 5 files changed, 142 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index faac29e..223d1d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Build the reference documentation in the source dir. + + * doc/Makefile.am (USER_REFMAN_PDF): Set to user-refman.pdf. + (USER_REFMAN_HTML): Set to user-refman-html. + (DEVEL_REFMAN_PDF): Set to devel/latex/refman.pdf. + (DEVEL_REFMAN_HTML): Set to devel/html. + (ref-doc-pdf, $(srcdir)/$(USER_REFMAN_PDF)) + (ref-doc-html, $(srcdir)/$(USER_REFMAN_HTML)) + (ref-doc-devel-pdf, $(srcdir)/$(DEVEL_REFMAN_PDF)) + (ref-doc-devel-html, $(srcdir)/$(DEVEL_REFMAN_HTML)) + (fake-doc): Adjust. + * doc/ref_guide/Makefile.am (REF_GUIDE_HH): Set to + $(srcdir)/ref_guide.hh. + (REF_GUIDE_PDF): Set to $(srcdir)/ref_guide.pdf + ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)): Adjust. + * doc/tutorial/Makefile.am (TUTORIAL_HH): Set to + $(srcdir)/tutorial.hh. + (TUTORIAL_PDF): Set to $(srcdir)/tutorial.pdf. + ($(TUTORIAL_HH), $(TUTORIAL_PDF)): Adjust. + * doc/white_paper/Makefile.am (WHITE_PAPER_HTML): Set to + $(srcdir)/white_paper_html/index.html. + (WHITE_PAPER_PDF): Set to $(srcdir)/white_paper.pdf. + ($(WHITE_PAPER_HTML), $(WHITE_PAPER_PDF), fake-doc): Adjust rules. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Polish clean rules. * apps/statues/Makefile.am (CLEANFILES): Add diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 57c3810..a7d4647 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -79,35 +79,43 @@ $(srcdir)/ref_guide/ref_guide.hh: fig-convert ## Vaucanson's doc build system. (Do not forget to adjust Doxyfiles.) # Doxygen PDF documentation outputs. -USER_REFMAN_PDF = $(srcdir)/user/latex/refman.pdf -ref-doc-pdf: $(USER_REFMAN_PDF) +USER_REFMAN_PDF = user-refman.pdf +ref-doc-pdf: $(srcdir)/$(USER_REFMAN_PDF) # FIXME: Split in two rules: one generating the LaTeX file from the # Doxyfile, and another one generating the PDF from the LaTeX source. # Moreover, the LaTeX to PDF rule could be factored using a suffix # rule (as in LRDE's share/). -$(USER_REFMAN_PDF): $(srcdir)/Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) - $(DOXYGEN) $< - cd $(srcdir)/user/latex && $(MAKE) pdf - -USER_REFMAN_HTML = $(srcdir)/user/html -ref-doc-html: $(USER_REFMAN_HTML) -$(USER_REFMAN_HTML): $(srcdir)/Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS) - $(DOXYGEN) $< +$(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< \ + && cd $(srcdir)/user/latex \ + && $(MAKE) pdf \ + && cp -f refman.pdf ../../$(USER_REFMAN_PDF) + +# FIXME: Careful, `user-refman-pdf' is a directory, and this make rule +# depends on its timestamp, which is wrong. +USER_REFMAN_HTML = user-refman-html +ref-doc-html: $(srcdir)/$(USER_REFMAN_HTML) +$(srcdir)/$(USER_REFMAN_HTML): $(srcdir)/Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< \ + && rm -fr $(srcdir)/$(USER_REFMAN_HTML) \ + && mv $(srcdir)/user/html $(srcdir)/$(USER_REFMAN_HTML) # Doxygen HTML documentation output directories. -DEVEL_REFMAN_PDF = $(srcdir)/devel/latex/refman.pdf -ref-doc-devel-pdf: $(DEVEL_REFMAN_PDF) +DEVEL_REFMAN_PDF = devel/latex/refman.pdf +ref-doc-devel-pdf: $(srcdir)/$(DEVEL_REFMAN_PDF) # FIXME: Split in two rules: one generating the LaTeX file from the # Doxyfile, and another one generating the PDF from the LaTeX source. # Moreover, the LaTeX to PDF rule could be factored using a suffix # rule (as in LRDE's share/). -$(DEVEL_REFMAN_PDF): $(srcdir)/Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) +$(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) $(DOXYGEN) $< cd $(srcdir)/devel/latex && $(MAKE) $(AM_MAKEFLAGS) -DEVEL_REFMAN_HTML = $(srcdir)/devel/html -ref-doc-devel-html: $(DEVEL_REFMAN_HTML) -$(DEVEL_REFMAN_HTML): $(srcdir)/Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS) +# FIXME: Careful, `devel/html' is a directory, and this make rule +# depends on its timestamp, which is wrong. +DEVEL_REFMAN_HTML = devel/html +ref-doc-devel-html: $(srcdir)/$(DEVEL_REFMAN_HTML) +$(srcdir)/$(DEVEL_REFMAN_HTML): $(srcdir)/Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS) $(DOXYGEN) $< ## ---------- ## @@ -303,10 +311,10 @@ fake-doc: touch $(srcdir)/Doxyfile_user touch $(srcdir)/Doxyfile_user_pdf cd $(srcdir) && test -d user || mkdir user - for d in $(USER_REFMAN_HTML) $(srcdir)/user/latex; do \ + for d in $(srcdir)/$(USER_REFMAN_HTML) $(srcdir)/user/latex; do \ if test -d $$d; then touch $$d; else mkdir $$d; fi; \ done - touch $(USER_REFMAN_PDF) + touch $(srcdir)/$(USER_REFMAN_PDF) # The converse of the previous rule, voiding the timestamps. .PHONY: void-doc diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index d1af059..f13074f 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -25,6 +25,29 @@ $(SPLIT_OUTPUTS_SRCDIR):$(IMG_SRCDIR):$(SPLIT_EXAMPLES_SRCDIR):" ref-guide: ref-guide-html ref-guide-pdf +# FIXME: As in milena/doc/Makefile.am, we should probably strip +# $(srcdir) prefixes from target variables, e.g. instead of: +# +# FOO = $(srcdir)/foo.pdf +# $(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# we should use: +# +# FOO = foo.pdf +# $(srcdir)/$(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# since it minimizes installation issues (see milena/doc/Makefile.am +# and Vaucanson's doc/Makefile.am). + +# FIXME: Distributed products should be generated in the source dir. +# That's actually the case, *but* the current solution is not clean +# and might break sometimes. The clean approach is to create a +# temporary directory, try to generate the documentation there, and +# move its contents to the source dir in case of success. If the +# product is a directory, also refresh a timestamp (in the source +# dir). # Intermediate product for the various doc targets of the parent # directory. @@ -32,20 +55,22 @@ ref-guide: ref-guide-html ref-guide-pdf # This is not a bug: REF_GUIDE_HH is meant to have a `.hh' # extension, since it is later parsed by Doxygen, which complains # about `.html' files. -REF_GUIDE_HH = ref_guide.hh +REF_GUIDE_HH = $(srcdir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) $(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) + $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) \ + && mv -f ref_guide.hh $(srcdir) # Final product. -REF_GUIDE_PDF = ref_guide.pdf +REF_GUIDE_PDF = $(srcdir)/ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) $(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + && mv -f ref_guide.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index ea4a84a..5cd7464 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -24,25 +24,51 @@ TEXINPUTS = $(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR): tutorial: tutorial-html tutorial-pdf +# FIXME: As in milena/doc/Makefile.am, we should probably strip +# $(srcdir) prefixes from target variables, e.g. instead of: +# +# FOO = $(srcdir)/foo.pdf +# $(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# we should use: +# +# FOO = foo.pdf +# $(srcdir)/$(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# since it minimizes installation issues (see milena/doc/Makefile.am +# and Vaucanson's doc/Makefile.am). + +# FIXME: Distributed products should be generated in the source dir. +# That's actually the case, *but* the current solution is not clean +# and might break sometimes. The clean approach is to create a +# temporary directory, try to generate the documentation there, and +# move its contents to the source dir in case of success. If the +# product is a directory, also refresh a timestamp (in the source +# dir). + # Intermediate product for the various doc targets of the parent # directory. # # This is not a bug: TUTORIAL_HH is meant to have a `.hh' extension, # since it is later parsed by Doxygen, which complains about `.html' # files. -TUTORIAL_HH = tutorial.hh +TUTORIAL_HH = $(srcdir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) $(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) + $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) \ + && mv tutorial.hh $(srcdir) # Final product. -TUTORIAL_PDF = tutorial.pdf +TUTORIAL_PDF = $(srcdir)/tutorial.pdf tutorial-pdf: $(TUTORIAL_PDF) $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + && tutorial.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index 6449bbb..df0a51b 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -38,20 +38,46 @@ EPSS = $(PNGS:png=eps) white-paper: white-paper-pdf white-paper-html -WHITE_PAPER_HTML = white_paper_html/index.html +# FIXME: As in milena/doc/Makefile.am, we should probably strip +# $(srcdir) prefixes from target variables, e.g. instead of: +# +# FOO = $(srcdir)/foo.pdf +# $(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# we should use: +# +# FOO = foo.pdf +# $(srcdir)/$(FOO): foo.tex bar.tex +# dist_doc_DATA = $(FOO) +# +# since it minimizes installation issues (see milena/doc/Makefile.am +# and Vaucanson's doc/Makefile.am). + +# FIXME: Distributed products should be generated in the source dir. +# That's actually the case, *but* the current solution is not clean +# and might break sometimes. The clean approach is to create a +# temporary directory, try to generate the documentation there, and +# move its contents to the source dir in case of success. If the +# product is a directory, also refresh a timestamp (in the source +# dir). + +WHITE_PAPER_HTML = $(srcdir)/white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) $(WHITE_PAPER_HTML): white_paper.tex $(EPSS) test -d white_paper_html || mkdir white_paper_html TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@ $(top_srcdir)/milena/doc/tools/clearbanner.sh $@ + mv -f white_paper_html $(srcdir) -WHITE_PAPER_PDF = white_paper.pdf +WHITE_PAPER_PDF = $(srcdir)/white_paper.pdf white-paper-pdf: $(WHITE_PAPER_PDF) $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + && mv white_paper.pdf $(srcdir) dist_doc_DATA = \ @@ -76,7 +102,9 @@ clean-local: # Pretend the documentation is up-to-date. .PHONY: fake-doc fake-doc: + test -d figures || mkdir figures touch $(EPSS) + test -d $(srcdir)/white_paper_html || mkdir $(srcdir)/white_paper_html touch $(WHITE_PAPER_HTML) touch $(WHITE_PAPER_PDF) -- 1.6.1.2

1 0

[PATCH 01/10] Polish clean rules.
by Roland Levillain 13 Jul '09

13 Jul '09

* apps/statues/Makefile.am (CLEANFILES): Add teapot-max-curv-skel.off, teapot-complex-max-curv.off, socket-max-curv-segm.off, teapot-max-curv-segm.off, socket-complex-max-curv-segm.off, teapot-complex-max-curv-segm.off, socket-max-curv-skel.off, teapot-max-curv.off and three-triangles-skel.off. --- milena/ChangeLog | 11 +++++++++++ milena/apps/statues/Makefile.am | 14 ++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5a7dda9..faac29e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + Polish clean rules. + + * apps/statues/Makefile.am (CLEANFILES): Add + teapot-max-curv-skel.off, teapot-complex-max-curv.off, + socket-max-curv-segm.off, teapot-max-curv-segm.off, + socket-complex-max-curv-segm.off, + teapot-complex-max-curv-segm.off, socket-max-curv-skel.off, + teapot-max-curv.off and three-triangles-skel.off. + 2009-07-08 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Make sure the documentation license is GPL v2. diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 0baf887..0185535 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -39,6 +39,7 @@ LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) bin_PROGRAMS = TESTS = +CLEANFILES = # FIXME: Have program names embed the type of structure used (either # graph or complex). @@ -59,6 +60,7 @@ if ENABLE_TRIMESH # mesh_segm_LDADD = $(LDADD_trimesh) # # TESTS += test-mesh-segm +# CLEANFILES += socket-segm.off teapot-segm.off # FIXME: mesh_skel is unfinished. Anyway, it should be superseded by # another program, using no Trimesh code. @@ -86,6 +88,7 @@ if ENABLE_TRIMESH mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) mesh_max_curv_LDADD = $(LDADD_trimesh) TESTS += test-mesh-max-curv + CLEANFILES += teapot-max-curv-skel.off endif ENABLE_TRIMESH ## ---------------------------------------------------- ## @@ -106,6 +109,7 @@ EXTRA_DIST = trimesh/README bin_PROGRAMS += mesh-complex-max-curv mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv +CLEANFILES += teapot-complex-max-curv.off # FIXME: Write a program showing the local minima (and maxima) of # scalar-valued complex-based mesh (to see the curvature extrema). @@ -115,6 +119,9 @@ TESTS += test-mesh-complex-max-curv bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm +CLEANFILES += \ + socket-max-curv-segm.off \ + teapot-max-curv-segm.off # Program computing the max curvature from a mesh, then segmenting it. # The advantage of this program over `mesh-complex-segm' is that the @@ -125,6 +132,9 @@ TESTS += test-mesh-complex-segm bin_PROGRAMS += mesh-complex-max-curv-segm mesh_complex_max_curv_segm_SOURCES = mesh-complex-max-curv-segm.cc TESTS += test-mesh-complex-max-curv-segm +CLEANFILES += \ + socket-complex-max-curv-segm.off \ + teapot-complex-max-curv-segm.off # FIXME: Implement `mesh-complex-pinv-curv-segm' (factor as much # code as possible with `mesh-complex-max-curv-segm'. @@ -137,3 +147,7 @@ TESTS += test-mesh-complex-max-curv-segm bin_PROGRAMS += mesh-complex-skel mesh_complex_skel_SOURCES = mesh-complex-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-skel +CLEANFILES += \ + socket-max-curv-skel.off \ + teapot-max-curv.off \ + three-triangles-skel.off -- 1.6.1.2

1 0

r4265: Add US segmentation method
by Fabien Freling 10 Jul '09

10 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-07-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add US segmentation method. * fabien/igr/Makefile: Add target. * fabien/igr/filter_morpho_us.cc: Segment US morpho images. * fabien/igr/segment_us_morpho.sh: New script for converting outputs. --- Makefile | 5 ++ filter_morpho_us.cc | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ segment_us_morpho.sh | 44 +++++++++++++++++++++++ 3 files changed, 144 insertions(+) Index: trunk/milena/sandbox/fabien/igr/filter_morpho_us.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/filter_morpho_us.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/filter_morpho_us.cc (revision 4265) @@ -0,0 +1,95 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/var.hh> +#include <mln/pw/all.hh> + +#include <mln/io/dump/all.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/label_16.hh> +#include <mln/value/rgb8.hh> + +#include <mln/binarization/threshold.hh> +#include <mln/data/convert.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/geom/bbox.hh> +#include <mln/labeling/blobs.hh> +#include <mln/labeling/fill_holes.hh> +#include <mln/labeling/n_max.hh> +#include <mln/literal/colors.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/opening/volume.hh> +#include <mln/morpho/elementary/gradient_external.hh> +#include <mln/util/array.hh> + +#include <mln/accu/transform.hh> +#include <mln/accu/maj_h.hh> + +#include <mln/win/disk2d.hh> + + +using namespace mln; +using value::int_u8; +using value::label_16; +using value::rgb8; + + +int main (int argc, char* argv[]) +{ + if (argc != 6) + { + std::cout << "Usage: " << argv[0] << " input closing threshold opening size" << std::endl; + return 1; + } + + unsigned lambda = atoi(argv[2]); + unsigned threshold = atoi(argv[3]); + unsigned opening_lambda = atoi(argv[4]); + unsigned size = atoi(argv[5]); + + image3d<int_u8> input; + io::dump::load(input, argv[1]); + image3d<rgb8> output = data::convert(rgb8(), input); + + image3d<int_u8> closing = morpho::closing::volume(input, c6(), lambda); + io::dump::save(closing, "closing.dump"); + + image3d<bool> thres = binarization::threshold(closing, threshold); + io::dump::save(thres, "threshold.dump"); + + image3d<bool> opening = morpho::opening::volume(thres, c6(), opening_lambda); + io::dump::save(opening, "opening.dump"); + + box<point3d> b = geom::bbox(opening); + label_16 nlabels; + accu::maj_h<bool> maj; + for (int slice_index = b.pmin().sli(); slice_index <= b.pmax().sli(); ++slice_index) + { + mln_VAR(slice_image, slice(opening, slice_index)); + mln_VAR(slice_out, slice(output, slice_index)); + mln_VAR(slice_blobs, labeling::blobs(slice_image, c4(), nlabels)); + util::array<label_16> nmax = labeling::n_max(slice_blobs, nlabels, 2); + data::fill((slice_image | pw::value(slice_blobs) != pw::cst(nmax[1])).rw(), false); + + // Filtering. + image2d<bool> maj_slice = accu::transform(slice_image, maj, win::disk2d(size)); + + mln_VAR(slice_blobs2, labeling::blobs(maj_slice, c4(), nlabels)); + mln_VAR(slice_noholes, labeling::fill_holes(duplicate(maj_slice), c4(), nlabels)); + data::fill((slice_image | pw::value(slice_noholes) == true).rw(), true); + + mln_VAR(gradient, morpho::elementary::gradient_external(slice_image, c4())); + + data::fill((slice_out | pw::value(gradient) == true).rw(), literal::red); + } + + io::dump::save(opening, "maj.dump"); + io::dump::save(output, "output.dump"); + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 4264) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 4265) @@ -82,6 +82,11 @@ ##################### +filter_morpho_us: filter_morpho_us.cc + ${CXX} -I../../../ -I../ ${CXXFLAGS} $^ -o filter_morpho_us + +##################### + clean: rm -rf *.dump *.p?m *.plot *.log *.csv *.dSYM rm seg2d seg3d wsd2d wsd3d nbasins_finder grad clo_vol wst graph med thres matlab time_max first_slice_dicom Index: trunk/milena/sandbox/fabien/igr/segment_us_morpho.sh =================================================================== --- trunk/milena/sandbox/fabien/igr/segment_us_morpho.sh (revision 0) +++ trunk/milena/sandbox/fabien/igr/segment_us_morpho.sh (revision 4265) @@ -0,0 +1,44 @@ +#!/bin/sh + + +process () +{ + nlabels=`./filter_morpho_us $@` +#if [ $? -gt 0 ]; then +# echo "error: filter_morpho_us failed" +# exit +# fi + + ../bin/dump2pgm8b closing.dump closing.pgm + convert closing.pgm 01_closing.png + rm closing.dump closing.pgm + + ../bin/dump2pbm threshold.dump 3 threshold.pbm + convert threshold.pbm 02_threshold.png + rm threshold.dump threshold.pbm + + ../bin/dump2pbm opening.dump 3 opening.pbm + convert opening.pbm 03_opening.png + rm opening.dump opening.pbm + + ../bin/dump2pbm maj.dump 3 maj.pbm + convert maj.pbm 05_maj.png + rm maj.dump maj.pbm + +#../bin/dumpl16_to_colorize blobs.dump 3 $nlabels blobs.ppm +# convert blobs.ppm 04_blobs.png +# rm blobs.dump blobs.ppm + + ../bin/dump2ppm output.dump output.ppm + convert output.ppm 06_output.png + rm output.dump output.ppm + + # Cleanup. +#rm *.pgm *.ppm +} + + +# $1 = input.dump +# $2 = lambda +# $3 = threshold +process $@ Property changes on: trunk/milena/sandbox/fabien/igr/segment_us_morpho.sh ___________________________________________________________________ Name: svn:executable + *

1 0