From 73de4c0bbce27ecd6280fea0c968b35ca6cec0a0 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Tue, 8 Mar 2016 15:19:41 +0100 Subject: [PATCH] Update gmap figures --- .../fig/fig/Diagramme_class.fig | 28 ++++---- .../fig/fig/exemple-gcarte2-3d.fig | 67 ++++++++++--------- .../fig/fig/intuitif-example-zoom.fig | 7 +- 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/Generalized_map/doc/Generalized_map/fig/fig/Diagramme_class.fig b/Generalized_map/doc/Generalized_map/fig/fig/Diagramme_class.fig index b6833eeb430..747439cdaf7 100644 --- a/Generalized_map/doc/Generalized_map/fig/fig/Diagramme_class.fig +++ b/Generalized_map/doc/Generalized_map/fig/fig/Diagramme_class.fig @@ -7,7 +7,7 @@ A4 Single -2 1200 2 -0 32 #9c0000 +0 32 #707070 0 33 #8c8c8c 0 34 #8c8c8c 0 35 #424242 @@ -47,23 +47,23 @@ Single 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 3600 7214 7539 7214 7539 8544 3600 8544 3600 7214 4 0 0 50 -1 2 18 0.0000 4 255 2100 3907 7521 Generalized_map\001 -4 0 0 50 -1 2 14 0.0000 4 210 2925 3702 7879 + typedef Items::GDart Dart\001 +4 0 0 50 -1 2 14 0.0000 4 210 2730 3702 7879 + typedef Items::Dart Dart\001 4 0 0 50 -1 2 14 0.0000 4 210 3840 3702 8135 + typedef Items::Attributes Attributes\001 -6 -6 8767 7418 12428 8595 -6 8870 8186 9807 8339 -4 0 0 50 -1 2 14 0.0000 4 165 1005 8870 8339 - Info info\001 +6 8767 7418 12348 8595 +6 8870 8174 9875 8339 +4 0 32 50 -1 2 14 0.0000 4 165 1005 8870 8339 - Info info\001 -6 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 8767 8032 11121 8032 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 +2 1 0 1 32 7 50 -1 -1 0.000 0 0 -1 0 0 2 8767 8442 11121 8442 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 8767 7623 11121 7623 11121 8595 8767 8595 8767 7623 -2 2 1 1 0 7 45 -1 20 4.000 0 0 -1 0 0 5 +2 2 1 1 32 7 45 -1 20 4.000 0 0 -1 0 0 5 9842 7418 12348 7418 12348 7725 9842 7725 9842 7418 -4 0 0 50 -1 2 18 0.0000 4 255 1710 8921 7981 Cell_attribute\001 -4 0 0 40 -1 1 11 0.0000 4 180 2535 9893 7623 GMap,Info_,Tag,OnMerge,OnSplit\001 +2 2 0 1 32 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 8767 7623 11121 7623 11121 8595 8767 8595 8767 7623 +2 1 0 1 32 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 8767 8032 11121 8032 +4 0 32 50 -1 2 18 0.0000 4 255 1710 8921 7981 Cell_attribute\001 +4 0 32 40 -1 1 11 0.0000 4 180 2415 9893 7623 Map,Info_,Tag,OnMerge,OnSplit\001 -6 6 4112 5013 8633 6190 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 @@ -73,7 +73,7 @@ Single 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 4112 5013 8358 5013 8358 6190 4112 6190 4112 5013 4 0 0 50 -1 2 14 0.0000 4 210 4470 4163 5883 + Types Dart_wrapper::Attributes\001 -4 0 0 50 -1 2 14 0.0000 4 210 4020 4163 5627 + Type Dart_wrapper::GDart\001 +4 0 0 50 -1 2 14 0.0000 4 210 3825 4163 5627 + Type Dart_wrapper::Dart\001 4 0 0 50 -1 3 18 0.0000 4 270 2580 4674 5269 GeneralizedMapItems\001 -6 2 1 1 2 0 0 50 -1 -1 6.000 0 0 -1 0 0 2 diff --git a/Generalized_map/doc/Generalized_map/fig/fig/exemple-gcarte2-3d.fig b/Generalized_map/doc/Generalized_map/fig/fig/exemple-gcarte2-3d.fig index dbe5c14b1d4..780b472363c 100644 --- a/Generalized_map/doc/Generalized_map/fig/fig/exemple-gcarte2-3d.fig +++ b/Generalized_map/doc/Generalized_map/fig/fig/exemple-gcarte2-3d.fig @@ -9,23 +9,10 @@ Single 1200 2 0 32 #000000 0 33 #9f9f9f -0 34 #00ff00 +0 34 #41ac33 0 35 #0000ff 0 36 #ff0000 -0 37 #000000 -0 38 #000000 -0 39 #000000 -0 40 #000000 -0 41 #000000 -0 42 #000000 -0 43 #000000 -0 44 #000000 -0 45 #000000 -0 46 #000000 -0 47 #ffffff -0 48 #b1b1b1 0 49 #343434 -0 50 #2a2a2a 0 51 #5d5d5d 6 2934 512 3354 861 4 0 49 500 -1 -1 20 0.0000 4 225 165 3189 861 3\001 @@ -181,8 +168,6 @@ Single 531 1930 765 2083 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 1751 1675 1697 1930 -2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 - 2133 2478 2260 2478 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 1114 2633 960 2673 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 @@ -225,18 +210,38 @@ Single 2400 2289 3542 2546 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 1242 785 1108 1053 -4 0 0 50 -1 0 16 0.0000 4 195 270 1514 2299 14\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 3074 2033 6\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 2234 1130 1\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 2730 1118 2\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 2278 2642 3\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 2065 2244 4\001 -4 0 0 50 -1 0 16 0.0000 4 195 270 1866 710 10\001 -4 0 0 50 -1 0 16 0.0000 4 195 270 651 646 11\001 -4 0 0 50 -1 0 16 0.0000 4 195 270 599 168 12\001 -4 0 0 50 -1 0 16 0.0000 4 195 270 1979 185 13\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 3304 1182 5\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 3343 2562 7\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 3665 1242 9\001 -4 0 0 50 -1 0 16 0.0000 4 195 270 3972 1992 15\001 -4 0 0 50 -1 0 16 0.0000 4 195 135 3555 2346 8\001 +2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 + 2175 2432 2302 2432 +2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2 + 3844 1492 4030 1541 +4 0 34 50 -1 2 14 0.0000 4 165 240 688 210 20\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 294 440 19\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 566 712 18\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 1391 895 17\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 1359 154 21\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 2001 252 22\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 2184 525 23\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 1921 797 24\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2483 720 2\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2656 1066 3\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2183 1032 1\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2013 1572 8\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 1994 2308 7\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2493 2246 5\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2609 1635 4\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 2150 2685 6\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3002 2737 15\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3051 1888 16\001 +4 0 34 50 -1 2 14 0.0000 4 165 120 3314 1215 9\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3512 898 10\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3702 1326 11\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3645 2007 12\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3498 2454 13\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3337 2857 14\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3595 1154 25\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3821 938 26\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 4109 1635 27\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 4049 1841 28\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 1349 1171 30\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 1654 1551 31\001 +4 0 34 50 -1 2 14 0.0000 4 165 240 3322 2024 29\001 diff --git a/Generalized_map/doc/Generalized_map/fig/fig/intuitif-example-zoom.fig b/Generalized_map/doc/Generalized_map/fig/fig/intuitif-example-zoom.fig index 0ffa0a2b1c2..5402116b6d6 100644 --- a/Generalized_map/doc/Generalized_map/fig/fig/intuitif-example-zoom.fig +++ b/Generalized_map/doc/Generalized_map/fig/fig/intuitif-example-zoom.fig @@ -18,6 +18,7 @@ Single 5 1 0 2 34 34 50 -1 -1 0.000 0 0 0 0 1966.766 2732.500 2220 2549 2220 2916 1761 2968 5 1 0 2 34 34 50 -1 -1 0.000 0 0 0 0 1099.106 2960.297 1226 2818 1261 3061 925 3038 5 1 0 2 34 34 50 -1 -1 0.000 0 0 0 0 2704.861 1419.521 2536 1284 2837 1248 2709 1636 +5 1 0 2 34 34 50 -1 -1 0.000 0 1 0 0 1534.366 1643.879 1626 1493 1371 1577 1427 1784 6 2305 2615 2684 2910 4 0 34 500 -1 32 22 0.0000 4 195 240 2305 2810 a\001 4 0 34 500 -1 -1 16 0.0000 4 195 135 2549 2910 3\001 @@ -30,6 +31,10 @@ Single 4 0 34 500 -1 -1 16 0.0000 4 195 135 3089 1352 2\001 4 0 34 500 -1 32 22 0.0000 4 195 240 2834 1247 a\001 -6 +6 1259 1146 1638 1435 +4 0 34 500 -1 32 22 0.0000 4 195 240 1259 1341 a\001 +4 0 34 500 -1 -1 16 0.0000 4 195 135 1503 1435 0\001 +-6 1 3 0 0 37 37 25 -1 20 0.000 1 0.0000 2089 931 64 64 2089 931 2130 980 1 3 0 0 37 37 25 -1 20 0.000 1 0.0000 1970 1348 64 64 1970 1348 2011 1397 1 3 0 0 37 37 25 -1 20 0.000 1 0.0000 1140 2088 64 64 1140 2088 1181 2137 @@ -92,7 +97,7 @@ Single 2097 912 1150 2123 2 1 0 2 33 33 750 0 -1 0.000 1 0 7 0 0 10 2090 1324 2064 162 1965 548 1743 469 1724 898 1415 803 - 1343 1166 1058 1067 1186 2605 2090 1324 + 1354 1112 1058 1067 1186 2605 2090 1324 2 1 0 2 35 34 510 -1 -1 0.000 0 0 -1 0 0 2 2092 928 2082 588 2 1 0 2 35 34 510 -1 -1 0.000 0 0 -1 0 0 2