a figure with hyperlinks... Cool, isnt'it ?

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@959 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/doc/Doxyfile.main.in b/doc/Doxyfile.main.in
index 65a004d..5bca9fb 100644 (file)
--- a/doc/Doxyfile.main.in
+++ b/doc/Doxyfile.main.in
@@ -433,7 +433,7 @@ EXCLUDE_PATTERNS       =
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
 # directories that contain example code fragments that are included (see 
 # the \include command).
 

-EXAMPLE_PATH           = 
+EXAMPLE_PATH           = ./

 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 538b6b3..94df3ee 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,19 +1,25 @@
 DOCSOURCES = $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.doc")
 
 EXTRA_DIST = html Doxyfile.API Doxyfile.Examples Doxyfile.main \
 DOCSOURCES = $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.doc")
 
 EXTRA_DIST = html Doxyfile.API Doxyfile.Examples Doxyfile.main \

- modules.doc FAQ.doc index.doc footer.html simgrid_logo.png simgrid_modules.jpg
+ modules.doc FAQ.doc index.doc footer.html simgrid_logo.png simgrid_modules.png

 
 DISTCLEANFILES = api_index.doc
 MAINTAINERCLEANFILES = html
 
 if MAINTAINER_MODE
 
 DISTCLEANFILES = api_index.doc
 MAINTAINERCLEANFILES = html
 
 if MAINTAINER_MODE

-html: $(DOCSOURCES) Doxyfile.API Doxyfile.Examples Doxyfile.main logcategories.doc
+simgrid_modules.map: simgrid_modules.fig
+       fig2dev -Lmap simgrid_modules.fig | sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | grep -e IMG -e MAP -e AREA > simgrid_modules.map
+
+simgrid_modules.png: simgrid_modules.fig
+       fig2dev -Lpng simgrid_modules.fig > simgrid_modules.png
+
+html: $(DOCSOURCES) Doxyfile.API Doxyfile.Examples Doxyfile.main logcategories.doc simgrid_modules.map simgrid_modules.png

        touch api_index.doc
        doxygen Doxyfile.main >/dev/null
        doxygen Doxyfile.API >/dev/null
        doxygen Doxyfile.Examples >/dev/null
        @top_srcdir@/tools/doxygen/index_create.pl html/API/API.tag api_index.doc
        touch api_index.doc
        doxygen Doxyfile.main >/dev/null
        doxygen Doxyfile.API >/dev/null
        doxygen Doxyfile.Examples >/dev/null
        @top_srcdir@/tools/doxygen/index_create.pl html/API/API.tag api_index.doc

-       cp @srcdir@/simgrid_logo.png @srcdir@/simgrid_modules.jpg html/
+       cp @srcdir@/simgrid_logo.png @srcdir@/simgrid_modules.png html/

        doxygen Doxyfile.API >/dev/null
        doxygen Doxyfile.Examples >/dev/null
        doxygen Doxyfile.main >/dev/null
        doxygen Doxyfile.API >/dev/null
        doxygen Doxyfile.Examples >/dev/null
        doxygen Doxyfile.main >/dev/null

diff --git a/doc/index.doc b/doc/index.doc
index 2d19f20..f7d79f5 100644 (file)
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -52,9 +52,13 @@ this page. It is organized as follow:
 As depicted by the following schema, the SimGrid toolkit is basically
 three-layered.
 
 As depicted by the following schema, the SimGrid toolkit is basically
 three-layered.
 

+
+\htmlonly
+<center>
+\endhtmlonly
+\htmlinclude simgrid_modules.map

 \htmlonly
 \htmlonly

-<center><img align=center src="simgrid_modules.jpg" alt="SimGrid"><br>
-<b>Relationships between the SimGrid components</b>
+<br><b>Relationships between the SimGrid components</b>

 </center>
 \endhtmlonly
 
 </center>
 \endhtmlonly
 

diff --git a/doc/simgrid_modules.fig b/doc/simgrid_modules.fig
index 326e514..e290963 100644 (file)
--- a/doc/simgrid_modules.fig
+++ b/doc/simgrid_modules.fig
@@ -7,37 +7,42 @@ A4
 Single
 -2
 1200 2
 Single
 -2
 1200 2

-0 32 #84e373
-0 33 #ffcb84
-0 34 #adbeff
-0 35 #ff4952
-0 36 #a5a6a5
+0 32 #86e371
+0 33 #ffcb86
+0 34 #aebeff
+0 35 #ff4951
+0 36 #a6a6a6

 6 -1215 1530 7290 2250
 2 2 0 1 0 31 60 -1 20 0.000 0 0 -1 0 0 5
         -1215 2250 7290 2250 7290 1530 -1215 1530 -1215 2250
 6 -1215 1530 7290 2250
 2 2 0 1 0 31 60 -1 20 0.000 0 0 -1 0 0 5
         -1215 2250 7290 2250 7290 1530 -1215 1530 -1215 2250

-4 1 0 50 -1 2 14 0.0000 6 180 810 3037 1965 User Code\001
+4 1 0 50 -1 2 14 0.0000 6 165 1080 3037 1965 User Code\001

 -6
 -6

