June 2009 - Olena-patches

[PATCH 1/4] Improve build dependencies in doc/.
by Roland Levillain 25 Jun '09

25 Jun '09

* doc/Makefile.am ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML)) ($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML)) * doc/ref_guide/Makefile.am ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)) * doc/tutorial/Makefile.am ($(TUTORIAL_HH), $(TUTORIAL_PDF)): Depend on $(srcdir)/figures.stamp instead of $(FIGURES_BUILDDIR). Shorten actions. * doc/white_paper/Makefile.am ($(WHITE_PAPER_PDF)): Add missing dependencies. Shorten actions. ($(WHITE_PAPER_HTML)): Simplify dependency name. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/Makefile.am | 24 ++++++++++++++++-------- milena/doc/ref_guide/Makefile.am | 15 +++++++-------- milena/doc/tutorial/Makefile.am | 15 +++++++-------- milena/doc/white_paper/Makefile.am | 10 +++++----- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 51ca591..c4eaf15 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,18 @@ +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Improve build dependencies in doc/. + + * doc/Makefile.am ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML)) + ($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML)) + * doc/ref_guide/Makefile.am ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)) + * doc/tutorial/Makefile.am ($(TUTORIAL_HH), $(TUTORIAL_PDF)): + Depend on $(srcdir)/figures.stamp instead of $(FIGURES_BUILDDIR). + Shorten actions. + * doc/white_paper/Makefile.am ($(WHITE_PAPER_PDF)): + Add missing dependencies. + Shorten actions. + ($(WHITE_PAPER_HTML)): Simplify dependency name. + 2009-06-25 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Various fixes in documentation. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 90685e4..a7664ed 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -67,26 +67,34 @@ ref_guide/ref_guide.hh: fig-convert # Doxygen PDF documentation outputs. USER_REFMAN_PDF = user/latex/refman.pdf ref-doc-pdf: $(USER_REFMAN_PDF) -$(USER_REFMAN_PDF): Doxyfile_user_pdf $(FIGURES_BUILDDIR) $(EXTRA_DEPS) - $(DOXYGEN) Doxyfile_user_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): Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< cd user/latex && make pdf USER_REFMAN_HTML = user/html ref-doc-html: $(USER_REFMAN_HTML) -$(USER_REFMAN_HTML): Doxyfile_user $(FIGURES_BUILDDIR) $(EXTRA_DEPS) - $(DOXYGEN) Doxyfile_user +$(USER_REFMAN_HTML): Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< # Doxygen HTML documentation output directories. DEVEL_REFMAN_PDF = devel/latex/refman.pdf ref-doc-devel-pdf: $(DEVEL_REFMAN_PDF) -$(DEVEL_REFMAN_PDF): Doxyfile_devel_pdf $(FIGURES_BUILDDIR) $(EXTRA_DEPS) - $(DOXYGEN) Doxyfile_devel_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): Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< cd devel/latex && make $(AM_MAKEFLAGS) DEVEL_REFMAN_HTML = devel/html ref-doc-devel-html: $(DEVEL_REFMAN_HTML) -$(DEVEL_REFMAN_HTML): Doxyfile_devel $(FIGURES_BUILDDIR) $(EXTRA_DEPS) - $(DOXYGEN) Doxyfile_devel +$(DEVEL_REFMAN_HTML): Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS) + $(DOXYGEN) $< # Tutorial. tutorial-pdf: fig-convert diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index 4079fdd..3ba3098 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -34,19 +34,18 @@ ref-guide: ref-guide-html ref-guide-pdf # about `.html' files. REF_GUIDE_HH = ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) -# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(REF_GUIDE_HH): $(FIGURES_BUILDDIR) - $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/ref_guide.tex $(DOC_BUILDDIR)/ref_guide $(DOC_SRCDIR) +$(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp + $(DOC_SRCDIR)/tools/todoxygen.sh \ + $< $(DOC_BUILDDIR)/ref_guide $(DOC_SRCDIR) # Final product. REF_GUIDE_PDF = ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) -# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(REF_GUIDE_PDF): $(FIGURES_BUILDDIR) - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex +$(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< dist_doc_DATA = $(REF_GUIDE_PDF) diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index dd97040..17d8154 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -32,19 +32,18 @@ tutorial: tutorial-html tutorial-pdf # files. TUTORIAL_HH = tutorial.hh tutorial-html: $(TUTORIAL_HH) -# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(TUTORIAL_HH): $(FIGURES_BUILDDIR) - $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/tutorial.tex $(DOC_BUILDDIR)/tutorial $(DOC_SRCDIR) +$(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp + $(DOC_SRCDIR)/tools/todoxygen.sh \ + $< $(DOC_BUILDDIR)/tutorial $(DOC_SRCDIR) # Final product. TUTORIAL_PDF = tutorial.pdf tutorial-pdf: $(TUTORIAL_PDF) -# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(TUTORIAL_PDF): $(FIGURES_BUILDDIR) - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex +$(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< dist_doc_DATA = $(TUTORIAL_PDF) diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index 6d5d512..322deb8 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -40,7 +40,7 @@ white-paper: white-paper-pdf white-paper-html WHITE_PAPER_HTML = white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): $(srcdir)/white_paper.tex $(EPSS) +$(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 $@ @@ -48,10 +48,10 @@ $(WHITE_PAPER_HTML): $(srcdir)/white_paper.tex $(EPSS) WHITE_PAPER_PDF = white_paper.pdf white-paper-pdf: $(WHITE_PAPER_PDF) -$(WHITE_PAPER_PDF): - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex - TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex +$(WHITE_PAPER_PDF): white_paper.tex $(PNGS) + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< + TEXINPUTS=$(TEXINPUTS) pdflatex $< dist_doc_DATA = \ -- 1.6.2.4

1 0

4192: Clean up ChangeLogs.
by Roland Levillain 25 Jun '09

25 Jun '09

