Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Danny B. <dan...@us...> - 2008-12-28 18:27:21
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4529 Modified Files: buildmap_range.c Log Message: Add minimal documentation Index: buildmap_range.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_range.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** buildmap_range.c 4 Aug 2008 17:44:07 -0000 1.16 --- buildmap_range.c 28 Dec 2008 18:27:13 -0000 1.17 *************** *** 287,296 **** /** ! * @brief * @param line * @param street */ ! void buildmap_range_add_no_address (int line, int street) { ! int index; RoadMapRangeNoAddress *this_noaddr; --- 287,296 ---- /** ! * @brief Add a range whose address we don't know * @param line * @param street */ ! void buildmap_range_add_no_address (int line, int street) ! { int index; RoadMapRangeNoAddress *this_noaddr; *************** *** 299,303 **** int offset = RangeNoAddressCount % BUILDMAP_BLOCK; - if (RangeByLine == NULL) buildmap_range_initialize(); --- 299,302 ---- |
|
From: Peter O. <pet...@gm...> - 2008-12-24 15:37:47
|
Is any one working on this? I saw this video the other day from July and it looks to be road map running fairly well on the iphone. http://www.youtube.com/watch?v=TswbcfrOd0Q Would be great is some one would release this to cydia |
|
From: Danny B. <dan...@us...> - 2008-12-24 12:19:18
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28891 Modified Files: Makefile roadmap.doxy Log Message: Move the location of the API docs to the doc directory that Paul created recently. Add a target to create the docs in the Makefile. Index: roadmap.doxy =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap.doxy,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap.doxy 12 Jul 2008 09:24:15 -0000 1.3 --- roadmap.doxy 24 Dec 2008 12:19:11 -0000 1.4 *************** *** 39,43 **** # where doxygen was started. If left blank the current directory will be used. ! OUTPUT_DIRECTORY = ../docs # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create --- 39,43 ---- # where doxygen was started. If left blank the current directory will be used. ! OUTPUT_DIRECTORY = ../doc/api # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** Makefile 7 Nov 2008 23:32:06 -0000 1.131 --- Makefile 24 Dec 2008 12:19:11 -0000 1.132 *************** *** 623,624 **** --- 623,630 ---- -include .depends.mk + + # + # Build API documentation based on doxygen + # + apidocs: roadmap.doxy + doxygen roadmap.doxy |
|
From: Danny B. <dan...@us...> - 2008-12-24 08:30:42
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11435 Modified Files: roadmap_line.h Log Message: Add description of "line". Index: roadmap_line.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_line.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_line.h 7 Jun 2007 16:03:54 -0000 1.4 --- roadmap_line.h 24 Dec 2008 08:30:35 -0000 1.5 *************** *** 1,4 **** ! /* roadmap_line.h - Manage the tiger lines. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 22,25 **** --- 21,49 ---- */ + /** + * @file + * @brief define functions that work on lines + * + * Lines have two endpoints, nothing in between. + * + * A line A-B should not be in a RoadMap map if it is a street that intersects with street C-D. + * + * A ---- C ------ B + * | + * / + * D + * In this case, A-B should not be a line in the map, but A-C, C-B and C-D should be. + * + * There are two higher level concepts also in RoadMap : streets and shapes. + * + * A street is something you'll recognize in real life : it has a name, and consists of + * some pieces that aren't even always adjacent. + * + * A shape is a RoadMap concept to represent the curves followed by a non-straight line. + * + * Lines are basic elements for navigation : they're interesting because we know there's + * nothing between the two endpoints. + */ + #ifndef INCLUDED__ROADMAP_LINE__H #define INCLUDED__ROADMAP_LINE__H |
|
From: Danny B. <dan...@us...> - 2008-12-16 23:44:04
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19074 Modified Files: buildmap_osm_text.c Log Message: Don't include ways with "landmark=" anything in the map. Index: buildmap_osm_text.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** buildmap_osm_text.c 12 Dec 2008 19:26:11 -0000 1.4 --- buildmap_osm_text.c 16 Dec 2008 23:43:57 -0000 1.5 *************** *** 87,90 **** --- 87,91 ---- static int NodeFakeFips; /**< fake postal code */ + static int WayLandUseNotInteresting = 0; /**< land use not interesting for RoadMap */ /** *************** *** 230,233 **** --- 231,235 ---- NodeLat = NodeLon = 0; NodeLatRead = NodeLonRead = 0; + while (NodeLatRead == 0 || NodeLonRead == 0) { for (; *p && isspace(*p); p++) ; *************** *** 347,350 **** --- 349,353 ---- */ sscanf(data, "way id=%*[\"']%d%*[\"']", &in_way); + WayLandUseNotInteresting = 0; if (in_way == 0) *************** *** 463,466 **** --- 466,472 ---- WayStreetName = strdup(value); return 0; /* FIX ME ?? */ + } else if (strcmp(tag, "landuse") == 0) { + WayLandUseNotInteresting = 1; + buildmap_info("discarding way %d, landuse %s", in_way, data); } *************** *** 515,518 **** --- 521,531 ---- buildmap_fatal(0, "Wasn't in a way (%s)", data); + if (WayLandUseNotInteresting) { + buildmap_info("discarding way %d, landuse %s", in_way, data); + WayLandUseNotInteresting = 0; + buildmap_osm_text_reset_way(); + return 0; + } + RoadMapString rms_dirp = str2dict(DictionaryPrefix, ""); RoadMapString rms_dirs = str2dict(DictionarySuffix, ""); |
|
From: Danny B. <dan...@us...> - 2008-12-12 19:26:19
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24862 Modified Files: buildmap_osm_text.c Log Message: Trivial fix. Thanks Derek Jones for pointing me to it. Index: buildmap_osm_text.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** buildmap_osm_text.c 16 Oct 2008 19:38:45 -0000 1.3 --- buildmap_osm_text.c 12 Dec 2008 19:26:11 -0000 1.4 *************** *** 681,684 **** --- 681,686 ---- * @brief This is the gut of buildmap_osm_text : parse an OSM XML file * @param fdata an open file pointer, this will get read twice + * @param country_num the country id that we're working for + * @param division_num the country subdivision id that we're working for * @return error indication * *************** *** 695,699 **** buildmap_osm_text_read(FILE * fdata, int country_num, int division_num) { ! int got; static char buf[LINELEN]; int ret = 0; --- 697,701 ---- buildmap_osm_text_read(FILE * fdata, int country_num, int division_num) { ! char *got; static char buf[LINELEN]; int ret = 0; *************** *** 720,725 **** while (! feof(fdata)) { buildmap_set_line(++LineNo); ! got = (int)fgets(buf, LINELEN, fdata); ! if (got <= 0) { if (feof(fdata)) break; --- 722,727 ---- while (! feof(fdata)) { buildmap_set_line(++LineNo); ! got = fgets(buf, LINELEN, fdata); ! if (got == NULL) { if (feof(fdata)) break; *************** *** 791,796 **** while (! feof(fdata)) { buildmap_set_line(++LineNo); ! got = (int)fgets(buf, LINELEN, fdata); ! if (got <= 0) { if (feof(fdata)) break; --- 793,798 ---- while (! feof(fdata)) { buildmap_set_line(++LineNo); ! got = fgets(buf, LINELEN, fdata); ! if (got == NULL) { if (feof(fdata)) break; |
|
From: Danny B. <dan...@us...> - 2008-12-09 16:22:31
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22049/win32 Modified Files: roadmap_main.cpp Log Message: Disable fullscreen on WinCE for now, it doesn't work well. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** roadmap_main.cpp 7 Dec 2008 13:02:16 -0000 1.28 --- roadmap_main.cpp 9 Dec 2008 16:22:26 -0000 1.29 *************** *** 690,694 **** --- 690,697 ---- void roadmap_main_toggle_full_screen (void) { + #if 1 // TODO: implement + return; + #else #ifdef UNDER_CE RECT rc; *************** *** 730,733 **** --- 733,737 ---- } #endif + #endif } |
|
From: Danny B. <dan...@us...> - 2008-12-07 14:45:33
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11641/win32 Modified Files: CreateCab.pl Log Message: Remove distribution/schema, it should not be used any more. Index: CreateCab.pl =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/CreateCab.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CreateCab.pl 7 Dec 2008 13:02:16 -0000 1.3 --- CreateCab.pl 7 Dec 2008 14:45:28 -0000 1.4 *************** *** 6,24 **** use strict; ! my $userName = "wroadmap.exe"; sub main() { - my $provider = "\"RoadMap project\""; - my $path = "wroadmap.exe"; die "$path not found\n" unless -f $path; ! my $cabname = `basename $path`; ! chomp $cabname; ! $cabname =~ s/.exe$//; ! ! $userName = $cabname unless $userName; ! my $cmdline = "\"%CE1%\\RoadMap\\" . $userName . "\""; my $cmdlen = length( $cmdline ); --- 6,20 ---- use strict; ! my $version = "-1.2"; ! my $rmcabname = "wroadmap" . $version; ! my $provider = "\"RoadMap project\""; ! my $dmcabname .= "demomaps" . $version . ".cab"; sub main() { my $path = "wroadmap.exe"; die "$path not found\n" unless -f $path; ! my $cmdline = "\"%CE1%\\RoadMap\\wroadmap.exe\""; my $cmdlen = length( $cmdline ); *************** *** 27,34 **** open FILE, "> $fname"; ! my $tmpfile = "/tmp/$userName"; ! `cp $path $tmpfile`; ! print FILE "$tmpfile "; ! print FILE '%CE1%\\RoadMap', "\n"; print FILE '%CE1%\\RoadMap', "\n"; --- 23,27 ---- open FILE, "> $fname"; ! print FILE 'wroadmap.exe %CE1%\\RoadMap', "\n"; print FILE '%CE1%\\RoadMap', "\n"; *************** *** 42,46 **** print FILE 'distribution/session.txt %CE1%\\RoadMap', "\n"; print FILE 'distribution/preferences.txt %CE1%\\RoadMap', "\n"; - print FILE 'distribution/schema %CE1%\\RoadMap', "\n"; # Create a link. The format, says Shaun, is --- 35,38 ---- *************** *** 58,66 **** close FILE; ! my $appname = $cabname; ! $cabname .= ".cab"; - my $cmd = "pocketpc-cab -p $provider -a $appname " - . "$fname $cabname"; print( STDERR $cmd, "\n"); print `$cmd`; --- 50,58 ---- close FILE; ! my $appname = $rmcabname; ! $rmcabname .= ".cab"; ! ! my $cmd = "pocketpc-cab -p $provider -a $appname " . "$fname $rmcabname"; print( STDERR $cmd, "\n"); print `$cmd`; *************** *** 70,74 **** sub DemoMapCab() { - my $provider = "\"RoadMap project\""; my $fname = "/tmp/file$$.list"; --- 62,65 ---- *************** *** 82,89 **** my $appname = "\"Demo Maps\""; - my $cabname .= "demomaps-1.1.cab"; ! my $cmd = "pocketpc-cab -p $provider -a $appname " ! . "$fname $cabname"; print( STDERR $cmd, "\n"); print `$cmd`; --- 73,78 ---- my $appname = "\"Demo Maps\""; ! my $cmd = "pocketpc-cab -p $provider -a $appname " . "$fname $dmcabname"; print( STDERR $cmd, "\n"); print `$cmd`; |
|
From: Danny B. <dan...@us...> - 2008-12-07 14:45:32
|
Update of /cvsroot/roadmap/roadmap/src/win32/distribution In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11641/win32/distribution Removed Files: schema Log Message: Remove distribution/schema, it should not be used any more. --- schema DELETED --- |
|
From: Danny B. <dan...@us...> - 2008-12-07 13:02:24
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6142/win32 Modified Files: roadmap_main.cpp roadmap_dialog.c Makefile CreateCab.pl Log Message: Add a demo maps CAB file. Get the WinCE RoadMap to figure out how big the screen is, and adjust dialog appearance to it. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 7 Dec 2008 10:31:58 -0000 1.14 --- Makefile 7 Dec 2008 13:02:16 -0000 1.15 *************** *** 49,53 **** wince_input_mon.h ! TARGETS = wroadmap.exe wroadmap.cab # --- The real targets -------------------------------------------- --- 49,53 ---- wince_input_mon.h ! TARGETS = wroadmap.exe wroadmap.cab demomaps.cab # --- The real targets -------------------------------------------- *************** *** 116,117 **** --- 116,119 ---- wroadmap.cab: wroadmap.exe CreateCab.pl + + demomaps.cab: Index: CreateCab.pl =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/CreateCab.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreateCab.pl 7 Dec 2008 11:37:10 -0000 1.2 --- CreateCab.pl 7 Dec 2008 13:02:16 -0000 1.3 *************** *** 66,71 **** print `$cmd`; ! unlink $tmpfile; } main(); --- 66,94 ---- print `$cmd`; ! # unlink $tmpfile; } + sub DemoMapCab() { + my $provider = "\"RoadMap project\""; + my $fname = "/tmp/file$$.list"; + + open FILE, "> $fname"; + + print FILE 'demomaps/usc81002.rdm %CE1%\\RoadMap\\Maps', "\n"; + print FILE 'demomaps/usc06075.rdm %CE1%\\RoadMap\\Maps', "\n"; + print FILE 'demomaps/usdir.rdm %CE1%\\RoadMap\\Maps', "\n"; + + close FILE; + + my $appname = "\"Demo Maps\""; + my $cabname .= "demomaps-1.1.cab"; + + my $cmd = "pocketpc-cab -p $provider -a $appname " + . "$fname $cabname"; + print( STDERR $cmd, "\n"); + print `$cmd`; + + unlink $fname; + } main(); + DemoMapCab(); Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_dialog.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_dialog.c 16 Nov 2008 16:48:36 -0000 1.12 --- roadmap_dialog.c 7 Dec 2008 13:02:16 -0000 1.13 *************** *** 64,68 **** #define ROADMAP_WIDGET_MUL_ENTRY 10 ! const unsigned int MAX_ROW_HEIGHT = 40; /* 20 */ const unsigned int MAX_ROW_SPACE = 5; const unsigned int MAX_LIST_HEIGHT = 80; --- 64,72 ---- #define ROADMAP_WIDGET_MUL_ENTRY 10 ! static int roadmap_dialog_screen_height, ! roadmap_dialog_screen_width; ! ! /* The value of this variable is overruled based on the screen dimensions. */ ! unsigned int MAX_ROW_HEIGHT = 40; /* 20 */ const unsigned int MAX_ROW_SPACE = 5; const unsigned int MAX_LIST_HEIGHT = 80; *************** *** 1059,1062 **** --- 1063,1067 ---- } } + #if 0 /* What if we're too far below ? */ if (curr_y > 20) { *************** *** 1064,1067 **** --- 1069,1073 ---- frame->name, itemcount, curr_y); } + #endif return TRUE; } *************** *** 1099,1100 **** --- 1105,1119 ---- return (INT_PTR)FALSE; } + + /** + * @brief note the screen resolution, use it to influence dialog appearance + * @param height the screen height + * @param width the screen width + */ + void roadmap_dialog_set_resolution(const int height, const int width) + { + roadmap_dialog_screen_height = height; + roadmap_dialog_screen_width = width; + + MAX_ROW_HEIGHT = (height > 320) ? 40 : 20; + } Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** roadmap_main.cpp 18 Nov 2008 23:15:42 -0000 1.27 --- roadmap_main.cpp 7 Dec 2008 13:02:16 -0000 1.28 *************** *** 67,70 **** --- 67,71 ---- #include "roadmap_wincecanvas.h" #include "roadmap_time.h" + #include "roadmap_dialog.h" } *************** *** 170,173 **** --- 171,184 ---- __except (handleException(GetExceptionInformation())) {} + /* + * Figure out how big the screen is, pass it on + */ + int width, height; + height = GetSystemMetrics(SM_CYSCREEN); + width = GetSystemMetrics(SM_CXSCREEN); + roadmap_log (ROADMAP_WARNING, "Screen %d x %d", height, width); + roadmap_dialog_set_resolution (height, width); + + ShowWindow(RoadMapMainWindow, nCmdShow); UpdateWindow(RoadMapMainWindow); *************** *** 759,763 **** } ! void roadmap_main_title(char *fmt, ...) { /* unimplemented */ } --- 770,775 ---- } ! void roadmap_main_title(char *fmt, ...) ! { /* unimplemented */ } |
|
From: Danny B. <dan...@us...> - 2008-12-07 13:02:19
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6142 Modified Files: roadmap_dialog.h Log Message: Add a demo maps CAB file. Get the WinCE RoadMap to figure out how big the screen is, and adjust dialog appearance to it. Index: roadmap_dialog.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_dialog.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_dialog.h 2 Apr 2008 17:28:07 -0000 1.7 --- roadmap_dialog.h 7 Dec 2008 13:02:16 -0000 1.8 *************** *** 233,235 **** --- 233,239 ---- #endif /* LANG_SUPPORT */ + #ifdef _WIN32_WCE + void roadmap_dialog_set_resolution(const int height, const int width); + #endif + #endif // INCLUDE__ROADMAP_DIALOG__H |
|
From: Danny B. <dan...@us...> - 2008-12-07 12:16:46
|
Update of /cvsroot/roadmap/roadmap/src/win32/distribution In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22346/distribution Added Files: schema Log Message: Add empty schema file, otherwise RoadMap complains. --- NEW FILE: schema --- |
|
From: Danny B. <dan...@us...> - 2008-12-07 12:16:37
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22346 Modified Files: CreateCab.pl Log Message: Add empty schema file, otherwise RoadMap complains. Index: CreateCab.pl =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/CreateCab.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreateCab.pl 7 Dec 2008 10:31:58 -0000 1.1 --- CreateCab.pl 7 Dec 2008 11:37:10 -0000 1.2 *************** *** 42,45 **** --- 42,46 ---- print FILE 'distribution/session.txt %CE1%\\RoadMap', "\n"; print FILE 'distribution/preferences.txt %CE1%\\RoadMap', "\n"; + print FILE 'distribution/schema %CE1%\\RoadMap', "\n"; # Create a link. The format, says Shaun, is |
|
From: Danny B. <dan...@us...> - 2008-12-07 10:32:05
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20061 Modified Files: Makefile Added Files: CreateCab.pl Log Message: Stuff to create a CAB file for a WinCE distribution. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 28 Jun 2008 16:49:29 -0000 1.13 --- Makefile 7 Dec 2008 10:31:58 -0000 1.14 *************** *** 49,53 **** wince_input_mon.h ! TARGETS = wroadmap.exe # --- The real targets -------------------------------------------- --- 49,53 ---- wince_input_mon.h ! TARGETS = wroadmap.exe wroadmap.cab # --- The real targets -------------------------------------------- *************** *** 59,63 **** clean: ! rm -f *.o *.a *.da $(addsuffix .exe,$(TARGETS)) .depends.mk libwroadmap.a: $(RMLIBOBJ) --- 59,63 ---- clean: ! rm -f *.o *.a *.da $(addsuffix .exe,$(TARGETS)) .depends.mk *.rsc libwroadmap.a: $(RMLIBOBJ) *************** *** 103,104 **** --- 103,117 ---- -include .depends.mk + + CABFILES= wroadmap.exe \ + distribution/libexpat-1.dll \ + distribution/font.ttf \ + distribution/roadmap.screenobjects \ + distribution/roadmap.toolbar \ + distribution/sprites \ + distribution/All \ + distribution/session.txt \ + distribution/preferences.txt + + wroadmap.cab: wroadmap.exe + CreateCab.pl --- NEW FILE: CreateCab.pl --- #!/usr/bin/perl # Script for turning the RoadMap executable into a cab, along with a shortcut # Inspired on Eric Houses exe2cab.pl script for the crosswords project. use strict; my $userName = "wroadmap.exe"; sub main() { my $provider = "\"RoadMap project\""; my $path = "wroadmap.exe"; die "$path not found\n" unless -f $path; my $cabname = `basename $path`; chomp $cabname; $cabname =~ s/.exe$//; $userName = $cabname unless $userName; my $cmdline = "\"%CE1%\\RoadMap\\" . $userName . "\""; my $cmdlen = length( $cmdline ); my $fname = "/tmp/file$$.list"; open FILE, "> $fname"; my $tmpfile = "/tmp/$userName"; `cp $path $tmpfile`; print FILE "$tmpfile "; print FILE '%CE1%\\RoadMap', "\n"; print FILE '%CE1%\\RoadMap', "\n"; print FILE 'distribution/libexpat-1.dll %CE1%\\RoadMap', "\n"; print FILE 'distribution/font.ttf %CE1%\\RoadMap', "\n"; print FILE 'distribution/roadmap.screenobjects %CE1%\\RoadMap', "\n"; print FILE 'distribution/roadmap.toolbar %CE1%\\RoadMap', "\n"; print FILE 'distribution/sprites %CE1%\\RoadMap', "\n"; print FILE 'distribution/All %CE1%\\RoadMap\\default', "\n"; print FILE 'distribution/session.txt %CE1%\\RoadMap', "\n"; print FILE 'distribution/preferences.txt %CE1%\\RoadMap', "\n"; # Create a link. The format, says Shaun, is # <number of characters>#command line<no carriage return or line feed> # my $linkName = "RoadMap.lnk"; # open LINKFILE, "> $linkName"; # print LINKFILE $cmdlen, "#", $cmdline; # close LINKFILE; # # print FILE "$linkName "; # print FILE '%CE11%', "\n"; # /* 11 is programs, 14 is games */ # unlink $linkName; close FILE; my $appname = $cabname; $cabname .= ".cab"; my $cmd = "pocketpc-cab -p $provider -a $appname " . "$fname $cabname"; print( STDERR $cmd, "\n"); print `$cmd`; unlink $tmpfile; } main(); |
Update of /cvsroot/roadmap/roadmap/src/win32/distribution In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20061/distribution Added Files: All font.ttf libexpat-1.dll preferences.txt roadmap.screenobjects roadmap.toolbar session.txt sprites Log Message: Stuff to create a CAB file for a WinCE distribution. --- NEW FILE: All --- Class.Name: All Class.Lines: Freeways Ramps Highways Streets Trails Rivers Shore Railroads Boundaries Class.Polygons: Lakes Sea Parks Hospitals Airports Stations Malls Navigation.Car: Freeways Ramps Highways Streets Trails Freeways.Color: black Freeways.Color1: IndianRed Freeways.Delta1: -2 Freeways.Color2: black Freeways.Delta2: 1 Freeways.Declutter: 10000 Freeways.Thickness: 6 Ramps.Color: black Ramps.Color1: red Ramps.Delta1: -2 Ramps.Declutter: 160 Ramps.Thickness: 3 Highways.Color: black Highways.Color1: yellow Highways.Delta1: -2 Highways.Declutter: 1300 Highways.Thickness: 3 Streets.Color: black Streets.Color1: white Streets.Delta1: -2 Streets.Declutter: 160 Streets.Thickness: 2 Trails.Color: DarkGrey Trails.Declutter: 160 Trails.Thickness: 1 Railroads.Color: black Railroads.Declutter: 250 Railroads.Style: dashed Railroads.Thickness: 1 Rivers.Color: LightBlue Rivers.Declutter: 300 Rivers.Thickness: 3 Shore.Color: LightSlateBlue Shore.Declutter: 2000 Shore.Thickness: 2 Hospitals.Color: red Hospitals.Declutter: 4096 Hospitals.Thickness: 1 Malls.Color: yellow Malls.Declutter: 4096 Malls.Thickness: 1 Airports.Color: grey Airports.Declutter: 4096 Airports.Thickness: 1 Stations.Color: grey Stations.Declutter: 4096 Stations.Thickness: 1 Lakes.Color: LightBlue Lakes.Declutter: 1300 Lakes.Thickness: 1 Parks.Color: green Parks.Declutter: 4096 Parks.Thickness: 1 Sea.Color: SlateBlue Sea.Declutter: 2147483647 Sea.Thickness: 1 Boundaries.Color: darkgreen Boundaries.Thickness: 2 Boundaries.Declutter: 2147483647 --- NEW FILE: roadmap.screenobjects --- # This file describes objects which can be displayed on the screen. # These objects can reflect the state of the program (e.g., which way # is north, how strong is the GPS signal), and/or allow actions to # be performed (e.g. zoom in, show the trip's destination). These # objects may be placed anywhere on the screen, but nothing prevents # them from being obscured by other popup messages and displays, so # their position should probably be along the sides of the screen. # # Syntax: # # N <name> Name of the object (unused, but starts a new object) # Specifying a name, and nothing else at all, will # define a null object which can be used to # override objects defined in other (e.g. system) # screenobjects files. # P <x> <y> The screen position of the sprite, measured from # the top left in pixels. Negative offsets measure # from the right and from the bottom. If the <x> or # <y> value begins with a 'C', then the remainder # is an offset from the center of the screen. # E <sprite> [text] The name of the sprite which will be drawn. # E <sprite> [text] Multiple sprites can be specified. Which one is # displayed is selected via the object's "state" # indicator. If "text" is specified, it will be # displayed with the sprite (assuming the sprite # has been defined to have text associated with it). # - The text can be divided into multiple lines. # Line breaks are indicated by inserting a '^'. # - The text can contain %-macros, just as defined # for other text displays, in order to display # dynamic content. The '|' "alternation" symbol # is also honored. See the documentation. # S <statename> The "state" indicator which will choose among # the listed sprites. For "constant" displays, this # is optional. # A <actionname> The action which should be invoked when the sprite # is selected. Optional. # R <angle> Sprites will normally rotate dynamically, either with # the screen, or based on an angle retrieved via the # state indicator. Specifying 'R' suppresses this # by forcing rotation to the given angle. (default 0) # B <x> <y> <x> <y> Optional -- the bounding box used to determine # whether a selection has taken place. (I.e., the # size of the sprite.) Normally the bounding box is # provided by the sprite itself, but irregularly # shaped sprites, combined with the rotation of the # sprite, may require that the box be overridden. # Note that the bounding box for any text associated # with the sprite is calculated and considered # separately. Also note that if sprite scaling is # used, this bounding box may need to be adjusted. # the Compass object shows which way is north. it changes from a # traditional "compass rose" to a simple arrow if "dynamic orientation" # is turned off. N Compass S get_orientation P 20 60 E Compass E Compass_fixed A toggleorientation # The GPS_reception object displays the relative GPS signal strength. # Selecting it will reposition the map to the current GPS position. # This version doesn't have a text object, the colour should suffice. N GPS_reception S get_GPS_reception P 20 100 E reception_na E reception_none E reception_poor E reception_good A gps R # When the Download object is visible, it indicates that RoadMap is # willing to download maps from the network. # N Download # S get_download_enabled # P -20, 60 # E Download # R # Uncomment this one to get an on-screen "Menu" icon. With this enabled, # you could then get rid of the normal drop-down menus, and the toolbar. # (You could also get rid of them and use a long-click to get menus.) # N Menus # P -20 -60 # E Menu # A ->Menus... # R 0 # The Direction_Next object points to the route's next waypoint, # relative to the current direction of travel (assuming the screen # is facing forward in the vehicle). # N Direction_Next # S get_direction_next # P -20 100 # E Direction_Next # A nextpoint # # The Direction_2nd object points to waypoint after the next. # # relative to the current direction of travel. This can be # # useful to see which way the route will go at the next turning. # N Direction_2nd # S get_direction_2nd # P -20 140 # E Direction_2nd # A 2ndpoint # The Direction_Dest object points to the route's last waypoint, # relative to the direction of travel. # N Direction_Dest # S get_direction_dest # P -20 180 # E Direction_Dest # A destination # The ZoomIn/Out_Buttons do just that, when selected. # N ZoomIn_Button # P 20 -100 # E ZoomIn # A zoomin # R 0 # N ZoomOut_Button # P 20 -60 # E ZoomOut # A zoomout # R 0 # The next four are up/down/left/right controls, centered on # each edge of the screen, each rotated appropriately. # (Most devices have dedicated arrow keys, though, so these # are commented out by default.) # N UpArrow # P C0 20 # E PurpleTriangle # A up # R 0 # # N DownArrow # P C0 -20 # E PurpleTriangle # A down # R -180 # # N RightArrow # P -20 C0 # E PurpleTriangle # A right # R 90 # # N LeftArrow # P 20 C0 # E PurpleTriangle # A left # R -90 # # provide a labeled "button" to switch view modes # N 2D3D # P 20 180 # S view_mode # E TextBox 3D # E TextBox 2D # A toggleview # # show current time, along with either sunset or sunrise time # N daylight # P C-80 -40 # E InfoBox Time: %T^Sunset:^%E|Time: %T^Sunrise:^%M --- NEW FILE: session.txt --- Delta.Rotate: 0 Delta.Y: 0 Delta.X: 0 Focus.Rotate: 0 Focus.Name: Address Hold.Direction: 0 Hold.Position: 0,0 Selection.Position: -122394181,37794928 Address.Position: -122394181,37794928 GPS.Direction: 0 GPS.Position: 0,0 General.Zoom: 150 --- NEW FILE: preferences.txt --- Destination.Color: red Download.Destination: \Storage Card\Roadmap\maps Map.Cache: 8 Map.Background: LightYellow General.Default Zoom: 20 General.Keyboard: no General.Icons: yes General.Toolbar: yes General.Unit: imperial GPS.Background: LightYellow GPS.Baud Rate: 4800 GPS.Color: red GPS.Foreground: black GPS.Source: com1: GPS.Timeout: 10 Help.Arguments: %s Help.Browser: \windows\iexplore Highlight.Background: yellow Highlight.Duration: 10 Highlight.Thickness: 4 Location.Color: red Polygons.Declutter: 1300 Shapes.Declutter: 1300 Display.Rotate: yes --- NEW FILE: roadmap.toolbar --- # # Sample replacement toolbar for RoadMap. # # One button will invoke the menu system as a series of popups, and # the other buttons will perform specific actions. The button labels will # come from "roadmap.actionlabels". # If a "Menus..." button like that below is to be used, it may be # desireable to suppress the default "normal" menus. To do so, create # an empty "roadmap.menus" file. ->Menus... gps destination addaswaypoint resumeroute toggleview --- NEW FILE: libexpat-1.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: font.ttf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sprites --- # # Sprites are small drawings (somewhat like icons) which RoadMap will put # on the screen in various roles. Some move, some are stationary. # # Syntax of the sprite description: # S <name> Start a sprite. The name is how RoadMap refers # to the sprite. These references are # hard-coded into RoadMap. # A <name> Defines this sprite as an alias for another sprite. # (An alias cannot itself have drawing directives). # F <color> <thickness> Start a new color plane. # X <percent> Optional scale factor, for resizing the entire sprite. # L <x>,<y> ... Defines a line. # P <x>,<y> ... Defines a (filled) polygon. # C <x>,<y> <radius> Defines a circle. # D <x>,<y> <radius> Defines a disk (i.e. a filled circle). # B <x>,<y> <x>,<y> Override the sprite's natural bounding box. # T <x>,<y> <s> text... Adds text to the sprite, of size 's'. "text" # can be ommitted, in cases where the sprite's # text will be provided by a screen object # definition. Text strings are fixed, with # no expansion of %-macros. # TR If the sprite has text, supply a backing rectangle # sized and positioned to match the text. # TB If the sprite has text, supply a box outline around # the text. # # The coordinates x and y are relative to the sprite's hot point. # Positive x and y values are towards the south-east. # # The natural "direction" for the sprite is north (e.g., for an arrow). # # The bounding box of sprite is normally calculated internally, # but can be overridden. If a sprite has text associated with # it, the text forms a second, separate, bounding box. Currently # these outlines are only used when sprite is referenced in # "roadmap.screenobjects". The bounding box can also be # overridden there. # # We use aliases to separate a sprite's usage from its actual drawing. # This makes it easier to change the representation of a specific object. S GPS A BlueDart S Friend A GreenTriangle S Selection A CrossHair S Direction A RedArrow S Destination A RedDotCircle S PointOfInterest A SmallRedDot S Waypoint A DarkGreenDot S Start A GreenTrianglePointer S RoutePoint A Circle-Pointer S SecondaryRoutePoint A Small-Circle-Pointer S PersonalLandmark A 5PointStar S TripLandmark A GreenSquare S Highlight A YellowDot S Kismet A RedDisk S Track A PurpleChevron S InactiveTrack A SmallPurpleChevron S BreadCrumb A PurpleDot S Departure A DottedSquare S Direction_Next A BigGreenDart S Direction_2nd A BigYellowDart S Direction_Dest A BigRedDart S ZoomIn A CirclePlus S ZoomOut A CircleMinus # The actual drawing sprites: S BlueDart F white 2 L 0,0 7,14 0,8 -7,14 F blue 1 P 0,1 6,13 0,10 -6,13 L 8,11 0,-3 -8,11 # same as "BlueDart", but with a bigger black # outline for visibility on low-contrast displays S OutlinedBlueDart F white 2 L 0,0 7,14 0,8 -7,14 L 11,17 0,-3 -11,17 0,14 11,17 F blue 1 P 0,1 6,13 0,10 -6,13 F black 1 L 11,17 0,-3 -11,17 0,14 11,17 S GreenTriangle F white 2 L 0,0 7,14 0,8 -7,14 F DarkGreen 2 L 0,1 6,13 0,10 -6,13 0,1 S PurpleTriangle F Purple 1 P 0,-10 -9,5 9,5 0,-10 S CrossHair F white 3 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 F black 1 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 S RedArrow F red 1 P -5,-20 0,-35 5,-20 F black 1 L -5,-20 0,-35 5,-20 -5,-20 S RedDotCircle F red 1 D 0,0 5 F black 1 C 0,0 5 C 0,0 7 S SmallRedDot F red 1 D 0,0 3 S GreenTrianglePointer F green 2 P 0,-9 -8,4 8,4 0,-9 F black 1 L 0,-9 -8,4 8,4 0,-9 L 1,-8 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-8 S GreenDot F green 1 D 0,0 5 F black 1 C 0,0 5 S DarkGreenDot F darkgreen 1 D 0,0 5 F black 1 C 0,0 5 S GreenSquare F black 1 L 5,5 5,-5 -5,-5 -5,5 5,5 F green 1 P 4,4 4,-4 -4,-4 -4,4 4,4 S PurpleChevron F purple 2 L -4,6 0,-6 4,6 S SmallPurpleChevron F purple 2 L -4,4 0,-4 4,4 S PurpleCross F purple 2 L -4,0 4,0 L 0,-4 0,4 S PurpleDot F purple 1 D 0,0 3 S 5PointStar F darkred 1 L 0,-9 5,7 L 5,7 -8,-3 L -8,-3 8,-3 L 8,-3 -5,7 L -5,7 0,-9 S YellowDot F yellow 1 D 0,0 5 F black 1 C 0,0 5 S RedDisk F red 1 D 0,0 10 S Circle F black 1 C 0,0 7 S Circle-Pointer F green 1 D 0,0 7 F black 1 C 0,0 7 C 0,0 1 L 1,-7 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-7 S Small-Circle-Pointer F green 1 D 0,0 6 F black 1 C 0,0 6 L 1,-6 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-6 S DottedSquare F black 1 L 9,9 9,-9 -9,-9 -9,9 9,9 C 0,0 1 # These are very specific sprites we do not expect to change much. S Compass #F white 1 #D 0,0 13 F black 2 C 0,0 14 F white 1 C 0,0 15 F white 3 L -4,0 0,-13 4,0 L -4,0 0,13 4,0 F black 1 P -4,0 0,-13 4,0 F black 1 L -4,0 0,-13 4,0 L -4,0 0,13 4,0 L -17,0 -7,0 L 7,0 17,0 L 0,-13 0,-17 L 0,13 0,17 S Compass_fixed A BigBlackDart S BigBlackDart F black 1 P -9,13 0,8 9,13 0,-13 F white 1 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigGreenDart F green 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigYellowDart F yellow 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigRedDart F red 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S Download #F white 1 #D 0,0 14 F white 1 C 0,0 9 F red 1 C 0,0 8 P -7,-6 -12,4 -2,4 P 7,6 12,-4 2,-4 F white 1 L -7,-6 -12,4 L -7,-6 -2,4 L 7,6 12,-4 L 7,6 2,-4 F black 2 C 0,0 14 F white 1 C 0,0 15 # GPS Indication symbols: S Reception_na #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F white 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F DarkRed 2 L -9,-9 9,9 L 9,-9 -9,9 S reception_none #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F red 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 S reception_poor #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F yellow 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 S reception_good #F green 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 #F white 1 F green 1 P 10,-5 3,-12 0,-5 2,-3 P -5,0 -12,3 -5,10 -2,3 P -5,-10 -10,-5 0,5 5,0 F black 1 L 10,-5 3,-12 0,-5 2,-3 10,-5 L -5,0 -12,3 -5,10 -2,3 -5,0 L -5,-10 -10,-5 0,5 5,0 -5,-10 L 7,1 6,3 3,6 1,7 L 10,1 9,3 3,9 1,10 L 13,1 12,3 3,12 1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 # Red X S X F DarkRed 4 L 4,4 20,20 L 20,4 4,20 S CirclePlus #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F black 1 P -2,2 -2,12 2,12 2,2 12,2 12,-2 2,-2 2,-12 -2,-12 -2,-2 -12,-2 -12,2 F white 1 L -3,3 -3,12 3,12 3,3 12,3 12,-3 3,-3 3,-12 -3,-12 -3,-3 -12,-3 -12,3 -3,3 S CircleMinus #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F black 1 P 12,2 12,-2 -12,-2 -12,2 F white 1 L 12,3 12,-3 -12,-3 -12,3 12,3 S Menu #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 P -5,-8 6,-8 2,8 -9,8 -5,-8 P 6,-8 5,7 8,7 6,-8 F black 1 L -5,-8 6,-8 2,8 -9,8 -5,-8 L 5,7 8,7 6,-8 L -3,-5 3,-5 L -3,-3 2,-3 L -4,-1 2,-1 L -5,1 1,1 L -5,3 1,3 # uncomment to add a text label # T 0,25 18 Menu # an empty textbox, which can be used as a screenobject S TextBox F white 1 TR F black 1 TB F black 2 T 0,0 20 # an empty textbox, which can be used as a screenobject S InfoBox F lightgreen 1 TR F black 1 TB F darkgreen 2 T 0,0 20 |
|
From: Danny B. <dan...@us...> - 2008-12-07 10:30:43
|
Update of /cvsroot/roadmap/roadmap/src/win32/distribution In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20037/distribution Log Message: Directory /cvsroot/roadmap/roadmap/src/win32/distribution added to the repository |
|
From: Danny B. <dan...@us...> - 2008-11-29 15:21:39
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12659 Modified Files: roadmap_message.c Log Message: Document what you can set in the source file, not just in the toplevel README. Index: roadmap_message.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_message.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_message.c 3 Nov 2008 18:25:10 -0000 1.6 --- roadmap_message.c 29 Nov 2008 15:21:32 -0000 1.7 *************** *** 102,105 **** --- 102,133 ---- /** * @brief set a numbered message to the given string + * + * This table outlines which message means what<table><tr> + * A estimated time of arrival (not yet implemented).<tr> + * B Direction of travel (bearing).<tr> + * C the name of the city for the selected or current street.<tr> + * D Distance to the destination (set only when a trip is active).<tr> + * E Next sunset time (evening), undefined in night time.<tr> + * e Next sunset time, always defined.<tr> + * F the full name (number, name, city) of the selected or current street.<tr> + * H Altitude.<tr> + * M Next sunrise time (morning), undefined in daylight time.<tr> + * m Next sunrise time, always defined.<tr> + * N the name of the selected or current street.<tr> + * P the name of the selected or current place.<tr> + * R the name of the route or list containing the selected place.<tr> + * S Speed.<tr> + * T Current time, format HH:MM.<tr> + * W Distance to the next waypoint (set only when a trip is active).<tr> + * X Directions to be followed when the next waypoint (with directions) is reached. + * (set only when a trip is active).<tr> + * Y Distance to the next waypoint which includes directions, unless the GPS is + * "at" that waypoint. (set only when a trip is active).<tr> + * # the street number range to the selected or current street block.<tr> + * s Total number of satellites.<tr> + * v Total number of available satellites.<tr> + * x Distance from one side of the screen to the other.<tr> + * y Distance from the top to the bottom of the screen.</table> + * * @param parameter indicates which message to set * @param format this and the next parameters are printf-style |
|
From: Danny B. <dan...@us...> - 2008-11-29 09:01:05
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12526 Modified Files: roadmap_screen_obj.c Log Message: Auch, remove accidental addition. Index: roadmap_screen_obj.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen_obj.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** roadmap_screen_obj.c 29 Nov 2008 08:59:26 -0000 1.11 --- roadmap_screen_obj.c 29 Nov 2008 09:01:01 -0000 1.12 *************** *** 3,6 **** --- 3,7 ---- * * Copyright 2006 Ehud Shabtai + * Copyright (c) 2008, Danny Backx * * This file is part of RoadMap. *************** *** 826,839 **** } } - - /** - * @brief - * @param x - * @param y - */ - void roadmap_screen_obj_offset (int x, int y) - { - OffsetX += x; - OffsetY += y; - } - --- 827,828 ---- |
|
From: Danny B. <dan...@us...> - 2008-11-29 08:59:33
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12347 Modified Files: roadmap_screen_obj.c Log Message: Make a couple of the error message more informative. Index: roadmap_screen_obj.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen_obj.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** roadmap_screen_obj.c 4 Apr 2008 23:47:33 -0000 1.10 --- roadmap_screen_obj.c 29 Nov 2008 08:59:26 -0000 1.11 *************** *** 1,4 **** ! /* roadmap_screen_obj.c - manage screen objects. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 20,25 **** * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * DESCRIPTION: * * This module manages a dynamic list of objects to be displayed on screen. --- 19,27 ---- * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! ! /** ! * @file ! * @brief roadmap_screen_obj.c - manage screen objects. * * This module manages a dynamic list of objects to be displayed on screen. *************** *** 207,211 **** if (image == NULL) { ! roadmap_screen_obj_syntax("Can't load image"); } object->images[object->states_count] = image; --- 209,214 ---- if (image == NULL) { ! roadmap_log(ROADMAP_WARNING, "%s, line %d: Can't load image (%s)", ! RoadMapScreenObjFile, RoadMapScreenObjLine, argv[i]); } object->images[object->states_count] = image; *************** *** 342,346 **** if (!object->state_fn) { ! roadmap_screen_obj_syntax ("Can't find specified state indicator"); } } --- 345,350 ---- if (!object->state_fn) { ! roadmap_log(ROADMAP_WARNING, "%s, line %d: Can't find state indicator (%s)", ! RoadMapScreenObjFile, RoadMapScreenObjLine, argv[1]); } } *************** *** 363,367 **** object->callback = action->callback; } else { ! roadmap_screen_obj_syntax ("Can't find specified action"); } --- 367,372 ---- object->callback = action->callback; } else { ! roadmap_log(ROADMAP_WARNING, "%s, line %d: Can't find action (%s)", ! RoadMapScreenObjFile, RoadMapScreenObjLine, argv[1]); } *************** *** 372,376 **** object->long_callback = action->callback; } else { ! roadmap_screen_obj_syntax ("Can't find specified action"); } } --- 377,382 ---- object->long_callback = action->callback; } else { ! roadmap_log(ROADMAP_WARNING, "%s, line %d: Can't find action (%s)", ! RoadMapScreenObjFile, RoadMapScreenObjLine, argv[2]); } } *************** *** 821,824 **** } ! --- 827,839 ---- } ! /** ! * @brief ! * @param x ! * @param y ! */ ! void roadmap_screen_obj_offset (int x, int y) ! { ! OffsetX += x; ! OffsetY += y; ! } |
|
From: Paul F. <pg...@us...> - 2008-11-19 21:58:30
|
Update of /cvsroot/roadmap/roadmap/doc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18896 Modified Files: ToDo Log Message: add i18n Index: ToDo =================================================================== RCS file: /cvsroot/roadmap/roadmap/doc/ToDo,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToDo 7 Nov 2008 13:46:54 -0000 1.1 --- ToDo 19 Nov 2008 21:53:36 -0000 1.2 *************** *** 91,94 **** --- 91,101 ---- is now synchronizing the system time, so don't mess with that subject.. + - Internationalization + + RoadMap has some initial i18n code. It's not based on gettext(). + Before going further, we should revisit that decision, just in case + we want to do it differently. But in any case, we should make the + entire program translatable, and add more languages. + - Modular map format |
|
From: Danny B. <dan...@us...> - 2008-11-18 23:15:49
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6177/win32 Modified Files: roadmap_main.cpp Log Message: One way to terminate the application is probably plenty. ExitProcess() does the trick, remove the other call. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roadmap_main.cpp 31 Oct 2008 04:57:50 -0000 1.26 --- roadmap_main.cpp 18 Nov 2008 23:15:42 -0000 1.27 *************** *** 25,28 **** --- 25,29 ---- * @file * @brief The main function of the RoadMap application for Windows. + * @ingroup windows */ *************** *** 1157,1162 **** { roadmap_start_exit (); - SendMessage(RoadMapMainWindow, WM_CLOSE, 0, 0); - /* This is an easy and clean way to terminate threads too */ ExitProcess(0); --- 1158,1161 ---- |
|
From: Danny B. <dan...@us...> - 2008-11-17 19:43:04
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23296/win32 Modified Files: roadmap_fileselection.c Log Message: Fix a bug: the format string wasn't properly formed. Add documentation in the process. Index: roadmap_fileselection.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_fileselection.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_fileselection.c 30 May 2008 08:04:33 -0000 1.3 --- roadmap_fileselection.c 17 Nov 2008 19:42:59 -0000 1.4 *************** *** 1,4 **** ! /* roadmap_fileselection.c - manage the Widget used in roadmap dialogs. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 20,27 **** * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * SYNOPSYS: ! * ! * See roadmap_fileselection.h */ --- 19,27 ---- * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! ! /** ! * @file ! * @brief win32/roadmap_fileselection.c - manage the Widget used in roadmap dialogs. */ *************** *** 35,43 **** void roadmap_fileselection_new (const char *title, ! const char *filter, ! const char *path, ! const char *mode, ! RoadMapFileCallback callback) { WCHAR filename[MAX_PATH] = {0}; --- 35,51 ---- + /** + * @brief pop up a dialog asking the user which file to load/save + * @param title the title of this dialog + * @param filter optional filter string, defaults to *.* + * @param path not used + * @param mode should contain 'r' for reading a file + * @param callback this function is called (on success) with the filename and mode as arguments + */ void roadmap_fileselection_new (const char *title, ! const char *filter, ! const char *path, ! const char *mode, ! RoadMapFileCallback callback) { WCHAR filename[MAX_PATH] = {0}; *************** *** 55,61 **** ofn.lpstrTitle = title_unicode; if (filter != NULL) { LPWSTR fltr = ConvertToUNICODE(filter); ! _snwprintf(strFilter, sizeof(strFilter)/sizeof(strFilter[0]), ! TEXT("%s\0%s\0"), fltr, fltr); free(fltr); ofn.lpstrFilter = strFilter; --- 63,77 ---- ofn.lpstrTitle = title_unicode; if (filter != NULL) { + /* + * Need to get the string converted into WCS and then + * stored twice with a couple of NULLs in between and at the end. + */ LPWSTR fltr = ConvertToUNICODE(filter); ! int l = wcslen(fltr); ! wcscpy(strFilter, fltr); ! strFilter[l] = L'\0'; /* one more zero */ ! wcscpy(strFilter+l+1, fltr); ! strFilter[2*l+1] = L'\0'; /* one more zero */ ! strFilter[2*l+2] = L'\0'; /* one more zero */ free(fltr); ofn.lpstrFilter = strFilter; *************** *** 81,83 **** } } - --- 97,98 ---- |
|
From: Danny B. <dan...@us...> - 2008-11-16 16:48:41
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12736 Modified Files: roadmap_dialog.c Log Message: Increase default item height in dialogs, this is necessary for devices with 640x480 resolution, but to be honest it's still a quick hack. Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_dialog.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** roadmap_dialog.c 30 May 2008 08:04:33 -0000 1.11 --- roadmap_dialog.c 16 Nov 2008 16:48:36 -0000 1.12 *************** *** 1,4 **** ! /* roadmap_dialog.c - manage the Widget used in roadmap dialogs. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 23,30 **** * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * SYNOPSYS: ! * ! * See roadmap_dialog.h */ --- 22,31 ---- * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! ! /** ! * @file ! * @brief win32/roadmap_dialog.c - manage the Widget used in roadmap dialogs. ! * @ingroup windows */ *************** *** 63,67 **** #define ROADMAP_WIDGET_MUL_ENTRY 10 ! const unsigned int MAX_ROW_HEIGHT = 20; const unsigned int MAX_ROW_SPACE = 5; const unsigned int MAX_LIST_HEIGHT = 80; --- 64,68 ---- #define ROADMAP_WIDGET_MUL_ENTRY 10 ! const unsigned int MAX_ROW_HEIGHT = 40; /* 20 */ const unsigned int MAX_ROW_SPACE = 5; const unsigned int MAX_LIST_HEIGHT = 80; *************** *** 1098,1100 **** return (INT_PTR)FALSE; } - --- 1099,1100 ---- |
|
From: Danny B. <dan...@us...> - 2008-11-16 16:46:01
|
Update of /cvsroot/roadmap/roadmap/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12550 Modified Files: roadmap_sprite.c Log Message: Hopefully harmless changes to add a few log messages, also add some docs. Index: roadmap_sprite.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_sprite.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** roadmap_sprite.c 25 Mar 2008 14:53:08 -0000 1.20 --- roadmap_sprite.c 16 Nov 2008 16:45:53 -0000 1.21 *************** *** 1,4 **** ! /* roadmap_sprite.c - manage the roadmap sprites that represent moving objects. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 20,27 **** * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * DESCRIPTION: ! * ! * This module draws predefined graphical objects on the RoadMap canvas. */ --- 19,27 ---- * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! ! /** ! * @file ! * @brief This module draws predefined graphical objects on the RoadMap canvas. */ *************** *** 113,125 **** static int RoadMapSpriteLine; ! static void roadmap_sprite_syntax(char *msg) { ! ! roadmap_log(ROADMAP_WARNING, "%s, line %d: %s", ! RoadMapSpriteFile, RoadMapSpriteLine, msg); ! } ! static RoadMapSprite roadmap_sprite_search (const char *name) { ! RoadMapSprite cursor; --- 113,136 ---- static int RoadMapSpriteLine; ! /** ! * @brief print a warning message ! * @param msg the message ! */ ! static void roadmap_sprite_syntax(char *msg) ! { ! roadmap_log(ROADMAP_WARNING, ! "%s, line %d: %s", ! RoadMapSpriteFile, ! RoadMapSpriteLine, ! msg); } ! /** ! * @brief look for a named sprite ! * @param name ! * @return the sprite ! */ ! static RoadMapSprite roadmap_sprite_search (const char *name) ! { RoadMapSprite cursor; *************** *** 485,491 **** } ! ! static int roadmap_sprite_load_line (char *line) { ! int argc; char *argv[256]; --- 496,506 ---- } ! /** ! * @brief process a line of sprite configuration file ! * @param line text from the sprites file ! * @return status ! */ ! static int roadmap_sprite_load_line (char *line) ! { int argc; char *argv[256]; *************** *** 645,657 **** } ! ! static void roadmap_sprite_load_file (const char *path) { ! FILE *file; if ((file = roadmap_file_fopen (path, "sprites", "r")) == NULL) { - roadmap_log (ROADMAP_ERROR, "cannot open file 'sprites' in %s", path); - } else { char line[1024]; --- 660,673 ---- } ! /** ! * @brief ! * @param path ! */ ! static void roadmap_sprite_load_file (const char *path) ! { FILE *file; if ((file = roadmap_file_fopen (path, "sprites", "r")) == NULL) { roadmap_log (ROADMAP_ERROR, "cannot open file 'sprites' in %s", path); } else { char line[1024]; *************** *** 661,673 **** while (!feof(file)) { ! ! if (fgets (line, sizeof(line), file) == NULL) break; ! ! if (roadmap_sprite_load_line (line) == 0) break; ! RoadMapSpriteLine++; } fclose (file); free (RoadMapSpriteFile); --- 677,689 ---- while (!feof(file)) { ! if (fgets (line, sizeof(line), file) == NULL) ! break; ! if (roadmap_sprite_load_line (line) == 0) ! break; RoadMapSpriteLine++; } fclose (file); + roadmap_log (ROADMAP_DEBUG, "roadmap_sprite_load_file: %d lines", RoadMapSpriteLine); free (RoadMapSpriteFile); *************** *** 800,804 **** int scale; ! if (sprite == NULL || sprite->alias_name != NULL) return; scale = RoadMapSpritePercent * sprite->scale / 100; --- 816,823 ---- int scale; ! if (sprite == NULL || sprite->alias_name != NULL) { ! roadmap_log (ROADMAP_WARNING, "roadmap_sprite_draw_with_text(%s): NULL", name); ! return; ! } scale = RoadMapSpritePercent * sprite->scale / 100; *************** *** 924,936 **** } ! void roadmap_sprite_draw ! (const char *name, RoadMapGuiPoint *location, int orientation) { ! ! roadmap_sprite_draw_with_text ! (name, location, orientation, NULL, NULL, NULL); } ! void roadmap_sprite_load (void) { ! int max_point_count; const char *cursor; --- 943,962 ---- } ! /** ! * @brief draw a sprite ! * @param name ! * @param location ! * @param orientation ! */ ! void roadmap_sprite_draw (const char *name, RoadMapGuiPoint *location, int orientation) ! { ! roadmap_sprite_draw_with_text (name, location, orientation, NULL, NULL, NULL); } ! /** ! * @brief initialize roadmap_sprite.c, load the sprite file ! */ ! void roadmap_sprite_load (void) ! { int max_point_count; const char *cursor; *************** *** 938,946 **** RoadMapSprite sprite; - for (cursor = roadmap_scan ("config", "sprites"); cursor != NULL; cursor = roadmap_scan_next ("config", "sprites", cursor)) { - roadmap_sprite_load_file (cursor); } --- 964,970 ---- *************** *** 956,960 **** if (RoadMapSpriteDefault == NULL) { - /* initialize character arrays to keep these strings writeable -- * strtok() will process them --- 980,983 ---- *************** *** 964,967 **** --- 987,992 ---- char hardcoded3[] = "P -4,-4 4,-4 4,4 -4,4"; + roadmap_log (ROADMAP_WARNING, "roadmap_sprite_load: no sprites found, just a default"); + roadmap_sprite_load_line (hardcoded1); roadmap_sprite_load_line (hardcoded2); *************** *** 973,984 **** roadmap_sprite_resolve_aliases(); - /* Allocate the space required to draw any configured sprite: */ RoadMapSpritePointCount = roadmap_sprite_maxpoint (RoadMapSpriteDefault); for (sprite = RoadMapSpriteList; sprite != NULL; sprite = sprite->next) { ! ! if (sprite->alias_name != NULL) continue; max_point_count = roadmap_sprite_maxpoint (sprite); --- 998,1009 ---- roadmap_sprite_resolve_aliases(); /* Allocate the space required to draw any configured sprite: */ RoadMapSpritePointCount = roadmap_sprite_maxpoint (RoadMapSpriteDefault); + roadmap_log (ROADMAP_DEBUG, "roadmap_sprite_load: %d sprites", RoadMapSpritePointCount); for (sprite = RoadMapSpriteList; sprite != NULL; sprite = sprite->next) { ! if (sprite->alias_name != NULL) ! continue; max_point_count = roadmap_sprite_maxpoint (sprite); *************** *** 988,1000 **** } } - RoadMapSpritePoints = - calloc (RoadMapSpritePointCount, sizeof(*RoadMapSpritePoints)); ! roadmap_config_declare ! ("preferences", &RoadMapConfigSpritePercent, "100"); ! RoadMapSpritePercent = ! roadmap_config_get_integer (&RoadMapConfigSpritePercent); ! } --- 1013,1022 ---- } } ! RoadMapSpritePoints = calloc (RoadMapSpritePointCount, sizeof(*RoadMapSpritePoints)); ! roadmap_config_declare ("preferences", &RoadMapConfigSpritePercent, "100"); ! RoadMapSpritePercent = roadmap_config_get_integer (&RoadMapConfigSpritePercent); + } |
|
From: Paul F. <pg...@us...> - 2008-11-08 05:45:45
|
Update of /cvsroot/roadmap/roadmap/sugar/activity In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22564 Modified Files: RoadMap.svg Log Message: removed funny wisp from drawing. don't know where it came from. Index: RoadMap.svg =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/activity/RoadMap.svg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoadMap.svg 4 Sep 2008 18:48:19 -0000 1.1 --- RoadMap.svg 8 Nov 2008 05:45:41 -0000 1.2 *************** *** 2,9 **** <!ENTITY stroke_color "#666666"> <!ENTITY fill_color "#ffffff"> - - <!ENTITY stroke_opacity "1"> <!ENTITY fill_opacity "1"> ! ]><svg height="45" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.45.1" sodipodi:docbase="/home/pgf/src/pdom/gps/roadmap/ndcvs/sugar/activity" sodipodi:docname="simpleRoadMap.svg" sodipodi:version="0.32" version="1.0" width="45" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"> <metadata id="metadata16"> <rdf:RDF> --- 2,7 ---- <!ENTITY stroke_color "#666666"> <!ENTITY fill_color "#ffffff"> <!ENTITY fill_opacity "1"> ! ]><svg height="45" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.46" sodipodi:docbase="/home/pgf/src/pdom/gps/roadmap/ndcvs/sugar/activity" sodipodi:docname="RoadMap.svg" sodipodi:version="0.32" version="1.0" width="45" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"> <metadata id="metadata16"> <rdf:RDF> *************** *** 14,29 **** </rdf:RDF> </metadata> ! <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" gridtolerance="10.0" guidetolerance="10.0" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="480" inkscape:window-width="640" objecttolerance="10.0" pagecolor="#ffffff"/> ! <defs id="defs13"/> ! <rect height="14.11365" id="rect3138" ry="0.43426618" style="fill:&fill_color;;fill-opacity:&fill_opacity;;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.934;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;" width="38.637459" x="2.5860298" y="1.6336505"/> ! <path d="M 8.3238071,6.2766696 C 8.5788169,6.5294076 8.773341,6.8310703 8.9704146,7.1279018 C 9.1289161,7.4262905 9.1756045,7.7579107 9.2351331,8.0849879 C 9.352776,8.312958 9.3864103,8.5637956 9.4365874,8.8109951 C 9.4662889,9.0618068 9.4738888,9.3149246 9.4858617,9.5668235 C 9.5566343,9.8006566 9.6208224,10.035716 9.681626,10.272401 C 9.7823823,10.517414 9.9331204,10.739748 10.066986,10.968532 C 10.165519,11.151962 10.283482,11.325677 10.38941,11.502104 L 8.8751293,12.406379 C 8.7657324,12.219988 8.6495328,12.035741 8.5434482,11.845895 C 8.4030489,11.604479 8.2457724,11.370773 8.1352532,11.114359 C 8.0734693,10.869223 8.0107105,10.62459 7.9267821,10.385522 C 7.9114891,10.134942 7.897353,9.8826516 7.880982,9.631194 C 7.8360001,9.3853526 7.8040448,9.140276 7.6837374,8.9154249 C 7.6348597,8.6056493 7.6019298,8.289419 7.4566863,8.0054537 C 7.2625761,7.7227569 7.0859997,7.4221374 6.8185944,7.1990651 L 8.3238071,6.2766696 z " id="path3142" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 14.235712,6.0959984 C 14.532727,6.0020396 14.841547,5.9718826 15.1483,5.9314483 C 15.41655,5.8687536 15.622573,5.9787057 15.867204,6.0572302 C 16.131376,6.1473187 16.370324,6.2903897 16.611884,6.419578 C 16.733462,6.6069886 16.872176,6.7895447 16.99619,6.9719752 C 17.158236,7.1448355 17.301157,7.3362051 17.450646,7.5205138 C 17.582045,7.7231405 17.735218,7.9058649 17.886331,8.0929312 C 18.053613,8.1969594 18.098701,8.3681662 18.187962,8.5187715 C 18.022109,9.1741949 16.898837,9.4271585 16.235212,9.7152387 C 15.998283,9.7889457 15.750735,9.7895774 15.505784,9.8030643 C 15.26559,9.807572 15.025338,9.8054686 14.78512,9.8048055 C 14.540211,9.8481082 14.320576,9.9687317 14.096569,10.067082 C 13.503625,10.332567 12.618743,10.886713 15.174352,9.4230854 L 13.536177,10.077259 C 14.195435,9.685598 14.78941,9.279243 15.470003,8.9684193 C 15.711044,8.8800063 15.947576,8.7666979 16.210565,8.7697514 C 16.44901,8.7696466 16.687616,8.7724816 16.925879,8.7610751 C 17.160539,8.7305723 17.401149,8.7317224 17.620354,8.6264761 C 18.751258,8.0533089 16.50945,9.1237688 16.603265,9.3181401 C 16.561198,9.2600681 16.484763,9.0550872 16.365812,8.990347 C 16.221776,8.804968 16.074041,8.6242939 15.945194,8.4274921 C 15.796216,8.2482886 15.652465,8.0635797 15.493358,7.8936445 C 15.36695,7.7197738 15.244395,7.5425301 15.124438,7.3654553 C 14.892572,7.250512 14.662779,7.1219613 14.411575,7.0479911 C 14.180029,6.9957919 13.98733,6.9067016 13.739312,6.979269 C 13.435787,7.0291747 13.128971,7.0669728 12.839932,7.1803743 L 14.235712,6.0959984 z " id="path3144" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 19.620775,12.645542 C 19.937459,12.436631 20.230272,12.194666 20.533389,11.967302 C 21.1622,11.443237 21.93724,11.092406 22.63318,10.703302 C 22.339941,10.951143 21.305611,11.454107 21.594545,11.20126 C 22.165591,10.670729 22.927457,10.359829 23.584688,9.9908861 C 23.869966,9.9915268 24.105715,9.8608599 24.359326,9.7545018 C 24.697872,9.6274566 25.035319,9.4977752 25.369666,9.3593459 C 26.201376,9.0341334 28.565857,7.6315138 24.826466,9.7277728 C 25.054917,9.5965635 25.253469,9.4279687 25.462065,9.2706405 C 26.691189,8.4719115 28.693811,7.3875494 26.023246,8.9093578 C 26.082081,8.8830521 26.10297,8.8221472 26.142833,8.7785419 L 27.752794,8.0529486 C 27.721858,8.1182335 27.713976,8.1944627 27.659987,8.2488034 C 27.635191,8.2750418 27.610395,8.3012802 27.5856,8.3275185 C 27.050565,8.635718 26.51553,8.9439175 25.980495,9.2521169 C 25.602141,9.4549224 27.464017,8.3887205 27.103654,8.622001 C 26.894858,8.7875907 26.690464,8.9563066 26.45385,9.0859179 C 25.651842,9.5632546 24.880481,10.131208 23.989742,10.440474 C 23.656456,10.576035 23.318894,10.700886 22.989492,10.845219 C 22.725773,10.932087 22.466401,11.023421 22.193256,11.078439 C 22.527917,10.880821 23.528083,10.2991 23.234498,10.553773 C 22.655784,11.068524 21.977599,11.514203 21.242602,11.790489 C 25.317614,9.3856005 22.575211,10.910217 22.163746,11.330643 C 21.852548,11.539842 21.563679,11.775651 21.264392,12.002441 L 19.620775,12.645542 z " id="path3146" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 32.138151,5.2953919 C 32.410166,5.4552967 32.705285,5.5775863 32.991026,5.7067304 C 33.187281,5.8293052 33.392752,5.9366946 33.592478,6.0516792 C 33.86967,6.0647062 33.962225,6.2431633 34.140065,6.3944098 C 34.211,6.5860821 34.240405,6.7962591 34.275475,6.9947378 C 34.392391,7.1671313 34.404572,7.3699783 34.451754,7.5642908 C 34.513336,7.7293742 34.581454,7.8980184 34.651481,8.0613831 C 34.74426,8.2789534 34.816417,8.5017851 34.888231,8.7266417 C 34.929593,8.9973628 35.103679,9.1559878 35.271861,9.3453319 C 35.419812,9.5086464 35.598806,9.6269463 35.773161,9.7587114 C 35.9708,9.8482485 36.135907,9.9820757 36.310137,10.10762 L 34.822596,11.060206 C 34.646245,10.935416 34.479601,10.801989 34.285433,10.703578 C 34.111822,10.565295 33.927879,10.443385 33.778774,10.275707 C 33.594323,10.055304 33.394804,9.861958 33.337786,9.5624402 C 33.263591,9.3418809 33.208262,9.1150949 33.100275,8.9058812 C 33.025549,8.7360443 32.959327,8.5564564 32.889973,8.3847566 C 32.851577,8.2041804 32.845853,8.0187318 32.734446,7.8602069 C 32.696744,7.6697329 32.642943,7.4755128 32.611009,7.2807561 C 32.461751,7.1966535 32.328147,7.0345718 32.121551,7.0208395 C 31.91908,6.9022996 31.713219,6.7887251 31.514597,6.6633474 C 31.223467,6.5344257 30.926778,6.4102528 30.651778,6.2471007 L 32.138151,5.2953919 z " id="path3148" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> ! <rect height="27.546658" id="rect3156" rx="1.2479817" ry="0" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.94042726;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;" transform="matrix(0.9982626,-5.8921749e-2,0.2040576,0.9789589,0,0)" width="3.4035833" x="31.123331" y="19.333595"/> ! <path d="M 24.478322,4.6840136 C 24.467738,4.98681 24.471974,5.2898858 24.472816,5.5928029 C 24.477445,5.7975 24.596308,5.9615069 24.684204,6.1373777 C 24.808488,6.3574042 24.919583,6.5848779 25.037473,6.8082052 C 25.142461,7.0744239 25.333979,7.2821058 25.510098,7.5010135 C 25.686137,7.6979803 25.788677,7.943424 25.904696,8.1754459 C 25.982689,8.3380285 26.115859,8.4511072 26.225816,8.5887703 C 26.385568,8.7047409 26.51541,8.8556627 26.658028,8.9891471 C 26.781794,9.1363168 26.960466,9.2211755 27.124454,9.3138754 C 27.318704,9.4080413 27.457295,9.5585086 27.610057,9.7023819 C 27.708984,9.7950385 27.793816,9.9001338 27.885562,9.9988655 L 26.367366,10.902118 C 26.277845,10.804893 26.187191,10.708176 26.098332,10.60993 C 25.945747,10.491767 25.804507,10.35288 25.630308,10.258386 C 25.454182,10.152382 25.262962,10.074148 25.144699,9.8939823 C 24.996597,9.7653104 24.847189,9.6297383 24.705674,9.4926717 C 24.594835,9.3514964 24.457147,9.2336838 24.38081,9.0662522 C 24.272149,8.8389569 24.176815,8.5996355 24.008406,8.406887 C 23.822046,8.1750282 23.619429,7.9543657 23.505477,7.6740384 C 23.39064,7.4576706 23.282682,7.2367743 23.16051,7.0241182 C 23.056072,6.8193983 22.918825,6.6295222 22.908136,6.390047 C 22.90897,6.0890017 22.9133,5.7877884 22.902631,5.4868681 L 24.478322,4.6840136 z " id="path3179" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 12.802968,10.916021 L 14.72732,11.059628 L 16.190099,11.222675 L 13.4291,10.977106 L 12.802968,10.916021 z " id="path7245" style="color:#010101"/> ! <path d="M 7.5005297,44.642604 C 7.5005297,44.642604 10.458525,44.37633 7.5835072,31.178518 C 5.8080522,23.006161 12.659934,18.45531 20.66637,16.096548" id="path3190" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 24.78118,44.375531 C 24.78118,44.375531 26.145215,42.219535 24.964948,38.467111 C 24.31672,36.4062 25.045411,38.512838 21.981656,32.325895 C 18.562711,25.421682 21.53257,20.88734 25.616307,17.849583 C 26.63724,17.090144 27.274109,16.644179 28.215586,15.990453" id="path3195" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:&stroke_opacity;;"/> ! <path d="M 15.776147,45.089864 C 15.776147,45.089864 16.886406,42.317466 16.874814,40.319062 C 16.8568,37.451413 16.548807,37.155454 14.65947,31.383001 C 12.809067,25.729503 15.033411,23.653596 17.415878,20.911991 C 19.798347,18.170387 23.433356,16.37067 27.216732,16.343884" id="path3215" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-miterlimit:4;stroke-dasharray:5.10000014, 5.10000014;stroke-dashoffset:3.4000001;stroke-opacity:&stroke_opacity;;"/> </svg> \ No newline at end of file --- 12,28 ---- </rdf:RDF> </metadata> ! <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" gridtolerance="10.0" guidetolerance="10.0" id="base" inkscape:current-layer="svg2" inkscape:cx="22.5" inkscape:cy="22.5" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="672" inkscape:window-width="640" inkscape:window-x="160" inkscape:window-y="38" inkscape:zoom="10.355556" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false"/> ! <defs id="defs13"> ! <inkscape:perspective id="perspective17" inkscape:persp3d-origin="22.5 : 15 : 1" inkscape:vp_x="0 : 22.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="45 : 22.5 : 1" sodipodi:type="inkscape:persp3d"/> ! </defs> ! <rect height="14.11365" id="rect3138" ry="0.43426618" style="fill:&fill_color;;fill-opacity:&fill_opacity;;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.934;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;" width="38.637459" x="2.5860298" y="1.6336505"/> ! <path d="M 8.3238071,6.2766696 C 8.5788169,6.5294076 8.773341,6.8310703 8.9704146,7.1279018 C 9.1289161,7.4262905 9.1756045,7.7579107 9.2351331,8.0849879 C 9.352776,8.312958 9.3864103,8.5637956 9.4365874,8.8109951 C 9.4662889,9.0618068 9.4738888,9.3149246 9.4858617,9.5668235 C 9.5566343,9.8006566 9.6208224,10.035716 9.681626,10.272401 C 9.7823823,10.517414 9.9331204,10.739748 10.066986,10.968532 C 10.165519,11.151962 10.283482,11.325677 10.38941,11.502104 L 8.8751293,12.406379 C 8.7657324,12.219988 8.6495328,12.035741 8.5434482,11.845895 C 8.4030489,11.604479 8.2457724,11.370773 8.1352532,11.114359 C 8.0734693,10.869223 8.0107105,10.62459 7.9267821,10.385522 C 7.9114891,10.134942 7.897353,9.8826516 7.880982,9.631194 C 7.8360001,9.3853526 7.8040448,9.140276 7.6837374,8.9154249 C 7.6348597,8.6056493 7.6019298,8.289419 7.4566863,8.0054537 C 7.2625761,7.7227569 7.0859997,7.4221374 6.8185944,7.1990651 L 8.3238071,6.2766696 z " id="path3142" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;"/> ! <path d="M 14.235712,6.0959984 C 14.532727,6.0020396 14.841547,5.9718826 15.1483,5.9314483 C 15.41655,5.8687536 15.622573,5.9787057 15.867204,6.0572302 C 16.131376,6.1473187 16.370324,6.2903897 16.611884,6.419578 C 16.733462,6.6069886 16.872176,6.7895447 16.99619,6.9719752 C 17.158236,7.1448355 17.301157,7.3362051 17.450646,7.5205138 C 17.582045,7.7231405 17.735218,7.9058649 17.886331,8.0929312 C 18.053613,8.1969594 18.098701,8.3681662 18.187962,8.5187715 C 18.022109,9.1741949 16.898837,9.4271585 16.235212,9.7152387 C 15.998283,9.7889457 15.750735,9.7895774 15.505784,9.8030643 C 15.26559,9.807572 15.025338,9.8054686 14.78512,9.8048055 C 14.540211,9.8481082 14.320576,9.9687317 14.096569,10.067082 C 13.503625,10.332567 12.618743,10.886713 15.174352,9.4230854 L 13.536177,10.077259 C 14.195435,9.685598 14.78941,9.279243 15.470003,8.9684193 C 15.711044,8.8800063 15.947576,8.7666979 16.210565,8.7697514 C 16.44901,8.7696466 16.687616,8.7724816 16.925879,8.7610751 C 17.160539,8.7305723 17.401149,8.7317224 17.620354,8.6264761 C 18.751258,8.0533089 16.50945,9.1237688 16.603265,9.3181401 C 16.561198,9.2600681 16.484763,9.0550872 16.365812,8.990347 C 16.221776,8.804968 16.074041,8.6242939 15.945194,8.4274921 C 15.796216,8.2482886 15.652465,8.0635797 15.493358,7.8936445 C 15.36695,7.7197738 15.244395,7.5425301 15.124438,7.3654553 C 14.892572,7.250512 14.662779,7.1219613 14.411575,7.0479911 C 14.180029,6.9957919 13.98733,6.9067016 13.739312,6.979269 C 13.435787,7.0291747 13.128971,7.0669728 12.839932,7.1803743 L 14.235712,6.0959984 z " id="path3144" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;"/> ! <path d="M 19.620775,12.645542 C 19.937459,12.436631 20.230272,12.194666 20.533389,11.967302 C 21.1622,11.443237 21.93724,11.092406 22.63318,10.703302 C 22.339941,10.951143 21.305611,11.454107 21.594545,11.20126 C 22.165591,10.670729 22.927457,10.359829 23.584688,9.9908861 C 23.869966,9.9915268 24.105715,9.8608599 24.359326,9.7545018 C 24.697872,9.6274566 25.035319,9.4977752 25.369666,9.3593459 C 26.201376,9.0341334 28.565857,7.6315138 24.826466,9.7277728 C 25.054917,9.5965635 25.253469,9.4279687 25.462065,9.2706405 C 26.691189,8.4719115 28.693811,7.3875494 26.023246,8.9093578 C 26.082081,8.8830521 26.10297,8.8221472 26.142833,8.7785419 L 27.752794,8.0529486 C 27.721858,8.1182335 27.713976,8.1944627 27.659987,8.2488034 C 27.635191,8.2750418 27.610395,8.3012802 27.5856,8.3275185 C 27.050565,8.635718 26.51553,8.9439175 25.980495,9.2521169 C 25.602141,9.4549224 27.464017,8.3887205 27.103654,8.622001 C 26.894858,8.7875907 26.690464,8.9563066 26.45385,9.0859179 C 25.651842,9.5632546 24.880481,10.131208 23.989742,10.440474 C 23.656456,10.576035 23.318894,10.700886 22.989492,10.845219 C 22.725773,10.932087 22.466401,11.023421 22.193256,11.078439 C 22.527917,10.880821 23.528083,10.2991 23.234498,10.553773 C 22.655784,11.068524 21.977599,11.514203 21.242602,11.790489 C 25.317614,9.3856005 22.575211,10.910217 22.163746,11.330643 C 21.852548,11.539842 21.563679,11.775651 21.264392,12.002441 L 19.620775,12.645542 z " id="path3146" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;"/> ! <path d="M 32.138151,5.2953919 C 32.410166,5.4552967 32.705285,5.5775863 32.991026,5.7067304 C 33.187281,5.8293052 33.392752,5.9366946 33.592478,6.0516792 C 33.86967,6.0647062 33.962225,6.2431633 34.140065,6.3944098 C 34.211,6.5860821 34.240405,6.7962591 34.275475,6.9947378 C 34.392391,7.1671313 34.404572,7.3699783 34.451754,7.5642908 C 34.513336,7.7293742 34.581454,7.8980184 34.651481,8.0613831 C 34.74426,8.2789534 34.816417,8.5017851 34.888231,8.7266417 C 34.929593,8.9973628 35.103679,9.1559878 35.271861,9.3453319 C 35.419812,9.5086464 35.598806,9.6269463 35.773161,9.7587114 C 35.9708,9.8482485 36.135907,9.9820757 36.310137,10.10762 L 34.822596,11.060206 C 34.646245,10.935416 34.479601,10.801989 34.285433,10.703578 C 34.111822,10.565295 33.927879,10.443385 33.778774,10.275707 C 33.594323,10.055304 33.394804,9.861958 33.337786,9.5624402 C 33.263591,9.3418809 33.208262,9.1150949 33.100275,8.9058812 C 33.025549,8.7360443 32.959327,8.5564564 32.889973,8.3847566 C 32.851577,8.2041804 32.845853,8.0187318 32.734446,7.8602069 C 32.696744,7.6697329 32.642943,7.4755128 32.611009,7.2807561 C 32.461751,7.1966535 32.328147,7.0345718 32.121551,7.0208395 C 31.91908,6.9022996 31.713219,6.7887251 31.514597,6.6633474 C 31.223467,6.5344257 30.926778,6.4102528 30.651778,6.2471007 L 32.138151,5.2953919 z " id="path3148" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;"/> ! <rect height="27.546658" id="rect3156" rx="1.2479817" ry="0" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.94042726;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;" transform="matrix(0.9982626,-5.8921749e-2,0.2040576,0.9789589,0,0)" width="3.4035833" x="31.123331" y="19.333595"/> ! <path d="M 24.478322,4.6840136 C 24.467738,4.98681 24.471974,5.2898858 24.472816,5.5928029 C 24.477445,5.7975 24.596308,5.9615069 24.684204,6.1373777 C 24.808488,6.3574042 24.919583,6.5848779 25.037473,6.8082052 C 25.142461,7.0744239 25.333979,7.2821058 25.510098,7.5010135 C 25.686137,7.6979803 25.788677,7.943424 25.904696,8.1754459 C 25.982689,8.3380285 26.115859,8.4511072 26.225816,8.5887703 C 26.385568,8.7047409 26.51541,8.8556627 26.658028,8.9891471 C 26.781794,9.1363168 26.960466,9.2211755 27.124454,9.3138754 C 27.318704,9.4080413 27.457295,9.5585086 27.610057,9.7023819 C 27.708984,9.7950385 27.793816,9.9001338 27.885562,9.9988655 L 26.367366,10.902118 C 26.277845,10.804893 26.187191,10.708176 26.098332,10.60993 C 25.945747,10.491767 25.804507,10.35288 25.630308,10.258386 C 25.454182,10.152382 25.262962,10.074148 25.144699,9.8939823 C 24.996597,9.7653104 24.847189,9.6297383 24.705674,9.4926717 C 24.594835,9.3514964 24.457147,9.2336838 24.38081,9.0662522 C 24.272149,8.8389569 24.176815,8.5996355 24.008406,8.406887 C 23.822046,8.1750282 23.619429,7.9543657 23.505477,7.6740384 C 23.39064,7.4576706 23.282682,7.2367743 23.16051,7.0241182 C 23.056072,6.8193983 22.918825,6.6295222 22.908136,6.390047 C 22.90897,6.0890017 22.9133,5.7877884 22.902631,5.4868681 L 24.478322,4.6840136 z " id="path3179" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:1;"/> ! <path d="M 7.5005297,44.642604 C 7.5005297,44.642604 10.458525,44.37633 7.5835072,31.178518 C 5.8080522,23.006161 12.659934,18.45531 20.66637,16.096548" id="path3190" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"/> ! <path d="M 24.78118,44.375531 C 24.78118,44.375531 26.145215,42.219535 24.964948,38.467111 C 24.31672,36.4062 25.045411,38.512838 21.981656,32.325895 C 18.562711,25.421682 21.53257,20.88734 25.616307,17.849583 C 26.63724,17.090144 27.274109,16.644179 28.215586,15.990453" id="path3195" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"/> ! <path d="M 15.776147,45.089864 C 15.776147,45.089864 16.886406,42.317466 16.874814,40.319062 C 16.8568,37.451413 16.548807,37.155454 14.65947,31.383001 C 12.809067,25.729503 15.033411,23.653596 17.415878,20.911991 C 19.798347,18.170387 23.433356,16.37067 27.216732,16.343884" id="path3215" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-miterlimit:4;stroke-dasharray:5.10000014, 5.10000014;stroke-dashoffset:3.4000001;stroke-opacity:1;"/> </svg> \ No newline at end of file |
