From 63a42d009b40cf8bc11338a13b396efb76ab38cb Mon Sep 17 00:00:00 2001 From: schnorr Date: Tue, 3 Apr 2012 14:49:26 +0200 Subject: [PATCH 1/1] better rendering of simgrid_modules.png (and corrected font for TRACE module) --- buildtools/Cmake/GenerateDoc.cmake | 2 +- doc/fig/simgrid_modules.fig | 62 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index a2739f533d..c61d7ef0dc 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -69,7 +69,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI string(REPLACE ".fig" ".png" tmp_file ${file}) string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/fig/" "${CMAKE_HOME_DIRECTORY}/doc/html/" tmp_file ${tmp_file}) ADD_CUSTOM_COMMAND(TARGET simgrid_documentation - COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng ${file} ${tmp_file} + COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file} ) endforeach(file ${DOC_FIGS}) diff --git a/doc/fig/simgrid_modules.fig b/doc/fig/simgrid_modules.fig index e9383eb659..eb9e8454f9 100644 --- a/doc/fig/simgrid_modules.fig +++ b/doc/fig/simgrid_modules.fig @@ -7,53 +7,53 @@ A4 Single -2 1200 2 -0 32 #84e373 -0 33 #ffcb84 -0 34 #adbeff -0 35 #ff4952 -0 36 #a5a6a5 -0 37 #ff9700 +0 32 #83e273 +0 33 #feca83 +0 34 #acbdfe +0 35 #fe4952 +0 36 #a4a5a4 +0 37 #fe9600 6 -360 2340 1305 3105 -4 1 0 50 -1 4 14 0.0000 2 180 555 472 2520 MSG\001 -4 1 0 50 -1 4 12 0.0000 2 195 1650 472 2835 Simple application-\001 -4 1 0 50 -1 4 12 0.0000 2 150 1260 472 3105 level simulator\001 +4 1 0 50 -1 4 14 0.0000 2 135 270 472 2520 MSG\001 +4 1 0 50 -1 4 12 0.0000 2 165 1710 472 2835 Simple application-\001 +4 1 0 50 -1 4 12 0.0000 2 135 1350 472 3105 level simulator\001 -6 6 1845 2295 3915 3240 -4 1 0 50 -1 4 14 0.0000 2 180 705 2430 2475 GRAS\001 -4 1 0 50 -1 4 12 0.0000 2 150 960 2430 2745 Framework\001 -4 1 0 50 -1 4 12 0.0000 2 195 960 2430 2970 to develop\001 -4 1 0 50 -1 4 12 0.0000 2 195 2055 2880 3195 distributed applications\001 +4 1 0 50 -1 4 14 0.0000 2 135 360 2430 2475 GRAS\001 +4 1 0 50 -1 4 12 0.0000 2 135 810 2430 2745 Framework\001 +4 1 0 50 -1 4 12 0.0000 2 165 990 2430 2970 to develop\001 +4 1 0 50 -1 4 12 0.0000 2 165 2250 2880 3195 distributed applications\001 -6 6 3060 2205 4095 2835 # href="group__AMOK__API.html" ALT="AMOK" 2 2 0 1 0 27 60 -1 20 0.000 0 0 -1 0 0 5 3082 2205 4072 2205 4072 2835 3082 2835 3082 2205 -4 1 0 50 -1 4 12 0.0000 2 150 630 3577 2745 toolbox\001 -4 1 0 50 -1 4 14 0.0000 2 180 720 3577 2475 AMOK\001 +4 1 0 50 -1 4 12 0.0000 2 135 630 3577 2745 toolbox\001 +4 1 0 50 -1 4 14 0.0000 2 135 360 3577 2475 AMOK\001 -6 6 -675 3510 9045 4365 6 3082 3645 5287 4185 -4 1 0 50 -1 4 12 0.0000 2 195 2145 4184 4102 virtual platform simulator\001 -4 1 0 50 -1 4 14 0.0000 2 180 675 4184 3847 SURF\001 +4 1 0 50 -1 4 12 0.0000 2 165 2340 4184 4102 virtual platform simulator\001 +4 1 0 50 -1 4 14 0.0000 2 135 360 4184 3847 SURF\001 -6 # href="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 9045 3510 9045 4365 -675 4365 -675 3510 -6 6 6840 2340 8865 3150 -4 1 0 50 -1 4 14 0.0000 2 225 870 7852 2520 SimDag\001 -4 1 0 50 -1 4 12 0.0000 2 150 1245 7852 2835 Framework for\001 -4 1 0 50 -1 4 12 0.0000 2 195 1965 7852 3105 DAGs of parallel tasks\001 +4 1 0 50 -1 4 14 0.0000 2 165 540 7852 2520 SimDag\001 +4 1 0 50 -1 4 12 0.0000 2 135 1170 7852 2835 Framework for\001 +4 1 0 50 -1 4 12 0.0000 2 165 1980 7852 3105 DAGs of parallel tasks\001 -6 6 -158 4590 7987 5085 -4 1 0 50 -1 4 12 0.0000 2 195 8085 3914 5025 Grounding features (logging, etc.), usual data structures (lists, sets, etc.) and portability layer\001 -4 1 0 50 -1 4 14 0.0000 2 180 480 3914 4770 XBT\001 +4 1 0 50 -1 4 12 0.0000 2 180 8910 3914 5025 Grounding features (logging, etc.), usual data structures (lists, sets, etc.) and portability layer\001 +4 1 0 50 -1 4 14 0.0000 2 135 270 3914 4770 XBT\001 -6 6 5435 1305 8318 1800 # href="/contrib.html" ALT="Contrib" 2 2 0 1 0 37 55 -1 20 0.000 0 0 -1 0 0 5 5435 1800 8318 1800 8318 1305 5435 1305 5435 1800 -4 1 0 50 -1 4 15 0.0000 2 180 855 6876 1635 Contrib\001 +4 1 0 50 -1 4 15 0.0000 2 135 630 6876 1635 Contrib\001 -6 # href="group__MSG__API.html" ALT="MSG" 2 2 0 1 0 32 60 -1 20 0.000 0 0 -1 0 0 5 @@ -74,12 +74,12 @@ Single 2 2 0 1 0 23 60 -1 30 0.000 0 0 -1 0 0 5 6705 2205 9045 2205 9045 3375 6705 3375 6705 2205 # href="group__TRACE__API.html" ALT="TRACE" -2 2 0 1 0 3 50 -1 20 0.000 0 0 -1 0 0 5 +2 2 0 1 0 3 50 -1 30 0.000 0 0 -1 0 0 5 9270 2160 9810 2160 9810 5220 9270 5220 9270 2160 -4 1 0 50 -1 4 12 0.0000 2 195 1860 5400 2955 applications on top of\001 -4 1 0 50 -1 4 12 0.0000 2 150 1815 5400 3210 a virtual environment\001 -4 1 0 50 -1 4 12 0.0000 2 195 1560 5400 2745 Library to run MPI\001 -4 1 0 50 -1 4 14 0.0000 2 180 585 5400 2520 SMPI\001 -4 1 0 50 -1 4 15 0.0000 2 180 1260 3560 1650 User Code\001 -4 0 0 50 -1 0 15 1.5708 4 165 810 9630 5085 TRACE\001 -4 0 0 50 -1 0 12 1.5708 4 180 1545 9585 4050 Tracing simulation\001 +4 1 0 50 -1 4 12 0.0000 2 165 1980 5400 2955 applications on top of\001 +4 1 0 50 -1 4 12 0.0000 2 135 1890 5400 3210 a virtual environment\001 +4 1 0 50 -1 4 12 0.0000 2 165 1620 5400 2745 Library to run MPI\001 +4 1 0 50 -1 4 15 0.0000 2 135 810 3560 1650 User Code\001 +4 0 0 50 -1 4 15 1.5708 2 135 450 9630 5085 TRACE\001 +4 1 0 50 -1 4 14 0.0000 2 135 360 5400 2520 SMPI\001 +4 0 0 50 -1 4 12 1.5708 2 165 1620 9585 4050 Tracing simulation\001 -- 2.20.1