Fix:projs/CodeBlocks:update project files, more work on native win32 gui/graphics

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@869 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/projs/CodeBlocks/Navit.workspace b/navit/projs/CodeBlocks/Navit.workspace
index 716ba31..0f176ad 100644 (file)
--- a/navit/projs/CodeBlocks/Navit.workspace
+++ b/navit/projs/CodeBlocks/Navit.workspace
@@ -21,7 +21,7 @@
                        <Depends filename="gentypes.cbp" />
                </Project>
                <Project filename="data_mg.cbp" />
-               <Project filename="Navit_win32.cbp" active="1">
+               <Project filename="Navit_win32.cbp">
                        <Depends filename="NavitCore.cbp" />
                        <Depends filename="win32_gui.cbp" />
                        <Depends filename="fib-1.1.cbp" />
@@ -40,7 +40,7 @@
                        <Depends filename="data_garmin.cbp" />
                        <Depends filename="data_mg.cbp" />
                </Project>
-               <Project filename="Navit_gtk.cbp">
+               <Project filename="Navit_gtk.cbp" active="1">
                        <Depends filename="NavitCore.cbp" />
                        <Depends filename="win32_gui.cbp" />
                        <Depends filename="fib-1.1.cbp" />

diff --git a/navit/projs/CodeBlocks/Osm2Navit.cbp b/navit/projs/CodeBlocks/Osm2Navit.cbp
index 6e6ca03..cfde16d 100644 (file)
--- a/navit/projs/CodeBlocks/Osm2Navit.cbp
+++ b/navit/projs/CodeBlocks/Osm2Navit.cbp
@@ -13,7 +13,7 @@
                                <Option type="1" />
                                <Option compiler="gcc" />
                                <Option use_console_runner="0" />
-                               <Option parameters="--input-file=d:\josm\nld_zuid.osm --attr-debug-level=0 -k ehv3.bin" />
+                               <Option parameters="--input-file=d:\europe.osm --attr-debug-level=5  europa.bin" />
                                <Compiler>
                                        <Add option="-g" />
                                </Compiler>

diff --git a/navit/projs/CodeBlocks/navit.xml.distr b/navit/projs/CodeBlocks/navit.xml.distr
index 398d7f5..0c22a50 100644 (file)
--- a/navit/projs/CodeBlocks/navit.xml.distr
+++ b/navit/projs/CodeBlocks/navit.xml.distr
@@ -96,9 +96,12 @@ Change to your home coordinates.
                        <item type="poly_sport" order="0-">
                                <polygon color="#4af04f" />
                        </item>
-                       <item type="poly_industry,poly_building,poly_place" order="0-">
+                       <item type="poly_industry,poly_place" order="0-">
                                <polygon color="#e6e6e6" />
                        </item>
+                       <item type="poly_building" order="0-">
+                               <polygon color="#b6a6a6" />
+                       </item>
                        <item type="water_line" order="0-">
                                <polyline color="#5096b8" width="1" />
                                <label label_size="5" />
@@ -109,6 +112,12 @@ Change to your home coordinates.
                        <item type="poly_terminal" order="7-">
                                <polygon color="#e3c6a6" />
                        </item>
+                       <item type="poly_cemetery" order="1-">
+                               <polygon color="#bde3cb" />
+                       </item>
+                       <item type="poly_car_parking" order="1-">
+                               <polygon color="#e7cf87" />
+                       </item>
                        <item type="rail" order="6-">
                                <polyline color="#808080" width="3" />
                        </item>
@@ -169,6 +178,42 @@ Change to your home coordinates.
                        <item type="street_nopass" order="10-">
                                <polyline color="#000000" width="1" />
                        </item>