--- ChangeLog | 257 ++++++++++++++++++++++++++++++- milena/ChangeLog | 394 +++++++++++++++++++++++----------------------- milena/sandbox/ChangeLog | 269 +------------------------------ scribo/ChangeLog | 18 +- 4 files changed, 470 insertions(+), 468 deletions(-) diff --git a/ChangeLog b/ChangeLog index 604b648..8075d39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -211,7 +211,7 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> Improve bootstrap. - + * bootstrap: Trigger option `-x' earlier. Run generators following the project's directory hierarchy. @@ -288,7 +288,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> - + Add tentative support for GDCM in the configuration system. * configure.ac: Find GDCM using OLN_WITH_LIB. @@ -407,6 +407,259 @@ * bootstrap: Generate unit tests for scribo. +2009-05-18 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Move Scribo from sandbox to the root directory. + + * milena/sandbox/scribo/Makefile, + * milena/sandbox/scribo/Makefile.am, + * milena/sandbox/scribo/all.hh, + * milena/sandbox/scribo/binarization/simple.hh, + * milena/sandbox/scribo/core/all.hh, + * milena/sandbox/scribo/core/central_sites.hh, + * milena/sandbox/scribo/core/component_bboxes.hh, + * milena/sandbox/scribo/core/erase_bboxes.hh, + * milena/sandbox/scribo/core/macros.hh, + * milena/sandbox/scribo/debug/all.hh, + * milena/sandbox/scribo/debug/save_label_image.hh, + * milena/sandbox/scribo/debug/save_linked_textbboxes_image.hh, + * milena/sandbox/scribo/debug/save_table_image.hh, + * milena/sandbox/scribo/debug/save_textbboxes_image.hh, + * milena/sandbox/scribo/demat.hh, + * milena/sandbox/scribo/draw/all.hh, + * milena/sandbox/scribo/draw/bounding_box_links.hh, + * milena/sandbox/scribo/draw/bounding_boxes.hh, + * milena/sandbox/scribo/extract/primitive/canvas.hh, + * milena/sandbox/scribo/extract/primitive/cells.hh, + * milena/sandbox/scribo/extract/primitive/lines_discontinued.hh, + * milena/sandbox/scribo/extract/primitive/lines_h_discontinued.hh, + * milena/sandbox/scribo/extract/primitive/lines_thick.hh, + * milena/sandbox/scribo/extract/primitive/lines_v_discontinued.hh, + * milena/sandbox/scribo/extract/primitive/objects.hh, + * milena/sandbox/scribo/filter/all.hh, + * milena/sandbox/scribo/filter/large_components.hh, + * milena/sandbox/scribo/filter/small_components.hh, + * milena/sandbox/scribo/filter/thick_bboxes.hh, + * milena/sandbox/scribo/filter/thin_bboxes.hh, + * milena/sandbox/scribo/make/all.hh, + * milena/sandbox/scribo/make/debug_filename.hh, + * milena/sandbox/scribo/make/influence_zone_graph.hh, + * milena/sandbox/scribo/make/text.hh, + * milena/sandbox/scribo/preprocessing/all.hh, + * milena/sandbox/scribo/preprocessing/unskew.hh, + * milena/sandbox/scribo/scribo.mk, + * milena/sandbox/scribo/src/Makefile.am, + * milena/sandbox/scribo/src/binarization/Makefile.am, + * milena/sandbox/scribo/src/binarization/simple.cc, + * milena/sandbox/scribo/src/dmap.cc, + * milena/sandbox/scribo/src/extract_text_double_link.cc, + * milena/sandbox/scribo/src/extract_text_double_several_links.cc, + * milena/sandbox/scribo/src/extract_text_graph.cc, + * milena/sandbox/scribo/src/extract_text_several_graph.cc, + * milena/sandbox/scribo/src/extract_text_several_left_links.cc, + * milena/sandbox/scribo/src/extract_text_single_link.cc, + * milena/sandbox/scribo/src/morpho.cc, + * milena/sandbox/scribo/src/photo.cc, + * milena/sandbox/scribo/src/photo_basic.cc, + * milena/sandbox/scribo/src/rectangularity.cc, + * milena/sandbox/scribo/src/table.cc, + * milena/sandbox/scribo/src/table_erase.cc, + * milena/sandbox/scribo/src/table_extract.cc, + * milena/sandbox/scribo/src/table_rebuild_opening.cc, + * milena/sandbox/scribo/src/table_rebuild_rank.cc, + * milena/sandbox/scribo/src/thin_bboxes.cc, + * milena/sandbox/scribo/table/align_lines_horizontaly.hh, + * milena/sandbox/scribo/table/align_lines_verticaly.hh, + * milena/sandbox/scribo/table/all.hh, + * milena/sandbox/scribo/table/connect_horizontal_lines.hh, + * milena/sandbox/scribo/table/connect_vertical_lines.hh, + * milena/sandbox/scribo/table/erase.hh, + * milena/sandbox/scribo/table/extract.hh, + * milena/sandbox/scribo/table/extract_lines_with_opening.hh, + * milena/sandbox/scribo/table/extract_lines_with_rank.hh, + * milena/sandbox/scribo/table/internal/align_lines.hh, + * milena/sandbox/scribo/table/internal/all.hh, + * milena/sandbox/scribo/table/internal/connect_lines.hh, + * milena/sandbox/scribo/table/internal/repair_lines.hh, + * milena/sandbox/scribo/table/rebuild.hh, + * milena/sandbox/scribo/table/repair_horizontal_lines.hh, + * milena/sandbox/scribo/table/repair_vertical_lines.hh, + * milena/sandbox/scribo/tests/Makefile.am, + * milena/sandbox/scribo/tests/data.hh.in, + * milena/sandbox/scribo/tests/filter/Makefile.am, + * milena/sandbox/scribo/tests/filter/small_and_large_bboxes.cc, + * milena/sandbox/scribo/tests/table/Makefile.am, + * milena/sandbox/scribo/tests/table/extract_lines_with_rank.cc, + * milena/sandbox/scribo/tests/table/repair_lines.cc, + * milena/sandbox/scribo/tests/text/Makefile.am, + * milena/sandbox/scribo/text/all.hh, + * milena/sandbox/scribo/text/extract_bboxes.hh, + * milena/sandbox/scribo/text/extract_lines.hh, + * milena/sandbox/scribo/text/grouping/all.hh, + * milena/sandbox/scribo/text/grouping/group_from_double_link.hh, + * milena/sandbox/scribo/text/grouping/group_from_graph.hh, + * milena/sandbox/scribo/text/grouping/group_from_single_link.hh, + * milena/sandbox/scribo/text/grouping/group_with_graph.hh, + * milena/sandbox/scribo/text/grouping/group_with_several_graphes.hh, + * milena/sandbox/scribo/text/grouping/group_with_several_left_links.hh, + * milena/sandbox/scribo/text/grouping/group_with_several_right_links.hh, + * milena/sandbox/scribo/text/grouping/group_with_single_left_link.hh, + * milena/sandbox/scribo/text/grouping/group_with_single_right_link.hh, + * milena/sandbox/scribo/text/grouping/internal/all.hh, + * milena/sandbox/scribo/text/grouping/internal/find_graph_link.hh, + * milena/sandbox/scribo/text/grouping/internal/find_left_link.hh, + * milena/sandbox/scribo/text/grouping/internal/find_right_link.hh, + * milena/sandbox/scribo/text/grouping/internal/find_root.hh, + * milena/sandbox/scribo/text/grouping/internal/init_link_array.hh, + * milena/sandbox/scribo/text/grouping/internal/is_link_valid.hh, + * milena/sandbox/scribo/text/grouping/internal/update_graph_link.hh, + * milena/sandbox/scribo/text/grouping/internal/update_link_array.hh, + * milena/sandbox/scribo/text/recognition.hh, + * milena/sandbox/scribo/util/all.hh, + * milena/sandbox/scribo/util/text.hh: Move ... + + * scribo/Doxyfile, + * scribo/Doxyfile_tex, + * scribo/Makefile.am, + * scribo/all.hh, + * scribo/binarization/simple.hh, + * scribo/core/all.hh, + * scribo/core/central_sites.hh, + * scribo/core/component_bboxes.hh, + * scribo/core/erase_bboxes.hh, + * scribo/core/macros.hh, + * scribo/debug/all.hh, + * scribo/debug/save_label_image.hh, + * scribo/debug/save_linked_textbboxes_image.hh, + * scribo/debug/save_table_image.hh, + * scribo/debug/save_textbboxes_image.hh, + * scribo/demat.hh, + * scribo/draw/all.hh, + * scribo/draw/bounding_box_links.hh, + * scribo/draw/bounding_boxes.hh, + * scribo/extract/primitive/canvas.hh, + * scribo/extract/primitive/cells.hh, + * scribo/extract/primitive/lines_discontinued.hh, + * scribo/extract/primitive/lines_h_discontinued.hh, + * scribo/extract/primitive/lines_thick.hh, + * scribo/extract/primitive/lines_v_discontinued.hh, + * scribo/extract/primitive/objects.hh, + * scribo/filter/all.hh, + * scribo/filter/large_components.hh, + * scribo/filter/small_components.hh, + * scribo/filter/thick_bboxes.hh, + * scribo/filter/thin_bboxes.hh, + * scribo/make/all.hh, + * scribo/make/debug_filename.hh, + * scribo/make/influence_zone_graph.hh, + * scribo/make/text.hh, + * scribo/preprocessing/all.hh, + * scribo/preprocessing/unskew.hh, + * scribo/scribo.mk, + * scribo/src/Makefile.am, + * scribo/src/binarization/Makefile.am, + * scribo/src/binarization/simple.cc, + * scribo/src/dmap.cc, + * scribo/src/extract_text_double_link.cc, + * scribo/src/extract_text_double_several_links.cc, + * scribo/src/extract_text_graph.cc, + * scribo/src/extract_text_several_graph.cc, + * scribo/src/extract_text_several_left_links.cc, + * scribo/src/extract_text_single_link.cc, + * scribo/src/morpho.cc, + * scribo/src/photo.cc, + * scribo/src/photo_basic.cc, + * scribo/src/recognition.cc, + * scribo/src/rectangularity.cc, + * scribo/src/table.cc, + * scribo/src/table_erase.cc, + * scribo/src/table_extract.cc, + * scribo/src/table_old.cc, + * scribo/src/table_rebuild_opening.cc, + * scribo/src/table_rebuild_rank.cc, + * scribo/src/thin_bboxes.cc, + * scribo/table/align_lines_horizontaly.hh, + * scribo/table/align_lines_verticaly.hh, + * scribo/table/all.hh, + * scribo/table/connect_horizontal_lines.hh, + * scribo/table/connect_vertical_lines.hh, + * scribo/table/erase.hh, + * scribo/table/extract.hh, + * scribo/table/extract_lines_with_opening.hh, + * scribo/table/extract_lines_with_rank.hh, + * scribo/table/internal/align_lines.hh, + * scribo/table/internal/all.hh, + * scribo/table/internal/connect_lines.hh, + * scribo/table/internal/repair_lines.hh, + * scribo/table/rebuild.hh, + * scribo/table/repair_horizontal_lines.hh, + * scribo/table/repair_vertical_lines.hh, + * scribo/test.cc, + * scribo/tests/Makefile.am, + * scribo/tests/data.hh.in, + * scribo/src/photo.cc, + * scribo/src/photo_basic.cc, + * scribo/src/recognition.cc, + * scribo/src/rectangularity.cc, + * scribo/src/table.cc, + * scribo/src/table_erase.cc, + * scribo/src/table_extract.cc, + * scribo/src/table_old.cc, + * scribo/src/table_rebuild_opening.cc, + * scribo/src/table_rebuild_rank.cc, + * scribo/src/thin_bboxes.cc, + * scribo/table/align_lines_horizontaly.hh, + * scribo/table/align_lines_verticaly.hh, + * scribo/table/all.hh, + * scribo/table/connect_horizontal_lines.hh, + * scribo/table/connect_vertical_lines.hh, + * scribo/table/erase.hh, + * scribo/table/extract.hh, + * scribo/table/extract_lines_with_opening.hh, + * scribo/table/extract_lines_with_rank.hh, + * scribo/table/internal/align_lines.hh, + * scribo/table/internal/all.hh, + * scribo/table/internal/connect_lines.hh, + * scribo/table/internal/repair_lines.hh, + * scribo/table/rebuild.hh, + * scribo/table/repair_horizontal_lines.hh, + * scribo/table/repair_vertical_lines.hh, + * scribo/test.cc, + * scribo/tests/Makefile.am, + * scribo/tests/data.hh.in, + * scribo/tests/filter/Makefile.am, + * scribo/tests/filter/small_and_large_bboxes.cc, + * scribo/tests/table/Makefile.am, + * scribo/tests/table/extract_lines_with_rank.cc, + * scribo/tests/table/repair_lines.cc, + * scribo/tests/text/Makefile.am, + * scribo/text/all.hh, + * scribo/text/clean.hh, + * scribo/text/extract_bboxes.hh, + * scribo/text/extract_lines.hh, + * scribo/text/grouping/all.hh, + * scribo/text/grouping/group_from_double_link.hh, + * scribo/text/grouping/group_from_graph.hh, + * scribo/text/grouping/group_from_single_link.hh, + * scribo/text/grouping/group_with_graph.hh, + * scribo/text/grouping/group_with_several_graphes.hh, + * scribo/text/grouping/group_with_several_left_links.hh, + * scribo/text/grouping/group_with_several_right_links.hh, + * scribo/text/grouping/group_with_single_left_link.hh, + * scribo/text/grouping/group_with_single_right_link.hh, + * scribo/text/grouping/internal/all.hh, + * scribo/text/grouping/internal/find_graph_link.hh, + * scribo/text/grouping/internal/find_left_link.hh, + * scribo/text/grouping/internal/find_right_link.hh, + * scribo/text/grouping/internal/find_root.hh, + * scribo/text/grouping/internal/init_link_array.hh, + * scribo/text/grouping/internal/is_link_valid.hh, + * scribo/text/grouping/internal/update_graph_link.hh, + * scribo/text/grouping/internal/update_link_array.hh, + * scribo/text/recognition.hh, + * scribo/util/all.hh, + * scribo/util/text.hh: ... here. + 2009-05-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: configure various test directories. diff --git a/milena/ChangeLog b/milena/ChangeLog index b91eaee..51ca591 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -12,7 +12,7 @@ * doc/ref_guide/Makefile.am, * doc/tutorial/Makefile.am: add dependency on FIGURES builddir. - + * doc/tutorial/tutorial.tex, * doc/ref_guide/ref_guide.tex, * doc/examples/accu-wrong-instanciation.cc.raw: update level::* to @@ -131,118 +131,118 @@ * doc/examples/split/win-create-1-1.cc, * doc/examples/split/win-create-2-1.cc: move... - * doc/examples/split/accu-right-instanciation-1.cc.raw, - * doc/examples/split/borderthickness-1.cc.raw, - * doc/examples/split/box2d-bbox-1.cc.raw, - * doc/examples/split/domain-display-1.cc.raw, - * doc/examples/split/dpoint-1-1.cc.raw, - * doc/examples/split/estim-sites-1.cc.raw, - * doc/examples/split/extend-1.cc.raw, - * doc/examples/split/extend-2.cc.raw, - * doc/examples/split/extend-3.cc.raw, - * doc/examples/split/extend-4.cc.raw, - * doc/examples/split/extend-5.cc.raw, - * doc/examples/split/extension-ignore-1.cc.raw, - * doc/examples/split/fill-1.cc.raw, - * doc/examples/split/fill-2.cc.raw, - * doc/examples/split/fill-3.cc.raw, - * doc/examples/split/fill-call-1-1.cc.raw, - * doc/examples/split/fill-call-1-2.cc.raw, - * doc/examples/split/fill-call-1-3.cc.raw, - * doc/examples/split/fill-part-image-1.cc.raw, - * doc/examples/split/fill-part-image-2.cc.raw, - * doc/examples/split/fill-subdomain-1.cc.raw, - * doc/examples/split/fill-subdomain-2.cc.raw, - * doc/examples/split/fill-subdomain-3.cc.raw, - * doc/examples/split/fill-subdomain-4.cc.raw, - * doc/examples/split/fill-subdomain-shorter-1.cc.raw, - * doc/examples/split/fill-subdomain-shorter-2.cc.raw, - * doc/examples/split/fill-subimage-cfun-1.cc.raw, - * doc/examples/split/fill-subimage-cfun-2.cc.raw, - * doc/examples/split/fill-subimage-cfun-3.cc.raw, - * doc/examples/split/forall-piter-1.cc.raw, - * doc/examples/split/fun-p2v-1-1.cc.raw, - * doc/examples/split/graph-data-1.cc.raw, - * doc/examples/split/graph-data-2.cc.raw, - * doc/examples/split/graph-data-3.cc.raw, - * doc/examples/split/graph-data-4.cc.raw, - * doc/examples/split/graph-data-5.cc.raw, - * doc/examples/split/graph-data-6.cc.raw, - * doc/examples/split/graph-iter-1.cc.raw, - * doc/examples/split/graph-iter-2.cc.raw, - * doc/examples/split/graph-iter-3.cc.raw, - * doc/examples/split/graph-iter-4.cc.raw, - * doc/examples/split/ima-has-1.cc.raw, - * doc/examples/split/ima-load-1.cc.raw, - * doc/examples/split/ima-save-1.cc.raw, - * doc/examples/split/ima-size-1.cc.raw, - * doc/examples/split/ima2d-1-1.cc.raw, - * doc/examples/split/ima2d-2-1.cc.raw, - * doc/examples/split/ima2d-3-1.cc.raw, - * doc/examples/split/ima2d-4-1.cc.raw, - * doc/examples/split/ima2d-5-1.cc.raw, - * doc/examples/split/ima2d-6-clone-1.cc.raw, - * doc/examples/split/ima2d-7-1.cc.raw, - * doc/examples/split/ima2d-rot-1.cc.raw, - * doc/examples/split/labeling-compute-1.cc.raw, - * doc/examples/split/labeling-compute-2.cc.raw, - * doc/examples/split/labeling-compute-3.cc.raw, - * doc/examples/split/labeling-compute-4.cc.raw, - * doc/examples/split/logical-not-1.cc.raw, - * doc/examples/split/logical-not-2.cc.raw, - * doc/examples/split/logical-not-3.cc.raw, - * doc/examples/split/mln_var-1.cc.raw, - * doc/examples/split/mln_var-2.cc.raw, - * doc/examples/split/mln_var-3.cc.raw, - * doc/examples/split/parray-append-1.cc.raw, - * doc/examples/split/parray-bbox-1.cc.raw, - * doc/examples/split/paste-1.cc.raw, - * doc/examples/split/paste-call-1-1.cc.raw, - * doc/examples/split/point-1-1.cc.raw, - * doc/examples/split/predicate-1-1.cc.raw, - * doc/examples/split/tuto2_first_image-1.cc.raw, - * doc/examples/split/tuto2_first_image-2.cc.raw, - * doc/examples/split/tuto2_first_image-3.cc.raw, - * doc/examples/split/tuto2_first_image-4.cc.raw, - * doc/examples/split/tuto3_colorize-1.cc.raw, - * doc/examples/split/tuto3_first_routine-1.cc.raw, - * doc/examples/split/tuto3_first_routine-2.cc.raw, - * doc/examples/split/tuto3_first_routine-3.cc.raw, - * doc/examples/split/tuto3_first_routine-4.cc.raw, - * doc/examples/split/tuto3_first_routine-5.cc.raw, - * doc/examples/split/tuto3_first_routine-6.cc.raw, - * doc/examples/split/tuto3_first_routine-7.cc.raw, - * doc/examples/split/tuto3_first_routine-8.cc.raw, - * doc/examples/split/tuto3_println-1.cc.raw, - * doc/examples/split/tuto3_println-2.cc.raw, - * doc/examples/split/tuto3_rw_image-1.cc.raw, - * doc/examples/split/tuto3_rw_image-2.cc.raw, - * doc/examples/split/tuto3_rw_image-3.cc.raw, - * doc/examples/split/tuto3_rw_image-4.cc.raw, - * doc/examples/split/tuto3_rw_image-5.cc.raw, - * doc/examples/split/tuto3_rw_image-6.cc.raw, - * doc/examples/split/tuto3_rw_image-7.cc.raw, - * doc/examples/split/tuto3_trace-1.cc.raw, - * doc/examples/split/tuto3_trace-2.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw, - * doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw, - * doc/examples/split/tuto4_point2d-1.cc.raw, - * doc/examples/split/tuto4_site_set_create-1.cc.raw, - * doc/examples/split/tuto4_site_set_create-2.cc.raw, - * doc/examples/split/tuto4_site_set_create-3.cc.raw, - * doc/examples/split/tuto4_site_set_create-4.cc.raw, - * doc/examples/split/win-create-1-1.cc.raw, - * doc/examples/split/win-create-2-1.cc.raw: ... here. + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/examples/split/borderthickness-1.cc.raw, + * doc/examples/split/box2d-bbox-1.cc.raw, + * doc/examples/split/domain-display-1.cc.raw, + * doc/examples/split/dpoint-1-1.cc.raw, + * doc/examples/split/estim-sites-1.cc.raw, + * doc/examples/split/extend-1.cc.raw, + * doc/examples/split/extend-2.cc.raw, + * doc/examples/split/extend-3.cc.raw, + * doc/examples/split/extend-4.cc.raw, + * doc/examples/split/extend-5.cc.raw, + * doc/examples/split/extension-ignore-1.cc.raw, + * doc/examples/split/fill-1.cc.raw, + * doc/examples/split/fill-2.cc.raw, + * doc/examples/split/fill-3.cc.raw, + * doc/examples/split/fill-call-1-1.cc.raw, + * doc/examples/split/fill-call-1-2.cc.raw, + * doc/examples/split/fill-call-1-3.cc.raw, + * doc/examples/split/fill-part-image-1.cc.raw, + * doc/examples/split/fill-part-image-2.cc.raw, + * doc/examples/split/fill-subdomain-1.cc.raw, + * doc/examples/split/fill-subdomain-2.cc.raw, + * doc/examples/split/fill-subdomain-3.cc.raw, + * doc/examples/split/fill-subdomain-4.cc.raw, + * doc/examples/split/fill-subdomain-shorter-1.cc.raw, + * doc/examples/split/fill-subdomain-shorter-2.cc.raw, + * doc/examples/split/fill-subimage-cfun-1.cc.raw, + * doc/examples/split/fill-subimage-cfun-2.cc.raw, + * doc/examples/split/fill-subimage-cfun-3.cc.raw, + * doc/examples/split/forall-piter-1.cc.raw, + * doc/examples/split/fun-p2v-1-1.cc.raw, + * doc/examples/split/graph-data-1.cc.raw, + * doc/examples/split/graph-data-2.cc.raw, + * doc/examples/split/graph-data-3.cc.raw, + * doc/examples/split/graph-data-4.cc.raw, + * doc/examples/split/graph-data-5.cc.raw, + * doc/examples/split/graph-data-6.cc.raw, + * doc/examples/split/graph-iter-1.cc.raw, + * doc/examples/split/graph-iter-2.cc.raw, + * doc/examples/split/graph-iter-3.cc.raw, + * doc/examples/split/graph-iter-4.cc.raw, + * doc/examples/split/ima-has-1.cc.raw, + * doc/examples/split/ima-load-1.cc.raw, + * doc/examples/split/ima-save-1.cc.raw, + * doc/examples/split/ima-size-1.cc.raw, + * doc/examples/split/ima2d-1-1.cc.raw, + * doc/examples/split/ima2d-2-1.cc.raw, + * doc/examples/split/ima2d-3-1.cc.raw, + * doc/examples/split/ima2d-4-1.cc.raw, + * doc/examples/split/ima2d-5-1.cc.raw, + * doc/examples/split/ima2d-6-clone-1.cc.raw, + * doc/examples/split/ima2d-7-1.cc.raw, + * doc/examples/split/ima2d-rot-1.cc.raw, + * doc/examples/split/labeling-compute-1.cc.raw, + * doc/examples/split/labeling-compute-2.cc.raw, + * doc/examples/split/labeling-compute-3.cc.raw, + * doc/examples/split/labeling-compute-4.cc.raw, + * doc/examples/split/logical-not-1.cc.raw, + * doc/examples/split/logical-not-2.cc.raw, + * doc/examples/split/logical-not-3.cc.raw, + * doc/examples/split/mln_var-1.cc.raw, + * doc/examples/split/mln_var-2.cc.raw, + * doc/examples/split/mln_var-3.cc.raw, + * doc/examples/split/parray-append-1.cc.raw, + * doc/examples/split/parray-bbox-1.cc.raw, + * doc/examples/split/paste-1.cc.raw, + * doc/examples/split/paste-call-1-1.cc.raw, + * doc/examples/split/point-1-1.cc.raw, + * doc/examples/split/predicate-1-1.cc.raw, + * doc/examples/split/tuto2_first_image-1.cc.raw, + * doc/examples/split/tuto2_first_image-2.cc.raw, + * doc/examples/split/tuto2_first_image-3.cc.raw, + * doc/examples/split/tuto2_first_image-4.cc.raw, + * doc/examples/split/tuto3_colorize-1.cc.raw, + * doc/examples/split/tuto3_first_routine-1.cc.raw, + * doc/examples/split/tuto3_first_routine-2.cc.raw, + * doc/examples/split/tuto3_first_routine-3.cc.raw, + * doc/examples/split/tuto3_first_routine-4.cc.raw, + * doc/examples/split/tuto3_first_routine-5.cc.raw, + * doc/examples/split/tuto3_first_routine-6.cc.raw, + * doc/examples/split/tuto3_first_routine-7.cc.raw, + * doc/examples/split/tuto3_first_routine-8.cc.raw, + * doc/examples/split/tuto3_println-1.cc.raw, + * doc/examples/split/tuto3_println-2.cc.raw, + * doc/examples/split/tuto3_rw_image-1.cc.raw, + * doc/examples/split/tuto3_rw_image-2.cc.raw, + * doc/examples/split/tuto3_rw_image-3.cc.raw, + * doc/examples/split/tuto3_rw_image-4.cc.raw, + * doc/examples/split/tuto3_rw_image-5.cc.raw, + * doc/examples/split/tuto3_rw_image-6.cc.raw, + * doc/examples/split/tuto3_rw_image-7.cc.raw, + * doc/examples/split/tuto3_trace-1.cc.raw, + * doc/examples/split/tuto3_trace-2.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw, + * doc/examples/split/tuto4_point2d-1.cc.raw, + * doc/examples/split/tuto4_site_set_create-1.cc.raw, + * doc/examples/split/tuto4_site_set_create-2.cc.raw, + * doc/examples/split/tuto4_site_set_create-3.cc.raw, + * doc/examples/split/tuto4_site_set_create-4.cc.raw, + * doc/examples/split/win-create-1-1.cc.raw, + * doc/examples/split/win-create-2-1.cc.raw: ... here. 2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> @@ -331,7 +331,7 @@ * Makefile.am, * tests/unit_test/Makefile.am: make use of the new scripts in build-aux. - + * tests/unit_test/disabled_tests: add a list of disabled unit tests. * headers.mk, @@ -457,8 +457,8 @@ * mln/morpho/tree/compute_attribute_image.hh, * sandbox/theo/tufa_2008/filter_n.cc: Replace accu::accu_name by accu::stat::accu_name, - accu::meta::accu_name by accu::meta::stat::accu_name, - accu/accu_name by accu/stat/accu_name. + accu::meta::accu_name by accu::meta::stat::accu_name, + accu/accu_name by accu/stat/accu_name. 2009-06-15 Roland Levillain <roland(a)lrde.epita.fr> @@ -487,7 +487,7 @@ * mln/fun/v2v/rgb_to_hsl.hh: fix ambiguities with operators. * mln/value/internal/gray_f.hh: repair header. - + * tests/registration/Makefile.am: disable registration test. 2009-06-15 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -504,7 +504,7 @@ * sandbox/theo/esiee/slides_2009_may/dilation.hh: Replace accu::accu_name by accu::math::accu_name, - accu/accu_name by accu/math/accu_name. + accu/accu_name by accu/math/accu_name. 2009-06-15 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> @@ -828,8 +828,8 @@ * trash/obased_rle_image.hh, * trash/p_bgraph.hh: Replace accu::accu_name by accu::shape::accu_name, - accu::meta::accu_name by accu::meta::shape::accu_name, - accu/accu_name by accu/shape/accu_name. + accu::meta::accu_name by accu::meta::shape::accu_name, + accu/accu_name by accu/shape/accu_name. 2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> @@ -951,7 +951,7 @@ * doc/Makefile.am: improve rules dependencies. * doc/examples/Makefile.am: - - Compare split files to references. + - Compare split files to references. - Add a rule 'data-regen'. Reference data is now generated on demand only. @@ -1075,7 +1075,7 @@ * doc/outputs/split/tuto3_println-2.txt: new reference files. * doc/tools/split_sample.sh: fix a typo. - + * doc/white_paper/white_paper.tex: fix path to figures. 2009-06-11 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -1108,7 +1108,7 @@ * tests/accu/math/Makefile.am: Update accus Makefiles. - * doc/examples/tuto3/first_routine.cc: + * doc/examples/tuto3/first_routine.cc: * mln/accu/site_set/rectangularity.hh, * mln/accu/stat/deviation.hh, * mln/accu/stat/mean.hh, @@ -1188,8 +1188,8 @@ * tests/morpho/opening/algebraic.cc, * tests/set/compute.cc: Replace accu::accu_name by accu::math::accu_name, - accu::meta::accu_name by accu::meta::math::accu_name, - accu/accu_name.hh by accu/math/accu_name.hh. + accu::meta::accu_name by accu::meta::math::accu_name, + accu/accu_name.hh by accu/math/accu_name.hh. 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> @@ -1321,12 +1321,12 @@ Use \tparam properly. - * milena/mln/core/image/complex_image.hh, - * milena/mln/core/site_set/p_complex.hh, - * milena/mln/util/line_graph.hh, - * milena/trash/bgraph_image.hh, - * milena/trash/graph_image.hh, - * milena/trash/line_graph_image.hh: + * mln/core/image/complex_image.hh, + * mln/core/site_set/p_complex.hh, + * mln/util/line_graph.hh, + * trash/bgraph_image.hh, + * trash/graph_image.hh, + * trash/line_graph_image.hh: Use \p instead of \tparam when highlighting a template parameter within a sentence. @@ -2377,22 +2377,22 @@ Simplify all_headers tests: keep a single one at the top-level. - * milena/tests/arith/all_headers.cc, - * milena/tests/border/all_headers.cc, - * milena/tests/display/all_headers.cc, - * milena/tests/draw/all_headers.cc, - * milena/tests/logical/all_headers.cc, - * milena/tests/util/all_headers.cc: + * tests/arith/all_headers.cc, + * tests/border/all_headers.cc, + * tests/display/all_headers.cc, + * tests/draw/all_headers.cc, + * tests/logical/all_headers.cc, + * tests/util/all_headers.cc: Remove. - * milena/tests/arith/Makefile.am, - * milena/tests/border/Makefile.am, - * milena/tests/data/Makefile.am, - * milena/tests/draw/Makefile.am, - * milena/tests/logical/Makefile.am + * tests/arith/Makefile.am, + * tests/border/Makefile.am, + * tests/data/Makefile.am, + * tests/draw/Makefile.am, + * tests/logical/Makefile.am (check_PROGRAM): Remove all_headers. (all_headers_SOURCES): Remove. - * milena/tests/all_headers.cc, - * milena/tests/display/Makefile.am: + * tests/all_headers.cc, + * tests/display/Makefile.am: Clean up. Aesthetic changes. @@ -6387,7 +6387,7 @@ * mln/io/off/load.hh, * mln/topo/complex.hh, * mln/topo/face.hh, - * mln/topo/face_iter.hh: + * mln/topo/face_iter.hh: * mln/topo/n_face_iter.hh, * tests/core/image/complex_image.cc, * tests/topo/complex.cc: @@ -6816,47 +6816,47 @@ Small fixes. - * milena/doc/Doxyfile.in: fix missing backspace. - - * milena/doc/examples/extend.cc: add missing include. + * doc/Doxyfile.in: fix missing backspace. + + * doc/examples/extend.cc: add missing include. - * milena/doc/ref_guide/ref_guide.tex: fix typo. - - * milena/doc/tools/clearbanner.sh: new tool to remove hevea banner. - - * milena/doc/tutorial/tutorial.tex: add navigation links. + * doc/ref_guide/ref_guide.tex: fix typo. - * milena/doc/white_paper/white_paper.tex: do not use pgf. + * doc/tools/clearbanner.sh: new tool to remove hevea banner. - * milena/tests/unit_test/unit-tests.mk, - * milena/headers.mk: update. + * doc/tutorial/tutorial.tex: add navigation links. - * milena/mln/metal/equal.hh, - * milena/mln/metal/is.hh, - * milena/mln/metal/is_a.hh: add comments. + * doc/white_paper/white_paper.tex: do not use pgf. - * milena/mln/transform/influence_zone_geodesic.hh, - * milena/mln/transform/internal/influence_zone_functor.hh: allow to + * tests/unit_test/unit-tests.mk, + * headers.mk: update. + + * mln/metal/equal.hh, + * mln/metal/is.hh, + * mln/metal/is_a.hh: add comments. + + * mln/transform/influence_zone_geodesic.hh, + * mln/transform/internal/influence_zone_functor.hh: allow to set a different value for the background. - * milena/mln/value/shell.hh: temporary re-enable the commented + * mln/value/shell.hh: temporary re-enable the commented overload of set_ and comment the other one. - * milena/tests/Makefile.am: fix pretty-check rule. + * tests/Makefile.am: fix pretty-check rule. - * milena/tests/extract/blue.cc, - * milena/tests/extract/green.cc, - * milena/tests/extract/red.cc: improve tests. + * tests/extract/blue.cc, + * tests/extract/green.cc, + * tests/extract/red.cc: improve tests. - * milena/tests/extract/Makefile.am, - * milena/tests/extract/hue.cc, - * milena/tests/extract/lum.cc, - * milena/tests/extract/sat.cc: new tests. + * tests/extract/Makefile.am, + * tests/extract/hue.cc, + * tests/extract/lum.cc, + * tests/extract/sat.cc: new tests. 2009-06-05 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Cleanup tests io::p*m tests and add new tests for io::p*ms. - + * mln/io/pgms/load.hh, * mln/io/pnms/load.hh, * mln/io/ppms/load.hh: fix invalid calls to pnm::load. @@ -9959,7 +9959,7 @@ * tests/global_vars2.cc: check potential global symbols duplications. 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> - + Add a pretty_check target for tests. * tests/Makefile.am: new target pretty_check. @@ -10045,7 +10045,7 @@ Add labeled_image type. * mln/core/image/imorph/labeled_image.hh: new image type. - + * mln/trait/ch_value.hh: Specialize ch_value trait for this type. * tests/core/image/imorph/labeled_image.cc: new associated test. @@ -10081,7 +10081,7 @@ * mln/core/image/extended.hh * mln/core/image/extension_fun.hh * mln/core/image/extension_ima.hh - * mln/core/image/extension_val.hh + * mln/core/image/extension_val.hh * mln/core/image/hexa.hh * mln/core/image/hexa_piter.hh * mln/core/image/image2d_h.hh @@ -10110,8 +10110,8 @@ Identity morphers: * mln/core/image/decorated_image.hh - * mln/core/image/interpolated.hh - * mln/core/image/lazy_image.hh + * mln/core/image/interpolated.hh + * mln/core/image/lazy_image.hh * mln/core/image/plain.hh * mln/core/image/safe.hh * mln/core/image/tr_image.hh: Move... @@ -10132,9 +10132,9 @@ Value morphers: - * mln/core/image/cast_image.hh - * mln/core/image/fun_image.hh - * mln/core/image/thru_morpher.hh + * mln/core/image/cast_image.hh + * mln/core/image/fun_image.hh + * mln/core/image/thru_morpher.hh * mln/core/image/thrubin_morpher.hh * mln/core/image/violent_cast_image.hh: Move... @@ -10176,7 +10176,7 @@ * tests/core/image/morph/t_image.cc, * tests/core/image/vmorph/cast_image.cc: ... here. - + Includes. * tests/core/image/plain.cc, @@ -10773,41 +10773,41 @@ Small fixes. - * milena/doc/examples/tuto3/fill_non_generic.cc.raw: Fix. + * doc/examples/tuto3/fill_non_generic.cc.raw: Fix. - * milena/tests/unit_test/build_unit_test.sh, - * milena/generate_dist_headers.sh: Use 'sort' to be sure of the output + * tests/unit_test/build_unit_test.sh, + * generate_dist_headers.sh: Use 'sort' to be sure of the output lines order. - * milena/headers.mk, - * milena/tests/unit_test/unit-tests.mk: Regenerate with the previous + * headers.mk, + * tests/unit_test/unit-tests.mk: Regenerate with the previous modified scripts. - * milena/mln/core/image/vertex_image.hh: Fix a wrong type declaration. + * mln/core/image/vertex_image.hh: Fix a wrong type declaration. - * milena/mln/core/internal/graph_psite_base.hh: Remove comparison + * mln/core/internal/graph_psite_base.hh: Remove comparison operators. - * milena/mln/core/site_set/p_array.hh: Enforce the comparison on the + * mln/core/site_set/p_array.hh: Enforce the comparison on the site type. - * milena/mln/core/site_set/p_edges_psite.hh, - * milena/mln/core/site_set/p_vertices_psite.hh: Add operator ==, != + * mln/core/site_set/p_edges_psite.hh, + * mln/core/site_set/p_vertices_psite.hh: Add operator ==, != and <. - * milena/mln/fun/v2v/hsi_to_rgb.hh: Reindent. + * mln/fun/v2v/hsi_to_rgb.hh: Reindent. - * milena/mln/fun/v2v/hsl_to_rgb.hh: Add a missing forward declaration. + * mln/fun/v2v/hsl_to_rgb.hh: Add a missing forward declaration. - * milena/mln/io/magick/load.hh: Move fixme. + * mln/io/magick/load.hh: Move fixme. - * milena/mln/io/magick/save.hh: Cleanup. + * mln/io/magick/save.hh: Cleanup. - * milena/mln/value/hsl.hh: Add operator==. + * mln/value/hsl.hh: Add operator==. - * milena/tests/io/magick/Makefile.am: Add ldflags to magick test. + * tests/io/magick/Makefile.am: Add ldflags to magick test. - * milena/tests/io/magick/magick.cc: Write a new test. + * tests/io/magick/magick.cc: Write a new test. 2009-05-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 9357e05..676b7c8 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -13,13 +13,13 @@ Stretch result of classification. * folio/tools/histo/classify_with_histo.cc: Stretch result in - the output image. + the output image. 2009-06-19 Etienne FOLIO <folio(a)lrde.epita.fr> Clean up. * folio/mln/histo/classify_with_histo_3d.hh: New algorithm - more generalist than the rgb version. + more generalist than the rgb version. * folio/mln/histo/compute_histo_3d.hh: Add macros. * folio/mln/histo/project_histo_3d.hh: Add macros. * folio/test/histo/classify_with_histo_rgb.cc: Move file. @@ -48,7 +48,9 @@ 2009-06-19 Fabien Freling <fabien.freling(a)lrde.epita.fr> - Add mln/ and tests/ directory for testing before integration into Milena. + Add mln/ and tests/ directory for testing before integration into + Milena. + * fabien/bin/pnms2dump.cc: Small update. * fabien/igr/Makefile: Add targets. * fabien/igr/check_edges.sh: Small update. @@ -85,7 +87,7 @@ Implement visualization routine for regions. * fabien/igr/wst_edges.cc: Add call to display_region(). - * fabien/mln/world/inter_pixel/display_region.hh: + * fabien/mln/world/inter_pixel/display_region.hh: Implement routine for visualization of regions after a watershed call [Draft, non functional]. @@ -108,8 +110,8 @@ Stop using \arg instead of \param or \tparam in documentation. - * sandbox/abraham/mln/transform/fft.hh, - * sandbox/nivault/dmap.hh: + * abraham/mln/transform/fft.hh, + * nivault/dmap.hh: Here. 2009-06-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -630,7 +632,7 @@ * garrigues/fllt/test_fllt13.cc, * garrigues/fllt/test_fllt15.cc, * garrigues/fllt/test_fllt8.cc (using): Remove useless typename. - That makes files compile with g++-2.95. + That makes files compile with g++-2.95. * inim/2009/binarization/binarization.hh (mln_concrete_ch_value): Replace by... (mln_ch_value): ...this. @@ -1232,259 +1234,6 @@ * folio/test/value/circular.cc: test. * folio/test/value/hsv.cc: test. -2009-05-18 Guillaume Lazzara <lazzara(a)lrde.epita.fr> - - Move Scribo from sandbox to the root directory. - - * milena/sandbox/scribo/Makefile, - * milena/sandbox/scribo/Makefile.am, - * milena/sandbox/scribo/all.hh, - * milena/sandbox/scribo/binarization/simple.hh, - * milena/sandbox/scribo/core/all.hh, - * milena/sandbox/scribo/core/central_sites.hh, - * milena/sandbox/scribo/core/component_bboxes.hh, - * milena/sandbox/scribo/core/erase_bboxes.hh, - * milena/sandbox/scribo/core/macros.hh, - * milena/sandbox/scribo/debug/all.hh, - * milena/sandbox/scribo/debug/save_label_image.hh, - * milena/sandbox/scribo/debug/save_linked_textbboxes_image.hh, - * milena/sandbox/scribo/debug/save_table_image.hh, - * milena/sandbox/scribo/debug/save_textbboxes_image.hh, - * milena/sandbox/scribo/demat.hh, - * milena/sandbox/scribo/draw/all.hh, - * milena/sandbox/scribo/draw/bounding_box_links.hh, - * milena/sandbox/scribo/draw/bounding_boxes.hh, - * milena/sandbox/scribo/extract/primitive/canvas.hh, - * milena/sandbox/scribo/extract/primitive/cells.hh, - * milena/sandbox/scribo/extract/primitive/lines_discontinued.hh, - * milena/sandbox/scribo/extract/primitive/lines_h_discontinued.hh, - * milena/sandbox/scribo/extract/primitive/lines_thick.hh, - * milena/sandbox/scribo/extract/primitive/lines_v_discontinued.hh, - * milena/sandbox/scribo/extract/primitive/objects.hh, - * milena/sandbox/scribo/filter/all.hh, - * milena/sandbox/scribo/filter/large_components.hh, - * milena/sandbox/scribo/filter/small_components.hh, - * milena/sandbox/scribo/filter/thick_bboxes.hh, - * milena/sandbox/scribo/filter/thin_bboxes.hh, - * milena/sandbox/scribo/make/all.hh, - * milena/sandbox/scribo/make/debug_filename.hh, - * milena/sandbox/scribo/make/influence_zone_graph.hh, - * milena/sandbox/scribo/make/text.hh, - * milena/sandbox/scribo/preprocessing/all.hh, - * milena/sandbox/scribo/preprocessing/unskew.hh, - * milena/sandbox/scribo/scribo.mk, - * milena/sandbox/scribo/src/Makefile.am, - * milena/sandbox/scribo/src/binarization/Makefile.am, - * milena/sandbox/scribo/src/binarization/simple.cc, - * milena/sandbox/scribo/src/dmap.cc, - * milena/sandbox/scribo/src/extract_text_double_link.cc, - * milena/sandbox/scribo/src/extract_text_double_several_links.cc, - * milena/sandbox/scribo/src/extract_text_graph.cc, - * milena/sandbox/scribo/src/extract_text_several_graph.cc, - * milena/sandbox/scribo/src/extract_text_several_left_links.cc, - * milena/sandbox/scribo/src/extract_text_single_link.cc, - * milena/sandbox/scribo/src/morpho.cc, - * milena/sandbox/scribo/src/photo.cc, - * milena/sandbox/scribo/src/photo_basic.cc, - * milena/sandbox/scribo/src/rectangularity.cc, - * milena/sandbox/scribo/src/table.cc, - * milena/sandbox/scribo/src/table_erase.cc, - * milena/sandbox/scribo/src/table_extract.cc, - * milena/sandbox/scribo/src/table_rebuild_opening.cc, - * milena/sandbox/scribo/src/table_rebuild_rank.cc, - * milena/sandbox/scribo/src/thin_bboxes.cc, - * milena/sandbox/scribo/table/align_lines_horizontaly.hh, - * milena/sandbox/scribo/table/align_lines_verticaly.hh, - * milena/sandbox/scribo/table/all.hh, - * milena/sandbox/scribo/table/connect_horizontal_lines.hh, - * milena/sandbox/scribo/table/connect_vertical_lines.hh, - * milena/sandbox/scribo/table/erase.hh, - * milena/sandbox/scribo/table/extract.hh, - * milena/sandbox/scribo/table/extract_lines_with_opening.hh, - * milena/sandbox/scribo/table/extract_lines_with_rank.hh, - * milena/sandbox/scribo/table/internal/align_lines.hh, - * milena/sandbox/scribo/table/internal/all.hh, - * milena/sandbox/scribo/table/internal/connect_lines.hh, - * milena/sandbox/scribo/table/internal/repair_lines.hh, - * milena/sandbox/scribo/table/rebuild.hh, - * milena/sandbox/scribo/table/repair_horizontal_lines.hh, - * milena/sandbox/scribo/table/repair_vertical_lines.hh, - * milena/sandbox/scribo/tests/Makefile.am, - * milena/sandbox/scribo/tests/data.hh.in, - * milena/sandbox/scribo/tests/filter/Makefile.am, - * milena/sandbox/scribo/tests/filter/small_and_large_bboxes.cc, - * milena/sandbox/scribo/tests/table/Makefile.am, - * milena/sandbox/scribo/tests/table/extract_lines_with_rank.cc, - * milena/sandbox/scribo/tests/table/repair_lines.cc, - * milena/sandbox/scribo/tests/text/Makefile.am, - * milena/sandbox/scribo/text/all.hh, - * milena/sandbox/scribo/text/extract_bboxes.hh, - * milena/sandbox/scribo/text/extract_lines.hh, - * milena/sandbox/scribo/text/grouping/all.hh, - * milena/sandbox/scribo/text/grouping/group_from_double_link.hh, - * milena/sandbox/scribo/text/grouping/group_from_graph.hh, - * milena/sandbox/scribo/text/grouping/group_from_single_link.hh, - * milena/sandbox/scribo/text/grouping/group_with_graph.hh, - * milena/sandbox/scribo/text/grouping/group_with_several_graphes.hh, - * milena/sandbox/scribo/text/grouping/group_with_several_left_links.hh, - * milena/sandbox/scribo/text/grouping/group_with_several_right_links.hh, - * milena/sandbox/scribo/text/grouping/group_with_single_left_link.hh, - * milena/sandbox/scribo/text/grouping/group_with_single_right_link.hh, - * milena/sandbox/scribo/text/grouping/internal/all.hh, - * milena/sandbox/scribo/text/grouping/internal/find_graph_link.hh, - * milena/sandbox/scribo/text/grouping/internal/find_left_link.hh, - * milena/sandbox/scribo/text/grouping/internal/find_right_link.hh, - * milena/sandbox/scribo/text/grouping/internal/find_root.hh, - * milena/sandbox/scribo/text/grouping/internal/init_link_array.hh, - * milena/sandbox/scribo/text/grouping/internal/is_link_valid.hh, - * milena/sandbox/scribo/text/grouping/internal/update_graph_link.hh, - * milena/sandbox/scribo/text/grouping/internal/update_link_array.hh, - * milena/sandbox/scribo/text/recognition.hh, - * milena/sandbox/scribo/util/all.hh, - * milena/sandbox/scribo/util/text.hh: Move ... - - * scribo/Doxyfile, - * scribo/Doxyfile_tex, - * scribo/Makefile.am, - * scribo/all.hh, - * scribo/binarization/simple.hh, - * scribo/core/all.hh, - * scribo/core/central_sites.hh, - * scribo/core/component_bboxes.hh, - * scribo/core/erase_bboxes.hh, - * scribo/core/macros.hh, - * scribo/debug/all.hh, - * scribo/debug/save_label_image.hh, - * scribo/debug/save_linked_textbboxes_image.hh, - * scribo/debug/save_table_image.hh, - * scribo/debug/save_textbboxes_image.hh, - * scribo/demat.hh, - * scribo/draw/all.hh, - * scribo/draw/bounding_box_links.hh, - * scribo/draw/bounding_boxes.hh, - * scribo/extract/primitive/canvas.hh, - * scribo/extract/primitive/cells.hh, - * scribo/extract/primitive/lines_discontinued.hh, - * scribo/extract/primitive/lines_h_discontinued.hh, - * scribo/extract/primitive/lines_thick.hh, - * scribo/extract/primitive/lines_v_discontinued.hh, - * scribo/extract/primitive/objects.hh, - * scribo/filter/all.hh, - * scribo/filter/large_components.hh, - * scribo/filter/small_components.hh, - * scribo/filter/thick_bboxes.hh, - * scribo/filter/thin_bboxes.hh, - * scribo/make/all.hh, - * scribo/make/debug_filename.hh, - * scribo/make/influence_zone_graph.hh, - * scribo/make/text.hh, - * scribo/preprocessing/all.hh, - * scribo/preprocessing/unskew.hh, - * scribo/scribo.mk, - * scribo/src/Makefile.am, - * scribo/src/binarization/Makefile.am, - * scribo/src/binarization/simple.cc, - * scribo/src/dmap.cc, - * scribo/src/extract_text_double_link.cc, - * scribo/src/extract_text_double_several_links.cc, - * scribo/src/extract_text_graph.cc, - * scribo/src/extract_text_several_graph.cc, - * scribo/src/extract_text_several_left_links.cc, - * scribo/src/extract_text_single_link.cc, - * scribo/src/morpho.cc, - * scribo/src/photo.cc, - * scribo/src/photo_basic.cc, - * scribo/src/recognition.cc, - * scribo/src/rectangularity.cc, - * scribo/src/table.cc, - * scribo/src/table_erase.cc, - * scribo/src/table_extract.cc, - * scribo/src/table_old.cc, - * scribo/src/table_rebuild_opening.cc, - * scribo/src/table_rebuild_rank.cc, - * scribo/src/thin_bboxes.cc, - * scribo/table/align_lines_horizontaly.hh, - * scribo/table/align_lines_verticaly.hh, - * scribo/table/all.hh, - * scribo/table/connect_horizontal_lines.hh, - * scribo/table/connect_vertical_lines.hh, - * scribo/table/erase.hh, - * scribo/table/extract.hh, - * scribo/table/extract_lines_with_opening.hh, - * scribo/table/extract_lines_with_rank.hh, - * scribo/table/internal/align_lines.hh, - * scribo/table/internal/all.hh, - * scribo/table/internal/connect_lines.hh, - * scribo/table/internal/repair_lines.hh, - * scribo/table/rebuild.hh, - * scribo/table/repair_horizontal_lines.hh, - * scribo/table/repair_vertical_lines.hh, - * scribo/test.cc, - * scribo/tests/Makefile.am, - * scribo/tests/data.hh.in, - * scribo/src/photo.cc, - * scribo/src/photo_basic.cc, - * scribo/src/recognition.cc, - * scribo/src/rectangularity.cc, - * scribo/src/table.cc, - * scribo/src/table_erase.cc, - * scribo/src/table_extract.cc, - * scribo/src/table_old.cc, - * scribo/src/table_rebuild_opening.cc, - * scribo/src/table_rebuild_rank.cc, - * scribo/src/thin_bboxes.cc, - * scribo/table/align_lines_horizontaly.hh, - * scribo/table/align_lines_verticaly.hh, - * scribo/table/all.hh, - * scribo/table/connect_horizontal_lines.hh, - * scribo/table/connect_vertical_lines.hh, - * scribo/table/erase.hh, - * scribo/table/extract.hh, - * scribo/table/extract_lines_with_opening.hh, - * scribo/table/extract_lines_with_rank.hh, - * scribo/table/internal/align_lines.hh, - * scribo/table/internal/all.hh, - * scribo/table/internal/connect_lines.hh, - * scribo/table/internal/repair_lines.hh, - * scribo/table/rebuild.hh, - * scribo/table/repair_horizontal_lines.hh, - * scribo/table/repair_vertical_lines.hh, - * scribo/test.cc, - * scribo/tests/Makefile.am, - * scribo/tests/data.hh.in, - * scribo/tests/filter/Makefile.am, - * scribo/tests/filter/small_and_large_bboxes.cc, - * scribo/tests/table/Makefile.am, - * scribo/tests/table/extract_lines_with_rank.cc, - * scribo/tests/table/repair_lines.cc, - * scribo/tests/text/Makefile.am, - * scribo/text/all.hh, - * scribo/text/clean.hh, - * scribo/text/extract_bboxes.hh, - * scribo/text/extract_lines.hh, - * scribo/text/grouping/all.hh, - * scribo/text/grouping/group_from_double_link.hh, - * scribo/text/grouping/group_from_graph.hh, - * scribo/text/grouping/group_from_single_link.hh, - * scribo/text/grouping/group_with_graph.hh, - * scribo/text/grouping/group_with_several_graphes.hh, - * scribo/text/grouping/group_with_several_left_links.hh, - * scribo/text/grouping/group_with_several_right_links.hh, - * scribo/text/grouping/group_with_single_left_link.hh, - * scribo/text/grouping/group_with_single_right_link.hh, - * scribo/text/grouping/internal/all.hh, - * scribo/text/grouping/internal/find_graph_link.hh, - * scribo/text/grouping/internal/find_left_link.hh, - * scribo/text/grouping/internal/find_right_link.hh, - * scribo/text/grouping/internal/find_root.hh, - * scribo/text/grouping/internal/init_link_array.hh, - * scribo/text/grouping/internal/is_link_valid.hh, - * scribo/text/grouping/internal/update_graph_link.hh, - * scribo/text/grouping/internal/update_link_array.hh, - * scribo/text/recognition.hh, - * scribo/util/all.hh, - * scribo/util/text.hh: ... here. - 2009-05-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make Etienne's code compile. diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2b85769..f255534 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -41,9 +41,9 @@ * headers.mk: regen. * nodist-headers: list of not distributed headers. - + * tests/unit_test/build_unit_test.sh: add output path as argument. - + * tests/unit_test/Makefile.am: update call to build_unit_test.sh. 2009-06-16 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -53,9 +53,9 @@ * table/extract.hh: add a missing include and specify the scribo namespace. - * table/internal/align_lines.hh: fix warnings. + * table/internal/align_lines.hh: fix warnings. - * table/internal/repair_lines.hh: do not use mln_VAR. + * table/internal/repair_lines.hh: do not use mln_VAR. 2009-06-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -70,8 +70,8 @@ * text/grouping/group_from_graph.hh, * text/grouping/group_from_single_link.hh: Replace accu::accu_name by accu::new_dir::accu_name, - accu::meta::accu_name by accu::meta::new_dir::accu_name, - accu/accu_name by accu/new_dir/accu_name. + accu::meta::accu_name by accu::meta::new_dir::accu_name, + accu/accu_name by accu/new_dir/accu_name. 2009-06-12 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -156,7 +156,7 @@ Compile more examples in Scribo. * src/Makefile.am: compile new examples. - + * filter/large_objects.hh: fix use of accu::math::count. * src/extract/primitive/extract_discontinued_hlines.cc, @@ -174,7 +174,7 @@ * src/filter/thin_objects.cc, * src/morpho.cc, * src/rectangularity.cc, - * src/thin_bboxes.cc: + * src/thin_bboxes.cc: - Do not use essential/2d.hh - Specify the namespace of the usage() routine. @@ -658,7 +658,7 @@ 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Make use of labeled_image type in Scribo. - + * text/extract_bboxes.hh, * core/component_bboxes.hh: useless so removed. -- 1.6.2.4

1 0

4191: bootstrap: update generation of distributed file lists in milena/doc.
by Guillaume Lazzara 25 Jun '09

25 Jun '09

--- ChangeLog | 4 ++++ bootstrap | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d05e22..604b648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-06-25 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * bootstrap: update generation of distributed file lists in milena/doc. + 2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * Makefile.am: add accu/math/all.hh as stripped file. diff --git a/bootstrap b/bootstrap index add2d30..53bf1c2 100755 --- a/bootstrap +++ b/bootstrap @@ -136,7 +136,9 @@ run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers # Generate lists of files to be part of the distribution # for the tutorial. -run milena/doc ./generate_dist_files.sh +run milena/doc/ ./generate_dist_files.sh figures 'p*m' +run milena/doc/ ./generate_dist_files.sh outputs txt +run milena/doc/ ./generate_dist_files.sh examples cc.raw # Generate unit test files. run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests -- 1.5.6.5

1 0

4190: Various fixes for in documentation.
by Guillaume Lazzara 25 Jun '09

25 Jun '09

* doc/Makefile.am: add missing dependencies in EXTRA_DIST. * doc/doxyfuns.sty: include .cc.raw instead of .cc. * doc/examples/examples.mk: regen. * doc/generate_dist_files.sh: add support for arguments. * doc/ref_guide/Makefile.am, * doc/tutorial/Makefile.am: add dependency on FIGURES builddir. * doc/tutorial/tutorial.tex, * doc/ref_guide/ref_guide.tex, * doc/examples/accu-wrong-instanciation.cc.raw: update level::* to data::*. * doc/examples/split/accu-right-instanciation-1.cc, * doc/examples/split/borderthickness-1.cc, * doc/examples/split/box2d-bbox-1.cc, * doc/examples/split/domain-display-1.cc, * doc/examples/split/dpoint-1-1.cc, * doc/examples/split/estim-sites-1.cc, * doc/examples/split/extend-1.cc, * doc/examples/split/extend-2.cc, * doc/examples/split/extend-3.cc, * doc/examples/split/extend-4.cc, * doc/examples/split/extend-5.cc, * doc/examples/split/extension-ignore-1.cc, * doc/examples/split/fill-1.cc, * doc/examples/split/fill-2.cc, * doc/examples/split/fill-3.cc, * doc/examples/split/fill-call-1-1.cc, * doc/examples/split/fill-call-1-2.cc, * doc/examples/split/fill-call-1-3.cc, * doc/examples/split/fill-part-image-1.cc, * doc/examples/split/fill-part-image-2.cc, * doc/examples/split/fill-subdomain-1.cc, * doc/examples/split/fill-subdomain-2.cc, * doc/examples/split/fill-subdomain-3.cc, * doc/examples/split/fill-subdomain-4.cc, * doc/examples/split/fill-subdomain-shorter-1.cc, * doc/examples/split/fill-subdomain-shorter-2.cc, * doc/examples/split/fill-subimage-cfun-1.cc, * doc/examples/split/fill-subimage-cfun-2.cc, * doc/examples/split/fill-subimage-cfun-3.cc, * doc/examples/split/forall-piter-1.cc, * doc/examples/split/fun-p2v-1-1.cc, * doc/examples/split/graph-data-1.cc, * doc/examples/split/graph-data-2.cc, * doc/examples/split/graph-data-3.cc, * doc/examples/split/graph-data-4.cc, * doc/examples/split/graph-data-5.cc, * doc/examples/split/graph-data-6.cc, * doc/examples/split/graph-iter-1.cc, * doc/examples/split/graph-iter-2.cc, * doc/examples/split/graph-iter-3.cc, * doc/examples/split/graph-iter-4.cc, * doc/examples/split/ima-has-1.cc, * doc/examples/split/ima-load-1.cc, * doc/examples/split/ima-save-1.cc, * doc/examples/split/ima-size-1.cc, * doc/examples/split/ima2d-1-1.cc, * doc/examples/split/ima2d-2-1.cc, * doc/examples/split/ima2d-3-1.cc, * doc/examples/split/ima2d-4-1.cc, * doc/examples/split/ima2d-5-1.cc, * doc/examples/split/ima2d-6-clone-1.cc, * doc/examples/split/ima2d-7-1.cc, * doc/examples/split/ima2d-rot-1.cc, * doc/examples/split/labeling-compute-1.cc, * doc/examples/split/labeling-compute-2.cc, * doc/examples/split/labeling-compute-3.cc, * doc/examples/split/labeling-compute-4.cc, * doc/examples/split/logical-not-1.cc, * doc/examples/split/logical-not-2.cc, * doc/examples/split/logical-not-3.cc, * doc/examples/split/mln_var-1.cc, * doc/examples/split/mln_var-2.cc, * doc/examples/split/mln_var-3.cc, * doc/examples/split/parray-append-1.cc, * doc/examples/split/parray-bbox-1.cc, * doc/examples/split/paste-1.cc, * doc/examples/split/paste-call-1-1.cc, * doc/examples/split/point-1-1.cc, * doc/examples/split/predicate-1-1.cc, * doc/examples/split/tuto2_first_image-1.cc, * doc/examples/split/tuto2_first_image-2.cc, * doc/examples/split/tuto2_first_image-3.cc, * doc/examples/split/tuto2_first_image-4.cc, * doc/examples/split/tuto3_colorize-1.cc, * doc/examples/split/tuto3_first_routine-1.cc, * doc/examples/split/tuto3_first_routine-2.cc, * doc/examples/split/tuto3_first_routine-3.cc, * doc/examples/split/tuto3_first_routine-4.cc, * doc/examples/split/tuto3_first_routine-5.cc, * doc/examples/split/tuto3_first_routine-6.cc, * doc/examples/split/tuto3_first_routine-7.cc, * doc/examples/split/tuto3_first_routine-8.cc, * doc/examples/split/tuto3_println-1.cc, * doc/examples/split/tuto3_println-2.cc, * doc/examples/split/tuto3_rw_image-1.cc, * doc/examples/split/tuto3_rw_image-2.cc, * doc/examples/split/tuto3_rw_image-3.cc, * doc/examples/split/tuto3_rw_image-4.cc, * doc/examples/split/tuto3_rw_image-5.cc, * doc/examples/split/tuto3_rw_image-6.cc, * doc/examples/split/tuto3_rw_image-7.cc, * doc/examples/split/tuto3_trace-1.cc, * doc/examples/split/tuto3_trace-2.cc, * doc/examples/split/tuto4_genericity_and_algorithms-1.cc, * doc/examples/split/tuto4_genericity_and_algorithms-10.cc, * doc/examples/split/tuto4_genericity_and_algorithms-11.cc, * doc/examples/split/tuto4_genericity_and_algorithms-12.cc, * doc/examples/split/tuto4_genericity_and_algorithms-2.cc, * doc/examples/split/tuto4_genericity_and_algorithms-3.cc, * doc/examples/split/tuto4_genericity_and_algorithms-4.cc, * doc/examples/split/tuto4_genericity_and_algorithms-5.cc, * doc/examples/split/tuto4_genericity_and_algorithms-6.cc, * doc/examples/split/tuto4_genericity_and_algorithms-7.cc, * doc/examples/split/tuto4_genericity_and_algorithms-8.cc, * doc/examples/split/tuto4_genericity_and_algorithms-9.cc, * doc/examples/split/tuto4_point2d-1.cc, * doc/examples/split/tuto4_site_set_create-1.cc, * doc/examples/split/tuto4_site_set_create-2.cc, * doc/examples/split/tuto4_site_set_create-3.cc, * doc/examples/split/tuto4_site_set_create-4.cc, * doc/examples/split/win-create-1-1.cc, * doc/examples/split/win-create-2-1.cc: move... * doc/examples/split/accu-right-instanciation-1.cc.raw, * doc/examples/split/borderthickness-1.cc.raw, * doc/examples/split/box2d-bbox-1.cc.raw, * doc/examples/split/domain-display-1.cc.raw, * doc/examples/split/dpoint-1-1.cc.raw, * doc/examples/split/estim-sites-1.cc.raw, * doc/examples/split/extend-1.cc.raw, * doc/examples/split/extend-2.cc.raw, * doc/examples/split/extend-3.cc.raw, * doc/examples/split/extend-4.cc.raw, * doc/examples/split/extend-5.cc.raw, * doc/examples/split/extension-ignore-1.cc.raw, * doc/examples/split/fill-1.cc.raw, * doc/examples/split/fill-2.cc.raw, * doc/examples/split/fill-3.cc.raw, * doc/examples/split/fill-call-1-1.cc.raw, * doc/examples/split/fill-call-1-2.cc.raw, * doc/examples/split/fill-call-1-3.cc.raw, * doc/examples/split/fill-part-image-1.cc.raw, * doc/examples/split/fill-part-image-2.cc.raw, * doc/examples/split/fill-subdomain-1.cc.raw, * doc/examples/split/fill-subdomain-2.cc.raw, * doc/examples/split/fill-subdomain-3.cc.raw, * doc/examples/split/fill-subdomain-4.cc.raw, * doc/examples/split/fill-subdomain-shorter-1.cc.raw, * doc/examples/split/fill-subdomain-shorter-2.cc.raw, * doc/examples/split/fill-subimage-cfun-1.cc.raw, * doc/examples/split/fill-subimage-cfun-2.cc.raw, * doc/examples/split/fill-subimage-cfun-3.cc.raw, * doc/examples/split/forall-piter-1.cc.raw, * doc/examples/split/fun-p2v-1-1.cc.raw, * doc/examples/split/graph-data-1.cc.raw, * doc/examples/split/graph-data-2.cc.raw, * doc/examples/split/graph-data-3.cc.raw, * doc/examples/split/graph-data-4.cc.raw, * doc/examples/split/graph-data-5.cc.raw, * doc/examples/split/graph-data-6.cc.raw, * doc/examples/split/graph-iter-1.cc.raw, * doc/examples/split/graph-iter-2.cc.raw, * doc/examples/split/graph-iter-3.cc.raw, * doc/examples/split/graph-iter-4.cc.raw, * doc/examples/split/ima-has-1.cc.raw, * doc/examples/split/ima-load-1.cc.raw, * doc/examples/split/ima-save-1.cc.raw, * doc/examples/split/ima-size-1.cc.raw, * doc/examples/split/ima2d-1-1.cc.raw, * doc/examples/split/ima2d-2-1.cc.raw, * doc/examples/split/ima2d-3-1.cc.raw, * doc/examples/split/ima2d-4-1.cc.raw, * doc/examples/split/ima2d-5-1.cc.raw, * doc/examples/split/ima2d-6-clone-1.cc.raw, * doc/examples/split/ima2d-7-1.cc.raw, * doc/examples/split/ima2d-rot-1.cc.raw, * doc/examples/split/labeling-compute-1.cc.raw, * doc/examples/split/labeling-compute-2.cc.raw, * doc/examples/split/labeling-compute-3.cc.raw, * doc/examples/split/labeling-compute-4.cc.raw, * doc/examples/split/logical-not-1.cc.raw, * doc/examples/split/logical-not-2.cc.raw, * doc/examples/split/logical-not-3.cc.raw, * doc/examples/split/mln_var-1.cc.raw, * doc/examples/split/mln_var-2.cc.raw, * doc/examples/split/mln_var-3.cc.raw, * doc/examples/split/parray-append-1.cc.raw, * doc/examples/split/parray-bbox-1.cc.raw, * doc/examples/split/paste-1.cc.raw, * doc/examples/split/paste-call-1-1.cc.raw, * doc/examples/split/point-1-1.cc.raw, * doc/examples/split/predicate-1-1.cc.raw, * doc/examples/split/tuto2_first_image-1.cc.raw, * doc/examples/split/tuto2_first_image-2.cc.raw, * doc/examples/split/tuto2_first_image-3.cc.raw, * doc/examples/split/tuto2_first_image-4.cc.raw, * doc/examples/split/tuto3_colorize-1.cc.raw, * doc/examples/split/tuto3_first_routine-1.cc.raw, * doc/examples/split/tuto3_first_routine-2.cc.raw, * doc/examples/split/tuto3_first_routine-3.cc.raw, * doc/examples/split/tuto3_first_routine-4.cc.raw, * doc/examples/split/tuto3_first_routine-5.cc.raw, * doc/examples/split/tuto3_first_routine-6.cc.raw, * doc/examples/split/tuto3_first_routine-7.cc.raw, * doc/examples/split/tuto3_first_routine-8.cc.raw, * doc/examples/split/tuto3_println-1.cc.raw, * doc/examples/split/tuto3_println-2.cc.raw, * doc/examples/split/tuto3_rw_image-1.cc.raw, * doc/examples/split/tuto3_rw_image-2.cc.raw, * doc/examples/split/tuto3_rw_image-3.cc.raw, * doc/examples/split/tuto3_rw_image-4.cc.raw, * doc/examples/split/tuto3_rw_image-5.cc.raw, * doc/examples/split/tuto3_rw_image-6.cc.raw, * doc/examples/split/tuto3_rw_image-7.cc.raw, * doc/examples/split/tuto3_trace-1.cc.raw, * doc/examples/split/tuto3_trace-2.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw, * doc/examples/split/tuto4_point2d-1.cc.raw, * doc/examples/split/tuto4_site_set_create-1.cc.raw, * doc/examples/split/tuto4_site_set_create-2.cc.raw, * doc/examples/split/tuto4_site_set_create-3.cc.raw, * doc/examples/split/tuto4_site_set_create-4.cc.raw, * doc/examples/split/win-create-1-1.cc.raw, * doc/examples/split/win-create-2-1.cc.raw: ... here. --- milena/ChangeLog | 246 ++++++++++++++++++++ milena/doc/Makefile.am | 22 ++- milena/doc/doxyfuns.sty | 4 +- .../doc/examples/accu-wrong-instanciation.cc.raw | 2 +- milena/doc/examples/examples.mk | 112 +++++++++ ...tion-1.cc => accu-right-instanciation-1.cc.raw} | 0 ...rderthickness-1.cc => borderthickness-1.cc.raw} | 0 .../split/{box2d-bbox-1.cc => box2d-bbox-1.cc.raw} | 0 ...domain-display-1.cc => domain-display-1.cc.raw} | 0 .../split/{dpoint-1-1.cc => dpoint-1-1.cc.raw} | 0 .../{estim-sites-1.cc => estim-sites-1.cc.raw} | 0 .../split/{extend-1.cc => extend-1.cc.raw} | 0 .../split/{extend-2.cc => extend-2.cc.raw} | 0 .../split/{extend-3.cc => extend-3.cc.raw} | 0 .../split/{extend-4.cc => extend-4.cc.raw} | 0 .../split/{extend-5.cc => extend-5.cc.raw} | 0 ...nsion-ignore-1.cc => extension-ignore-1.cc.raw} | 0 .../examples/split/{fill-1.cc => fill-1.cc.raw} | 0 .../examples/split/{fill-2.cc => fill-2.cc.raw} | 0 .../examples/split/{fill-3.cc => fill-3.cc.raw} | 0 .../{fill-call-1-1.cc => fill-call-1-1.cc.raw} | 0 .../{fill-call-1-2.cc => fill-call-1-2.cc.raw} | 0 .../{fill-call-1-3.cc => fill-call-1-3.cc.raw} | 0 ...ll-part-image-1.cc => fill-part-image-1.cc.raw} | 0 ...ll-part-image-2.cc => fill-part-image-2.cc.raw} | 0 ...fill-subdomain-1.cc => fill-subdomain-1.cc.raw} | 0 ...fill-subdomain-2.cc => fill-subdomain-2.cc.raw} | 0 ...fill-subdomain-3.cc => fill-subdomain-3.cc.raw} | 0 ...fill-subdomain-4.cc => fill-subdomain-4.cc.raw} | 0 ...horter-1.cc => fill-subdomain-shorter-1.cc.raw} | 0 ...horter-2.cc => fill-subdomain-shorter-2.cc.raw} | 0 ...image-cfun-1.cc => fill-subimage-cfun-1.cc.raw} | 0 ...image-cfun-2.cc => fill-subimage-cfun-2.cc.raw} | 0 ...image-cfun-3.cc => fill-subimage-cfun-3.cc.raw} | 0 .../{forall-piter-1.cc => forall-piter-1.cc.raw} | 0 .../split/{fun-p2v-1-1.cc => fun-p2v-1-1.cc.raw} | 0 .../split/{graph-data-1.cc => graph-data-1.cc.raw} | 0 .../split/{graph-data-2.cc => graph-data-2.cc.raw} | 0 .../split/{graph-data-3.cc => graph-data-3.cc.raw} | 0 .../split/{graph-data-4.cc => graph-data-4.cc.raw} | 0 .../split/{graph-data-5.cc => graph-data-5.cc.raw} | 0 .../split/{graph-data-6.cc => graph-data-6.cc.raw} | 0 .../split/{graph-iter-1.cc => graph-iter-1.cc.raw} | 0 .../split/{graph-iter-2.cc => graph-iter-2.cc.raw} | 0 .../split/{graph-iter-3.cc => graph-iter-3.cc.raw} | 0 .../split/{graph-iter-4.cc => graph-iter-4.cc.raw} | 0 .../split/{ima-has-1.cc => ima-has-1.cc.raw} | 0 .../split/{ima-load-1.cc => ima-load-1.cc.raw} | 0 .../split/{ima-save-1.cc => ima-save-1.cc.raw} | 0 .../split/{ima-size-1.cc => ima-size-1.cc.raw} | 0 .../split/{ima2d-1-1.cc => ima2d-1-1.cc.raw} | 0 .../split/{ima2d-2-1.cc => ima2d-2-1.cc.raw} | 0 .../split/{ima2d-3-1.cc => ima2d-3-1.cc.raw} | 0 .../split/{ima2d-4-1.cc => ima2d-4-1.cc.raw} | 0 .../split/{ima2d-5-1.cc => ima2d-5-1.cc.raw} | 0 .../{ima2d-6-clone-1.cc => ima2d-6-clone-1.cc.raw} | 0 .../split/{ima2d-7-1.cc => ima2d-7-1.cc.raw} | 0 .../split/{ima2d-rot-1.cc => ima2d-rot-1.cc.raw} | 0 ...ling-compute-1.cc => labeling-compute-1.cc.raw} | 0 ...ling-compute-2.cc => labeling-compute-2.cc.raw} | 0 ...ling-compute-3.cc => labeling-compute-3.cc.raw} | 0 ...ling-compute-4.cc => labeling-compute-4.cc.raw} | 0 .../{logical-not-1.cc => logical-not-1.cc.raw} | 0 .../{logical-not-2.cc => logical-not-2.cc.raw} | 0 .../{logical-not-3.cc => logical-not-3.cc.raw} | 0 .../split/{mln_var-1.cc => mln_var-1.cc.raw} | 0 .../split/{mln_var-2.cc => mln_var-2.cc.raw} | 0 .../split/{mln_var-3.cc => mln_var-3.cc.raw} | 0 .../{parray-append-1.cc => parray-append-1.cc.raw} | 0 .../{parray-bbox-1.cc => parray-bbox-1.cc.raw} | 0 .../examples/split/{paste-1.cc => paste-1.cc.raw} | 0 .../{paste-call-1-1.cc => paste-call-1-1.cc.raw} | 0 .../split/{point-1-1.cc => point-1-1.cc.raw} | 0 .../{predicate-1-1.cc => predicate-1-1.cc.raw} | 0 ...first_image-1.cc => tuto2_first_image-1.cc.raw} | 0 ...first_image-2.cc => tuto2_first_image-2.cc.raw} | 0 ...first_image-3.cc => tuto2_first_image-3.cc.raw} | 0 ...first_image-4.cc => tuto2_first_image-4.cc.raw} | 0 ...tuto3_colorize-1.cc => tuto3_colorize-1.cc.raw} | 0 ...t_routine-1.cc => tuto3_first_routine-1.cc.raw} | 0 ...t_routine-2.cc => tuto3_first_routine-2.cc.raw} | 0 ...t_routine-3.cc => tuto3_first_routine-3.cc.raw} | 0 ...t_routine-4.cc => tuto3_first_routine-4.cc.raw} | 0 ...t_routine-5.cc => tuto3_first_routine-5.cc.raw} | 0 ...t_routine-6.cc => tuto3_first_routine-6.cc.raw} | 0 ...t_routine-7.cc => tuto3_first_routine-7.cc.raw} | 0 ...t_routine-8.cc => tuto3_first_routine-8.cc.raw} | 0 .../{tuto3_println-1.cc => tuto3_println-1.cc.raw} | 0 .../{tuto3_println-2.cc => tuto3_println-2.cc.raw} | 0 ...tuto3_rw_image-1.cc => tuto3_rw_image-1.cc.raw} | 0 ...tuto3_rw_image-2.cc => tuto3_rw_image-2.cc.raw} | 0 ...tuto3_rw_image-3.cc => tuto3_rw_image-3.cc.raw} | 0 ...tuto3_rw_image-4.cc => tuto3_rw_image-4.cc.raw} | 0 ...tuto3_rw_image-5.cc => tuto3_rw_image-5.cc.raw} | 0 ...tuto3_rw_image-6.cc => tuto3_rw_image-6.cc.raw} | 0 ...tuto3_rw_image-7.cc => tuto3_rw_image-7.cc.raw} | 0 .../{tuto3_trace-1.cc => tuto3_trace-1.cc.raw} | 0 .../{tuto3_trace-2.cc => tuto3_trace-2.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-1.cc.raw} | 0 ...c => tuto4_genericity_and_algorithms-10.cc.raw} | 0 ...c => tuto4_genericity_and_algorithms-11.cc.raw} | 0 ...c => tuto4_genericity_and_algorithms-12.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-2.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-3.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-4.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-5.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-6.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-7.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-8.cc.raw} | 0 ...cc => tuto4_genericity_and_algorithms-9.cc.raw} | 0 .../{tuto4_point2d-1.cc => tuto4_point2d-1.cc.raw} | 0 ..._create-1.cc => tuto4_site_set_create-1.cc.raw} | 0 ..._create-2.cc => tuto4_site_set_create-2.cc.raw} | 0 ..._create-3.cc => tuto4_site_set_create-3.cc.raw} | 0 ..._create-4.cc => tuto4_site_set_create-4.cc.raw} | 0 .../{win-create-1-1.cc => win-create-1-1.cc.raw} | 0 .../{win-create-2-1.cc => win-create-2-1.cc.raw} | 0 milena/doc/generate_dist_files.sh | 27 ++- milena/doc/ref_guide/Makefile.am | 4 +- milena/doc/ref_guide/ref_guide.tex | 4 +- milena/doc/tutorial/Makefile.am | 3 +- milena/doc/tutorial/tutorial.tex | 2 +- 122 files changed, 402 insertions(+), 24 deletions(-) rename milena/doc/examples/split/{accu-right-instanciation-1.cc => accu-right-instanciation-1.cc.raw} (100%) rename milena/doc/examples/split/{borderthickness-1.cc => borderthickness-1.cc.raw} (100%) rename milena/doc/examples/split/{box2d-bbox-1.cc => box2d-bbox-1.cc.raw} (100%) rename milena/doc/examples/split/{domain-display-1.cc => domain-display-1.cc.raw} (100%) rename milena/doc/examples/split/{dpoint-1-1.cc => dpoint-1-1.cc.raw} (100%) rename milena/doc/examples/split/{estim-sites-1.cc => estim-sites-1.cc.raw} (100%) rename milena/doc/examples/split/{extend-1.cc => extend-1.cc.raw} (100%) rename milena/doc/examples/split/{extend-2.cc => extend-2.cc.raw} (100%) rename milena/doc/examples/split/{extend-3.cc => extend-3.cc.raw} (100%) rename milena/doc/examples/split/{extend-4.cc => extend-4.cc.raw} (100%) rename milena/doc/examples/split/{extend-5.cc => extend-5.cc.raw} (100%) rename milena/doc/examples/split/{extension-ignore-1.cc => extension-ignore-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-1.cc => fill-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-2.cc => fill-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-3.cc => fill-3.cc.raw} (100%) rename milena/doc/examples/split/{fill-call-1-1.cc => fill-call-1-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-call-1-2.cc => fill-call-1-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-call-1-3.cc => fill-call-1-3.cc.raw} (100%) rename milena/doc/examples/split/{fill-part-image-1.cc => fill-part-image-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-part-image-2.cc => fill-part-image-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-1.cc => fill-subdomain-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-2.cc => fill-subdomain-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-3.cc => fill-subdomain-3.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-4.cc => fill-subdomain-4.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-shorter-1.cc => fill-subdomain-shorter-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-subdomain-shorter-2.cc => fill-subdomain-shorter-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-subimage-cfun-1.cc => fill-subimage-cfun-1.cc.raw} (100%) rename milena/doc/examples/split/{fill-subimage-cfun-2.cc => fill-subimage-cfun-2.cc.raw} (100%) rename milena/doc/examples/split/{fill-subimage-cfun-3.cc => fill-subimage-cfun-3.cc.raw} (100%) rename milena/doc/examples/split/{forall-piter-1.cc => forall-piter-1.cc.raw} (100%) rename milena/doc/examples/split/{fun-p2v-1-1.cc => fun-p2v-1-1.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-1.cc => graph-data-1.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-2.cc => graph-data-2.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-3.cc => graph-data-3.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-4.cc => graph-data-4.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-5.cc => graph-data-5.cc.raw} (100%) rename milena/doc/examples/split/{graph-data-6.cc => graph-data-6.cc.raw} (100%) rename milena/doc/examples/split/{graph-iter-1.cc => graph-iter-1.cc.raw} (100%) rename milena/doc/examples/split/{graph-iter-2.cc => graph-iter-2.cc.raw} (100%) rename milena/doc/examples/split/{graph-iter-3.cc => graph-iter-3.cc.raw} (100%) rename milena/doc/examples/split/{graph-iter-4.cc => graph-iter-4.cc.raw} (100%) rename milena/doc/examples/split/{ima-has-1.cc => ima-has-1.cc.raw} (100%) rename milena/doc/examples/split/{ima-load-1.cc => ima-load-1.cc.raw} (100%) rename milena/doc/examples/split/{ima-save-1.cc => ima-save-1.cc.raw} (100%) rename milena/doc/examples/split/{ima-size-1.cc => ima-size-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-1-1.cc => ima2d-1-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-2-1.cc => ima2d-2-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-3-1.cc => ima2d-3-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-4-1.cc => ima2d-4-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-5-1.cc => ima2d-5-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-6-clone-1.cc => ima2d-6-clone-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-7-1.cc => ima2d-7-1.cc.raw} (100%) rename milena/doc/examples/split/{ima2d-rot-1.cc => ima2d-rot-1.cc.raw} (100%) rename milena/doc/examples/split/{labeling-compute-1.cc => labeling-compute-1.cc.raw} (100%) rename milena/doc/examples/split/{labeling-compute-2.cc => labeling-compute-2.cc.raw} (100%) rename milena/doc/examples/split/{labeling-compute-3.cc => labeling-compute-3.cc.raw} (100%) rename milena/doc/examples/split/{labeling-compute-4.cc => labeling-compute-4.cc.raw} (100%) rename milena/doc/examples/split/{logical-not-1.cc => logical-not-1.cc.raw} (100%) rename milena/doc/examples/split/{logical-not-2.cc => logical-not-2.cc.raw} (100%) rename milena/doc/examples/split/{logical-not-3.cc => logical-not-3.cc.raw} (100%) rename milena/doc/examples/split/{mln_var-1.cc => mln_var-1.cc.raw} (100%) rename milena/doc/examples/split/{mln_var-2.cc => mln_var-2.cc.raw} (100%) rename milena/doc/examples/split/{mln_var-3.cc => mln_var-3.cc.raw} (100%) rename milena/doc/examples/split/{parray-append-1.cc => parray-append-1.cc.raw} (100%) rename milena/doc/examples/split/{parray-bbox-1.cc => parray-bbox-1.cc.raw} (100%) rename milena/doc/examples/split/{paste-1.cc => paste-1.cc.raw} (100%) rename milena/doc/examples/split/{paste-call-1-1.cc => paste-call-1-1.cc.raw} (100%) rename milena/doc/examples/split/{point-1-1.cc => point-1-1.cc.raw} (100%) rename milena/doc/examples/split/{predicate-1-1.cc => predicate-1-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto2_first_image-1.cc => tuto2_first_image-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto2_first_image-2.cc => tuto2_first_image-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto2_first_image-3.cc => tuto2_first_image-3.cc.raw} (100%) rename milena/doc/examples/split/{tuto2_first_image-4.cc => tuto2_first_image-4.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_colorize-1.cc => tuto3_colorize-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-1.cc => tuto3_first_routine-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-2.cc => tuto3_first_routine-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-3.cc => tuto3_first_routine-3.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-4.cc => tuto3_first_routine-4.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-5.cc => tuto3_first_routine-5.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-6.cc => tuto3_first_routine-6.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-7.cc => tuto3_first_routine-7.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_first_routine-8.cc => tuto3_first_routine-8.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_println-1.cc => tuto3_println-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_println-2.cc => tuto3_println-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-1.cc => tuto3_rw_image-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-2.cc => tuto3_rw_image-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-3.cc => tuto3_rw_image-3.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-4.cc => tuto3_rw_image-4.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-5.cc => tuto3_rw_image-5.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-6.cc => tuto3_rw_image-6.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_rw_image-7.cc => tuto3_rw_image-7.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_trace-1.cc => tuto3_trace-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto3_trace-2.cc => tuto3_trace-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-1.cc => tuto4_genericity_and_algorithms-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-10.cc => tuto4_genericity_and_algorithms-10.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-11.cc => tuto4_genericity_and_algorithms-11.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-12.cc => tuto4_genericity_and_algorithms-12.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-2.cc => tuto4_genericity_and_algorithms-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-3.cc => tuto4_genericity_and_algorithms-3.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-4.cc => tuto4_genericity_and_algorithms-4.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-5.cc => tuto4_genericity_and_algorithms-5.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-6.cc => tuto4_genericity_and_algorithms-6.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-7.cc => tuto4_genericity_and_algorithms-7.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-8.cc => tuto4_genericity_and_algorithms-8.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_genericity_and_algorithms-9.cc => tuto4_genericity_and_algorithms-9.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_point2d-1.cc => tuto4_point2d-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_site_set_create-1.cc => tuto4_site_set_create-1.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_site_set_create-2.cc => tuto4_site_set_create-2.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_site_set_create-3.cc => tuto4_site_set_create-3.cc.raw} (100%) rename milena/doc/examples/split/{tuto4_site_set_create-4.cc => tuto4_site_set_create-4.cc.raw} (100%) rename milena/doc/examples/split/{win-create-1-1.cc => win-create-1-1.cc.raw} (100%) rename milena/doc/examples/split/{win-create-2-1.cc => win-create-2-1.cc.raw} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9f6fb97..b91eaee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,249 @@ +2009-06-25 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Various fixes in documentation. + + * doc/Makefile.am: add missing dependencies in EXTRA_DIST. + + * doc/doxyfuns.sty: include .cc.raw instead of .cc. + + * doc/examples/examples.mk: regen. + + * doc/generate_dist_files.sh: add support for arguments. + + * doc/ref_guide/Makefile.am, + * doc/tutorial/Makefile.am: add dependency on FIGURES builddir. + + * doc/tutorial/tutorial.tex, + * doc/ref_guide/ref_guide.tex, + * doc/examples/accu-wrong-instanciation.cc.raw: update level::* to + data::*. + + * doc/examples/split/accu-right-instanciation-1.cc, + * doc/examples/split/borderthickness-1.cc, + * doc/examples/split/box2d-bbox-1.cc, + * doc/examples/split/domain-display-1.cc, + * doc/examples/split/dpoint-1-1.cc, + * doc/examples/split/estim-sites-1.cc, + * doc/examples/split/extend-1.cc, + * doc/examples/split/extend-2.cc, + * doc/examples/split/extend-3.cc, + * doc/examples/split/extend-4.cc, + * doc/examples/split/extend-5.cc, + * doc/examples/split/extension-ignore-1.cc, + * doc/examples/split/fill-1.cc, + * doc/examples/split/fill-2.cc, + * doc/examples/split/fill-3.cc, + * doc/examples/split/fill-call-1-1.cc, + * doc/examples/split/fill-call-1-2.cc, + * doc/examples/split/fill-call-1-3.cc, + * doc/examples/split/fill-part-image-1.cc, + * doc/examples/split/fill-part-image-2.cc, + * doc/examples/split/fill-subdomain-1.cc, + * doc/examples/split/fill-subdomain-2.cc, + * doc/examples/split/fill-subdomain-3.cc, + * doc/examples/split/fill-subdomain-4.cc, + * doc/examples/split/fill-subdomain-shorter-1.cc, + * doc/examples/split/fill-subdomain-shorter-2.cc, + * doc/examples/split/fill-subimage-cfun-1.cc, + * doc/examples/split/fill-subimage-cfun-2.cc, + * doc/examples/split/fill-subimage-cfun-3.cc, + * doc/examples/split/forall-piter-1.cc, + * doc/examples/split/fun-p2v-1-1.cc, + * doc/examples/split/graph-data-1.cc, + * doc/examples/split/graph-data-2.cc, + * doc/examples/split/graph-data-3.cc, + * doc/examples/split/graph-data-4.cc, + * doc/examples/split/graph-data-5.cc, + * doc/examples/split/graph-data-6.cc, + * doc/examples/split/graph-iter-1.cc, + * doc/examples/split/graph-iter-2.cc, + * doc/examples/split/graph-iter-3.cc, + * doc/examples/split/graph-iter-4.cc, + * doc/examples/split/ima-has-1.cc, + * doc/examples/split/ima-load-1.cc, + * doc/examples/split/ima-save-1.cc, + * doc/examples/split/ima-size-1.cc, + * doc/examples/split/ima2d-1-1.cc, + * doc/examples/split/ima2d-2-1.cc, + * doc/examples/split/ima2d-3-1.cc, + * doc/examples/split/ima2d-4-1.cc, + * doc/examples/split/ima2d-5-1.cc, + * doc/examples/split/ima2d-6-clone-1.cc, + * doc/examples/split/ima2d-7-1.cc, + * doc/examples/split/ima2d-rot-1.cc, + * doc/examples/split/labeling-compute-1.cc, + * doc/examples/split/labeling-compute-2.cc, + * doc/examples/split/labeling-compute-3.cc, + * doc/examples/split/labeling-compute-4.cc, + * doc/examples/split/logical-not-1.cc, + * doc/examples/split/logical-not-2.cc, + * doc/examples/split/logical-not-3.cc, + * doc/examples/split/mln_var-1.cc, + * doc/examples/split/mln_var-2.cc, + * doc/examples/split/mln_var-3.cc, + * doc/examples/split/parray-append-1.cc, + * doc/examples/split/parray-bbox-1.cc, + * doc/examples/split/paste-1.cc, + * doc/examples/split/paste-call-1-1.cc, + * doc/examples/split/point-1-1.cc, + * doc/examples/split/predicate-1-1.cc, + * doc/examples/split/tuto2_first_image-1.cc, + * doc/examples/split/tuto2_first_image-2.cc, + * doc/examples/split/tuto2_first_image-3.cc, + * doc/examples/split/tuto2_first_image-4.cc, + * doc/examples/split/tuto3_colorize-1.cc, + * doc/examples/split/tuto3_first_routine-1.cc, + * doc/examples/split/tuto3_first_routine-2.cc, + * doc/examples/split/tuto3_first_routine-3.cc, + * doc/examples/split/tuto3_first_routine-4.cc, + * doc/examples/split/tuto3_first_routine-5.cc, + * doc/examples/split/tuto3_first_routine-6.cc, + * doc/examples/split/tuto3_first_routine-7.cc, + * doc/examples/split/tuto3_first_routine-8.cc, + * doc/examples/split/tuto3_println-1.cc, + * doc/examples/split/tuto3_println-2.cc, + * doc/examples/split/tuto3_rw_image-1.cc, + * doc/examples/split/tuto3_rw_image-2.cc, + * doc/examples/split/tuto3_rw_image-3.cc, + * doc/examples/split/tuto3_rw_image-4.cc, + * doc/examples/split/tuto3_rw_image-5.cc, + * doc/examples/split/tuto3_rw_image-6.cc, + * doc/examples/split/tuto3_rw_image-7.cc, + * doc/examples/split/tuto3_trace-1.cc, + * doc/examples/split/tuto3_trace-2.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-1.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-10.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-11.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-12.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-2.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-3.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-4.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-5.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-6.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-7.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-8.cc, + * doc/examples/split/tuto4_genericity_and_algorithms-9.cc, + * doc/examples/split/tuto4_point2d-1.cc, + * doc/examples/split/tuto4_site_set_create-1.cc, + * doc/examples/split/tuto4_site_set_create-2.cc, + * doc/examples/split/tuto4_site_set_create-3.cc, + * doc/examples/split/tuto4_site_set_create-4.cc, + * doc/examples/split/win-create-1-1.cc, + * doc/examples/split/win-create-2-1.cc: move... + + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/examples/split/borderthickness-1.cc.raw, + * doc/examples/split/box2d-bbox-1.cc.raw, + * doc/examples/split/domain-display-1.cc.raw, + * doc/examples/split/dpoint-1-1.cc.raw, + * doc/examples/split/estim-sites-1.cc.raw, + * doc/examples/split/extend-1.cc.raw, + * doc/examples/split/extend-2.cc.raw, + * doc/examples/split/extend-3.cc.raw, + * doc/examples/split/extend-4.cc.raw, + * doc/examples/split/extend-5.cc.raw, + * doc/examples/split/extension-ignore-1.cc.raw, + * doc/examples/split/fill-1.cc.raw, + * doc/examples/split/fill-2.cc.raw, + * doc/examples/split/fill-3.cc.raw, + * doc/examples/split/fill-call-1-1.cc.raw, + * doc/examples/split/fill-call-1-2.cc.raw, + * doc/examples/split/fill-call-1-3.cc.raw, + * doc/examples/split/fill-part-image-1.cc.raw, + * doc/examples/split/fill-part-image-2.cc.raw, + * doc/examples/split/fill-subdomain-1.cc.raw, + * doc/examples/split/fill-subdomain-2.cc.raw, + * doc/examples/split/fill-subdomain-3.cc.raw, + * doc/examples/split/fill-subdomain-4.cc.raw, + * doc/examples/split/fill-subdomain-shorter-1.cc.raw, + * doc/examples/split/fill-subdomain-shorter-2.cc.raw, + * doc/examples/split/fill-subimage-cfun-1.cc.raw, + * doc/examples/split/fill-subimage-cfun-2.cc.raw, + * doc/examples/split/fill-subimage-cfun-3.cc.raw, + * doc/examples/split/forall-piter-1.cc.raw, + * doc/examples/split/fun-p2v-1-1.cc.raw, + * doc/examples/split/graph-data-1.cc.raw, + * doc/examples/split/graph-data-2.cc.raw, + * doc/examples/split/graph-data-3.cc.raw, + * doc/examples/split/graph-data-4.cc.raw, + * doc/examples/split/graph-data-5.cc.raw, + * doc/examples/split/graph-data-6.cc.raw, + * doc/examples/split/graph-iter-1.cc.raw, + * doc/examples/split/graph-iter-2.cc.raw, + * doc/examples/split/graph-iter-3.cc.raw, + * doc/examples/split/graph-iter-4.cc.raw, + * doc/examples/split/ima-has-1.cc.raw, + * doc/examples/split/ima-load-1.cc.raw, + * doc/examples/split/ima-save-1.cc.raw, + * doc/examples/split/ima-size-1.cc.raw, + * doc/examples/split/ima2d-1-1.cc.raw, + * doc/examples/split/ima2d-2-1.cc.raw, + * doc/examples/split/ima2d-3-1.cc.raw, + * doc/examples/split/ima2d-4-1.cc.raw, + * doc/examples/split/ima2d-5-1.cc.raw, + * doc/examples/split/ima2d-6-clone-1.cc.raw, + * doc/examples/split/ima2d-7-1.cc.raw, + * doc/examples/split/ima2d-rot-1.cc.raw, + * doc/examples/split/labeling-compute-1.cc.raw, + * doc/examples/split/labeling-compute-2.cc.raw, + * doc/examples/split/labeling-compute-3.cc.raw, + * doc/examples/split/labeling-compute-4.cc.raw, + * doc/examples/split/logical-not-1.cc.raw, + * doc/examples/split/logical-not-2.cc.raw, + * doc/examples/split/logical-not-3.cc.raw, + * doc/examples/split/mln_var-1.cc.raw, + * doc/examples/split/mln_var-2.cc.raw, + * doc/examples/split/mln_var-3.cc.raw, + * doc/examples/split/parray-append-1.cc.raw, + * doc/examples/split/parray-bbox-1.cc.raw, + * doc/examples/split/paste-1.cc.raw, + * doc/examples/split/paste-call-1-1.cc.raw, + * doc/examples/split/point-1-1.cc.raw, + * doc/examples/split/predicate-1-1.cc.raw, + * doc/examples/split/tuto2_first_image-1.cc.raw, + * doc/examples/split/tuto2_first_image-2.cc.raw, + * doc/examples/split/tuto2_first_image-3.cc.raw, + * doc/examples/split/tuto2_first_image-4.cc.raw, + * doc/examples/split/tuto3_colorize-1.cc.raw, + * doc/examples/split/tuto3_first_routine-1.cc.raw, + * doc/examples/split/tuto3_first_routine-2.cc.raw, + * doc/examples/split/tuto3_first_routine-3.cc.raw, + * doc/examples/split/tuto3_first_routine-4.cc.raw, + * doc/examples/split/tuto3_first_routine-5.cc.raw, + * doc/examples/split/tuto3_first_routine-6.cc.raw, + * doc/examples/split/tuto3_first_routine-7.cc.raw, + * doc/examples/split/tuto3_first_routine-8.cc.raw, + * doc/examples/split/tuto3_println-1.cc.raw, + * doc/examples/split/tuto3_println-2.cc.raw, + * doc/examples/split/tuto3_rw_image-1.cc.raw, + * doc/examples/split/tuto3_rw_image-2.cc.raw, + * doc/examples/split/tuto3_rw_image-3.cc.raw, + * doc/examples/split/tuto3_rw_image-4.cc.raw, + * doc/examples/split/tuto3_rw_image-5.cc.raw, + * doc/examples/split/tuto3_rw_image-6.cc.raw, + * doc/examples/split/tuto3_rw_image-7.cc.raw, + * doc/examples/split/tuto3_trace-1.cc.raw, + * doc/examples/split/tuto3_trace-2.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw, + * doc/examples/split/tuto4_point2d-1.cc.raw, + * doc/examples/split/tuto4_site_set_create-1.cc.raw, + * doc/examples/split/tuto4_site_set_create-2.cc.raw, + * doc/examples/split/tuto4_site_set_create-3.cc.raw, + * doc/examples/split/tuto4_site_set_create-4.cc.raw, + * doc/examples/split/win-create-1-1.cc.raw, + * doc/examples/split/win-create-2-1.cc.raw: ... here. + 2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> Install the documentation and the images. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 1a73c35..90685e4 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -171,7 +171,10 @@ include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: @rm -f $(srcdir)/headers.stamp.tmp @touch $(srcdir)/headers.stamp.tmp - cd $(srcdir) && ./generate_dist_files.sh + @cd $(srcdir) && \ + ./generate_dist_files.sh figures 'p*m' && \ + ./generate_dist_files.sh outputs txt && \ + ./generate_dist_files.sh examples cc.raw @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp $(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp @@ -182,7 +185,10 @@ $(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp $(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh @rm -f $@.tmp @touch $@.tmp - cd $(srcdir) && ./generate_dist_files.sh + @cd $(srcdir) && \ + ./generate_dist_files.sh figures 'p*m' && \ + ./generate_dist_files.sh outputs txt && \ + ./generate_dist_files.sh examples cc.raw @mv -f $@.tmp $@ @@ -195,11 +201,21 @@ dist_doc_DATA = \ $(USER_REFMAN_HTML) \ $(USER_REFMAN_PDF) + EXTRA_DIST += \ Doxyfile.in \ Doxyfile_user \ Doxyfile_user_pdf \ - groups \ + groups/accu.hh \ + groups/graph.hh \ + groups/images.hh \ + groups/main.hh \ + groups/neighb.hh \ + groups/site_set.hh \ + groups/util.hh \ + groups/win.hh \ + img/small-enlarged.png \ + img/small.png \ doxyfuns.sty \ milena.sty \ tools/clearbanner.sh \ diff --git a/milena/doc/doxyfuns.sty b/milena/doc/doxyfuns.sty index 983061b..cf0d0b6 100644 --- a/milena/doc/doxyfuns.sty +++ b/milena/doc/doxyfuns.sty @@ -74,7 +74,7 @@ % #2 - sample file name. \newcommand{\doxycode}[2][1]{ \backslash endhtmlonly% -\backslash include #2-#1.cc% +\backslash include #2-#1.cc.raw% \backslash htmlonly % } @@ -178,7 +178,7 @@ $$ \renewcommand{\doxysection}[2]{\section{#2}\label{#1}} \renewcommand{\doxysubsection}[2]{\subsection{#2}\label{#1}} \renewcommand{\doxysubsubsection}[2]{\subsubsection{#2}\label{#1}} -\renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{examples/split/#2-#1.cc}} +\renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{examples/split/#2-#1.cc.raw}} \renewcommand{\doxyrawcode}[1]{\lstinputlisting[frame=single]{examples/#1.cc.raw}} \renewcommand{\doxyoutput}[1]{\lstinputlisting[frame=single]{outputs/#1.txt}} \renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/split/#2-#1.txt}} diff --git a/milena/doc/examples/accu-wrong-instanciation.cc.raw b/milena/doc/examples/accu-wrong-instanciation.cc.raw index 895c9f4..27f8a86 100644 --- a/milena/doc/examples/accu-wrong-instanciation.cc.raw +++ b/milena/doc/examples/accu-wrong-instanciation.cc.raw @@ -1 +1 @@ -level::compute(accu::meta::max, ima); +data::compute(accu::meta::max, ima); diff --git a/milena/doc/examples/examples.mk b/milena/doc/examples/examples.mk index dba7c48..db42389 100644 --- a/milena/doc/examples/examples.mk +++ b/milena/doc/examples/examples.mk @@ -6,4 +6,116 @@ examples/fill-proto.cc.raw \ examples/ima2d-restricted-1.cc.raw \ examples/ima2d-restricted-2.cc.raw \ examples/ima2d-restricted-3.cc.raw \ +examples/split/accu-right-instanciation-1.cc.raw \ +examples/split/borderthickness-1.cc.raw \ +examples/split/box2d-bbox-1.cc.raw \ +examples/split/domain-display-1.cc.raw \ +examples/split/dpoint-1-1.cc.raw \ +examples/split/estim-sites-1.cc.raw \ +examples/split/extend-1.cc.raw \ +examples/split/extend-2.cc.raw \ +examples/split/extend-3.cc.raw \ +examples/split/extend-4.cc.raw \ +examples/split/extend-5.cc.raw \ +examples/split/extension-ignore-1.cc.raw \ +examples/split/fill-1.cc.raw \ +examples/split/fill-2.cc.raw \ +examples/split/fill-3.cc.raw \ +examples/split/fill-call-1-1.cc.raw \ +examples/split/fill-call-1-2.cc.raw \ +examples/split/fill-call-1-3.cc.raw \ +examples/split/fill-part-image-1.cc.raw \ +examples/split/fill-part-image-2.cc.raw \ +examples/split/fill-subdomain-1.cc.raw \ +examples/split/fill-subdomain-2.cc.raw \ +examples/split/fill-subdomain-3.cc.raw \ +examples/split/fill-subdomain-4.cc.raw \ +examples/split/fill-subdomain-shorter-1.cc.raw \ +examples/split/fill-subdomain-shorter-2.cc.raw \ +examples/split/fill-subimage-cfun-1.cc.raw \ +examples/split/fill-subimage-cfun-2.cc.raw \ +examples/split/fill-subimage-cfun-3.cc.raw \ +examples/split/forall-piter-1.cc.raw \ +examples/split/fun-p2v-1-1.cc.raw \ +examples/split/graph-data-1.cc.raw \ +examples/split/graph-data-2.cc.raw \ +examples/split/graph-data-3.cc.raw \ +examples/split/graph-data-4.cc.raw \ +examples/split/graph-data-5.cc.raw \ +examples/split/graph-data-6.cc.raw \ +examples/split/graph-iter-1.cc.raw \ +examples/split/graph-iter-2.cc.raw \ +examples/split/graph-iter-3.cc.raw \ +examples/split/graph-iter-4.cc.raw \ +examples/split/ima-has-1.cc.raw \ +examples/split/ima-load-1.cc.raw \ +examples/split/ima-save-1.cc.raw \ +examples/split/ima-size-1.cc.raw \ +examples/split/ima2d-1-1.cc.raw \ +examples/split/ima2d-2-1.cc.raw \ +examples/split/ima2d-3-1.cc.raw \ +examples/split/ima2d-4-1.cc.raw \ +examples/split/ima2d-5-1.cc.raw \ +examples/split/ima2d-6-clone-1.cc.raw \ +examples/split/ima2d-7-1.cc.raw \ +examples/split/ima2d-rot-1.cc.raw \ +examples/split/labeling-compute-1.cc.raw \ +examples/split/labeling-compute-2.cc.raw \ +examples/split/labeling-compute-3.cc.raw \ +examples/split/labeling-compute-4.cc.raw \ +examples/split/logical-not-1.cc.raw \ +examples/split/logical-not-2.cc.raw \ +examples/split/logical-not-3.cc.raw \ +examples/split/mln_var-1.cc.raw \ +examples/split/mln_var-2.cc.raw \ +examples/split/mln_var-3.cc.raw \ +examples/split/parray-append-1.cc.raw \ +examples/split/parray-bbox-1.cc.raw \ +examples/split/paste-1.cc.raw \ +examples/split/paste-call-1-1.cc.raw \ +examples/split/point-1-1.cc.raw \ +examples/split/predicate-1-1.cc.raw \ +examples/split/tuto2_first_image-1.cc.raw \ +examples/split/tuto2_first_image-2.cc.raw \ +examples/split/tuto2_first_image-3.cc.raw \ +examples/split/tuto2_first_image-4.cc.raw \ +examples/split/tuto3_colorize-1.cc.raw \ +examples/split/tuto3_first_routine-1.cc.raw \ +examples/split/tuto3_first_routine-2.cc.raw \ +examples/split/tuto3_first_routine-3.cc.raw \ +examples/split/tuto3_first_routine-4.cc.raw \ +examples/split/tuto3_first_routine-5.cc.raw \ +examples/split/tuto3_first_routine-6.cc.raw \ +examples/split/tuto3_first_routine-7.cc.raw \ +examples/split/tuto3_first_routine-8.cc.raw \ +examples/split/tuto3_println-1.cc.raw \ +examples/split/tuto3_println-2.cc.raw \ +examples/split/tuto3_rw_image-1.cc.raw \ +examples/split/tuto3_rw_image-2.cc.raw \ +examples/split/tuto3_rw_image-3.cc.raw \ +examples/split/tuto3_rw_image-4.cc.raw \ +examples/split/tuto3_rw_image-5.cc.raw \ +examples/split/tuto3_rw_image-6.cc.raw \ +examples/split/tuto3_rw_image-7.cc.raw \ +examples/split/tuto3_trace-1.cc.raw \ +examples/split/tuto3_trace-2.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-1.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-10.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-11.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-12.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-2.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-3.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-4.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-5.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-6.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-7.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-8.cc.raw \ +examples/split/tuto4_genericity_and_algorithms-9.cc.raw \ +examples/split/tuto4_point2d-1.cc.raw \ +examples/split/tuto4_site_set_create-1.cc.raw \ +examples/split/tuto4_site_set_create-2.cc.raw \ +examples/split/tuto4_site_set_create-3.cc.raw \ +examples/split/tuto4_site_set_create-4.cc.raw \ +examples/split/win-create-1-1.cc.raw \ +examples/split/win-create-2-1.cc.raw \ examples/tuto3/fill_non_generic.cc.raw diff --git a/milena/doc/examples/split/accu-right-instanciation-1.cc b/milena/doc/examples/split/accu-right-instanciation-1.cc.raw similarity index 100% rename from milena/doc/examples/split/accu-right-instanciation-1.cc rename to milena/doc/examples/split/accu-right-instanciation-1.cc.raw diff --git a/milena/doc/examples/split/borderthickness-1.cc b/milena/doc/examples/split/borderthickness-1.cc.raw similarity index 100% rename from milena/doc/examples/split/borderthickness-1.cc rename to milena/doc/examples/split/borderthickness-1.cc.raw diff --git a/milena/doc/examples/split/box2d-bbox-1.cc b/milena/doc/examples/split/box2d-bbox-1.cc.raw similarity index 100% rename from milena/doc/examples/split/box2d-bbox-1.cc rename to milena/doc/examples/split/box2d-bbox-1.cc.raw diff --git a/milena/doc/examples/split/domain-display-1.cc b/milena/doc/examples/split/domain-display-1.cc.raw similarity index 100% rename from milena/doc/examples/split/domain-display-1.cc rename to milena/doc/examples/split/domain-display-1.cc.raw diff --git a/milena/doc/examples/split/dpoint-1-1.cc b/milena/doc/examples/split/dpoint-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/dpoint-1-1.cc rename to milena/doc/examples/split/dpoint-1-1.cc.raw diff --git a/milena/doc/examples/split/estim-sites-1.cc b/milena/doc/examples/split/estim-sites-1.cc.raw similarity index 100% rename from milena/doc/examples/split/estim-sites-1.cc rename to milena/doc/examples/split/estim-sites-1.cc.raw diff --git a/milena/doc/examples/split/extend-1.cc b/milena/doc/examples/split/extend-1.cc.raw similarity index 100% rename from milena/doc/examples/split/extend-1.cc rename to milena/doc/examples/split/extend-1.cc.raw diff --git a/milena/doc/examples/split/extend-2.cc b/milena/doc/examples/split/extend-2.cc.raw similarity index 100% rename from milena/doc/examples/split/extend-2.cc rename to milena/doc/examples/split/extend-2.cc.raw diff --git a/milena/doc/examples/split/extend-3.cc b/milena/doc/examples/split/extend-3.cc.raw similarity index 100% rename from milena/doc/examples/split/extend-3.cc rename to milena/doc/examples/split/extend-3.cc.raw diff --git a/milena/doc/examples/split/extend-4.cc b/milena/doc/examples/split/extend-4.cc.raw similarity index 100% rename from milena/doc/examples/split/extend-4.cc rename to milena/doc/examples/split/extend-4.cc.raw diff --git a/milena/doc/examples/split/extend-5.cc b/milena/doc/examples/split/extend-5.cc.raw similarity index 100% rename from milena/doc/examples/split/extend-5.cc rename to milena/doc/examples/split/extend-5.cc.raw diff --git a/milena/doc/examples/split/extension-ignore-1.cc b/milena/doc/examples/split/extension-ignore-1.cc.raw similarity index 100% rename from milena/doc/examples/split/extension-ignore-1.cc rename to milena/doc/examples/split/extension-ignore-1.cc.raw diff --git a/milena/doc/examples/split/fill-1.cc b/milena/doc/examples/split/fill-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-1.cc rename to milena/doc/examples/split/fill-1.cc.raw diff --git a/milena/doc/examples/split/fill-2.cc b/milena/doc/examples/split/fill-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-2.cc rename to milena/doc/examples/split/fill-2.cc.raw diff --git a/milena/doc/examples/split/fill-3.cc b/milena/doc/examples/split/fill-3.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-3.cc rename to milena/doc/examples/split/fill-3.cc.raw diff --git a/milena/doc/examples/split/fill-call-1-1.cc b/milena/doc/examples/split/fill-call-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-call-1-1.cc rename to milena/doc/examples/split/fill-call-1-1.cc.raw diff --git a/milena/doc/examples/split/fill-call-1-2.cc b/milena/doc/examples/split/fill-call-1-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-call-1-2.cc rename to milena/doc/examples/split/fill-call-1-2.cc.raw diff --git a/milena/doc/examples/split/fill-call-1-3.cc b/milena/doc/examples/split/fill-call-1-3.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-call-1-3.cc rename to milena/doc/examples/split/fill-call-1-3.cc.raw diff --git a/milena/doc/examples/split/fill-part-image-1.cc b/milena/doc/examples/split/fill-part-image-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-part-image-1.cc rename to milena/doc/examples/split/fill-part-image-1.cc.raw diff --git a/milena/doc/examples/split/fill-part-image-2.cc b/milena/doc/examples/split/fill-part-image-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-part-image-2.cc rename to milena/doc/examples/split/fill-part-image-2.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-1.cc b/milena/doc/examples/split/fill-subdomain-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-1.cc rename to milena/doc/examples/split/fill-subdomain-1.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-2.cc b/milena/doc/examples/split/fill-subdomain-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-2.cc rename to milena/doc/examples/split/fill-subdomain-2.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-3.cc b/milena/doc/examples/split/fill-subdomain-3.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-3.cc rename to milena/doc/examples/split/fill-subdomain-3.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-4.cc b/milena/doc/examples/split/fill-subdomain-4.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-4.cc rename to milena/doc/examples/split/fill-subdomain-4.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-shorter-1.cc b/milena/doc/examples/split/fill-subdomain-shorter-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-shorter-1.cc rename to milena/doc/examples/split/fill-subdomain-shorter-1.cc.raw diff --git a/milena/doc/examples/split/fill-subdomain-shorter-2.cc b/milena/doc/examples/split/fill-subdomain-shorter-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subdomain-shorter-2.cc rename to milena/doc/examples/split/fill-subdomain-shorter-2.cc.raw diff --git a/milena/doc/examples/split/fill-subimage-cfun-1.cc b/milena/doc/examples/split/fill-subimage-cfun-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subimage-cfun-1.cc rename to milena/doc/examples/split/fill-subimage-cfun-1.cc.raw diff --git a/milena/doc/examples/split/fill-subimage-cfun-2.cc b/milena/doc/examples/split/fill-subimage-cfun-2.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subimage-cfun-2.cc rename to milena/doc/examples/split/fill-subimage-cfun-2.cc.raw diff --git a/milena/doc/examples/split/fill-subimage-cfun-3.cc b/milena/doc/examples/split/fill-subimage-cfun-3.cc.raw similarity index 100% rename from milena/doc/examples/split/fill-subimage-cfun-3.cc rename to milena/doc/examples/split/fill-subimage-cfun-3.cc.raw diff --git a/milena/doc/examples/split/forall-piter-1.cc b/milena/doc/examples/split/forall-piter-1.cc.raw similarity index 100% rename from milena/doc/examples/split/forall-piter-1.cc rename to milena/doc/examples/split/forall-piter-1.cc.raw diff --git a/milena/doc/examples/split/fun-p2v-1-1.cc b/milena/doc/examples/split/fun-p2v-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/fun-p2v-1-1.cc rename to milena/doc/examples/split/fun-p2v-1-1.cc.raw diff --git a/milena/doc/examples/split/graph-data-1.cc b/milena/doc/examples/split/graph-data-1.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-1.cc rename to milena/doc/examples/split/graph-data-1.cc.raw diff --git a/milena/doc/examples/split/graph-data-2.cc b/milena/doc/examples/split/graph-data-2.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-2.cc rename to milena/doc/examples/split/graph-data-2.cc.raw diff --git a/milena/doc/examples/split/graph-data-3.cc b/milena/doc/examples/split/graph-data-3.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-3.cc rename to milena/doc/examples/split/graph-data-3.cc.raw diff --git a/milena/doc/examples/split/graph-data-4.cc b/milena/doc/examples/split/graph-data-4.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-4.cc rename to milena/doc/examples/split/graph-data-4.cc.raw diff --git a/milena/doc/examples/split/graph-data-5.cc b/milena/doc/examples/split/graph-data-5.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-5.cc rename to milena/doc/examples/split/graph-data-5.cc.raw diff --git a/milena/doc/examples/split/graph-data-6.cc b/milena/doc/examples/split/graph-data-6.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-data-6.cc rename to milena/doc/examples/split/graph-data-6.cc.raw diff --git a/milena/doc/examples/split/graph-iter-1.cc b/milena/doc/examples/split/graph-iter-1.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-iter-1.cc rename to milena/doc/examples/split/graph-iter-1.cc.raw diff --git a/milena/doc/examples/split/graph-iter-2.cc b/milena/doc/examples/split/graph-iter-2.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-iter-2.cc rename to milena/doc/examples/split/graph-iter-2.cc.raw diff --git a/milena/doc/examples/split/graph-iter-3.cc b/milena/doc/examples/split/graph-iter-3.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-iter-3.cc rename to milena/doc/examples/split/graph-iter-3.cc.raw diff --git a/milena/doc/examples/split/graph-iter-4.cc b/milena/doc/examples/split/graph-iter-4.cc.raw similarity index 100% rename from milena/doc/examples/split/graph-iter-4.cc rename to milena/doc/examples/split/graph-iter-4.cc.raw diff --git a/milena/doc/examples/split/ima-has-1.cc b/milena/doc/examples/split/ima-has-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima-has-1.cc rename to milena/doc/examples/split/ima-has-1.cc.raw diff --git a/milena/doc/examples/split/ima-load-1.cc b/milena/doc/examples/split/ima-load-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima-load-1.cc rename to milena/doc/examples/split/ima-load-1.cc.raw diff --git a/milena/doc/examples/split/ima-save-1.cc b/milena/doc/examples/split/ima-save-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima-save-1.cc rename to milena/doc/examples/split/ima-save-1.cc.raw diff --git a/milena/doc/examples/split/ima-size-1.cc b/milena/doc/examples/split/ima-size-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima-size-1.cc rename to milena/doc/examples/split/ima-size-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-1-1.cc b/milena/doc/examples/split/ima2d-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-1-1.cc rename to milena/doc/examples/split/ima2d-1-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-2-1.cc b/milena/doc/examples/split/ima2d-2-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-2-1.cc rename to milena/doc/examples/split/ima2d-2-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-3-1.cc b/milena/doc/examples/split/ima2d-3-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-3-1.cc rename to milena/doc/examples/split/ima2d-3-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-4-1.cc b/milena/doc/examples/split/ima2d-4-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-4-1.cc rename to milena/doc/examples/split/ima2d-4-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-5-1.cc b/milena/doc/examples/split/ima2d-5-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-5-1.cc rename to milena/doc/examples/split/ima2d-5-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-6-clone-1.cc b/milena/doc/examples/split/ima2d-6-clone-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-6-clone-1.cc rename to milena/doc/examples/split/ima2d-6-clone-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-7-1.cc b/milena/doc/examples/split/ima2d-7-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-7-1.cc rename to milena/doc/examples/split/ima2d-7-1.cc.raw diff --git a/milena/doc/examples/split/ima2d-rot-1.cc b/milena/doc/examples/split/ima2d-rot-1.cc.raw similarity index 100% rename from milena/doc/examples/split/ima2d-rot-1.cc rename to milena/doc/examples/split/ima2d-rot-1.cc.raw diff --git a/milena/doc/examples/split/labeling-compute-1.cc b/milena/doc/examples/split/labeling-compute-1.cc.raw similarity index 100% rename from milena/doc/examples/split/labeling-compute-1.cc rename to milena/doc/examples/split/labeling-compute-1.cc.raw diff --git a/milena/doc/examples/split/labeling-compute-2.cc b/milena/doc/examples/split/labeling-compute-2.cc.raw similarity index 100% rename from milena/doc/examples/split/labeling-compute-2.cc rename to milena/doc/examples/split/labeling-compute-2.cc.raw diff --git a/milena/doc/examples/split/labeling-compute-3.cc b/milena/doc/examples/split/labeling-compute-3.cc.raw similarity index 100% rename from milena/doc/examples/split/labeling-compute-3.cc rename to milena/doc/examples/split/labeling-compute-3.cc.raw diff --git a/milena/doc/examples/split/labeling-compute-4.cc b/milena/doc/examples/split/labeling-compute-4.cc.raw similarity index 100% rename from milena/doc/examples/split/labeling-compute-4.cc rename to milena/doc/examples/split/labeling-compute-4.cc.raw diff --git a/milena/doc/examples/split/logical-not-1.cc b/milena/doc/examples/split/logical-not-1.cc.raw similarity index 100% rename from milena/doc/examples/split/logical-not-1.cc rename to milena/doc/examples/split/logical-not-1.cc.raw diff --git a/milena/doc/examples/split/logical-not-2.cc b/milena/doc/examples/split/logical-not-2.cc.raw similarity index 100% rename from milena/doc/examples/split/logical-not-2.cc rename to milena/doc/examples/split/logical-not-2.cc.raw diff --git a/milena/doc/examples/split/logical-not-3.cc b/milena/doc/examples/split/logical-not-3.cc.raw similarity index 100% rename from milena/doc/examples/split/logical-not-3.cc rename to milena/doc/examples/split/logical-not-3.cc.raw diff --git a/milena/doc/examples/split/mln_var-1.cc b/milena/doc/examples/split/mln_var-1.cc.raw similarity index 100% rename from milena/doc/examples/split/mln_var-1.cc rename to milena/doc/examples/split/mln_var-1.cc.raw diff --git a/milena/doc/examples/split/mln_var-2.cc b/milena/doc/examples/split/mln_var-2.cc.raw similarity index 100% rename from milena/doc/examples/split/mln_var-2.cc rename to milena/doc/examples/split/mln_var-2.cc.raw diff --git a/milena/doc/examples/split/mln_var-3.cc b/milena/doc/examples/split/mln_var-3.cc.raw similarity index 100% rename from milena/doc/examples/split/mln_var-3.cc rename to milena/doc/examples/split/mln_var-3.cc.raw diff --git a/milena/doc/examples/split/parray-append-1.cc b/milena/doc/examples/split/parray-append-1.cc.raw similarity index 100% rename from milena/doc/examples/split/parray-append-1.cc rename to milena/doc/examples/split/parray-append-1.cc.raw diff --git a/milena/doc/examples/split/parray-bbox-1.cc b/milena/doc/examples/split/parray-bbox-1.cc.raw similarity index 100% rename from milena/doc/examples/split/parray-bbox-1.cc rename to milena/doc/examples/split/parray-bbox-1.cc.raw diff --git a/milena/doc/examples/split/paste-1.cc b/milena/doc/examples/split/paste-1.cc.raw similarity index 100% rename from milena/doc/examples/split/paste-1.cc rename to milena/doc/examples/split/paste-1.cc.raw diff --git a/milena/doc/examples/split/paste-call-1-1.cc b/milena/doc/examples/split/paste-call-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/paste-call-1-1.cc rename to milena/doc/examples/split/paste-call-1-1.cc.raw diff --git a/milena/doc/examples/split/point-1-1.cc b/milena/doc/examples/split/point-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/point-1-1.cc rename to milena/doc/examples/split/point-1-1.cc.raw diff --git a/milena/doc/examples/split/predicate-1-1.cc b/milena/doc/examples/split/predicate-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/predicate-1-1.cc rename to milena/doc/examples/split/predicate-1-1.cc.raw diff --git a/milena/doc/examples/split/tuto2_first_image-1.cc b/milena/doc/examples/split/tuto2_first_image-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto2_first_image-1.cc rename to milena/doc/examples/split/tuto2_first_image-1.cc.raw diff --git a/milena/doc/examples/split/tuto2_first_image-2.cc b/milena/doc/examples/split/tuto2_first_image-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto2_first_image-2.cc rename to milena/doc/examples/split/tuto2_first_image-2.cc.raw diff --git a/milena/doc/examples/split/tuto2_first_image-3.cc b/milena/doc/examples/split/tuto2_first_image-3.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto2_first_image-3.cc rename to milena/doc/examples/split/tuto2_first_image-3.cc.raw diff --git a/milena/doc/examples/split/tuto2_first_image-4.cc b/milena/doc/examples/split/tuto2_first_image-4.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto2_first_image-4.cc rename to milena/doc/examples/split/tuto2_first_image-4.cc.raw diff --git a/milena/doc/examples/split/tuto3_colorize-1.cc b/milena/doc/examples/split/tuto3_colorize-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_colorize-1.cc rename to milena/doc/examples/split/tuto3_colorize-1.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-1.cc b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-1.cc rename to milena/doc/examples/split/tuto3_first_routine-1.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-2.cc b/milena/doc/examples/split/tuto3_first_routine-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-2.cc rename to milena/doc/examples/split/tuto3_first_routine-2.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-3.cc b/milena/doc/examples/split/tuto3_first_routine-3.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-3.cc rename to milena/doc/examples/split/tuto3_first_routine-3.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-4.cc b/milena/doc/examples/split/tuto3_first_routine-4.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-4.cc rename to milena/doc/examples/split/tuto3_first_routine-4.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-5.cc b/milena/doc/examples/split/tuto3_first_routine-5.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-5.cc rename to milena/doc/examples/split/tuto3_first_routine-5.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-6.cc b/milena/doc/examples/split/tuto3_first_routine-6.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-6.cc rename to milena/doc/examples/split/tuto3_first_routine-6.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-7.cc b/milena/doc/examples/split/tuto3_first_routine-7.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-7.cc rename to milena/doc/examples/split/tuto3_first_routine-7.cc.raw diff --git a/milena/doc/examples/split/tuto3_first_routine-8.cc b/milena/doc/examples/split/tuto3_first_routine-8.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_first_routine-8.cc rename to milena/doc/examples/split/tuto3_first_routine-8.cc.raw diff --git a/milena/doc/examples/split/tuto3_println-1.cc b/milena/doc/examples/split/tuto3_println-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_println-1.cc rename to milena/doc/examples/split/tuto3_println-1.cc.raw diff --git a/milena/doc/examples/split/tuto3_println-2.cc b/milena/doc/examples/split/tuto3_println-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_println-2.cc rename to milena/doc/examples/split/tuto3_println-2.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-1.cc b/milena/doc/examples/split/tuto3_rw_image-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-1.cc rename to milena/doc/examples/split/tuto3_rw_image-1.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-2.cc b/milena/doc/examples/split/tuto3_rw_image-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-2.cc rename to milena/doc/examples/split/tuto3_rw_image-2.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-3.cc b/milena/doc/examples/split/tuto3_rw_image-3.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-3.cc rename to milena/doc/examples/split/tuto3_rw_image-3.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-4.cc b/milena/doc/examples/split/tuto3_rw_image-4.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-4.cc rename to milena/doc/examples/split/tuto3_rw_image-4.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-5.cc b/milena/doc/examples/split/tuto3_rw_image-5.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-5.cc rename to milena/doc/examples/split/tuto3_rw_image-5.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-6.cc b/milena/doc/examples/split/tuto3_rw_image-6.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-6.cc rename to milena/doc/examples/split/tuto3_rw_image-6.cc.raw diff --git a/milena/doc/examples/split/tuto3_rw_image-7.cc b/milena/doc/examples/split/tuto3_rw_image-7.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_rw_image-7.cc rename to milena/doc/examples/split/tuto3_rw_image-7.cc.raw diff --git a/milena/doc/examples/split/tuto3_trace-1.cc b/milena/doc/examples/split/tuto3_trace-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_trace-1.cc rename to milena/doc/examples/split/tuto3_trace-1.cc.raw diff --git a/milena/doc/examples/split/tuto3_trace-2.cc b/milena/doc/examples/split/tuto3_trace-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto3_trace-2.cc rename to milena/doc/examples/split/tuto3_trace-2.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-1.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-1.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-1.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-10.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-10.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-10.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-11.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-12.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-2.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-2.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-2.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-3.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-3.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-3.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-6.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-6.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-6.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-7.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-7.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-7.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-8.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-8.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-8.cc.raw diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-9.cc b/milena/doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_genericity_and_algorithms-9.cc rename to milena/doc/examples/split/tuto4_genericity_and_algorithms-9.cc.raw diff --git a/milena/doc/examples/split/tuto4_point2d-1.cc b/milena/doc/examples/split/tuto4_point2d-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_point2d-1.cc rename to milena/doc/examples/split/tuto4_point2d-1.cc.raw diff --git a/milena/doc/examples/split/tuto4_site_set_create-1.cc b/milena/doc/examples/split/tuto4_site_set_create-1.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_site_set_create-1.cc rename to milena/doc/examples/split/tuto4_site_set_create-1.cc.raw diff --git a/milena/doc/examples/split/tuto4_site_set_create-2.cc b/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_site_set_create-2.cc rename to milena/doc/examples/split/tuto4_site_set_create-2.cc.raw diff --git a/milena/doc/examples/split/tuto4_site_set_create-3.cc b/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_site_set_create-3.cc rename to milena/doc/examples/split/tuto4_site_set_create-3.cc.raw diff --git a/milena/doc/examples/split/tuto4_site_set_create-4.cc b/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw similarity index 100% rename from milena/doc/examples/split/tuto4_site_set_create-4.cc rename to milena/doc/examples/split/tuto4_site_set_create-4.cc.raw diff --git a/milena/doc/examples/split/win-create-1-1.cc b/milena/doc/examples/split/win-create-1-1.cc.raw similarity index 100% rename from milena/doc/examples/split/win-create-1-1.cc rename to milena/doc/examples/split/win-create-1-1.cc.raw diff --git a/milena/doc/examples/split/win-create-2-1.cc b/milena/doc/examples/split/win-create-2-1.cc.raw similarity index 100% rename from milena/doc/examples/split/win-create-2-1.cc rename to milena/doc/examples/split/win-create-2-1.cc.raw diff --git a/milena/doc/generate_dist_files.sh b/milena/doc/generate_dist_files.sh index 9c77f20..6a6b711 100755 --- a/milena/doc/generate_dist_files.sh +++ b/milena/doc/generate_dist_files.sh @@ -11,16 +11,21 @@ ECHO_N=printf # Use the C locale to have a deterministic sort. export LC_ALL=C -for dir in figures outputs examples; do - OUT="$dir/$dir.mk" - echo "## Generated by ../generate_dist_files, do not modify." > $OUT - echo >>$OUT - $ECHO_N "EXTRA_DIST += " >> $OUT - for ftype in cc.raw p*m txt; do - for file in `find $dir -mindepth 1 -name *.$ftype | sort`; do - echo " \\" >> $OUT - $ECHO_N $file >> $OUT - done +if [ $# -ne 2 ]; then + echo "Usage: $0 <path to scan> <filename filter>" 1>&2 + exit 1 +fi + +OUT="$1/$1.mk" +echo "## Generated by ../generate_dist_files, do not modify." > $OUT +echo >>$OUT + +$ECHO_N "EXTRA_DIST += " >> $OUT +for ftype in $2; do + for file in `find $1 -name *.$ftype | sort`; do + echo " \\" >> $OUT + $ECHO_N $file >> $OUT done - echo "" >> $OUT done + +echo "" >> $OUT diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index 543265f..4079fdd 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -35,7 +35,7 @@ ref-guide: ref-guide-html ref-guide-pdf REF_GUIDE_HH = ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) # FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(REF_GUIDE_HH): +$(REF_GUIDE_HH): $(FIGURES_BUILDDIR) $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/ref_guide.tex $(DOC_BUILDDIR)/ref_guide $(DOC_SRCDIR) @@ -43,7 +43,7 @@ $(REF_GUIDE_HH): REF_GUIDE_PDF = ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) # FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(REF_GUIDE_PDF): +$(REF_GUIDE_PDF): $(FIGURES_BUILDDIR) TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex index a9b91da..3bfb50e 100644 --- a/milena/doc/ref_guide/ref_guide.tex +++ b/milena/doc/ref_guide/ref_guide.tex @@ -856,7 +856,7 @@ Output: %================================================ %\doxysection{imaconvvals}{Conversion of image values} -%FIXME: Parler de level::compute/level::apply. +%FIXME: Parler de data::compute/data::apply. % Parler de i2v et v2v. % Voir les vset => attendre que ca soit ameliore? @@ -1410,7 +1410,7 @@ elements it computes. labeling::compute() & compute an accumulator for each component in a labeled image. \\ -level::compute() & compute an accumulator on the values of an image. \\ +data::compute() & compute an accumulator on the values of an image. \\ \end{tabular} \doxysubsection{accu}{Accumulators} diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index bc651c6..dd97040 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -1,4 +1,3 @@ - # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -34,7 +33,7 @@ tutorial: tutorial-html tutorial-pdf TUTORIAL_HH = tutorial.hh tutorial-html: $(TUTORIAL_HH) # FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR). -$(TUTORIAL_HH): +$(TUTORIAL_HH): $(FIGURES_BUILDDIR) $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/tutorial.tex $(DOC_BUILDDIR)/tutorial $(DOC_SRCDIR) diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index aac5d52..168160f 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -389,7 +389,7 @@ List of \hpath{mln}'s subdirectories: \item \dir{topo} --- Complex related structures. \item \dir{trace} --- Debug trace mechanism. \item \dir{trait} --- Internal traits mechanism. - \item \dir{transform} --- Algorithms based on the level::transform. + \item \dir{transform} --- Algorithms based on the data::transform. \item \dir{util} --- Various utilitarian classes. \item \dir{value} --- Set of value types which can be used in an image. \item \dir{win} --- Set of various window kinds. -- 1.5.6.5

1 0

[PATCH 3/3] Install the documentation and the images.
by Roland Levillain 24 Jun '09

24 Jun '09

* Makefile.am (imgdir): New variable. (EXTRA_DIST): Move img/README, img/fly.pbm, img/fly.pgm, img/fly.ppm, img/lena.pbm, img/lena.pgm, img/lena.ppm, img/lena_16.ppm, img/medium.pgm, img/medium.ppm, img/picasso.pbm, img/picasso.pgm, img/quite-small.pgm, img/small.pbm, img/small.pgm, img/small.ppm, img/squares-lc.pgm, img/squares.pgm, img/test.fits, img/tiny.pbm, img/tiny.pgm, img/tiny.ppm and img/toto.pbm... (dist_img_DATA): ...here (new variable). * doc/Makefile.am (EXTRA_DIST): Move $(USER_REFMAN_HTML) and $(USER_REFMAN_PDF)... (dist_doc_DATA): ...here (new variable). * doc/ref_guide/Makefile.am (EXTRA_DIST): Move $(REF_GUIDE_PDF)... (dist_doc_DATA): ...here (new variable). * doc/tutorial/Makefile.am (EXTRA_DIST): Move $(TUTORIAL_PDF)... (dist_doc_DATA): ...here (new variable). * doc/white_paper/Makefile.am (EXTRA_DIST): Move $(WHITE_PAPER_HTML) and $(WHITE_PAPER_PDF)... (dist_doc_DATA): ...here (new variable). (clean-local): Replace target by... (CLEANFILES): ...this variable. --- milena/ChangeLog | 26 ++++++++++++++++++++++++++ milena/Makefile.am | 3 ++- milena/doc/Makefile.am | 6 ++++-- milena/doc/ref_guide/Makefile.am | 12 ++++++------ milena/doc/tutorial/Makefile.am | 11 ++++++----- milena/doc/white_paper/Makefile.am | 19 +++++++++++-------- 6 files changed, 55 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b9501d7..9f6fb97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> + Install the documentation and the images. + + * Makefile.am (imgdir): New variable. + (EXTRA_DIST): Move img/README, img/fly.pbm, img/fly.pgm, + img/fly.ppm, img/lena.pbm, img/lena.pgm, img/lena.ppm, + img/lena_16.ppm, img/medium.pgm, img/medium.ppm, img/picasso.pbm, + img/picasso.pgm, img/quite-small.pgm, img/small.pbm, + img/small.pgm, img/small.ppm, img/squares-lc.pgm, img/squares.pgm, + img/test.fits, img/tiny.pbm, img/tiny.pgm, img/tiny.ppm and + img/toto.pbm... + (dist_img_DATA): ...here (new variable). + * doc/Makefile.am (EXTRA_DIST): Move $(USER_REFMAN_HTML) and + $(USER_REFMAN_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/ref_guide/Makefile.am (EXTRA_DIST): Move $(REF_GUIDE_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/tutorial/Makefile.am (EXTRA_DIST): Move $(TUTORIAL_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/white_paper/Makefile.am (EXTRA_DIST): Move + $(WHITE_PAPER_HTML) and $(WHITE_PAPER_PDF)... + (dist_doc_DATA): ...here (new variable). + (clean-local): Replace target by... + (CLEANFILES): ...this variable. + +2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> + Distribute Doxyfiles. * doc/Makefile.am (EXTRA_DIST): Add Doxyfile_user, diff --git a/milena/Makefile.am b/milena/Makefile.am index 5e06f1b..f08e193 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -85,7 +85,8 @@ include $(srcdir)/headers.mk # Generated by configure from mln/version.hh.in. nobase_include_HEADERS += mln/version.hh -EXTRA_DIST += \ +imgdir = $(pkgdatadir)/images +dist_img_DATA = \ img/README \ img/fly.pbm \ img/fly.pgm \ diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8b396fd..1a73c35 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -191,6 +191,10 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk +dist_doc_DATA = \ + $(USER_REFMAN_HTML) \ + $(USER_REFMAN_PDF) + EXTRA_DIST += \ Doxyfile.in \ Doxyfile_user \ @@ -201,8 +205,6 @@ EXTRA_DIST += \ tools/clearbanner.sh \ tools/sample_utils.hh \ tools/split_sample.sh \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) \ tools/todoxygen.sh CLEANFILES = \ diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index e77300a..543265f 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -49,6 +49,12 @@ $(REF_GUIDE_PDF): TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex +dist_doc_DATA = $(REF_GUIDE_PDF) + +EXTRA_DIST = \ + ref_guide.tex \ + $(REF_GUIDE_HH) + CLEANFILES = \ ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out \ *~ *blg *.lot \ @@ -56,9 +62,3 @@ CLEANFILES = \ *.haux *.hh *.html *.htoc \ ref_guide.html \ $(REF_GUIDE_HH) - - -EXTRA_DIST = \ - ref_guide.tex \ - $(REF_GUIDE_HH) \ - $(REF_GUIDE_PDF) diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 8c81afe..bc651c6 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -47,6 +47,12 @@ $(TUTORIAL_PDF): $(FIGURES_BUILDDIR) TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex +dist_doc_DATA = $(TUTORIAL_PDF) + +EXTRA_DIST = \ + tutorial.tex \ + $(TUTORIAL_HH) + CLEANFILES = \ tutorial.aux tutorial.toc tutorial.log tutorial.bbl tutorial.out \ *~ *blg *.lot \ @@ -55,8 +61,3 @@ CLEANFILES = \ tutorial.haux \ tutorial.html \ $(TUTORIAL_HH) - -EXTRA_DIST = \ - tutorial.tex \ - $(TUTORIAL_HH) \ - $(TUTORIAL_PDF) diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index ab542a8..6d5d512 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -53,16 +53,19 @@ $(WHITE_PAPER_PDF): TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex -clean-local: - rm -Rf white_paper_html - rm -f white_paper_image.* - rm -f white_paper.pdf - rm -f *.log *.idx *.out *.aux - rm -Rf figures + +dist_doc_DATA = \ + $(WHITE_PAPER_HTML) \ + $(WHITE_PAPER_PDF) EXTRA_DIST = \ white_paper.tex \ - $(WHITE_PAPER_HTML) \ - $(WHITE_PAPER_PDF) \ $(PNGS) \ $(EPSS) + +CLEANFILES = \ + white_paper_html \ + white_paper_image.* \ + white_paper.pdf \ + *.log *.idx *.out *.aux \ + figures -- 1.6.2.4

1 0

[PATCH 2/3] Distribute Doxyfiles.
by Roland Levillain 24 Jun '09

24 Jun '09

* doc/Makefile.am (EXTRA_DIST): Add Doxyfile_user, Doxyfile_user_pdf, doxyfuns.sty and milena.sty. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f17b700..b9501d7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> + Distribute Doxyfiles. + + * doc/Makefile.am (EXTRA_DIST): Add Doxyfile_user, + Doxyfile_user_pdf, doxyfuns.sty and milena.sty. + +2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> + * doc/Makefile.am (Doxyfile_devel_pdf): Typo in dependency name. 2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e193619..8b396fd 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -191,14 +191,18 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk -EXTRA_DIST += \ - Doxyfile.in \ - groups \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) \ - tools/clearbanner.sh \ - tools/sample_utils.hh \ - tools/split_sample.sh \ +EXTRA_DIST += \ + Doxyfile.in \ + Doxyfile_user \ + Doxyfile_user_pdf \ + groups \ + doxyfuns.sty \ + milena.sty \ + tools/clearbanner.sh \ + tools/sample_utils.hh \ + tools/split_sample.sh \ + $(USER_REFMAN_HTML) \ + $(USER_REFMAN_PDF) \ tools/todoxygen.sh CLEANFILES = \ -- 1.6.2.4

1 0

[PATCH 1/3] doc/Makefile.am (Doxyfile_devel_pdf): Typo in dependency name.
by Roland Levillain 24 Jun '09

24 Jun '09

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1360c66..f17b700 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-24 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/Makefile.am (Doxyfile_devel_pdf): Typo in dependency name. + 2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> * nodist-headers: sort using the right local. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5c9a626..e193619 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -221,5 +221,5 @@ Doxyfile_devel: $(srcdir)/Doxyfile.in Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ -Doxyfile_devel_pdf: $Doxyfile_devel +Doxyfile_devel_pdf: Doxyfile_devel $(edit_pdf) $< >$@ -- 1.6.2.4

1 0

4186: nodist-headers: sort using the right local.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

--- milena/ChangeLog | 4 ++++ milena/nodist-headers | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 787b8fc..1360c66 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * nodist-headers: sort using the right local. + +2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add accu::count_value. * mln/accu/count_value.hh: new. diff --git a/milena/nodist-headers b/milena/nodist-headers index ceba967..985b49f 100644 --- a/milena/nodist-headers +++ b/milena/nodist-headers @@ -16,14 +16,14 @@ mln/fun/access/mean.hh mln/fun/accu_result.hh mln/fun/binary.hh mln/fun/binary_param.hh -mln/fun/component/red.hh +mln/fun/component/blue.hh +mln/fun/component/comp.hh mln/fun/component/comp_count.hh -mln/fun/component/scomp.hh mln/fun/component/green.hh -mln/fun/component/comp.hh -mln/fun/component/blue.hh -mln/fun/component/rgb.hh mln/fun/component/ithcomp.hh +mln/fun/component/red.hh +mln/fun/component/rgb.hh +mln/fun/component/scomp.hh mln/fun/compose.hh mln/fun/composition.hh mln/fun/from_accu.hh -- 1.5.6.5

1 0

4185: Add accu::count_value.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

* mln/accu/count_value.hh: new. --- milena/ChangeLog | 6 + milena/mln/accu/count_value.hh | 204 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+), 0 deletions(-) create mode 100644 milena/mln/accu/count_value.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 289810b..787b8fc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add accu::count_value. + + * mln/accu/count_value.hh: new. + +2009-06-23 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix compilation warnings. * mln/core/image/vmorph/fun_image.hh: move inline keyword before diff --git a/milena/mln/accu/count_value.hh b/milena/mln/accu/count_value.hh new file mode 100644 index 0000000..12562e1 --- /dev/null +++ b/milena/mln/accu/count_value.hh @@ -0,0 +1,204 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_ACCU_COUNT_VALUE_HH +# define MLN_ACCU_COUNT_VALUE_HH + +/// \file +/// +/// Define an accumulator that counts the number of different value. + +# include <mln/accu/internal/base.hh> +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/metal/is_a.hh> + +namespace mln +{ + + namespace accu + { + + /// \brief Count a given value. + /// + /// \ingroup modaccuvalues + // + template <typename V> + struct count_value + : public mln::accu::internal::base< unsigned , count_value<V> > + { + typedef V argument; + + count_value(); + explicit count_value(const V& ref); + + /// Manipulators. + /// \{ + void init(); + void take(const argument&); + void take(const count_value<V>& other); + void untake(const argument&); + void untake(const count_value<V>& other); + + /// Force the value of the counter to \a c. + void set_value(unsigned c); + /// \} + + /// Get the value of the accumulator. + unsigned to_result() const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + /// The value of the counter. + unsigned count_; + /// The value which must be counted. + V ref_; + + /// Set to false if the reference value is not set. + bool valid_; + }; + + + namespace meta + { + + /// FIXME: How to write a meta accumulator with a constructor taking + /// a generic argument? + /// Meta accumulator for count_value. + struct count_value : public Meta_Accumulator< count_value > + { + + template <typename V> + struct with + { + typedef accu::count_value<V> ret; + }; + + }; + + } // end of namespace mln::accu::meta + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + inline + count_value<V>::count_value() + { + init(); + valid_ = false; + } + + template <typename V> + inline + count_value<V>::count_value(const V& ref) + { + ref_ = ref; + valid_ = true; + init(); + } + + template <typename V> + inline + void + count_value<V>::init() + { + count_ = 0; + } + + template <typename V> + inline + void + count_value<V>::take(const argument& l) + { + if (l == ref_) + ++count_; + } + + template <typename V> + inline + void + count_value<V>::take(const count_value<V>& other) + { + mln_precondition(other.is_valid()); + mln_precondition(other.ref_ == ref_); + count_ += other.count_; + } + + template <typename V> + inline + void + count_value<V>::untake(const argument& l) + { + if (l == ref_) + --count_; + } + + template <typename V> + inline + void + count_value<V>::untake(const count_value<V>& other) + { + mln_precondition(other.is_valid()); + mln_precondition(other.ref_ == ref_); + count_ -= other.count_; + } + + template <typename V> + inline + unsigned + count_value<V>::to_result() const + { + // The background label MUST not be counted. + return count_; + } + + template <typename V> + inline + void + count_value<V>::set_value(unsigned c) + { + count_ = c; + } + + template <typename V> + inline + bool + count_value<V>::is_valid() const + { + return valid_; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_COUNT_VALUE_HH -- 1.5.6.5

1 0

4184: Improve Scribo demo.
by Guillaume Lazzara 23 Jun '09

23 Jun '09

* demo/src/mainwindow.cc, * demo/src/mainwindow.hh, * demo/ui/mainwindow.ui: add new functionalities. - Auto-demo. - Display ppm pictures instead of pbm ones. --- scribo/ChangeLog | 10 ++ scribo/demo/src/mainwindow.cc | 286 +++++++++++++++++++++++++++++++---- scribo/demo/src/mainwindow.hh | 42 +++++- scribo/demo/ui/mainwindow.ui | 333 ++++++++++++++++++++++++++++++++--------- 4 files changed, 564 insertions(+), 107 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 39c6c72..2b85769 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve Scribo demo. + + * demo/src/mainwindow.cc, + * demo/src/mainwindow.hh, + * demo/ui/mainwindow.ui: add new functionalities. + - Auto-demo. + - Display ppm pictures instead of pbm ones. + +2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Update Scribo. * extract/lines_discontinued.hh: remove. Useless. diff --git a/scribo/demo/src/mainwindow.cc b/scribo/demo/src/mainwindow.cc index 28e120e..1bfaec9 100644 --- a/scribo/demo/src/mainwindow.cc +++ b/scribo/demo/src/mainwindow.cc @@ -34,15 +34,15 @@ const char * modes[][4] = { - { "Text in pictures", "pics", "text_in_photo", "image-x-generic.png" }, + { "Text in pictures", "pics", "../src/text_in_photo", "image-x-generic.png" }, { (const char *)(1), 0, 0, 0}, // Separator - { "Handwritten text lines", "hsc", "input_to_lines", "text-x-generic.png" }, - { "Handwritten text words", "hsc", "input_to_words", "text-x-generic.png" }, + { "Handwritten text lines", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_lines", "text-x-generic.png" }, + { "Handwritten text words", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_words", "text-x-generic.png" }, { (const char *)(1), 0, 0, 0}, // Separator - { "Horizontal and Vertical Lines", "hvl", "extract/primitive/find_discontinued_lines", "list-add.png" }, - { "Tables", "tables", "table/extract", "x-office-spreadsheet.png" }, - { "Pre-processing", "pproc", "preprocess", "format-indent-more.png" }, - { "OCR", "ocr", "recognition", "edit-find.png" }, + { "Horizontal and Vertical Lines", "hvl", "../src/extract/primitive/find_discontinued_lines", "list-add.png" }, + { "Tables", "hvl", "../src/table/extract", "x-office-spreadsheet.png" }, + { "Pre-processing", "pproc", "../src/preprocess", "format-indent-more.png" }, + { "OCR", "ocr", "../src/recognition", "edit-find.png" }, { 0, 0, 0 } // Empty line, do NOT delete. }; @@ -63,7 +63,7 @@ const char *args_list[][3] = { { "/dev/null", 0, 0 }, // Handwritten text lines { "/dev/null", 0, 0 }, // Handwritten text words { (const char *)(1), 0, 0}, // Separator - { "51", "6", 0 }, // Horizontal and Vertical lines + { "51", 0, 0 }, // Horizontal and Vertical lines { "/dev/null", 0, 0 }, // Tables { 0, 0, 0 }, // Pre-processing { 0, 0, 0 }, // OCR @@ -83,14 +83,22 @@ namespace scribo { setupUi(this); - mainItem_ = 0; - exec_prefix_ = "../src/"; + unsigned nmodes = 0; + for (unsigned i = 0; modes[i][0] != 0; ++i) + ++nmodes; + + cached_result_.resize(nmodes); + mainRefItem_ = 0; + mainResultItem_ = 0; + exec_prefix_ = ""; base_img_dir_ = QCoreApplication::applicationDirPath(); pdialog_.setRange(0,0); pdialog_.setLabelText(tr("Please wait while computing...")); pdialog_.setWindowModality(Qt::WindowModal); + qDebug() << "Cache located in " << QDir::tempPath(); + connect(&pdialog_, SIGNAL(canceled()), this, SLOT(compute_canceled())); connect(&exec_, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(exec_finished(int, QProcess::ExitStatus))); @@ -100,12 +108,36 @@ namespace scribo connect(&context_, SIGNAL(triggered(QAction *)), this, SLOT(context_changed(QAction *))); + connect(imageResult->verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(move_vertical_sliders(int))); + connect(imageResult->horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(move_horizontal_sliders(int))); + connect(imageRef->verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(move_vertical_sliders(int))); + connect(imageRef->horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(move_horizontal_sliders(int))); + connect(&timer_, SIGNAL(timeout()), this, SLOT(timer_timeout())); + context_.setExclusive(true); + // No status bar. + setStatusBar(0); + initToolBar(); setup_scene(); } + MainWindow::~MainWindow() + { + for (int i = 0; i < cached_result_.size(); ++i) + foreach(QString value, cached_result_[i]) + { + QFile f(value); + f.remove(); + } + } + + void MainWindow::set_base_img_dir(const QString& dir) { QDir d(dir); @@ -130,6 +162,7 @@ namespace scribo context_.addAction(action); action->setCheckable(true); action->setData(i); + action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0 + i)); if (modes[i][3] != 0) action->setIcon(QIcon(QString(":/icons/") + modes[i][3])); @@ -143,7 +176,7 @@ namespace scribo void MainWindow::on_browseBtn_clicked(bool) { - QString current_dir = modes[mode_][1] + QString("/"); + QString current_dir = current_mode() + "/"; QString filename = QFileDialog::getOpenFileName(this, @@ -151,30 +184,61 @@ namespace scribo base_img_dir_ + "/" + current_dir, tr("Images (*.pbm *.pgm *.ppm)")); + prepare_for_run(filename); + } + + void MainWindow::prepare_for_run(const QString& filename) + { if (!filename.isEmpty()) { filepath->setText(filename); - update_pixmap(filepath->text()); + + update_pixmap(imageRef, filename); + update_pixmap(imageResult); + + if (autoRun->isChecked()) + on_runBtn_clicked(); } } - - void MainWindow::on_runBtn_clicked(bool) + void MainWindow::on_runBtn_clicked() { + if (useCache->isChecked() && cached_result_[mode_].contains(filepath->text())) + { + last_output_ = cached_result_[mode_][filepath->text()]; + exec_finished(0, QProcess::NormalExit); + return; + } + wait_for_result(); QStringList args; - args << filepath->text(); + + QString input = filepath->text(); + + // Loading ppm file + if (current_mode() == "pics") + { + QFileInfo f(input); + QDir dir = f.absoluteDir(); + dir.cd("../pics_pbm"); + + QFileInfo pbm_file(dir.path() + "/" + f.completeBaseName() + ".pbm"); + if (pbm_file.exists()) + input = pbm_file.absoluteFilePath(); + } + + args << input; for (unsigned i = 0; args_list[mode_][i]; ++i) args << args_list[mode_][i]; - if (!is_in_ocr_mode()) - { +// if (!is_in_ocr_mode()) +// { QTemporaryFile f; f.open(); args << f.fileName(); last_output_ = f.fileName(); - } +// } exec_.start(exec_prefix_ + modes[mode_][2], args); } @@ -182,7 +246,7 @@ namespace scribo void MainWindow::on_displayBtn_clicked(bool) { - update_pixmap(filepath->text()); + update_pixmap(imageRef, filepath->text()); } @@ -195,8 +259,36 @@ namespace scribo } - void MainWindow::update_pixmap(const QString& name) + void MainWindow::on_zoomIn_clicked() + { + imageResult->scale(1.2, 1.2); + imageRef->scale(1.2, 1.2); + } + + void MainWindow::on_zoomOut_clicked() + { + imageResult->scale(1 / 1.2, 1 / 1.2); + imageRef->scale(1 / 1.2, 1 / 1.2); + } + + QGraphicsItem *& MainWindow::view_to_item(QGraphicsView *view) + { + if (view == imageResult) + return mainResultItem_; + else + return mainRefItem_; + } + + void MainWindow::update_pixmap(QGraphicsView* view, const QString& name) { + if (name.isEmpty()) + { + update_status_message(""); + return; + } + + QGraphicsItem* item = view_to_item(view); + QPixmap pixmap; if (!pixmap.load(name)) { @@ -205,35 +297,67 @@ namespace scribo return; } - imageResult->scene()->removeItem(mainItem_); - mainItem_ = imageResult->scene()->addPixmap(pixmap); - imageResult->scene()->setSceneRect(mainItem_->boundingRect()); - Q_ASSERT(mainItem_ != 0); + QFileInfo finfo(name); + if (item != mainResultItem_ && current_mode() != "hsc" + && current_mode() != "pproc" + && (current_mode() != "pics" || finfo.suffix() == "pbm")) + { + QImage image(pixmap.toImage()); + image.invertPixels(); + pixmap = QPixmap::fromImage(image); + } + + if (item != 0) + { + view->scene()->removeItem(item); + delete item; + } + item = view->scene()->addPixmap(pixmap); + view->scene()->setSceneRect(item->boundingRect()); + Q_ASSERT(item != 0); + view->fitInView(item->boundingRect(), Qt::KeepAspectRatio); + view_to_item(view) = item; + + bool b = (mainResultItem_ != 0 || mainRefItem_ != 0); + zoomLabel->setEnabled(b); + zoomIn->setEnabled(b); + zoomOut->setEnabled(b); + zoomFixed->setEnabled(b); + zoomOriginal->setEnabled(b); } void MainWindow::exec_finished(int rvalue, QProcess::ExitStatus status) { pdialog_.hide(); - qDebug() << rvalue; if (rvalue == 0) { if (status != QProcess::CrashExit) { + if (useCache->isChecked()) + cached_result_[mode_][filepath->text()] = last_output_; + setEnabled(true); if (is_in_ocr_mode()) { - textBrowser->setText(exec_.readAllStandardOutput()); + QFile f(last_output_); + f.open(QIODevice::ReadOnly); + textBrowser->setText(QString::fromUtf8(f.readAll().data())); +// textBrowser->setText(exec_.readAllStandardOutput()); on_displayBtn_clicked(true); tabWidget->setCurrentIndex(1); } else - update_pixmap(last_output_); + update_pixmap(imageResult, last_output_); } // Else : canceled. } else exec_error(tr("Error during last run.")); + + imageResult->setFocus(); + if (autoDemo->isChecked()) + timer_.start(timeoutDelay->text().toInt() * 1000); } @@ -242,10 +366,14 @@ namespace scribo QGraphicsScene *scene = new QGraphicsScene(); imageResult->setScene(scene); + scene = new QGraphicsScene(); + imageRef->setScene(scene); + update_status_message(tr("1) Choose an algorithm.\n\ 2) Select an image.\n3) Run.")); imageResult->show(); + imageRef->show(); } @@ -255,15 +383,18 @@ namespace scribo setEnabled(false); if (!is_in_ocr_mode()) - update_status_message(tr("Please wait while computing...")); + update_status_message(""); } void MainWindow::update_status_message(const QString& msg) { - if (mainItem_ != 0) - imageResult->scene()->removeItem(mainItem_); - mainItem_ = imageResult->scene()->addText(msg); + if (mainResultItem_ != 0) + { + imageResult->scene()->removeItem(mainResultItem_); + delete mainResultItem_; + } + mainResultItem_ = imageResult->scene()->addText(msg); } @@ -283,7 +414,8 @@ namespace scribo exec_error(tr("This program does not exist: ") + exec_prefix_ + modes[mode_][2]); else - qDebug() << "The computation stopped."; + exec_error(tr("The computation stopped.") + + exec_prefix_ + modes[mode_][2]); } @@ -305,7 +437,95 @@ namespace scribo bool MainWindow::is_in_ocr_mode() { - return (QString(modes[mode_][1]) == "ocr"); + return current_mode() == "ocr"; + } + + + void MainWindow::resize_pixmaps(const QRectF& rect) + { + if (mainRefItem_ != 0) + imageRef->fitInView(rect, Qt::KeepAspectRatio); + if (mainResultItem_ != 0) + imageResult->fitInView(rect, Qt::KeepAspectRatio); + } + + void MainWindow::move_vertical_sliders(int value) + { + imageRef->verticalScrollBar()->setValue(value); + imageResult->verticalScrollBar()->setValue(value); + } + + void MainWindow::move_horizontal_sliders(int value) + { + imageRef->horizontalScrollBar()->setValue(value); + imageResult->horizontalScrollBar()->setValue(value); + } + + + void MainWindow::on_zoomFixed_clicked() + { + resize_pixmaps(mainRefItem_->boundingRect()); + } + + void MainWindow::on_zoomOriginal_clicked() + { + resize_pixmaps(imageResult->viewport()->geometry()); + } + + void MainWindow::on_autoDemo_clicked(bool checked) + { + if (checked) + timer_.start(100); + else + timer_.stop(); + } + + void MainWindow::resizeEvent(QResizeEvent * event) + { + if (mainRefItem_ != 0) + resize_pixmaps(mainRefItem_->boundingRect()); + event->ignore(); + } + + void MainWindow::keyPressEvent(QKeyEvent *event) + { + if (event->text() == QString("+")) + { + on_zoomIn_clicked(); + event->accept(); + } + else if (event->text() == QString("-")) + { + on_zoomOut_clicked(); + event->accept(); + } + else + event->ignore(); + } + + QString MainWindow::current_mode() const + { + return modes[mode_][1]; + } + + void MainWindow::timer_timeout() + { + update_auto_demo_dir(); + timer_.stop(); + prepare_for_run(demoDir_.absolutePath() + "/" + + demo_files_[demo_index_]); + demo_index_ = (demo_index_ + 1) % demo_files_.size(); + } + + void MainWindow::update_auto_demo_dir() + { + QString tmp_path = base_img_dir_ + "/" + current_mode(); + if (demoDir_.path() != tmp_path) + { + demoDir_.setPath(tmp_path); + demo_index_ = 0; + demo_files_ = demoDir_.entryList(QDir::NoDotAndDotDot | QDir::Files); + } } } // end of namespace scribo::demo diff --git a/scribo/demo/src/mainwindow.hh b/scribo/demo/src/mainwindow.hh index 25b7667..3641658 100644 --- a/scribo/demo/src/mainwindow.hh +++ b/scribo/demo/src/mainwindow.hh @@ -25,6 +25,8 @@ #ifndef SCRIBO_APPS_DEMO_SRC_MAINWINDOW_HH +# include <QDir> +# include <QTimer> # include <QStringList> # include <QProcess> # include <QtGui/QWidget> @@ -44,6 +46,7 @@ namespace scribo public: MainWindow(QWidget *parent = 0); + ~MainWindow(); void set_base_img_dir(const QString& dir); @@ -51,9 +54,14 @@ namespace scribo void initToolBar(); void on_browseBtn_clicked(bool b); - void on_runBtn_clicked(bool b); + void on_runBtn_clicked(); void on_displayBtn_clicked(bool b); void on_filepath_textChanged(); + void on_zoomIn_clicked(); + void on_zoomOut_clicked(); + void on_zoomFixed_clicked(); + void on_zoomOriginal_clicked(); + void on_autoDemo_clicked(bool checked); void exec_finished(int rvalue, QProcess::ExitStatus status); void exec_error(QProcess::ProcessError error); @@ -62,9 +70,15 @@ namespace scribo void compute_canceled(); + void resize_pixmaps(const QRectF& rect); + + void move_vertical_sliders(int value); + void move_horizontal_sliders(int value); + void timer_timeout(); + private: // Members void setup_scene(); - void update_pixmap(const QString& name); + void update_pixmap(QGraphicsView* view, const QString& name = QString()); void exec_error(const QString& msg); @@ -72,10 +86,22 @@ namespace scribo void update_status_message(const QString& msg); - bool is_in_ocr_mode(); + void prepare_for_run(const QString& filename); + + bool is_in_ocr_mode(); + + QGraphicsItem *& view_to_item(QGraphicsView *view); + + void resizeEvent(QResizeEvent * event); + void keyPressEvent(QKeyEvent *event); + + QString current_mode() const; + + void update_auto_demo_dir(); private: // Attributes - QGraphicsItem *mainItem_; + QGraphicsItem *mainRefItem_; + QGraphicsItem *mainResultItem_; QString exec_prefix_; QActionGroup context_; @@ -86,6 +112,14 @@ namespace scribo QProgressDialog pdialog_; QString base_img_dir_; + + QVector<QHash<QString, QString> > cached_result_; + + /// Related to auto demo. + QTimer timer_; + QDir demoDir_; + unsigned demo_index_; + QStringList demo_files_; }; diff --git a/scribo/demo/ui/mainwindow.ui b/scribo/demo/ui/mainwindow.ui index 9a237be..cb85804 100644 --- a/scribo/demo/ui/mainwindow.ui +++ b/scribo/demo/ui/mainwindow.ui @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="geometry" > + <widget class="QMainWindow" name="MainWindow"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,122 +10,314 @@ <height>459</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Scribo Demo - v0.1</string> </property> - <property name="dockOptions" > + <property name="dockOptions"> <set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks</set> </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QVBoxLayout" name="verticalLayout_2" > + <property name="unifiedTitleAndToolBarOnMac"> + <bool>false</bool> + </property> + <widget class="QWidget" name="centralwidget"> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <property name="margin"> + <number>0</number> + </property> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="margin"> + <number>5</number> + </property> <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" colspan="4" > - <widget class="QLabel" name="description" > - <property name="text" > - <string>Write description here.</string> - </property> - </widget> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLineEdit" name="filepath"/> </item> - <item row="1" column="0" > - <widget class="QLineEdit" name="filepath" /> - </item> - <item row="1" column="1" > - <widget class="QPushButton" name="browseBtn" > - <property name="text" > + <item row="0" column="1"> + <widget class="QPushButton" name="browseBtn"> + <property name="text"> <string>&Browse</string> </property> - <property name="icon" > - <iconset resource="../demo.qrc" > + <property name="icon"> + <iconset resource="../demo.qrc"> <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset> </property> + <property name="shortcut"> + <string>Ctrl+B</string> + </property> </widget> </item> - <item row="1" column="2" > - <widget class="QPushButton" name="displayBtn" > - <property name="enabled" > + <item row="0" column="2"> + <widget class="QPushButton" name="displayBtn"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > - <string>Display</string> + <property name="text"> + <string>Refresh</string> </property> - <property name="icon" > - <iconset resource="../demo.qrc" > + <property name="icon"> + <iconset resource="../demo.qrc"> <normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="runBtn" > - <property name="enabled" > + <item row="0" column="3"> + <widget class="QPushButton" name="runBtn"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Run</string> </property> - <property name="icon" > - <iconset resource="../demo.qrc" > + <property name="icon"> + <iconset resource="../demo.qrc"> <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset> </property> </widget> </item> + <item row="0" column="4"> + <widget class="QCheckBox" name="autoRun"> + <property name="text"> + <string>Auto Run</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="5"> + <widget class="QCheckBox" name="useCache"> + <property name="text"> + <string>Enable cache</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </item> <item> - <widget class="QTabWidget" name="tabWidget" > - <property name="currentIndex" > + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="spacing"> + <number>-1</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>Image</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="zoomLabel"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Zoom:</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="zoomIn"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>+</string> + </property> + </widget> + </item> <item> - <widget class="QGraphicsView" name="imageResult" /> + <widget class="QPushButton" name="zoomOut"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>-</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="zoomFixed"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Fixed width</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="zoomOriginal"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Original size</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="autoDemo"> + <property name="text"> + <string>Auto demo</string> + </property> + <property name="shortcut"> + <string>Ctrl+D</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="timeoutDelay"> + <property name="maximumSize"> + <size> + <width>30</width> + <height>16777215</height> + </size> + </property> + <property name="inputMask"> + <string/> + </property> + <property name="text"> + <string>5</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>s.</string> + </property> + </widget> </item> </layout> - </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > - <string>Text</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4" > + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QTextBrowser" name="textBrowser" > - <property name="html" > - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Test</p></body></html></string> + <widget class="QTabWidget" name="tabWidget_2"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tab_3"> + <attribute name="title"> + <string>Reference Image</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QGraphicsView" name="imageRef"/> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>0</number> </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>Result Image</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QGraphicsView" name="imageResult"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_2"> + <property name="font"> + <font> + <kerning>true</kerning> + </font> + </property> + <attribute name="title"> + <string>Text</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QTextBrowser" name="textBrowser"> + <property name="html"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Test</span></p></body></html></string> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> - </widget> - </widget> + </item> + </layout> </item> </layout> </item> </layout> </widget> - <widget class="QMenuBar" name="menubar" > - <property name="geometry" > + <widget class="QMenuBar" name="menubar"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>658</width> - <height>31</height> + <height>22</height> </rect> </property> </widget> - <widget class="QStatusBar" name="statusbar" /> + <widget class="QStatusBar" name="statusbar"/> </widget> <resources> - <include location="../demo.qrc" /> + <include location="../demo.qrc"/> </resources> <connections> <connection> @@ -133,13 +326,13 @@ p, li { white-space: pre-wrap; } <receiver>displayBtn</receiver> <slot>click()</slot> <hints> - <hint type="sourcelabel" > - <x>201</x> - <y>92</y> + <hint type="sourcelabel"> + <x>213</x> + <y>62</y> </hint> - <hint type="destinationlabel" > - <x>516</x> - <y>92</y> + <hint type="destinationlabel"> + <x>564</x> + <y>64</y> </hint> </hints> </connection> -- 1.5.6.5

1 0