+# href="API/html/group__XBT__API.html" ALT="XBT"

 2 3 0 1 0 33 60 -1 20 0.000 0 0 -1 0 0 7
         -765 2475 -1215 2475 -1215 5400 7290 5400 7290 4500 -765 4500
         -765 2475
 2 3 0 1 0 33 60 -1 20 0.000 0 0 -1 0 0 7
         -765 2475 -1215 2475 -1215 5400 7290 5400 7290 4500 -765 4500
         -765 2475

-2 2 0 1 0 35 60 -1 20 0.000 0 0 -1 0 0 5
-        2025 2475 4590 2475 4590 3375 2025 3375 2025 2475
-2 2 0 1 0 32 60 -1 20 0.000 0 0 -1 0 0 5
-        -675 2475 1890 2475 1890 3375 -675 3375 -675 2475
+# href="API/html/group__SMPI__API.html" ALT="SMPI"

 2 2 0 1 0 36 60 -1 20 0.000 0 0 -1 0 0 5
         4725 2475 7290 2475 7290 3375 4725 3375 4725 2475
 2 2 0 1 0 36 60 -1 20 0.000 0 0 -1 0 0 5
         4725 2475 7290 2475 7290 3375 4725 3375 4725 2475

+# href="API/html/group__SURF__API.html" ALT="SMPI"

 2 2 0 1 0 34 60 -1 20 0.000 0 0 -1 0 0 5
         -675 3510 7290 3510 7290 4365 -675 4365 -675 3510
 2 2 0 1 0 34 60 -1 20 0.000 0 0 -1 0 0 5
         -675 3510 7290 3510 7290 4365 -675 4365 -675 3510

-4 1 0 50 -1 0 12 0.0000 2 195 5610 3037 5115 Grounding features (logging, etc.), usual data structures (lists, sets, etc.) and portability layer\001
-4 1 0 50 -1 0 12 0.0000 2 195 1560 3307 4102 virtual platform simulator\001
-4 1 0 50 -1 0 12 0.0000 2 195 1350 3307 2955 Framework to develop\001
-4 1 0 50 -1 0 12 0.0000 2 195 1410 3307 3210 distributed applications\001
-4 1 0 50 -1 0 12 0.0000 2 165 900 607 3232 level simulator\001
-4 1 0 50 -1 0 12 0.0000 2 195 1185 607 2977 Simple application-\001
-4 1 0 50 -1 0 12 0.0000 2 195 1920 6030 2955 Library to run MPI applications\001
-4 1 0 50 -1 0 12 0.0000 2 195 1890 6030 3210 on top of a virtual environment\001
-4 1 0 50 -1 2 14 0.0000 6 165 375 3037 4860 XBT\001
-4 1 0 50 -1 2 14 0.0000 6 180 480 3307 3847 SURF\001
-4 1 0 50 -1 2 14 0.0000 6 180 510 3307 2700 GRAS\001
-4 1 0 50 -1 2 14 0.0000 6 180 405 607 2722 MSG\001
-4 1 0 50 -1 2 14 0.0000 6 180 450 6030 2700 SMPI\001
+# href="API/html/group__GRAS__API.html" ALT="GRAS"
+2 2 0 1 0 35 60 -1 20 0.000 0 0 -1 0 0 5
+        2025 2475 4590 2475 4590 3375 2025 3375 2025 2475
+# href="API/html/group__MSG__API.html" ALT="MSG"
+2 2 0 1 0 32 60 -1 20 0.000 0 0 -1 0 0 5
+        -675 2475 1890 2475 1890 3375 -675 3375 -675 2475
+4 1 0 50 -1 0 12 0.0000 2 195 7950 3037 5115 Grounding features (logging, etc.), usual data structures (lists, sets, etc.) and portability layer\001
+4 1 0 50 -1 0 12 0.0000 2 195 2145 3307 4102 virtual platform simulator\001
+4 1 0 50 -1 0 12 0.0000 2 195 1950 3307 2955 Framework to develop\001
+4 1 0 50 -1 0 12 0.0000 2 195 1965 3307 3210 distributed applications\001
+4 1 0 50 -1 0 12 0.0000 2 195 2685 6030 2955 Library to run MPI applications\001
+4 1 0 50 -1 0 12 0.0000 2 195 2595 6030 3210 on top of a virtual environment\001
+4 1 0 50 -1 2 14 0.0000 6 165 495 3037 4860 XBT\001
+4 1 0 50 -1 2 14 0.0000 6 165 645 3307 3847 SURF\001
+4 1 0 50 -1 2 14 0.0000 6 165 675 3307 2700 GRAS\001
+4 1 0 50 -1 2 14 0.0000 6 165 600 6030 2700 SMPI\001
+4 1 0 50 -1 0 12 0.0000 2 150 1245 607 3232 level simulator\001
+4 1 0 50 -1 0 12 0.0000 2 195 1620 607 2977 Simple application-\001
+4 1 0 50 -1 2 14 0.0000 6 165 540 607 2722 MSG\001