+                       <item type="street_pedestrian" order="10">
+                               <polyline color="#d2d2d2" width="3" />
+                               <polyline color="#dddddd" width="1" />
+                       </item>
+                       <item type="street_pedestrian" order="11">
+                               <polyline color="#d2d2d2" width="5" />
+                               <polyline color="#dddddd" width="3" />
+                       </item>
+                       <item type="street_pedestrian" order="12">
+                               <polyline color="#d2d2d2" width="8" />
+                               <polyline color="#dddddd" width="6" />
+                       </item>
+                       <item type="street_pedestrian" order="13">
+                               <polyline color="#d2d2d2" width="9" />
+                               <polyline color="#dddddd" width="7" />
+                       </item>
+                       <item type="street_pedestrian" order="14">
+                               <polyline color="#d2d2d2" width="13" />
+                               <polyline color="#dddddd" width="9" />
+                       </item>
+                       <item type="street_pedestrian" order="15">
+                               <polyline color="#d2d2d2" width="18" />
+                               <polyline color="#dddddd" width="14" />
+                       </item>
+                       <item type="street_pedestrian" order="16">
+                               <polyline color="#d2d2d2" width="21" />
+                               <polyline color="#dddddd" width="17" />
+                       </item>
+                       <item type="street_pedestrian" order="17">
+                               <polyline color="#d2d2d2" width="25" />
+                               <polyline color="#dddddd" width="21" />
+                       </item>
+                       <item type="street_pedestrian" order="18">
+                               <polyline color="#d2d2d2" width="40" />
+                               <polyline color="#dddddd" width="34" />
+                       </item>
                        <item type="street_service"     order="11">
                                <polyline color="#d2d2d2" width="4" />
                                <polyline color="#fefefe" width="2" />
@@ -646,11 +691,11 @@ Change to your home coordinates.
                        <item type="poi_bowling" order="0-">
                                <icon src="bowling.xpm" />
                        </item>
-                       <item type="poi_bus_station" order="0-">
-                               <icon src="bus_station.xpm" />
+                       <item type="poi_bus_station" order="12-">
+                               <icon src="bus.xpm" />
                        </item>
-                       <item type="poi_bus_stop" order="0-">
-                               <icon src="bus_stop.xpm" />
+                       <item type="poi_bus_stop" order="12-">
+                               <icon src="bus.xpm" />
                        </item>
                        <item type="poi_bussines_service" order="0-">
                                <icon src="bussines_service.xpm" />

diff --git a/navit/projs/CodeBlocks/win32gui/xpm2bmp.c b/navit/projs/CodeBlocks/win32gui/xpm2bmp.c
index f8749d7..3c60c15 100644 (file)
--- a/navit/projs/CodeBlocks/win32gui/xpm2bmp.c
+++ b/navit/projs/CodeBlocks/win32gui/xpm2bmp.c
@@ -4,7 +4,7 @@
 #include <wingdi.h>
 #include "Xpm2bmp.h"
 
-// #define _DBG
+#define _DBG
 
 // function prototypes
 static int CreateBitmapFromXpm( const char* filename, PXPM2BMP pXpm2bmp );
@@ -334,11 +334,10 @@ static DWORD string2hex16( const char* str )
 static int parse_color_values( const char* line, PXPM2BMP pXpm2bmp )
 {
        int return_value = 0;
-
        char* cq    = strchr( line, '"' );
-       char* cchar = strchr(  cq+pXpm2bmp->chars_per_pixel, 'c' );
-       char* chash = strchr(  cq+pXpm2bmp->chars_per_pixel, '#' );
-       char* qe    = strchr(  cq+pXpm2bmp->chars_per_pixel, '"' );
+       char* cchar = strchr(  cq+pXpm2bmp->chars_per_pixel+1, 'c' );
+       char* chash = strchr(  cq+pXpm2bmp->chars_per_pixel+1, '#' );
+       char* qe    = strchr(  cq+pXpm2bmp->chars_per_pixel+1, '"' );
 
        cq++;
 
@@ -358,12 +357,13 @@ static int parse_color_values( const char* line, PXPM2BMP pXpm2bmp )
                        pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].g = string2hex16( &chash[len / 3] );
                        pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b = string2hex16( &chash[len * 2 / 3] );
 #ifdef _DBG
-printf( "adding color %s => %d RGB %x %x %x \n",
+printf( "adding color %s => %d RGB %x %x %x to index %d\n",
                        line,
                        pXpm2bmp->color_entires_size,
                        pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].r,
                        pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].g,
-                       pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b );
+                       pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b,
+                       pXpm2bmp->color_entires_size );
 #endif
                }
                else