From: <mar...@us...> - 2008-07-26 20:36:19
|
Revision: 1231 http://navit.svn.sourceforge.net/navit/?rev=1231&view=rev Author: martin-s Date: 2008-07-26 20:36:27 +0000 (Sat, 26 Jul 2008) Log Message: ----------- Add:Core:Made detail level for layouts configurable Modified Paths: -------------- trunk/navit/navit/attr_def.h trunk/navit/navit/graphics.c trunk/navit/navit/layout.c trunk/navit/navit/layout.h trunk/navit/navit/navit.c trunk/navit/navit/osm2navit.c trunk/navit/navit/xmlconfig.c Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/attr_def.h 2008-07-26 20:36:27 UTC (rev 1231) @@ -63,6 +63,7 @@ ATTR(vocabulary_distances) ATTR(announce_name_systematic_first) ATTR(antialias) +ATTR(order_delta) ATTR2(0x00028000,type_boolean_begin) /* boolean */ ATTR(overwrite) @@ -130,7 +131,7 @@ ATTR(src) ATTR(path) ATTR2(0x0003ffff,type_string_end) -ATTR(order_limit) +ATTR(order) ATTR2(0x00050000,type_double_start) ATTR(position_height) ATTR(position_speed) Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/graphics.c 2008-07-26 20:36:27 UTC (rev 1231) @@ -835,12 +835,12 @@ p.x=0; p.y=0; // FIXME find a better place to set the background color - graphics_gc_set_background(gra->gc[0], l->color); - graphics_gc_set_foreground(gra->gc[0], l->color); + graphics_gc_set_background(gra->gc[0], &l->color); + graphics_gc_set_foreground(gra->gc[0], &l->color); gra->meth.background_gc(gra->priv, gra->gc[0]->priv); gra->meth.draw_mode(gra->priv, draw_mode_begin); gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &p, 32767, 32767); - xdisplay_draw(displaylist->dl, gra, l, order); + xdisplay_draw(displaylist->dl, gra, l, order+l->order_delta); if (callback) callback_list_call_attr_0(gra->cbl, attr_postdraw); gra->meth.draw_mode(gra->priv, draw_mode_end); @@ -892,6 +892,8 @@ } #endif profile(0,NULL); + dbg(0,"delta=%d\n", l->order_delta); + order+=l->order_delta; do_draw(displaylist, trans, mapsets, order); // profile(1,"do_draw"); graphics_displaylist_draw(gra, displaylist, trans, l, 1); Modified: trunk/navit/navit/layout.c =================================================================== --- trunk/navit/navit/layout.c 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/layout.c 2008-07-26 20:36:27 UTC (rev 1231) @@ -19,16 +19,26 @@ #include <glib.h> #include <string.h> +#include "item.h" #include "layout.h" -struct layout * layout_new(const char *name, struct color *color) +struct layout * layout_new(struct attr *parent, struct attr **attrs) { struct layout *l; + struct color def_color = {0xffff, 0xefef, 0xb7b7, 0xffff}; + struct attr *name_attr,*color_attr,*order_delta_attr; + + if (! (name_attr=attr_search(attrs, NULL, attr_name))) + return NULL; l = g_new0(struct layout, 1); - l->name = g_strdup(name); - l->color = g_new0(struct color,1); - *(l->color) = *color; + l->name = g_strdup(name_attr->u.str); + if ((color_attr=attr_search(attrs, NULL, attr_color))) + l->color = *color_attr->u.color; + else + l->color = def_color; + if ((order_delta_attr=attr_search(attrs, NULL, attr_order_delta))) + l->order_delta=order_delta_attr->u.num; return l; } Modified: trunk/navit/navit/layout.h =================================================================== --- trunk/navit/navit/layout.h 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/layout.h 2008-07-26 20:36:27 UTC (rev 1231) @@ -62,7 +62,7 @@ struct layer { char *name; int details; GList *itemtypes; }; -struct layout { char *name; struct color *color; GList *layers; }; +struct layout { char *name; struct color color; GList *layers; int order_delta; }; /* prototypes */ enum item_type; @@ -70,7 +70,7 @@ struct itemtype; struct layer; struct layout; -struct layout *layout_new(const char *name, struct color *color); +struct layout *layout_new(struct attr *parent, struct attr **attrs); struct layer *layer_new(const char *name, int details); void layout_add_layer(struct layout *layout, struct layer *layer); struct itemtype *itemtype_new(int order_min, int order_max); Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/navit.c 2008-07-26 20:36:27 UTC (rev 1231) @@ -161,15 +161,6 @@ } void -navit_add_layout(struct navit *this_, struct layout *lay) -{ - this_->layouts = g_list_append(this_->layouts, lay); - if(!this_->layout_current) { - this_->layout_current=lay; - } -} - -void navit_draw(struct navit *this_) { GList *l; @@ -1434,6 +1425,11 @@ return navit_set_gui(this_, attr->u.gui); case attr_graphics: return navit_set_graphics(this_, attr->u.graphics); + case attr_layout: + this_->layouts = g_list_append(this_->layouts, attr->u.layout); + if(!this_->layout_current) + this_->layout_current=attr->u.layout; + return 1; case attr_route: this_->route=attr->u.route; route_set_projection(this_->route, transform_get_projection(this_->trans)); Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/osm2navit.c 2008-07-26 20:36:27 UTC (rev 1231) @@ -1808,7 +1808,7 @@ struct index_item { struct item_bin item; struct rect r; - struct attr_bin attr_order_limit; + struct attr_bin attr_order; short min; short max; struct attr_bin attr_zipfile_ref; @@ -1836,8 +1836,8 @@ ii.item.type=type_submap; ii.item.clen=4; - ii.attr_order_limit.len=2; - ii.attr_order_limit.type=attr_order_limit; + ii.attr_order.len=2; + ii.attr_order.type=attr_order; ii.attr_zipfile_ref.len=2; ii.attr_zipfile_ref.type=attr_zipfile_ref; Modified: trunk/navit/navit/xmlconfig.c =================================================================== --- trunk/navit/navit/xmlconfig.c 2008-07-24 19:44:57 UTC (rev 1230) +++ trunk/navit/navit/xmlconfig.c 2008-07-26 20:36:27 UTC (rev 1231) @@ -463,22 +463,6 @@ } static int -xmlconfig_layout(struct xmlstate *state) -{ - const char *name=find_attribute(state, "name", 1); - struct color color = {0xffff, 0xefef, 0xb7b7, 0xffff}; - - if (! name) - return 0; - find_color(state, 0, &color); - state->element_attr.u.data = layout_new(name, &color); - if (! state->element_attr.u.data) - return 0; - navit_add_layout(state->parent->element_attr.u.data, state->element_attr.u.data); - return 1; -} - -static int xmlconfig_layer(struct xmlstate *state) { const char *name=find_attribute(state, "name", 1); @@ -648,7 +632,7 @@ { "navit", "config", NULL, NEW(navit_new), ADD(navit_add_attr), INIT(navit_init), DESTROY(navit_destroy)}, { "graphics", "navit", NULL, NEW(graphics_new), NULL, NULL, NULL}, { "gui", "navit", NULL, NEW(gui_new), NULL, NULL, NULL}, - { "layout", "navit", xmlconfig_layout}, + { "layout", "navit", NULL, NEW(layout_new), NULL, NULL, NULL}, { "layer", "layout", xmlconfig_layer}, { "item", "layer", xmlconfig_item}, { "circle", "item", xmlconfig_circle}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-05 18:26:20
|
Revision: 1250 http://navit.svn.sourceforge.net/navit/?rev=1250&view=rev Author: martin-s Date: 2008-08-05 18:26:28 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Add:vehicle_file:Made baudrate configurable Modified Paths: -------------- trunk/navit/navit/attr_def.h trunk/navit/navit/vehicle/file/vehicle_file.c Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2008-08-05 18:24:55 UTC (rev 1249) +++ trunk/navit/navit/attr_def.h 2008-08-05 18:26:28 UTC (rev 1250) @@ -64,6 +64,7 @@ ATTR(announce_name_systematic_first) ATTR(antialias) ATTR(order_delta) +ATTR(baudrate) ATTR2(0x00028000,type_boolean_begin) /* boolean */ ATTR(overwrite) Modified: trunk/navit/navit/vehicle/file/vehicle_file.c =================================================================== --- trunk/navit/navit/vehicle/file/vehicle_file.c 2008-08-05 18:24:55 UTC (rev 1249) +++ trunk/navit/navit/vehicle/file/vehicle_file.c 2008-08-05 18:26:28 UTC (rev 1250) @@ -74,6 +74,7 @@ #ifdef _WIN32 int no_data_count; #endif + speed_t baudrate; }; #ifdef _WIN32 @@ -171,8 +172,8 @@ } else { tcgetattr(priv->fd, &tio); cfmakeraw(&tio); - cfsetispeed(&tio, B4800); - cfsetospeed(&tio, B4800); + cfsetispeed(&tio, priv->baudrate); + cfsetospeed(&tio, priv->baudrate); tio.c_cc[VMIN] = 16; tio.c_cc[VTIME] = 1; tcsetattr(priv->fd, TCSANOW, &tio); @@ -478,6 +479,7 @@ struct attr *source; struct attr *time; struct attr *on_eof; + struct attr *baudrate; dbg(1, "enter\n"); source = attr_search(attrs, NULL, attr_source); @@ -487,9 +489,23 @@ ret->source = g_strdup(source->u.str); ret->buffer = g_malloc(buffer_size); ret->time=1000; + ret->baudrate=B4800; time = attr_search(attrs, NULL, attr_time); if (time) ret->time=time->u.num; + baudrate = attr_search(attrs, NULL, attr_baudrate); + if (baudrate) { + switch (baudrate->u.num) { + case 4800: + ret->baudrate=B4800; + break; +#ifdef B57600 + case 57600: + ret->baudrate=B57600; + break; +#endif + } + } on_eof = attr_search(attrs, NULL, attr_on_eof); if (on_eof && !strcasecmp(on_eof->u.str, "stop")) ret->on_eof=1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-05 18:29:28
|
Revision: 1251 http://navit.svn.sourceforge.net/navit/?rev=1251&view=rev Author: martin-s Date: 2008-08-05 18:29:34 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Add:gui_internal:Added support for POIs Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/item.c trunk/navit/navit/item.h trunk/navit/navit/map.c trunk/navit/navit/map.h Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2008-08-05 18:26:28 UTC (rev 1250) +++ trunk/navit/navit/gui/internal/gui_internal.c 2008-08-05 18:29:34 UTC (rev 1251) @@ -164,7 +164,7 @@ struct widget *highlighted_menu; struct widget *list; int vehicle_valid; - struct coord_geo click, vehicle; + struct pcoord clickp, vehiclep; struct search_list *sl; }; @@ -246,25 +246,31 @@ } static char * -coordinates(struct coord_geo *g, char sep) +coordinates(struct pcoord *pc, char sep) { char latc='N',lngc='E'; int lat_deg,lat_min,lat_sec; int lng_deg,lng_min,lng_sec; - if (g->lat < 0) { - g->lat=-g->lat; + struct coord_geo g; + struct coord c; + c.x=pc->x; + c.y=pc->y; + transform_to_geo(pc->pro, &c, &g); + + if (g.lat < 0) { + g.lat=-g.lat; latc='S'; } - if (g->lng < 0) { - g->lng=-g->lng; + if (g.lng < 0) { + g.lng=-g.lng; lngc='W'; } - lat_deg=g->lat; - lat_min=fmod(g->lat*60,60); - lat_sec=fmod(g->lat*3600,60); - lng_deg=g->lng; - lng_min=fmod(g->lng*60,60); - lng_sec=fmod(g->lng*3600,60); + lat_deg=g.lat; + lat_min=fmod(g.lat*60,60); + lat_sec=fmod(g.lat*3600,60); + lng_deg=g.lng; + lng_min=fmod(g.lng*60,60); + lng_sec=fmod(g.lng*3600,60); return g_strdup_printf("%d°%d'%d\" %c%c%d°%d'%d\" %c",lat_deg,lat_min,lat_sec,latc,sep,lng_deg,lng_min,lng_sec,lngc); } @@ -993,7 +999,7 @@ menu->w=this->root.w; menu->h=this->root.h; menu->background=this->background; - if (this->root.w > 320 || this->root.h > 320) { + if (this->root.w > 3200 || this->root.h > 3200) { this->font_size=40; this->icon_s=48; this->icon_l=96; @@ -1035,11 +1041,230 @@ gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm) { struct widget *w=wm->data; + dbg(0,"c=%d:0x%x,0x%x\n", w->c.pro, w->c.x, w->c.y); navit_set_destination(this->nav, &w->c, w->name); gui_internal_prune_menu(this, NULL); } static void +gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm) +{ + struct widget *w=wm->data; + navit_set_position(this->nav, &w->c); + gui_internal_prune_menu(this, NULL); +} + + +static void +get_direction(char *buffer, int angle, int mode) +{ + angle=angle%360; + switch (mode) { + case 0: + sprintf(buffer,"%d",angle); + break; + case 1: + if (angle < 69 || angle > 291) + *buffer++='N'; + if (angle > 111 && angle < 249) + *buffer++='S'; + if (angle > 22 && angle < 158) + *buffer++='E'; + if (angle > 202 && angle < 338) + *buffer++='W'; + *buffer++='\0'; + break; + case 2: + angle=(angle+15)/30; + if (! angle) + angle=12; + sprintf(buffer,"%d H", angle); + break; + } +} + +struct selector { + char *icon; + char *name; + enum item_type *types; +} selectors[]={ + {"bank","Bank",(enum item_type []){type_poi_bank,type_poi_bank,type_none}}, + {"fuel","Fuel",(enum item_type []){type_poi_fuel,type_poi_fuel,type_none}}, + {"hotel","Hotel",(enum item_type []) { + type_poi_hotel,type_poi_camp_rv, + type_poi_camping,type_poi_camping, + type_poi_resort,type_poi_resort, + type_none}}, + {"restaurant","Restaurant",(enum item_type []) { + type_poi_bar,type_poi_picnic, + type_poi_burgerking,type_poi_fastfood, + type_poi_restaurant,type_poi_restaurant, + type_none}}, + {"shopping","Shopping",(enum item_type []) { + type_poi_mall,type_poi_mall, + type_poi_shop_grocery,type_poi_shop_grocery, + type_none}}, + {"hospital","Service",(enum item_type []) { + type_poi_marina,type_poi_marina, + type_poi_hospital,type_poi_hospital, + type_poi_public_utilities,type_poi_public_utilities, + type_poi_police,type_poi_autoservice, + type_poi_information,type_poi_information, + type_poi_personal_service,type_poi_repair_service, + type_poi_rest_room,type_poi_rest_room, + type_poi_restroom,type_poi_restroom, + type_none}}, + {"parking","Parking",(enum item_type []){type_poi_car_parking,type_poi_car_parking,type_none}}, + {"peak","Land Features",(enum item_type []){ + type_poi_land_feature,type_poi_rock, + type_poi_dam,type_poi_dam, + type_none}}, + {"unknown","Other",(enum item_type []){ + type_point_unspecified,type_poi_land_feature-1, + type_poi_rock+1,type_poi_fuel-1, + type_poi_marina+1,type_poi_car_parking-1, + type_poi_car_parking+1,type_poi_bar-1, + type_poi_bank+1,type_poi_dam-1, + type_poi_dam+1,type_poi_information-1, + type_poi_information+1,type_poi_mall-1, + type_poi_mall+1,type_poi_personal_service-1, + type_poi_restaurant+1,type_poi_restroom-1, + type_poi_restroom+1,type_poi_shop_grocery-1, + type_poi_shop_grocery+1,type_poi_wifi, + type_none}}, +}; + +static void gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm); + +static struct widget * +gui_internal_cmd_pois_selector(struct gui_priv *this, struct pcoord *c) +{ + struct widget *wl,*wb; + int i; + wl=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill); + for (i = 0 ; i < sizeof(selectors)/sizeof(struct selector) ; i++) { + gui_internal_widget_append(wl, wb=gui_internal_button_new_with_callback(this, NULL, + image_new_xs(this, selectors[i].icon), gravity_center|orientation_vertical, + gui_internal_cmd_pois, &selectors[i])); + wb->c=*c; + } + return wl; +} + +static struct widget * +gui_internal_cmd_pois_item(struct gui_priv *this, struct coord *center, struct item *item, struct coord *c, int dist) +{ + char coordbuf[64]; + struct param_list param[5]; + char distbuf[32]; + char dirbuf[32]; + char *type; + struct attr attr; + struct widget *wl; + + wl=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill); + + sprintf(distbuf,"%d", dist/1000); + gui_internal_widget_append(wl, gui_internal_label_new(this, distbuf)); + get_direction(dirbuf, transform_get_angle_delta(center, c, 0), 1); + gui_internal_widget_append(wl, gui_internal_label_new(this, dirbuf)); + gui_internal_widget_append(wl, gui_internal_label_new(this, item_to_name(item->type))); + if (! item_attr_get(item, attr_label, &attr)) + attr.u.str=""; + gui_internal_widget_append(wl, gui_internal_label_new(this, attr.u.str)); + + return wl; +} + +static gint +gui_internal_cmd_pois_sort_num(gconstpointer a, gconstpointer b, gpointer user_data) +{ + struct widget *wa=a; + struct widget *wb=b; + struct widget *wac=wa->children->data; + struct widget *wbc=wb->children->data; + int ia,ib; + ia=atoi(wac->text); + ib=atoi(wbc->text); + + return ia-ib; +} + +static int +gui_internal_cmd_pois_item_selected(struct selector *sel, enum item_type type) +{ + enum item_type *types; + if (type >= type_line) + return 0; + if (! sel || !sel->types) + return 1; + types=sel->types; + while (*types != type_none) { + if (type >= types[0] && type <= types[1]) { + return 1; + } + types+=2; + } + return 0; +} + +static void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm); + +static void +gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm) +{ + struct map_selection *sel,*selm; + struct coord c,center; + struct mapset_handle *h; + struct map *m; + struct map_rect *mr; + struct item *item; + int idist,dist=400000; + struct widget *wi,*w,*w2,*wb; + enum projection pro=wm->c.pro; + struct selector *isel=wm->data; + + wb=gui_internal_menu(this, isel ? isel->name : "POIs"); + w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill); + gui_internal_widget_append(wb, w); + if (! isel) + gui_internal_widget_append(w, gui_internal_cmd_pois_selector(this,&wm->c)); + w2=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill); + gui_internal_widget_append(w, w2); + + sel=map_selection_rect_new(&wm->c, dist, 18); + center.x=wm->c.x; + center.y=wm->c.y; + h=mapset_open(navit_get_mapset(this->nav)); + while ((m=mapset_next(h, 1))) { + selm=map_selection_dup_pro(sel, pro, map_projection(m)); + mr=map_rect_new(m, selm); + dbg(2,"mr=%p\n", mr); + if (mr) { + while ((item=map_rect_get_item(mr))) { + if (gui_internal_cmd_pois_item_selected(isel, item->type) && + item_coord_get_pro(item, &c, 1, pro) && + coord_rect_contains(&sel->u.c_rect, &c) && + (idist=transform_distance(pro, ¢er, &c)) < dist) { + gui_internal_widget_append(w2, wi=gui_internal_cmd_pois_item(this, ¢er, item, &c, idist)); + wi->func=gui_internal_cmd_position; + wi->state |= STATE_SENSITIVE; + wi->c.x=c.x; + wi->c.y=c.y; + wi->c.pro=pro; + } + } + map_rect_destroy(mr); + } + map_selection_destroy(selm); + } + map_selection_destroy(sel); + mapset_close(h); + w2->children=g_list_sort_with_data(w2->children, gui_internal_cmd_pois_sort_num, (void *)1); + gui_internal_menu_render(this); +} + +static void gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm) { struct widget *w=wm->data; @@ -1050,17 +1275,20 @@ static void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm) { - struct widget *wb,*w,*wc; + struct widget *wb,*w,*wc,*wbc; struct coord_geo g; struct coord c; char *coord; +#if 0 switch ((int)wm->data) { case 0: +#endif c.x=wm->c.x; c.y=wm->c.y; dbg(0,"x=0x%x y=0x%x\n", c.x, c.y); transform_to_geo(wm->c.pro, &c, &g); +#if 0 break; case 1: g=this->click; @@ -1069,16 +1297,26 @@ g=this->vehicle; break; } +#endif wb=gui_internal_menu(this, wm->name ? wm->name : wm->text); w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(wb, w); - coord=coordinates(&g, ' '); + coord=coordinates(&wm->c, ' '); gui_internal_widget_append(w, gui_internal_label_new(this, coord)); g_free(coord); gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, "Set as destination", image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill, gui_internal_cmd_set_destination, wm)); + gui_internal_widget_append(w, + gui_internal_button_new_with_callback(this, "Set as position", + image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill, + gui_internal_cmd_set_position, wm)); + gui_internal_widget_append(w, + wbc=gui_internal_button_new_with_callback(this, "POIs", + image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill, + gui_internal_cmd_pois, NULL)); + wbc->c=wm->c; #if 0 gui_internal_widget_append(w, gui_internal_button_new(this, "Add to tour", @@ -1635,20 +1873,22 @@ gui_internal_button_new_with_callback(this, "Bookmarks", image_new_l(this, "gui_bookmark"), gravity_center|orientation_vertical, gui_internal_cmd_bookmarks, NULL)); - coord=coordinates(&this->click, '\n'); + coord=coordinates(&this->clickp, '\n'); gui_internal_widget_append(w, wc=gui_internal_button_new_with_callback(this, coord, image_new_l(this, "gui_map"), gravity_center|orientation_vertical, - gui_internal_cmd_position, (void *)1)); + gui_internal_cmd_position, NULL)); wc->name=g_strdup("Map Point"); + wc->c=this->clickp; g_free(coord); if (this->vehicle_valid) { - coord=coordinates(&this->vehicle, '\n'); + coord=coordinates(&this->vehiclep, '\n'); gui_internal_widget_append(w, wc=gui_internal_button_new_with_callback(this, coord, image_new_l(this, "gui_rules"), gravity_center|orientation_vertical, - gui_internal_cmd_position, (void *)2)); + gui_internal_cmd_position, NULL)); wc->name=g_strdup("Vehicle Position"); + wc->c=this->vehiclep; g_free(coord); } gui_internal_widget_append(w, @@ -1841,10 +2081,15 @@ trans=navit_get_trans(this->nav); transform_reverse(trans, p, &c); dbg(0,"x=0x%x y=0x%x\n", c.x, c.y); - transform_to_geo(transform_get_projection(trans), &c, &this->click); + this->clickp.pro=transform_get_projection(trans); + this->clickp.x=c.x; + this->clickp.y=c.y; if (navit_get_attr(this->nav, attr_vehicle, &attr, NULL) && attr.u.vehicle && vehicle_get_attr(attr.u.vehicle, attr_position_coord_geo, &attrp)) { - this->vehicle=*attrp.u.coord_geo; + this->vehiclep.pro=transform_get_projection(trans); + transform_from_geo(this->vehiclep.pro, attrp.u.coord_geo, &c); + this->vehiclep.x=c.x; + this->vehiclep.y=c.y; this->vehicle_valid=1; } // draw menu Modified: trunk/navit/navit/item.c =================================================================== --- trunk/navit/navit/item.c 2008-08-05 18:26:28 UTC (rev 1250) +++ trunk/navit/navit/item.c 2008-08-05 18:29:34 UTC (rev 1251) @@ -49,6 +49,18 @@ return it->meth->item_coord_get(it->priv_data, c, count); } +int +item_coord_get_pro(struct item *it, struct coord *c, int count, enum projection to) +{ + int ret=item_coord_get(it, c, count); + int i; + enum projection from=map_projection(it->map); + if (from != to) + for (i = 0 ; i < count ; i++) + transform_from_to(c+i, from, c+i, to); + return ret; +} + int item_coord_is_segment(struct item *it) { Modified: trunk/navit/navit/item.h =================================================================== --- trunk/navit/navit/item.h 2008-08-05 18:26:28 UTC (rev 1250) +++ trunk/navit/navit/item.h 2008-08-05 18:29:34 UTC (rev 1251) @@ -75,6 +75,7 @@ struct item_hash; void item_coord_rewind(struct item *it); int item_coord_get(struct item *it, struct coord *c, int count); +int item_coord_get_pro(struct item *it, struct coord *c, int count, enum projection pro); /* does the next returned coordinate mark a segment */ int item_coord_is_segment(struct item *it); void item_attr_rewind(struct item *it); Modified: trunk/navit/navit/map.c =================================================================== --- trunk/navit/navit/map.c 2008-08-05 18:26:28 UTC (rev 1250) +++ trunk/navit/navit/map.c 2008-08-05 18:29:34 UTC (rev 1251) @@ -303,14 +303,33 @@ } struct map_selection * -map_selection_dup(struct map_selection *sel) +map_selection_rect_new(struct pcoord *center, int distance, int order) { + int i; + struct map_selection *ret=g_new0(struct map_selection, 1); + for (i = 0 ; i < layer_end ; i++) { + ret->order[i]=order; + } + ret->u.c_rect.lu.x=center->x-distance; + ret->u.c_rect.lu.y=center->y+distance; + ret->u.c_rect.rl.x=center->x+distance; + ret->u.c_rect.rl.y=center->y-distance; + return ret; +} + +struct map_selection * +map_selection_dup_pro(struct map_selection *sel, enum projection from, enum projection to) +{ struct map_selection *next,**last; struct map_selection *ret=NULL; last=&ret; while (sel) { next = g_new(struct map_selection, 1); *next=*sel; + if (from != projection_none || to != projection_none) { + transform_from_to(&sel->u.c_rect.lu, from, &next->u.c_rect.lu, to); + transform_from_to(&sel->u.c_rect.rl, from, &next->u.c_rect.rl, to); + } *last=next; last=&next->next; sel = sel->next; @@ -318,6 +337,12 @@ return ret; } +struct map_selection * +map_selection_dup(struct map_selection *sel) +{ + return map_selection_dup_pro(sel, projection_none, projection_none); +} + void map_selection_destroy(struct map_selection *sel) { Modified: trunk/navit/navit/map.h =================================================================== --- trunk/navit/navit/map.h 2008-08-05 18:26:28 UTC (rev 1250) +++ trunk/navit/navit/map.h 2008-08-05 18:29:34 UTC (rev 1251) @@ -177,6 +177,8 @@ struct map_search *map_search_new(struct map *m, struct item *item, struct attr *search_attr, int partial); struct item *map_search_get_item(struct map_search *this_); void map_search_destroy(struct map_search *this_); +struct map_selection *map_selection_rect_new(struct pcoord *center, int distance, int order); +struct map_selection *map_selection_dup_pro(struct map_selection *sel, enum projection from, enum projection to); struct map_selection *map_selection_dup(struct map_selection *sel); void map_selection_destroy(struct map_selection *sel); int map_selection_contains_item_rect(struct map_selection *sel, struct item *item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-18 19:00:10
|
Revision: 1260 http://navit.svn.sourceforge.net/navit/?rev=1260&view=rev Author: christeck Date: 2008-08-18 19:00:08 +0000 (Mon, 18 Aug 2008) Log Message: ----------- added 6 hiking trail types according to osm sac_scales. Due to current build problems, please be polite if I have broken anything :) . Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/osm2navit.c Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-08-18 18:55:24 UTC (rev 1259) +++ trunk/navit/navit/item_def.h 2008-08-18 19:00:08 UTC (rev 1260) @@ -345,6 +345,12 @@ ITEM(water_stream) ITEM(water_drain) ITEM(path) +ITEM(hiking) +ITEM(hiking_mountain) +ITEM(hiking_mountain_demanding) +ITEM(hiking_alpine) +ITEM(hiking_alpine_demanding) +ITEM(hiking_alpine_difficult) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-08-18 18:55:24 UTC (rev 1259) +++ trunk/navit/navit/osm2navit.c 2008-08-18 19:00:08 UTC (rev 1260) @@ -154,7 +154,7 @@ "w highway=path,bicycle=designated cycleway\n" "w highway=footway footway\n" "w piste:type=nordic piste_nordic\n" - "w route=ski piste_nordic\n" + "w route=ski piste_nordic\n" "w piste:type=downhill,piste:difficulty=novice piste_downhill_novice\n" "w piste:type=downhill,piste:difficulty=easy piste_downhill_easy\n" "w piste:type=downhill,piste:difficulty=intermediate piste_downhill_intermediate\n" @@ -162,8 +162,14 @@ "w piste:type=downhill,piste:difficulty=expert piste_downhill_expert\n" "w piste:type=downhill,piste:difficulty=freeride piste_downhill_freeride\n" "w highway=path,foot=designated footway\n" - "w highway=steps steps\n" - "w highway=path path\n" + "w highway=steps steps\n" + "w highway=path path\n" + "w highway=path,sac_scale=hiking hiking\n" + "w highway=path,sac_scale=mountain_hiking hiking_mountain\n" + "w highway=path,sac_scale=demanding_mountain_hiking hiking_mountain_demanding\n" + "w highway=path,sac_scale=alpine_hiking hiking_alpine\n" + "w highway=path,sac_scale=demanding_alpine_hiking hiking_alpine_demanding\n" + "w highway=path,sac_scale=difficult_alpine_hiking hiking_alpine_difficult\n" "w highway=unsurfaced track_gravelled\n" "w highway=track track_gravelled\n" "w highway=track,tracktype=grade1 track_paved\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-19 21:13:46
|
Revision: 1266 http://navit.svn.sourceforge.net/navit/?rev=1266&view=rev Author: christeck Date: 2008-08-19 21:13:56 +0000 (Tue, 19 Aug 2008) Log Message: ----------- added some POIs (also updated the wiki page): ITEM(poi_bench) ITEM(poi_biergarten) ITEM(poi_boundary_stone) ITEM(poi_castle) ITEM(poi_hunting_stand) ITEM(poi_memorial) ITEM(poi_monument) ITEM(poi_shelter) ITEM(poi_fountain) ITEM(poi_potable_water) ITEM(poi_toilets) ITEM(poi_viewpoint) Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/osm2navit.c Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-08-19 20:35:15 UTC (rev 1265) +++ trunk/navit/navit/item_def.h 2008-08-19 21:13:56 UTC (rev 1266) @@ -260,6 +260,18 @@ ITEM(poi_rail_halt) ITEM(poi_rail_tram_stop) ITEM(poi_wifi) +ITEM(poi_bench) +ITEM(poi_biergarten) +ITEM(poi_boundary_stone) +ITEM(poi_castle) +ITEM(poi_hunting_stand) +ITEM(poi_memorial) +ITEM(poi_monument) +ITEM(poi_shelter) +ITEM(poi_fountain) +ITEM(poi_potable_water) +ITEM(poi_toilets) +ITEM(poi_viewpoint) /* Line */ ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-08-19 20:35:15 UTC (rev 1265) +++ trunk/navit/navit/osm2navit.c 2008-08-19 21:13:56 UTC (rev 1266) @@ -139,6 +139,18 @@ "n railway=level_crossing poi_level_crossing\n" "n railway=station poi_rail_station\n" "n railway=tram_stop poi_rail_tram_stop\n" + "n poi_bench amenity=park_bench amenity=bench\n" + "n poi_biergarten amenity=biergarten\n" + "n poi_boundary_stone historic=boundary_stone\n" + "n poi_castle historic=castle\n" + "n poi_hunting_stand Annehmlichkeit=Hochsitz\n" + "n poi_memorial historic=memorial\n" + "n poi_monument historic=monument\n" + "n poi_shelter amenity=shelter\n" + "n poi_fountain amenity=fountain\n" + "n poi_potable_water amenity=drinking_water\n" + "n poi_toilets amenity=toilets\n" + "n poi_viewpoint tourism=viewpoint\n" "w *=* street_unkn\n" "w amenity=place_of_worship poly_building\n" "w building=* poly_building\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2008-08-21 14:42:45
|
Revision: 1288 http://navit.svn.sourceforge.net/navit/?rev=1288&view=rev Author: kazer_ Date: 2008-08-21 14:42:51 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Fix:Tickets 141 & 182:Make fonts configurable from the xml file, and change default fonts to Sans instead of Mono. Thanks Sarah & Nekohayo for the patches Modified Paths: -------------- trunk/navit/navit/attr_def.h trunk/navit/navit/graphics/cogl/graphics_cogl.c trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c trunk/navit/navit/graphics/null/graphics_null.c trunk/navit/navit/graphics/opengl/graphics_opengl.c trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp trunk/navit/navit/graphics/sdl/graphics_sdl.c trunk/navit/navit/graphics.c trunk/navit/navit/graphics.h trunk/navit/navit/layout.c trunk/navit/navit/layout.h trunk/navit/navit/navit.c trunk/navit/navit/navit.dtd trunk/navit/navit/navit.xml Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/attr_def.h 2008-08-21 14:42:51 UTC (rev 1288) @@ -131,6 +131,7 @@ ATTR(command) ATTR(src) ATTR(path) +ATTR(font) ATTR2(0x0003ffff,type_string_end) ATTR(order) ATTR2(0x00050000,type_double_start) Modified: trunk/navit/navit/graphics/cogl/graphics_cogl.c =================================================================== --- trunk/navit/navit/graphics/cogl/graphics_cogl.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/cogl/graphics_cogl.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -84,7 +84,7 @@ font_destroy }; -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size) +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size) { return NULL; } Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -113,12 +113,12 @@ * List of font families to use, in order of preference */ static char *fontfamilies[]={ - "Liberation Mono", + "Liberation Sans", "Arial", - "DejaVu Sans", "NcrBI4nh", "luximbi", "FreeSans", + "DejaVu Sans", NULL, }; @@ -136,8 +136,14 @@ * Load a new font using the fontconfig library. * First search for each of the font families and require and exact match on family * If no font found, let fontconfig pick the best match - */ -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags) + * @param graphics_priv FIXME + * @param graphics_font_methods FIXME + * @param fontfamily the preferred font family + * @param size requested size of fonts + * @param flags extra flags for the font (bold,etc) + * @returns <> +*/ +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size, int flags) { struct graphics_font_priv *font=g_new(struct graphics_font_priv, 1); @@ -150,10 +156,24 @@ gr->library_init=1; } found=0; + dbg(2," about to search for fonts, prefered = %s\n",fontfamily); for (exact=1;!found && exact>=0;exact--) { - family=fontfamilies; + if(fontfamily) { + /* prepend the font passed so we look for it first */ + family = malloc(sizeof(fontfamilies)+sizeof(fontfamily)); + if(!family) { + dbg(0,"Out of memory while creating the font families table\n"); + return NULL; + } + memcpy(family, &fontfamily, sizeof(fontfamily)); + memcpy(family+1, fontfamilies, sizeof(fontfamilies)); + } else { + family=fontfamilies; + } + + while (*family && !found) { - dbg(1, "Looking for font family %s. exact=%d\n", *family, exact); + dbg(2, "Looking for font family %s. exact=%d\n", *family, exact); FcPattern *required = FcPatternBuild(NULL, FC_FAMILY, FcTypeString, *family, NULL); if (flags) FcPatternAddInteger(required,FC_WEIGHT,FC_WEIGHT_BOLD); Modified: trunk/navit/navit/graphics/null/graphics_null.c =================================================================== --- trunk/navit/navit/graphics/null/graphics_null.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/null/graphics_null.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -55,7 +55,7 @@ font_destroy }; -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size) +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size) { *meth=font_methods; return &graphics_font_priv; Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c =================================================================== --- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -99,7 +99,7 @@ font_destroy }; -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size) +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size) { #if 0 char **filename=fontlist; Modified: trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp =================================================================== --- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2008-08-21 14:42:51 UTC (rev 1288) @@ -308,7 +308,7 @@ //# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags) +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size, int flags) { *meth=font_methods; return &graphics_font_priv; Modified: trunk/navit/navit/graphics/sdl/graphics_sdl.c =================================================================== --- trunk/navit/navit/graphics/sdl/graphics_sdl.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics/sdl/graphics_sdl.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -228,7 +228,7 @@ font_destroy }; -static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags) +static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size, int flags) { struct graphics_font_priv *gf=g_new(struct graphics_font_priv, 1); Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -56,25 +56,26 @@ { struct graphics_priv *priv; struct graphics_methods meth; + char *default_font; struct graphics_font *font[16]; struct graphics_gc *gc[3]; struct attr **attrs; struct callback_list *cbl; int ready; }; -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## + + struct displaylist { GHashTable *dl; }; -//############################################################################################################## -//# Description: Creates a new graphics object -//# Comment: attr type required -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## + +/** + * Creates a new graphics object + * attr type required + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics * graphics_new(struct attr *parent, struct attr **attrs) { struct graphics *this_; @@ -95,21 +96,23 @@ return this_; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ int graphics_get_attr(struct graphics *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { return attr_generic_get_attr(this_->attrs, type, attr, iter); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics * graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h) { struct graphics *this_; @@ -118,11 +121,12 @@ return this_; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_init(struct graphics *this_) { this_->gc[0]=graphics_gc_new(this_); @@ -137,51 +141,56 @@ this_->meth.background_gc(this_->priv, this_->gc[0]->priv); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void * graphics_get_data(struct graphics *this_, char *type) { return (this_->meth.get_data(this_->priv, type)); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_register_resize_callback(struct graphics *this_, void (*callback)(void *data, int w, int h), void *data) { this_->meth.register_resize_callback(this_->priv, callback, data); } -//############################################################################################################## -//# Description: -//# Comment: Called in navit.c -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * Called in navit.c + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_register_button_callback(struct graphics *this_, void (*callback)(void *data, int pressed, int button, struct point *p), void *data) { this_->meth.register_button_callback(this_->priv, callback, data); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_register_motion_callback(struct graphics *this_, void (*callback)(void *data, struct point *p), void *data) { this_->meth.register_motion_callback(this_->priv, callback, data); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_register_keypress_callback(struct graphics *this_, void (*callback)(void *data, char *key), void *data) { this_->meth.register_keypress_callback(this_->priv, callback, data); @@ -192,25 +201,44 @@ callback_list_add(this_->cbl, cb); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics_font * graphics_font_new(struct graphics *gra, int size, int flags) { struct graphics_font *this_; this_=g_new0(struct graphics_font,1); - this_->priv=gra->meth.font_new(gra->priv, &this_->meth, size, flags); + this_->priv=gra->meth.font_new(gra->priv, &this_->meth, gra->default_font, size, flags); return this_; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * Free all loaded fonts. + * Used when switching layouts. + * @param gra The graphics instance + * @returns nothing + * @author Sarah Nordstrom (05/2008) + */ +void graphics_font_destroy_all(struct graphics *gra) +{ + int i; + for(i = 0 ; i < sizeof(gra->font) / sizeof(gra->font[0]); i++) { + if(!gra->font[i]) continue; + gra->font[i]->meth.font_destroy(gra->font[i]->priv); + gra->font[i] = NULL; + } +} + +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics_gc * graphics_gc_new(struct graphics *gra) { struct graphics_gc *this_; @@ -220,63 +248,72 @@ return this_; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_gc_destroy(struct graphics_gc *gc) { gc->meth.gc_destroy(gc->priv); g_free(gc); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_gc_set_foreground(struct graphics_gc *gc, struct color *c) { gc->meth.gc_set_foreground(gc->priv, c); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_gc_set_background(struct graphics_gc *gc, struct color *c) { gc->meth.gc_set_background(gc->priv, c); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_gc_set_linewidth(struct graphics_gc *gc, int width) { gc->meth.gc_set_linewidth(gc->priv, width); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_gc_set_dashes(struct graphics_gc *gc, int width, int offset, unsigned char dash_list[], int n) { if (gc->meth.gc_set_dashes) gc->meth.gc_set_dashes(gc->priv, width, offset, dash_list, n); } -//############################################################################################################## -//# Description: Create a new image from file path scaled to w and h pixels -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * Create a new image from file path scaled to w and h pixels + * @param gra the graphics instance + * @param path path of the image to load + * @param w width to rescale to + * @param h height to rescale to + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics_image * graphics_image_new_scaled(struct graphics *gra, char *path, int w, int h) { struct graphics_image *this_; @@ -292,21 +329,24 @@ return this_; } -//############################################################################################################## -//# Description: Create a new image from file path -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * Create a new image from file path + * @param gra the graphics instance + * @param path path of the image to load + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct graphics_image * graphics_image_new(struct graphics *gra, char *path) { return graphics_image_new_scaled(gra, path, -1, -1); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_image_free(struct graphics *gra, struct graphics_image *img) { if (gra->meth.image_free) @@ -314,92 +354,101 @@ g_free(img); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h) { this_->meth.draw_restore(this_->priv, p, w, h); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode) { this_->meth.draw_mode(this_->priv, mode); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc, struct point *p, int count) { this_->meth.draw_lines(this_->priv, gc->priv, p, count); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int r) { this_->meth.draw_circle(this_->priv, gc->priv, p, r); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_rectangle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int w, int h) { this_->meth.draw_rectangle(this_->priv, gc->priv, p, w, h); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_text(struct graphics *this_, struct graphics_gc *gc1, struct graphics_gc *gc2, struct graphics_font *font, char *text, struct point *p, int dx, int dy) { this_->meth.draw_text(this_->priv, gc1->priv, gc2 ? gc2->priv : NULL, font->priv, text, p, dx, dy); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_get_text_bbox(struct graphics *this_, struct graphics_font *font, char *text, int dx, int dy, struct point *ret) { this_->meth.get_text_bbox(this_->priv, font->priv, text, dx, dy, ret); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_overlay_disable(struct graphics *this_, int disable) { if (this_->meth.overlay_disable) this_->meth.overlay_disable(this_->priv, disable); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw_image(struct graphics *this_, struct graphics_gc *gc, struct point *p, struct graphics_image *img) { this_->meth.draw_image(this_->priv, gc->priv, p, img->priv); @@ -455,11 +504,12 @@ } #endif -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct displayitem { struct item item; char *label; @@ -468,11 +518,12 @@ struct point pnt[0]; }; -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static int xdisplay_free_list(gpointer key, gpointer value, gpointer user_data) { GList *h, *l; @@ -489,21 +540,23 @@ return TRUE; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void xdisplay_free(GHashTable *display_list) { g_hash_table_foreach_remove(display_list, xdisplay_free_list, NULL); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void display_add(struct displaylist *displaylist, struct item *item, int count, struct point *pnt, char *label) { struct displayitem *di; @@ -535,11 +588,12 @@ } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void label_line(struct graphics *gra, struct graphics_gc *fg, struct graphics_gc *bg, struct graphics_font *font, struct point *p, int count, char *label) { int i,x,y,tl; @@ -576,11 +630,12 @@ } } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void xdisplay_draw_elements(struct graphics *gra, GHashTable *display_list, struct itemtype *itm) { struct element *e; @@ -679,11 +734,12 @@ graphics_gc_destroy(gc); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void xdisplay_draw_layer(GHashTable *display_list, struct graphics *gra, struct layer *lay, int order) { GList *itms; @@ -698,11 +754,12 @@ } } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void xdisplay_draw(GHashTable *display_list, struct graphics *gra, struct layout *l, int order) { GList *lays; @@ -716,18 +773,20 @@ } } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ extern void *route_selection; -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void do_draw_map(struct displaylist *displaylist, struct transformation *t, struct map *m, int order) { enum projection pro; @@ -792,11 +851,12 @@ map_selection_destroy(sel); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static void do_draw(struct displaylist *displaylist, struct transformation *t, GList *mapsets, int order) { struct mapset *ms; @@ -813,21 +873,23 @@ mapset_close(h); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ int graphics_ready(struct graphics *this_) { return this_->ready; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l, int callback) { int order=transform_get_order(trans); @@ -837,6 +899,7 @@ // FIXME find a better place to set the background color graphics_gc_set_background(gra->gc[0], &l->color); graphics_gc_set_foreground(gra->gc[0], &l->color); + gra->default_font = g_strdup(l->font); gra->meth.background_gc(gra->priv, gra->gc[0]->priv); gra->meth.draw_mode(gra->priv, draw_mode_begin); gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &p, 32767, 32767); @@ -846,11 +909,12 @@ gra->meth.draw_mode(gra->priv, draw_mode_end); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_displaylist_move(struct displaylist *displaylist, int dx, int dy) { struct displaylist_handle *dlh; @@ -867,11 +931,12 @@ graphics_displaylist_close(dlh); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, struct layout *l) { int order=transform_get_order(trans); @@ -908,20 +973,22 @@ gra->ready=1; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct displaylist_handle { GList *hl_head,*hl,*l; }; -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct displaylist_handle * graphics_displaylist_open(struct displaylist *displaylist) { struct displaylist_handle *ret; @@ -932,11 +999,12 @@ return ret; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct displayitem * graphics_displaylist_next(struct displaylist_handle *dlh) { struct displayitem *ret; @@ -951,22 +1019,24 @@ return ret; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ void graphics_displaylist_close(struct displaylist_handle *dlh) { g_list_free(dlh->hl_head); g_free(dlh); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct displaylist * graphics_displaylist_new(void) { struct displaylist *ret=g_new(struct displaylist, 1); @@ -976,31 +1046,34 @@ return ret; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ struct item * graphics_displayitem_get_item(struct displayitem *di) { return &di->item; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ char * graphics_displayitem_get_label(struct displayitem *di) { return di->label; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static int within_dist_point(struct point *p0, struct point *p1, int dist) { if (p0->x == 32767 || p0->y == 32767 || p1->x == 32767 || p1->y == 32767) @@ -1013,11 +1086,12 @@ return 0; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static int within_dist_line(struct point *p, struct point *line_p0, struct point *line_p1, int dist) { int vx,vy,wx,wy; @@ -1041,11 +1115,12 @@ return within_dist_point(p, &line_p, dist); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static int within_dist_polyline(struct point *p, struct point *line_pnt, int count, int dist, int close) { int i; @@ -1059,11 +1134,12 @@ return 0; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ static int within_dist_polygon(struct point *p, struct point *poly_pnt, int count, int dist) { int i, j, c = 0; @@ -1078,11 +1154,12 @@ return c; } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## +/** + * FIXME + * @param <> + * @returns <> + * @author Martin Schaller (04/2008) +*/ int graphics_displayitem_within_dist(struct displayitem *di, struct point *p, int dist) { if (di->item.type < type_line) { Modified: trunk/navit/navit/graphics.h =================================================================== --- trunk/navit/navit/graphics.h 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/graphics.h 2008-08-21 14:42:51 UTC (rev 1288) @@ -56,7 +56,7 @@ void (*draw_image)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img); void (*draw_image_warp)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, char *data); void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w, int h); - struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags); + struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font, int size, int flags); struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr, struct graphics_gc_methods *meth); void (*background_gc)(struct graphics_priv *gr, struct graphics_gc_priv *gc); struct graphics_priv *(*overlay_new)(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h); @@ -133,6 +133,7 @@ void graphics_register_motion_callback(struct graphics *this_, void (*callback)(void *data, struct point *p), void *data); void graphics_register_keypress_callback(struct graphics *this_, void (*callback)(void *data, char *key), void *data); struct graphics_font *graphics_font_new(struct graphics *gra, int size, int flags); +void graphics_font_destroy_all(struct graphics *gra); struct graphics_gc *graphics_gc_new(struct graphics *gra); void graphics_gc_destroy(struct graphics_gc *gc); void graphics_gc_set_foreground(struct graphics_gc *gc, struct color *c); Modified: trunk/navit/navit/layout.c =================================================================== --- trunk/navit/navit/layout.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/layout.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -26,13 +26,15 @@ { struct layout *l; struct color def_color = {0xffff, 0xefef, 0xb7b7, 0xffff}; - struct attr *name_attr,*color_attr,*order_delta_attr; + struct attr *name_attr,*color_attr,*order_delta_attr,*font_attr; - if (! (name_attr=attr_search(attrs, NULL, attr_name))) return NULL; l = g_new0(struct layout, 1); l->name = g_strdup(name_attr->u.str); + if ((font_attr=attr_search(attrs, NULL, attr_font))) { + l->font = g_strdup(font_attr->u.str); + } if ((color_attr=attr_search(attrs, NULL, attr_color))) l->color = *color_attr->u.color; else Modified: trunk/navit/navit/layout.h =================================================================== --- trunk/navit/navit/layout.h 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/layout.h 2008-08-21 14:42:51 UTC (rev 1288) @@ -62,7 +62,7 @@ struct layer { char *name; int details; GList *itemtypes; }; -struct layout { char *name; struct color color; GList *layers; int order_delta; }; +struct layout { char *name; char *font; struct color color; GList *layers; int order_delta; }; /* prototypes */ enum item_type; Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/navit.c 2008-08-21 14:42:51 UTC (rev 1288) @@ -1262,6 +1262,7 @@ case attr_layout: if(this_->layout_current!=attr->u.layout) { this_->layout_current=attr->u.layout; + graphics_font_destroy_all(this_->gra); navit_draw(this_); attr_updated=1; } Modified: trunk/navit/navit/navit.dtd =================================================================== --- trunk/navit/navit/navit.dtd 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/navit.dtd 2008-08-21 14:42:51 UTC (rev 1288) @@ -55,6 +55,7 @@ <!ELEMENT layout (layer*)> <!ATTLIST layout name CDATA #REQUIRED> <!ATTLIST layout color CDATA #IMPLIED> +<!ATTLIST layout font CDATA #IMPLIED> <!ELEMENT layer (item+)> <!ATTLIST layer name CDATA #REQUIRED> <!ATTLIST layer details CDATA #REQUIRED> Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-08-21 13:40:31 UTC (rev 1287) +++ trunk/navit/navit/navit.xml 2008-08-21 14:42:51 UTC (rev 1288) @@ -119,7 +119,7 @@ <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> </mapset> - <layout name="Car" color= "#ffefb7"> + <layout name="Car" color= "#ffefb7" font="Liberation Sans"> <layer name="polygons"> <item type="image" order="0-"> <image /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-22 19:21:40
|
Revision: 1302 http://navit.svn.sourceforge.net/navit/?rev=1302&view=rev Author: martin-s Date: 2008-08-22 19:21:49 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Fix:Core:Reworked routing code a bit Modified Paths: -------------- trunk/navit/navit/navigation.c trunk/navit/navit/transform.c trunk/navit/navit/transform.h Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2008-08-22 18:38:26 UTC (rev 1301) +++ trunk/navit/navit/navigation.c 2008-08-22 19:21:49 UTC (rev 1302) @@ -684,27 +684,33 @@ dbg(1,"enter\n"); ritem=map_rect_get_item(mr); if (ritem) { - if (item_attr_get(ritem, attr_street_item, &street_item)) { - sitem=street_item.u.item; - dbg(1,"sitem=%p\n", sitem); - itm=item_hash_lookup(this_->hash, sitem); - dbg(2,"itm for item with id (0x%x,0x%x) is %p\n", sitem->id_hi, sitem->id_lo, itm); - navigation_destroy_itms_cmds(this_, itm); - if (itm) { - incr=1; - navigation_itm_update(itm, ritem); - } else { - dbg(1,"not on track\n"); - do { - dbg(1,"item\n"); - navigation_itm_new(this_, ritem); - ritem=map_rect_get_item(mr); - } while (ritem); - itm=navigation_itm_new(this_, NULL); - make_maneuvers(this_); + if (!item_attr_get(ritem, attr_street_item, &street_item)) { + ritem=map_rect_get_item(mr); + if (! ritem) { + return; } - } else - dbg(0,"no street_item\n"); + if (!item_attr_get(ritem, attr_street_item, &street_item)) { + dbg(0,"no street item\n"); + } + } + sitem=street_item.u.item; + dbg(1,"sitem=%p\n", sitem); + itm=item_hash_lookup(this_->hash, sitem); + dbg(2,"itm for item with id (0x%x,0x%x) is %p\n", sitem->id_hi, sitem->id_lo, itm); + navigation_destroy_itms_cmds(this_, itm); + if (itm) { + incr=1; + navigation_itm_update(itm, ritem); + } else { + dbg(1,"not on track\n"); + do { + dbg(1,"item\n"); + navigation_itm_new(this_, ritem); + ritem=map_rect_get_item(mr); + } while (ritem); + itm=navigation_itm_new(this_, NULL); + make_maneuvers(this_); + } calculate_dest_distance(this_, incr); dbg(2,"destination distance old=%d new=%d\n", this_->distance_last, this_->first->dest_length); if (this_->first->dest_length > this_->distance_last && this_->distance_last >= 0) Modified: trunk/navit/navit/transform.c =================================================================== --- trunk/navit/navit/transform.c 2008-08-22 18:38:26 UTC (rev 1301) +++ trunk/navit/navit/transform.c 2008-08-22 19:21:49 UTC (rev 1302) @@ -560,6 +560,17 @@ } } +double +transform_polyline_length(enum projection pro, struct coord *c, int count) +{ + double ret=0; + int i; + + for (i = 0 ; i < count-1 ; i++) + ret+=transform_distance(pro, &c[i], &c[i+1]); + return ret; +} + int transform_distance_sq(struct coord *c1, struct coord *c2) { Modified: trunk/navit/navit/transform.h =================================================================== --- trunk/navit/navit/transform.h 2008-08-22 18:38:26 UTC (rev 1301) +++ trunk/navit/navit/transform.h 2008-08-22 19:21:49 UTC (rev 1302) @@ -59,6 +59,7 @@ void transform_geo_text(struct coord_geo *g, char *buffer); double transform_scale(int y); double transform_distance(enum projection pro, struct coord *c1, struct coord *c2); +double transform_polyline_length(enum projection pro, struct coord *c, int count); int transform_distance_sq(struct coord *c1, struct coord *c2); int transform_distance_line_sq(struct coord *l0, struct coord *l1, struct coord *ref, struct coord *lpnt); int transform_distance_polyline_sq(struct coord *c, int count, struct coord *ref, struct coord *lpnt, int *pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-22 21:30:37
|
Revision: 1305 http://navit.svn.sourceforge.net/navit/?rev=1305&view=rev Author: martin-s Date: 2008-08-22 21:30:46 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Fix:osd_core:Fixed buttons with negative coordinates Modified Paths: -------------- trunk/navit/navit/navit.c trunk/navit/navit/navit.h trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-08-22 21:23:52 UTC (rev 1304) +++ trunk/navit/navit/navit.c 2008-08-22 21:30:46 UTC (rev 1305) @@ -123,6 +123,7 @@ struct pcoord destination; int destination_valid; int blocked; + int w,h; }; struct gui *main_loop_gui; @@ -195,12 +196,27 @@ memset(&sel, 0, sizeof(sel)); sel.u.p_rect.rl.x=w; sel.u.p_rect.rl.y=h; + this_->w=w; + this_->h=h; transform_set_screen_selection(this_->trans, &sel); this_->ready |= 2; if (this_->ready == 3) navit_draw(this_); } +int +navit_get_width(struct navit *this_) +{ + return this_->w; +} + + +int +navit_get_height(struct navit *this_) +{ + return this_->h; +} + static void navit_popup(void *data) { Modified: trunk/navit/navit/navit.h =================================================================== --- trunk/navit/navit/navit.h 2008-08-22 21:23:52 UTC (rev 1304) +++ trunk/navit/navit/navit.h 2008-08-22 21:30:46 UTC (rev 1305) @@ -33,7 +33,6 @@ struct displaylist; struct graphics; struct gui; -struct layout; struct mapset; struct navigation; struct navit; @@ -49,10 +48,12 @@ void navit_add_mapset(struct navit *this_, struct mapset *ms); struct mapset *navit_get_mapset(struct navit *this_); struct tracking *navit_get_tracking(struct navit *this_); -void navit_add_layout(struct navit *this_, struct layout *lay); void navit_draw(struct navit *this_); void navit_draw_displaylist(struct navit *this_); void navit_resize(void *data, int w, int h); +int navit_get_width(struct navit *this_); +int navit_get_height(struct navit *this_); +int navit_ignore_button(struct navit *this_); int navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback); void navit_handle_motion(struct navit *this_, struct point *p); void navit_zoom_in(struct navit *this_, int factor, struct point *p); @@ -81,8 +82,6 @@ struct navit_vehicle *navit_add_vehicle(struct navit *this_, struct vehicle *v, struct attr **attrs); void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv); void navit_tracking_add(struct navit *this_, struct tracking *tracking); -void navit_route_add(struct navit *this_, struct route *route); -void navit_navigation_add(struct navit *this_, struct navigation *navigation); void navit_set_speech(struct navit *this_, struct speech *speech); struct gui *navit_get_gui(struct navit *this_); struct transformation *navit_get_trans(struct navit *this_); Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2008-08-22 21:23:52 UTC (rev 1304) +++ trunk/navit/navit/osd/core/osd_core.c 2008-08-22 21:30:46 UTC (rev 1305) @@ -599,9 +599,21 @@ }; static void +wrap_point(struct point *p, struct navit *nav) +{ + if (p->x < 0) + p->x+=navit_get_width(nav); + if (p->y < 0) + p->y+=navit_get_height(nav); + +} + +static void osd_button_click(struct osd_button *this, struct navit *nav, int pressed, int button, struct point *p) { - if (p->x < this->p.x || p->y < this->p.y || p->x > this->p.x+this->img->width || p->y > this->p.y+this->img->height) + struct point bp=this->p; + wrap_point(&bp, this->nav); + if (p->x < bp.x || p->y < bp.y || p->x > bp.x+this->img->width || p->y > bp.y+this->img->height) return; navit_ignore_button(nav); if (pressed) { @@ -618,7 +630,9 @@ static void osd_button_draw(struct osd_button *this) { - graphics_draw_image(this->gra,this->gc, &this->p, this->img); + struct point bp=this->p; + wrap_point(&bp, this->nav); + graphics_draw_image(this->gra,this->gc, &bp, this->img); } static void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-22 22:51:56
|
Revision: 1306 http://navit.svn.sourceforge.net/navit/?rev=1306&view=rev Author: martin-s Date: 2008-08-22 22:52:05 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Add:Core:Make it possible to add more commands to osd buttons Modified Paths: -------------- trunk/navit/navit/callback.c trunk/navit/navit/callback.h trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/navit.c trunk/navit/navit/navit.h trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/callback.c =================================================================== --- trunk/navit/navit/callback.c 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/callback.c 2008-08-22 22:52:05 UTC (rev 1306) @@ -66,6 +66,12 @@ } void +callback_destroy(struct callback *cb) +{ + g_free(cb); +} + +void callback_set_arg(struct callback *cb, int arg, void *p) { if (arg < 0 || arg > cb->pcount) Modified: trunk/navit/navit/callback.h =================================================================== --- trunk/navit/navit/callback.h 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/callback.h 2008-08-22 22:52:05 UTC (rev 1306) @@ -31,8 +31,9 @@ struct callback; struct callback_list; struct callback_list *callback_list_new(void); -struct callback * callback_new_attr(void (*func)(void), enum attr_type type, int pcount, void **p); +struct callback *callback_new_attr(void (*func)(void), enum attr_type type, int pcount, void **p); struct callback *callback_new(void (*func)(void), int pcount, void **p); +void callback_destroy(struct callback *cb); void callback_set_arg(struct callback *cb, int arg, void *p); void callback_list_add(struct callback_list *l, struct callback *cb); struct callback *callback_list_add_new(struct callback_list *l, void (*func)(void), int pcount, void **p); Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/gui/internal/gui_internal.c 2008-08-22 22:52:05 UTC (rev 1306) @@ -164,7 +164,7 @@ struct widget *highlighted; struct widget *highlighted_menu; struct widget *list; - int vehicle_valid; + int clickp_valid, vehicle_valid; struct pcoord clickp, vehiclep; struct search_list *sl; }; @@ -1955,14 +1955,16 @@ gui_internal_button_new_with_callback(this, "Bookmarks", image_new_l(this, "gui_bookmark"), gravity_center|orientation_vertical, gui_internal_cmd_bookmarks, NULL)); - coord=coordinates(&this->clickp, '\n'); - gui_internal_widget_append(w, - wc=gui_internal_button_new_with_callback(this, coord, - image_new_l(this, "gui_map"), gravity_center|orientation_vertical, - gui_internal_cmd_position, NULL)); - wc->name=g_strdup("Map Point"); - wc->c=this->clickp; - g_free(coord); + if (this->clickp_valid) { + coord=coordinates(&this->clickp, '\n'); + gui_internal_widget_append(w, + wc=gui_internal_button_new_with_callback(this, coord, + image_new_l(this, "gui_map"), gravity_center|orientation_vertical, + gui_internal_cmd_position, NULL)); + wc->name=g_strdup("Map Point"); + wc->c=this->clickp; + g_free(coord); + } if (this->vehicle_valid) { coord=coordinates(&this->vehiclep, '\n'); gui_internal_widget_append(w, @@ -2138,7 +2140,40 @@ gui_internal_menu_render(this); } +static void +gui_internal_cmd_menu(struct gui_priv *this, struct point *p) +{ + struct graphics *gra=this->gra; + struct transformation *trans; + struct coord c; + struct attr attr,attrp; + navit_block(this->nav, 1); + graphics_overlay_disable(gra, 1); + trans=navit_get_trans(this->nav); + if (p) { + transform_reverse(trans, p, &c); + dbg(0,"x=0x%x y=0x%x\n", c.x, c.y); + this->clickp.pro=transform_get_projection(trans); + this->clickp.x=c.x; + this->clickp.y=c.y; + this->clickp_valid=1; + } + if (navit_get_attr(this->nav, attr_vehicle, &attr, NULL) && attr.u.vehicle + && vehicle_get_attr(attr.u.vehicle, attr_position_coord_geo, &attrp)) { + this->vehiclep.pro=transform_get_projection(trans); + transform_from_geo(this->vehiclep.pro, attrp.u.coord_geo, &c); + this->vehiclep.x=c.x; + this->vehiclep.y=c.y; + this->vehicle_valid=1; + } + // draw menu + this->root.p.x=0; + this->root.p.y=0; + this->root.background=this->background; + gui_internal_menu_root(this); +} + //############################################################################################################## //# Description: Function to handle mouse clicks and scroll wheel movement //# Comment: @@ -2148,37 +2183,13 @@ { struct gui_priv *this=data; struct graphics *gra=this->gra; - struct transformation *trans; - struct attr attr,attrp; - struct coord c; // if still on the map (not in the menu, yet): if (!this->root.children) { // check whether the position of the mouse changed during press/release OR if it is the scrollwheel if (!navit_handle_button(this->nav, pressed, button, p, NULL) || button >=4) // Maybe there's a better way to do this return; - - navit_block(this->nav, 1); - graphics_overlay_disable(gra, 1); - trans=navit_get_trans(this->nav); - transform_reverse(trans, p, &c); - dbg(0,"x=0x%x y=0x%x\n", c.x, c.y); - this->clickp.pro=transform_get_projection(trans); - this->clickp.x=c.x; - this->clickp.y=c.y; - if (navit_get_attr(this->nav, attr_vehicle, &attr, NULL) && attr.u.vehicle - && vehicle_get_attr(attr.u.vehicle, attr_position_coord_geo, &attrp)) { - this->vehiclep.pro=transform_get_projection(trans); - transform_from_geo(this->vehiclep.pro, attrp.u.coord_geo, &c); - this->vehiclep.x=c.x; - this->vehiclep.y=c.y; - this->vehicle_valid=1; - } - // draw menu - this->root.p.x=0; - this->root.p.y=0; - this->root.background=this->background; - gui_internal_menu_root(this); + gui_internal_cmd_menu(this, p); return; } @@ -2217,7 +2228,7 @@ struct gui_priv *this=data; this->root.w=w; this->root.h=h; - dbg(0,"w=%d h=%d\n", w, h); + dbg(0,"w=%d h=%d children=%p\n", w, h, this->root.children); navit_resize(this->nav, w, h); if (this->root.children) { gui_internal_prune_menu(this, NULL); @@ -2340,7 +2351,8 @@ *meth=gui_internal_methods; this=g_new0(struct gui_priv, 1); this->nav=nav; - + navit_command_register(nav,"gui_internal_menu",callback_new_2(gui_internal_cmd_menu,this,NULL)); + navit_command_register(nav,"gui_internal_fullscreen",callback_new_2(gui_internal_cmd_fullscreen,this,NULL)); return this; } Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/navit.c 2008-08-22 22:52:05 UTC (rev 1306) @@ -124,6 +124,7 @@ int destination_valid; int blocked; int w,h; + GHashTable *commands; }; struct gui *main_loop_gui; @@ -461,6 +462,9 @@ this_->trans=transform_new(); transform_setup(this_->trans, ¢er, zoom, 0); this_->displaylist=graphics_displaylist_new(); + this_->commands=g_hash_table_new(g_str_hash, g_str_equal); + navit_command_register(this_, "zoom_in", callback_new_3(navit_zoom_in, this_, 2, NULL)); + navit_command_register(this_, "zoom_out", callback_new_3(navit_zoom_out, this_, 2, NULL)); return this_; } @@ -1714,12 +1718,45 @@ return 0; } +int +navit_command_register(struct navit *this_, char *command, struct callback *cb) +{ + dbg(0,"registering '%s'\n", command); + g_hash_table_insert(this_->commands, command, cb); + + return 0; +} + +struct callback * +navit_command_unregister(struct navit *this_, char *command) +{ + struct callback *ret=g_hash_table_lookup(this_->commands, command); + if (ret) { + g_hash_table_remove(this_->commands, command); + } + + return ret; +} + +int +navit_command_call(struct navit *this_, char *command) +{ + struct callback *cb=g_hash_table_lookup(this_->commands, command); + dbg(0,"calling callback %p for '%s'\n", cb, command); + if (! cb) + return 1; + callback_call_1(cb, command); +} + void navit_destroy(struct navit *this_) { /* TODO: destroy objects contained in this_ */ main_remove_navit(this_); navit_write_center_to_file(this_, "center.txt"); + callback_destroy(navit_command_unregister(this_, "zoom_in")); + callback_destroy(navit_command_unregister(this_, "zoom_out")); + g_hash_table_destroy(this_->commands); g_free(this_); } Modified: trunk/navit/navit/navit.h =================================================================== --- trunk/navit/navit/navit.h 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/navit.h 2008-08-22 22:52:05 UTC (rev 1306) @@ -89,6 +89,9 @@ struct navigation *navit_get_navigation(struct navit *this_); struct displaylist *navit_get_displaylist(struct navit *this_); int navit_block(struct navit *this_, int block); +int navit_command_register(struct navit *this_, char *command, struct callback *cb); +struct callback *navit_command_unregister(struct navit *this_, char *command); +int navit_command_call(struct navit *this_, char *command); void navit_destroy(struct navit *this_); /* end of prototypes */ #ifdef __cplusplus Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2008-08-22 21:30:46 UTC (rev 1305) +++ trunk/navit/navit/osd/core/osd_core.c 2008-08-22 22:52:05 UTC (rev 1306) @@ -594,6 +594,7 @@ struct callback *navit_init_cb; struct callback *draw_cb; struct graphics_image *img; + int pressed; char *src; char *command; }; @@ -613,17 +614,14 @@ { struct point bp=this->p; wrap_point(&bp, this->nav); - if (p->x < bp.x || p->y < bp.y || p->x > bp.x+this->img->width || p->y > bp.y+this->img->height) + dbg(0,"%d,%d-%d,%d %d,%d\n", bp.x, bp.y, bp.x+this->img->width, bp.y+this->img->height, p->x, p->y); + if ((p->x < bp.x || p->y < bp.y || p->x > bp.x+this->img->width || p->y > bp.y+this->img->height) && !this->pressed) return; navit_ignore_button(nav); + this->pressed=pressed; if (pressed) { - dbg(0,"enter\n"); - if (! strcmp(this->command, "zoom_in")) { - navit_zoom_in(nav, 2, NULL); - } - if (! strcmp(this->command, "zoom_out")) { - navit_zoom_out(nav, 2, NULL); - } + dbg(0,"calling command '%s'\n", this->command); + navit_command_call(nav, this->command); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-23 09:44:06
|
Revision: 1311 http://navit.svn.sourceforge.net/navit/?rev=1311&view=rev Author: martin-s Date: 2008-08-23 09:44:16 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Add:gui_internal:Made the menu appears on map click feature configurable, fixed a bug with menu generation from osd button Modified Paths: -------------- trunk/navit/navit/attr_def.h trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2008-08-23 00:22:34 UTC (rev 1310) +++ trunk/navit/navit/attr_def.h 2008-08-23 09:44:16 UTC (rev 1311) @@ -82,6 +82,7 @@ ATTR(postdraw) ATTR(button) ATTR(ondemand) +ATTR(menu_on_map_click) ATTR2(0x0002ffff,type_int_end) ATTR2(0x00030000,type_string_begin) ATTR(type) Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2008-08-23 00:22:34 UTC (rev 1310) +++ trunk/navit/navit/gui/internal/gui_internal.c 2008-08-23 09:44:16 UTC (rev 1311) @@ -167,6 +167,8 @@ int clickp_valid, vehicle_valid; struct pcoord clickp, vehiclep; struct search_list *sl; + int ignore_button; + int menu_on_map_click; }; static void gui_internal_widget_render(struct gui_priv *this, struct widget *w); @@ -2141,13 +2143,15 @@ } static void -gui_internal_cmd_menu(struct gui_priv *this, struct point *p) +gui_internal_cmd_menu(struct gui_priv *this, struct point *p, int ignore) { struct graphics *gra=this->gra; struct transformation *trans; struct coord c; struct attr attr,attrp; + this->ignore_button=ignore; + navit_block(this->nav, 1); graphics_overlay_disable(gra, 1); trans=navit_get_trans(this->nav); @@ -2185,11 +2189,13 @@ struct graphics *gra=this->gra; // if still on the map (not in the menu, yet): - if (!this->root.children) { + if (!this->root.children || this->ignore_button) { + this->ignore_button=0; // check whether the position of the mouse changed during press/release OR if it is the scrollwheel if (!navit_handle_button(this->nav, pressed, button, p, NULL) || button >=4) // Maybe there's a better way to do this return; - gui_internal_cmd_menu(this, p); + if (this->menu_on_map_click) + gui_internal_cmd_menu(this, p, 0); return; } @@ -2348,10 +2354,15 @@ static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) { struct gui_priv *this; + struct attr *attr; *meth=gui_internal_methods; this=g_new0(struct gui_priv, 1); this->nav=nav; - navit_command_register(nav,"gui_internal_menu",callback_new_2(gui_internal_cmd_menu,this,NULL)); + if ((attr=attr_search(attrs, NULL, attr_menu_on_map_click))) + this->menu_on_map_click=attr->u.num; + else + this->menu_on_map_click=1; + navit_command_register(nav,"gui_internal_menu",callback_new_3(gui_internal_cmd_menu,this,NULL,1)); navit_command_register(nav,"gui_internal_fullscreen",callback_new_2(gui_internal_cmd_fullscreen,this,NULL)); return this; } Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2008-08-23 00:22:34 UTC (rev 1310) +++ trunk/navit/navit/osd/core/osd_core.c 2008-08-23 09:44:16 UTC (rev 1311) @@ -614,7 +614,6 @@ { struct point bp=this->p; wrap_point(&bp, this->nav); - dbg(0,"%d,%d-%d,%d %d,%d\n", bp.x, bp.y, bp.x+this->img->width, bp.y+this->img->height, p->x, p->y); if ((p->x < bp.x || p->y < bp.y || p->x > bp.x+this->img->width || p->y > bp.y+this->img->height) && !this->pressed) return; navit_ignore_button(nav); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-28 17:42:40
|
Revision: 1332 http://navit.svn.sourceforge.net/navit/?rev=1332&view=rev Author: christeck Date: 2008-08-28 17:42:47 +0000 (Thu, 28 Aug 2008) Log Message: ----------- modified some icons Modified Paths: -------------- trunk/navit/navit/navit.xml trunk/navit/navit/xpm/airport.xpm trunk/navit/navit/xpm/attraction.xpm trunk/navit/navit/xpm/boundary_stone.xpm trunk/navit/navit/xpm/car_dealer.xpm trunk/navit/navit/xpm/church.xpm trunk/navit/navit/xpm/golf.xpm trunk/navit/navit/xpm/heliport.xpm trunk/navit/navit/xpm/level_crossing.xpm Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/navit.xml 2008-08-28 17:42:47 UTC (rev 1332) @@ -1062,7 +1062,7 @@ <icon src="auto_club.xpm" /> </item> <item type="poi_autoservice" order="12-"> - <icon src="autoservice.xpm" /> + <icon src="car_dealer.xpm" /> </item> <item type="poi_bank" order="12-"> <icon src="bank.xpm" /> Modified: trunk/navit/navit/xpm/airport.xpm =================================================================== --- trunk/navit/navit/xpm/airport.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/airport.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,75 +1,63 @@ /* XPM */ -static char * airport_xpm[] = { -"16 16 56 1", -" c None", -". c #03705F", -"+ c #0F7767", -"@ c #0F7766", -"# c #DBEAE8", -"$ c #D9EAE7", -"% c #FEFEFE", -"& c #FAFCFB", -"* c #F8FAFA", -"= c #FBFDFC", -"- c #FCFDFD", -"; c #0A7463", -"> c #73B0A6", -", c #F8FBFB", -"' c #F9FBFB", -") c #82B7AE", -"! c #58A095", -"~ c #057160", -"{ c #5CA398", -"] c #F8FBFA", -"^ c #FFFFFF", -"/ c #FBFCFC", -"( c #E1EDEB", -"_ c #077261", -": c #459689", -"< c #EFF6F5", -"[ c #6FADA3", -"} c #2E897B", -"| c #F1F7F6", -"1 c #FAFCFC", -"2 c #388E81", -"3 c #ECF4F3", -"4 c #F3F8F7", -"5 c #EDF5F3", -"6 c #519C90", -"7 c #0A7464", -"8 c #FDFEFE", -"9 c #087362", -"0 c #4A988C", -"a c #AED1CC", -"b c #61A59B", -"c c #529D91", -"d c #0B7564", -"e c #F7FAFA", -"f c #338B7D", -"g c #66A89E", -"h c #077362", -"i c #B4D4CF", -"j c #E7F1F0", -"k c #097363", -"l c #DCEBE9", -"m c #218172", -"n c #348C7E", -"o c #047160", -"p c #278476", -"q c #30897B", -".......+@.......", -".......#$.......", -".......%%.......", -".......&*.......", -".......=-.......", -".......&-.......", -".....;>,')!.....", -"...~{]^^^^/(_...", -"..:^^^^^^^^^<[..", -"}|^^^^/^-1/^^^(2", -"3^4567.88.90#'^a", -"bcd....e^....f6g", -"......./1.......", -".....hi%%jk.....", -".....l^--^^.....", -".....mno.pq....."}; +static char *dummy[]={ +"16 16 44 1", +". c None", +"m c #000000", +"b c #010101", +"z c #020202", +"e c #030303", +"c c #040404", +"h c #050505", +"d c #060606", +"w c #090909", +"t c #0a0a0a", +"q c #0b0b0b", +"x c #0c0c0c", +"v c #0d0d0d", +"J c #111111", +"n c #151515", +"K c #181818", +"a c #191919", +"I c #333333", +"C c #363636", +"i c #545454", +"g c #5d5d5d", +"r c #606060", +"H c #666666", +"D c #6a6a6a", +"l c #6c6c6c", +"j c #707070", +"E c #737373", +"y c #747474", +"B c #797979", +"p c #7c7c7c", +"u c #858585", +"M c #878787", +"G c #888888", +"P c #8a8a8a", +"s c #8b8b8b", +"O c #909090", +"L c #949494", +"# c #a0a0a0", +"F c #a2a2a2", +"f c #a3a3a3", +"A c #a4a4a4", +"o c #a5a5a5", +"k c #a7a7a7", +"N c #a8a8a8", +".......##.......", +".......aa.......", +".......bb.......", +".......cd.......", +".......ee.......", +".......ce.......", +".....fghhij.....", +"...klhmmmmcno...", +"..pmmmmmmmmmqr..", +"stmmmmcmeccmmmnu", +"vmwxyf.zz.ABahmC", +"DEF....dm....GyH", +".......cc.......", +".....oIbbJA.....", +".....Kmeemm.....", +".....LMkNOP....."}; Modified: trunk/navit/navit/xpm/attraction.xpm =================================================================== --- trunk/navit/navit/xpm/attraction.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/attraction.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,141 +1,22 @@ /* XPM */ -static char * attraction_xpm[] = { -"16 16 122 2", -" c None", -". c #CC1400", -"+ c #AE1100", -"@ c #FB1800", -"# c #BA1200", -"$ c #FF1900", -"% c #F61800", -"& c #DA1500", -"* c #DE1500", -"= c #E51600", -"- c #C31300", -"; c #810C00", -"> c #F01700", -", c #FE1800", -"' c #8B0D00", -") c #8D0D00", -"! c #D21400", -"~ c #BB1200", -"{ c #9D0F00", -"] c #B21100", -"^ c #AF1100", -"/ c #AC1000", -"( c #D61500", -"_ c #8C0D00", -": c #C11200", -"< c #D71500", -"[ c #9F0F00", -"} c #D31400", -"| c #C71300", -"1 c #920E00", -"2 c #F81800", -"3 c #CD1400", -"4 c #EE1700", -"5 c #DC1500", -"6 c #F71800", -"7 c #840D00", -"8 c #B31100", -"9 c #E61600", -"0 c #A41000", -"a c #970E00", -"b c #8A0D00", -"c c #B61100", -"d c #D11400", -"e c #990F00", -"f c #8E0D00", -"g c #C81300", -"h c #EB1700", -"i c #E41600", -"j c #E71600", -"k c #B91200", -"l c #B81200", -"m c #EC1700", -"n c #C61300", -"o c #950E00", -"p c #E01600", -"q c #DB1500", -"r c #9C0F00", -"s c #AA1000", -"t c #C01200", -"u c #FA1800", -"v c #E31600", -"w c #DF1500", -"x c #F91800", -"y c #940E00", -"z c #F31700", -"A c #EF1700", -"B c #D51400", -"C c #B11100", -"D c #890D00", -"E c #A10F00", -"F c #840C00", -"G c #F11700", -"H c #930E00", -"I c #BE1200", -"J c #FC1800", -"K c #850D00", -"L c #F51800", -"M c #860D00", -"N c #DD1500", -"O c #A91000", -"P c #EA1700", -"Q c #E81600", -"R c #FD1800", -"S c #A61000", -"T c #F41700", -"U c #E11600", -"V c #B41100", -"W c #A00F00", -"X c #D91500", -"Y c #F21700", -"Z c #C91300", -"` c #960E00", -" . c #CF1400", -".. c #980E00", -"+. c #D41400", -"@. c #820C00", -"#. c #A20F00", -"$. c #D61400", -"%. c #BF1200", -"&. c #830C00", -"*. c #9A0F00", -"=. c #D01400", -"-. c #A71000", -";. c #CA1300", -">. c #B51100", -",. c #EA1600", -"'. c #E21600", -"). c #E91600", -"!. c #A81000", -"~. c #B01100", -"{. c #F41800", -"]. c #8E0E00", -"^. c #CB1300", -"/. c #ED1700", -"(. c #D81500", -"_. c #C51300", -":. c #AD1100", -"<. c #BD1200", -"[. c #CE1400", -"}. c #C21300", -"|. c #910E00", -"1. c #C41300", -" ", -" $ { ", -" $ $ ", -" $ $ ", -" $ $ ", -" $ $ $ $ ", -"$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ ", -" $ $ $ $ $ $ $ $ $ $ $ $ ", -" $ $ $ $ $ $ $ $ $ $ ", -" $ $ $ $ $ $ $ $ ", -" $ $ $ $ $ $ ", -" $ $ $ $ $ $ $ $ ", -" $ $ $ $ $ $ $ ", -" $ $ $ $ ", -" $ $ $ ", -" $ $ "}; +static char *dummy[]={ +"16 16 3 1", +". c None", +"a c #2c2c2c", +"# c #484848", +"................", +".......#a.......", +".......##.......", +".......##.......", +".......##.......", +"......####......", +"###############.", +"..############..", +"...##########...", +"....########....", +".....######.....", +"....########....", +"....###.####....", +"....##....##....", +"...##......#....", +"...#........#..."}; Modified: trunk/navit/navit/xpm/boundary_stone.xpm =================================================================== --- trunk/navit/navit/xpm/boundary_stone.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/boundary_stone.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,15 +1,39 @@ /* XPM */ static char *dummy[]={ -"4 8 4 1", +"32 32 4 1", ". c None", "b c #797979", "a c #7e7e7e", "# c #999999", -".##.", -"###a", -"###b", -"###b", -"###b", -"###b", -"###b", -"###b"}; +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"..............##................", +".............###a...............", +".............###b...............", +".............###b...............", +".............###b...............", +".............###b...............", +".............###b...............", +".............###b...............", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................"}; Modified: trunk/navit/navit/xpm/car_dealer.xpm =================================================================== --- trunk/navit/navit/xpm/car_dealer.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/car_dealer.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,26 +1,23 @@ /* XPM */ -static char *car_dealer[]={ -"16 16 7 1", +static char *dummy[]={ +"16 16 4 1", ". c None", -"c c #000000", -"a c #0000ff", -"b c #7f7f7f", -"d c #bfbfbf", -"e c #f6f6fa", -"# c #ffffff", -".##############.", -"#aaaaaaaaaaaaaa#", -"#a############a#", -"#a####bccb####a#", -"#a##dccccccd##a#", -"#a#####cc#####a#", -"#a##dccccccd##a#", -"#a####bccbe###a#", -"#a#####cc#####a#", -"#a####dccd####a#", -"#a####dccd####a#", -"#a####bccb####a#", -"#a####bccb####a#", -"#a############a#", -"#aaaaaaaaaaaaaa#", -".##############."}; +"a c #000000", +"# c #7f7f7f", +"b c #bfbfbf", +"................", +"................", +"................", +"......#aa#......", +"....baaaaaab....", +".......aa.......", +"....baaaaaab....", +"......#aa#......", +".......aa.......", +".......aa.......", +".......aa.......", +".......aa.......", +".......aa.......", +"................", +"................", +"................"}; Modified: trunk/navit/navit/xpm/church.xpm =================================================================== --- trunk/navit/navit/xpm/church.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/church.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,24 +1,23 @@ /* XPM */ -static char * church_xpm[] = { -"10 16 5 1", -" c None", -". c #FFFFFF", -"+ c #2F2F2F", -"@ c #B1B1B1", -"# c #000000", -" .++. ", -" .++. ", -" ...++... ", -".+++@@+++.", -".+++@@+++.", -" ...++... ", -" .++. ", -" ...++... ", -".########.", -".########.", -".########.", -".########.", -".########.", -".########.", -".########.", -".########."}; +static char *dummy[]={ +"16 16 4 1", +". c None", +"b c #000000", +"# c #2f2f2f", +"a c #b1b1b1", +".......##.......", +".......##.......", +".......##.......", +"....###aa###....", +"....###aa###....", +".......##.......", +".......##.......", +".......##.......", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb....", +"....bbbbbbbb...."}; Modified: trunk/navit/navit/xpm/golf.xpm =================================================================== --- trunk/navit/navit/xpm/golf.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/golf.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,275 +1,40 @@ /* XPM */ -static char * golf_xpm[] = { -"16 16 256 2", -" c #3D3D3D", -". c #696969", -"+ c #393939", -"@ c #474747", -"# c #3A3223", -"$ c #0D0D0D", -"% c #060606", -"& c #4A412F", -"* c #5A5A5A", -"= c #555555", -"- c #15110B", -"; c #514632", -"> c #121212", -", c #221D13", -"' c #6E5C3B", -") c #4D3E22", -"! c #292929", -"~ c #161616", -"{ c #2B2B2B", -"] c #222222", -"^ c #564B37", -"/ c #1E1E1E", -"( c #242424", -"_ c #29251B", -": c #202020", -"< c #090909", -"[ c #1C1C1C", -"} c #110E08", -"| c #020202", -"1 c #181818", -"2 c #1A1A1A", -"3 c #080807", -"4 c #0F0C07", -"5 c #010101", -"6 c #ADADAD", -"7 c #65583D", -"8 c #FEFEFE", -"9 c #484848", -"0 c #909090", -"a c #292317", -"b c #3C3424", -"c c #504631", -"d c #4C3D21", -"e c #62573F", -"f c #6E5D3C", -"g c #867552", -"h c #886D36", -"i c #6C6C6C", -"j c #F7F7F7", -"k c #FDFDFD", -"l c #A2A2A2", -"m c #FAFAFA", -"n c #FBFBFB", -"o c #6D6D6D", -"p c #C7C7C7", -"q c #F1F1F1", -"r c #989898", -"s c #FFCE6D", -"t c #D4D4D4", -"u c #262626", -"v c #F6F6F6", -"w c #F5F5F5", -"x c #B1B1B1", -"y c #FFD278", -"z c #ACACAC", -"A c #505050", -"B c #D1D1D1", -"C c #BEBEBE", -"D c #BDBDBD", -"E c #B0B0B0", -"F c #9A9A9A", -"G c #404040", -"H c #8F8F8F", -"I c #A3A3A3", -"J c #F3F3F3", -"K c #635840", -"L c #4C4C4C", -"M c #878787", -"N c #FCFCFC", -"O c #CDCDCD", -"P c #D7D7D7", -"Q c #4D4D4D", -"R c #A1A1A1", -"S c #C3C3C3", -"T c #373737", -"U c #F0F0F0", -"V c #F4F4F4", -"W c #E1E1E1", -"X c #F2F2F2", -"Y c #DBDBDB", -"Z c #B2B2B2", -"` c #A9A9A9", -" . c #424242", -".. c #BFBFBF", -"+. c #7D7D7D", -"@. c #D0D0D0", -"#. c #EAEAEA", -"$. c #8B8B8B", -"%. c #2C2C2C", -"&. c #898989", -"*. c #AEAEAE", -"=. c #F9F9F9", -"-. c #272115", -";. c #5C5C5C", -">. c #D8D8D8", -",. c #DFDFDF", -"'. c #494949", -"). c #B3B3B3", -"!. c #2F2F2F", -"~. c #888888", -"{. c #515151", -"]. c #9D9D9D", -"^. c #6F6F6F", -"/. c #2F281B", -"(. c #434343", -"_. c #2D271B", -":. c #F5C86E", -"<. c #6B6B6B", -"[. c #A18D63", -"}. c #DCB568", -"|. c #5B4D32", -"1. c #554729", -"2. c #F2C469", -"3. c #D2D2D2", -"4. c #BA9E66", -"5. c #86734E", -"6. c #FACB6F", -"7. c #D0AF6D", -"8. c #FDCB69", -"9. c #9E9E9E", -"0. c #A5A5A5", -"a. c #666666", -"b. c #B7B7B7", -"c. c #777777", -"d. c #927B4D", -"e. c #5C5038", -"f. c #E6E6E6", -"g. c #6E6E6E", -"h. c #6A6A6A", -"i. c #040403", -"j. c #9B7E43", -"k. c #67583A", -"l. c #999999", -"m. c #EFEFEF", -"n. c #3E3729", -"o. c #62553A", -"p. c #CBCBCB", -"q. c #828282", -"r. c #FACC6E", -"s. c #D5B370", -"t. c #524732", -"u. c #443B29", -"v. c #DCDCDC", -"w. c #93805A", -"x. c #ABABAB", -"y. c #BBBBBB", -"z. c #C1C1C1", -"A. c #6C5B3A", -"B. c #DDB86D", -"C. c #756341", -"D. c #BCBCBC", -"E. c #483F2D", -"F. c #8B7854", -"G. c #F9C866", -"H. c #FDCD6F", -"I. c #787878", -"J. c #B49455", -"K. c #E7BE6B", -"L. c #716348", -"M. c #E2BA6C", -"N. c #62563F", -"O. c #847351", -"P. c #A88D55", -"Q. c #AE8F50", -"R. c #A28B5E", -"S. c #E3E3E3", -"T. c #C8C8C8", -"U. c #D2B06C", -"V. c #A7A7A7", -"W. c #303030", -"X. c #201B12", -"Y. c #4E3F23", -"Z. c #9B9B9B", -"`. c #CECECE", -" + c #5F533D", -".+ c #5F543E", -"++ c #9B8457", -"@+ c #848484", -"#+ c #727272", -"$+ c #65583E", -"%+ c #66583E", -"&+ c #EAC06C", -"*+ c #ECC068", -"=+ c #8C8C8C", -"-+ c #FECC6A", -";+ c #322E26", -">+ c #939393", -",+ c #B5B5B5", -"'+ c #C6C6C6", -")+ c #F5C971", -"!+ c #D5D5D5", -"~+ c #776748", -"{+ c #959595", -"]+ c #534832", -"^+ c #C3A363", -"/+ c #AA8B4D", -"(+ c #AD8E4F", -"_+ c #7F7F7F", -":+ c #0C0B09", -"<+ c #F8F8F8", -"[+ c #7A7A7A", -"}+ c #444444", -"|+ c #403828", -"1+ c #A38851", -"2+ c #443C2D", -"3+ c #FECC66", -"4+ c #EBEBEB", -"5+ c #957E4F", -"6+ c #DADADA", -"7+ c #BFA166", -"8+ c #636363", -"9+ c #504227", -"0+ c #CCCCCC", -"a+ c #D3B372", -"b+ c #757575", -"c+ c #988256", -"d+ c #B9B9B9", -"e+ c #AC9363", -"f+ c #C2C2C2", -"g+ c #64573D", -"h+ c #AFAFAF", -"i+ c #605031", -"j+ c #E8E8E8", -"k+ c #E9E9E9", -"l+ c #E5E5E5", -"m+ c #705E3D", -"n+ c #D3D3D3", -"o+ c #565656", -"p+ c #B8B8B8", -"q+ c #B6B6B6", -"r+ c #A6A6A6", -"s+ c #584D36", -"t+ c #5B4F37", -"u+ c #5E523A", -"v+ c #353535", -"w+ c #969696", -"x+ c #979797", -"y+ c #8D8D8D", -"z+ c #4B422F", -"A+ c #5D5D5D", -"B+ c #7B7B7B", -"C+ c #020201", -"D+ c #FFCF6F", -"E+ c #FFCC66", -"F+ c #FFFFFF", -"G+ c #000000", -"G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+", -"G+G+G+G+F+F+F+F+F+F+F+F+v.G+G+G+", -"G+G+G+G+G+G+O n G+5 k+F+z G+G+G+", -"G+G+G+G+G+G+F+F+G+F+8 F+G+G+G+G+", -"G+G+G+G+G+G+G+G+F+W 3 F+G+G+G+G+", -"G+G+G+G+G+G+G+F+F+j F+G+G+G+G+G+", -"G+G+G+G+G+G+r F+F+F+G+G+G+G+G+G+", -"G+G+G+G+G+G+l F+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+G+l F+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+G+6 F+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+G+*.F+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+G+j F+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+k F+| F+6 G+G+G+G+G+G+", -"G+G+G+G+F+w 5 G+F+6 G+G+G+G+G+G+", -"G+G+G+G+G+G+G+G+F+].G+G+G+G+G+G+", -"G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+"}; +static char *dummy[]={ +"16 16 21 1", +". c None", +"# c #000000", +"h c #010101", +"p c #020202", +"c c #040404", +"k c #080808", +"r c #0a0a0a", +"f c #161616", +"i c #1e1e1e", +"a c #232323", +"b c #323232", +"o c #515151", +"n c #525252", +"g c #535353", +"m c #5d5d5d", +"s c #626262", +"l c #676767", +"j c #f7f7f8", +"q c #fdfdfd", +"e c #fefefe", +"d c #ffffff", +"................", +"....########a...", +"......bcdef#g...", +"......##d#h#....", +"........#ij#....", +".......##k#.....", +"......l###......", +"......m##n......", +"......m##n......", +"......n##n......", +"......o##n......", +"......k##n......", +".....p#q#n......", +"....#re.#n......", +"........#s......", +"................"}; Modified: trunk/navit/navit/xpm/heliport.xpm =================================================================== --- trunk/navit/navit/xpm/heliport.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/heliport.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,19 +1,91 @@ /* XPM */ -static char * heliport_xpm[] = { -"20 12 4 1", -" c None", -". c #FFFFFF", -"+ c #000000", -"@ c #000070", -" .+. ", -" ...... .+. ", -".++++++....+.. ", -" ......+++++++......", -". ..++...++++++", -"@. .+@@@@@......", -"@. .+@@@@ @@@. ", -"@@....@@@@@@ @. ", -"@@@@@@@@@@@@ @.", -"........@@@@ @.", -" .@@@@@ @@.", -" ..@@@@@@@. "}; +static char *dummy[]={ +"16 16 72 2", +"Qt c None", +".S c #000000", +"#. c #030303", +"#e c #040404", +"#c c #060606", +".R c #0a0a0a", +"## c #0e0e0e", +".I c #0f0f0f", +"#a c #101010", +".J c #171717", +".H c #191919", +".1 c #1b1b1b", +"#d c #1c1c1c", +".K c #1f1f1f", +".2 c #202020", +"#f c #232323", +".k c #282828", +".T c #292929", +".j c #2d2d2d", +".Q c #2e2e2e", +".D c #2f2f54", +".9 c #343434", +".h c #373737", +".l c #383838", +".v c #3c3c3c", +".c c #3f3f3f", +".m c #3f3f93", +".G c #414141", +".0 c #434343", +".M c #444444", +".w c #464646", +".E c #474747", +".z c #484848", +".i c #4d4d4d", +".N c #4f4f4f", +".F c #505050", +".f c #535353", +".L c #565656", +".6 c #5a5a5a", +".y c #5b5b5b", +".C c #616161", +".P c #686868", +".8 c #6a6a6a", +".t c #6b6b6b", +".Y c #6c6c6c", +".4 c #6f6f6f", +".X c #727272", +".5 c #737373", +".n c #757575", +"#b c #7c7c7c", +".a c #7f7f7f", +".e c #848484", +".W c #868686", +".V c #898989", +".o c #8a8a8a", +".q c #8f8f8f", +".r c #909090", +".g c #949494", +".x c #9595b1", +".O c #999999", +".p c #9b9b9b", +".3 c #9d9d9d", +".B c #9e9e9e", +".A c #9f9f9f", +".b c #aaaaaa", +".d c #aaaacf", +".Z c #b1b1b1", +".u c #b3b3b3", +".s c #b8b8b8", +".U c #cacaca", +".7 c #ececec", +".# c #ffffff", +"Qt.#.#QtQtQt.aQtQtQtQtQtQtQtQtQt", +".b.a.a.a.a.c.aQtQtQtQtQtQtQtQtQt", +".dQtQt.e.f.f.g.h.i.c.j.k.k.lQtQt", +".m.n.o.p.q.q.r.s.t.u.v.h.h.wQtQt", +".x.y.z.o.A.A.A.B.C.D.E.FQtQtQtQt", +".G.a.H.I.J.J.J.J.K.L.M.E.NQtQtQt", +".O.P.Q.R.S.S.S.S.T.U.r.g.V.WQtQt", +"Qt.X.Y.Z.0.1.S.S.2.3.4.5.r.6.7Qt", +"QtQtQtQtQt.8.9.S#.##.R.R#a.J#bQt", +"QtQtQtQtQtQt.f.S.S.S.S.S.S#c.QQt", +"QtQtQtQtQtQtQt#d.S.S.S.S.S.kQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.9.S.S.S.S.S.S#e#fQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; Modified: trunk/navit/navit/xpm/level_crossing.xpm =================================================================== --- trunk/navit/navit/xpm/level_crossing.xpm 2008-08-28 16:11:15 UTC (rev 1331) +++ trunk/navit/navit/xpm/level_crossing.xpm 2008-08-28 17:42:47 UTC (rev 1332) @@ -1,16 +1,46 @@ /* XPM */ -static char * level_crossing_xpm[] = { -"11 11 2 1", -" c None", -". c #797774", -". .", -".. ..", -" .. .. ", -" .. .. ", -" .. .. ", -" ... ", -" .. .. ", -" .. .. ", -" .. .. ", -".. ..", -". ."}; +static char *dummy[]={ +"16 16 27 1", +". c None", +"a c #cb0000", +"# c #cc0000", +"w c #cf1818", +"b c #d01a1a", +"y c #d85151", +"d c #db5656", +"x c #df7676", +"c c #e07b7b", +"s c #e19090", +"e c #e49898", +"v c #ecb8b8", +"j c #ecbcbc", +"p c #f0f0f0", +"r c #f4f4f4", +"o c #f5f5f5", +"q c #f6f6f6", +"l c #f7f7f7", +"h c #f8f8f8", +"k c #f9f9f9", +"t c #faefef", +"u c #fbfbfb", +"f c #fcf3f3", +"g c #fcfcfc", +"m c #fdfdfd", +"n c #fefefe", +"i c #ffffff", +"....#......#....", +"...a#.....###...", +"...a##...###....", +"....#bc..d##....", +"....efg.hij.....", +".....kilmno.....", +"......niig......", +"......gin.......", +"......gin.......", +".....pniih......", +".....kiqgir.....", +"....stu.hnv.....", +"....#wx..ya#....", +"...###...###....", +"...##.....a##...", +"....a......#...."}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-08-28 18:09:15
|
Revision: 1333 http://navit.svn.sourceforge.net/navit/?rev=1333&view=rev Author: martin-s Date: 2008-08-28 18:09:24 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Fix:grapics_qt_qpainter:Fixed a few bugs Modified Paths: -------------- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp trunk/navit/navit/graphics.c trunk/navit/navit/gui/internal/gui_internal.c Modified: trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp =================================================================== --- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2008-08-28 17:42:47 UTC (rev 1332) +++ trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2008-08-28 18:09:24 UTC (rev 1333) @@ -252,28 +252,28 @@ //# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## -static struct graphics_font_priv { - int dummy; -} graphics_font_priv; +struct graphics_font_priv { + QFont *font; +}; //############################################################################################################## //# Description: //# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## -static struct graphics_gc_priv { +struct graphics_gc_priv { QPen *pen; QBrush *brush; -} graphics_gc_priv; +}; //############################################################################################################## //# Description: //# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## -static struct graphics_image_priv { +struct graphics_image_priv { QImage *image; -} graphics_image_priv; +}; //############################################################################################################## //# Description: @@ -310,8 +310,10 @@ //############################################################################################################## static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size, int flags) { + struct graphics_font_priv *ret=g_new0(struct graphics_font_priv, 1); + ret->font=new QFont("Arial",size/20); *meth=font_methods; - return &graphics_font_priv; + return ret; } //############################################################################################################## @@ -401,8 +403,13 @@ //############################################################################################################## static struct graphics_image_priv * image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot) { - struct graphics_image_priv *ret=g_new0(struct graphics_image_priv, 1); + struct graphics_image_priv *ret; + if (strlen(path) > 4 && !strcmp(path+strlen(path)-4, ".svg")) { + return NULL; + } + ret=g_new0(struct graphics_image_priv, 1); + ret->image=new QImage(path); *w=ret->image->width(); *h=ret->image->height(); @@ -472,7 +479,7 @@ static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int r) { gr->painter->setPen(*gc->pen); - gr->painter->drawArc(p->x-r, p->y-r, r*2, r*2, 0, 360*16); + gr->painter->drawArc(p->x-r/2, p->y-r/2, r, r, 0, 360*16); } @@ -483,8 +490,27 @@ //############################################################################################################## static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) { - QString tmp = text; - gr->painter->drawText(p->x, p->y, tmp); + QPainter *painter=gr->painter; + QString tmp=QString::fromUtf8(text); +#ifndef QT_NO_TRANSFORMATIONS +#if QT_VERSION >= 0x040000 + QMatrix sav=gr->painter->worldMatrix(); + QMatrix m(dx/65535.0,dy/65535.0,-dy/65535.0,dx/65535.0,p->x,p->y); + painter->setWorldMatrix(m,TRUE); +#else + QWMatrix sav=gr->painter->worldMatrix(); + QWMatrix m(dx/65535.0,dy/65535.0,-dy/65535.0,dx/65535.0,p->x,p->y); + painter->setWorldMatrix(m,TRUE); +#endif + painter->setPen(*fg->pen); + painter->setFont(*font->font); + painter->drawText(0, 0, tmp); + painter->setWorldMatrix(sav); +#else + painter->setPen(*fg->pen); + painter->setFont(*font->font); + painter->drawText(p->x, p->y, tmp); +#endif } //############################################################################################################## @@ -532,7 +558,7 @@ //############################################################################################################## static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) { - dbg(0,"mode=%d\n", mode); + dbg(1,"mode=%d\n", mode); if (mode == draw_mode_begin) { gr->painter->begin(gr->widget->pixmap); #if 0 @@ -615,11 +641,54 @@ this_->widget->button_callback_data=data; } +static void +image_free(struct graphics_priv *gr, struct graphics_image_priv *priv) +{ + delete priv->image; + g_free(priv); +} + +static void +get_text_bbox(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy, struct point *ret) +{ + QPainter *painter=gr->painter; + QString tmp=QString::fromUtf8(text); + painter->setFont(*font->font); + QRect r=painter->boundingRect(0,0,gr->widget->width(),gr->widget->height(),0,tmp); + ret[0].x=0; + ret[0].y=-r.height(); + ret[1].x=0; + ret[1].y=0; + ret[2].x=r.width(); + ret[2].y=0; + ret[3].x=r.width(); + ret[3].y=-r.height(); +} + + //############################################################################################################## //# Description: //# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## +static void overlay_disable(struct graphics_priv *gr, int disable) +{ +} + +//############################################################################################################## +//# Description: +//# Comment: +//# Authors: Martin Schaller (04/2008) +//############################################################################################################## +static void register_keypress_callback(struct graphics_priv *this_, void (*callback)(void *data, char *key), void *data) +{ +} + +//############################################################################################################## +//# Description: +//# Comment: +//# Authors: Martin Schaller (04/2008) +//############################################################################################################## static struct graphics_methods graphics_methods = { graphics_destroy, draw_mode, @@ -640,6 +709,11 @@ register_resize_callback, register_button_callback, register_motion_callback, + image_free, + get_text_bbox, + overlay_disable, + register_keypress_callback, + }; //############################################################################################################## Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2008-08-28 17:42:47 UTC (rev 1332) +++ trunk/navit/navit/graphics.c 2008-08-28 18:09:24 UTC (rev 1333) @@ -130,14 +130,14 @@ void graphics_init(struct graphics *this_) { this_->gc[0]=graphics_gc_new(this_); - graphics_gc_set_background(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7 }); - graphics_gc_set_foreground(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7 }); + graphics_gc_set_background(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7, 0xffff}); + graphics_gc_set_foreground(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7, 0xffff }); this_->gc[1]=graphics_gc_new(this_); - graphics_gc_set_background(this_->gc[1], &(struct color) { 0x0000, 0x0000, 0x0000 }); - graphics_gc_set_foreground(this_->gc[1], &(struct color) { 0xffff, 0xffff, 0xffff }); + graphics_gc_set_background(this_->gc[1], &(struct color) { 0x0000, 0x0000, 0x0000, 0xffff }); + graphics_gc_set_foreground(this_->gc[1], &(struct color) { 0xffff, 0xffff, 0xffff, 0xffff }); this_->gc[2]=graphics_gc_new(this_); - graphics_gc_set_background(this_->gc[2], &(struct color) { 0xffff, 0xffff, 0xffff }); - graphics_gc_set_foreground(this_->gc[2], &(struct color) { 0xffff, 0xffff, 0xffff }); + graphics_gc_set_background(this_->gc[2], &(struct color) { 0xffff, 0xffff, 0xffff, 0xffff }); + graphics_gc_set_foreground(this_->gc[2], &(struct color) { 0x0000, 0x0000, 0x0000, 0xffff }); this_->meth.background_gc(this_->priv, this_->gc[0]->priv); } Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2008-08-28 17:42:47 UTC (rev 1332) +++ trunk/navit/navit/gui/internal/gui_internal.c 2008-08-28 18:09:24 UTC (rev 1333) @@ -1042,9 +1042,7 @@ l=g_list_last(this->root.children); menu=l->data; gui_internal_widget_pack(this, menu); - graphics_draw_mode(this->gra, draw_mode_begin); gui_internal_widget_render(this, menu); - graphics_draw_mode(this->gra, draw_mode_end); } static void @@ -2136,6 +2134,7 @@ { struct widget *w; + graphics_draw_mode(this->gra, draw_mode_begin); w=gui_internal_menu(this, "Main menu"); w->spx=this->spacing*10; gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, "Actions", @@ -2147,6 +2146,7 @@ gui_internal_widget_append(w, gui_internal_button_new(this, "Tools", image_new_l(this, "gui_tools"), gravity_center|orientation_vertical)); gui_internal_menu_render(this); + graphics_draw_mode(this->gra, draw_mode_end); } static void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-28 18:27:20
|
Revision: 1334 http://navit.svn.sourceforge.net/navit/?rev=1334&view=rev Author: christeck Date: 2008-08-28 18:27:29 +0000 (Thu, 28 Aug 2008) Log Message: ----------- added POI ruins Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/navit.xml trunk/navit/navit/osm2navit.c trunk/navit/navit/xpm/Makefile.am Added Paths: ----------- trunk/navit/navit/xpm/ruins.xpm Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-08-28 18:09:24 UTC (rev 1333) +++ trunk/navit/navit/item_def.h 2008-08-28 18:27:29 UTC (rev 1334) @@ -272,6 +272,7 @@ ITEM(poi_potable_water) ITEM(poi_toilets) ITEM(poi_viewpoint) +ITEM(poi_ruins) /* Line */ ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-08-28 18:09:24 UTC (rev 1333) +++ trunk/navit/navit/navit.xml 2008-08-28 18:27:29 UTC (rev 1334) @@ -1434,6 +1434,9 @@ <item type="poi_castle" order="12-"> <icon src="castle.xpm" /> </item> + <item type="poi_ruins" order="12-"> + <icon src="ruins.xpm" /> + </item> <item type="poi_hunting_stand" order="13-"> <icon src="hunting_stand.xpm" /> </item> Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-08-28 18:09:24 UTC (rev 1333) +++ trunk/navit/navit/osm2navit.c 2008-08-28 18:27:29 UTC (rev 1334) @@ -144,6 +144,7 @@ "n amenity=biergarten poi_biergarten\n" "n historic=boundary_stone poi_boundary_stone\n" "n historic=castle poi_castle\n" + "n historic=ruins poi_ruins\n" "n Annehmlichkeit=Hochsitz poi_hunting_stand\n" "n amenity=hunting_stand poi_hunting_stand\n" "n historic=memorial poi_memorial\n" Modified: trunk/navit/navit/xpm/Makefile.am =================================================================== --- trunk/navit/navit/xpm/Makefile.am 2008-08-28 18:09:24 UTC (rev 1333) +++ trunk/navit/navit/xpm/Makefile.am 2008-08-28 18:27:29 UTC (rev 1334) @@ -13,6 +13,7 @@ xpm_DATA += camping.xpm xpm_DATA += car_dealer.xpm xpm_DATA += castle.xpm +xpm_DATA += ruins.xpm xpm_DATA += cemetery.xpm xpm_DATA += church.xpm xpm_DATA += cinema.xpm Added: trunk/navit/navit/xpm/ruins.xpm =================================================================== --- trunk/navit/navit/xpm/ruins.xpm (rev 0) +++ trunk/navit/navit/xpm/ruins.xpm 2008-08-28 18:27:29 UTC (rev 1334) @@ -0,0 +1,22 @@ +/* XPM */ +static char *dummy[]={ +"16 16 3 1", +". c None", +"# c #000000", +"a c #010101", +"...........#.#.#", +"...........#####", +"..##.......#####", +".###........###.", +".###.#a##a#.###.", +".##############.", +".##############.", +".##.########.##.", +".#...######...#.", +".#...######...#.", +".######..######.", +".#####a..a#####.", +".#####....#####.", +".#####....#####.", +".#####....#####.", +"................"}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-28 23:06:21
|
Revision: 1338 http://navit.svn.sourceforge.net/navit/?rev=1338&view=rev Author: christeck Date: 2008-08-28 23:06:31 +0000 (Thu, 28 Aug 2008) Log Message: ----------- added bus_halt icon Modified Paths: -------------- trunk/navit/navit/navit.xml trunk/navit/navit/xpm/Makefile.am trunk/navit/navit/xpm/bus.xpm Added Paths: ----------- trunk/navit/navit/xpm/bus_halt.xpm Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-08-28 22:57:01 UTC (rev 1337) +++ trunk/navit/navit/navit.xml 2008-08-28 23:06:31 UTC (rev 1338) @@ -1077,7 +1077,7 @@ <icon src="bus.xpm" /> </item> <item type="poi_bus_stop" order="12-"> - <icon src="bus.xpm" /> + <icon src="bus_halt.xpm" /> </item> <item type="poi_bussines_service" order="12-"> <icon src="bussines_service.xpm" /> Modified: trunk/navit/navit/xpm/Makefile.am =================================================================== --- trunk/navit/navit/xpm/Makefile.am 2008-08-28 22:57:01 UTC (rev 1337) +++ trunk/navit/navit/xpm/Makefile.am 2008-08-28 23:06:31 UTC (rev 1338) @@ -9,6 +9,7 @@ xpm_DATA += boat_ramp.xpm xpm_DATA += boundary_stone.xpm xpm_DATA += bus.xpm +xpm_DATA += bus_halt.xpm xpm_DATA += cafe.xpm xpm_DATA += camping.xpm xpm_DATA += car_dealer.xpm Modified: trunk/navit/navit/xpm/bus.xpm =================================================================== --- trunk/navit/navit/xpm/bus.xpm 2008-08-28 22:57:01 UTC (rev 1337) +++ trunk/navit/navit/xpm/bus.xpm 2008-08-28 23:06:31 UTC (rev 1338) @@ -1,165 +1,81 @@ /* XPM */ -static char *bus[] = { -/* columns rows colors chars-per-pixel */ -"30 12 147 2", -" c #0C0C0C", -". c #0E0E0E", -"X c #101010", -"o c gray8", -"O c #161616", -"+ c gray10", -"@ c #1D1D1D", -"# c #1E1E1E", -"$ c gray14", -"% c gray15", -"& c gray17", -"* c #323232", -"= c gray21", -"- c #3A3A3A", -"; c #3B3C3C", -": c gray27", -"> c #464646", -", c #565656", -"< c #5B5B5B", -"1 c #5D6262", -"2 c #606060", -"3 c #6B6D6D", -"4 c #6E7777", -"5 c #008080", -"6 c #018080", -"7 c #018181", -"8 c #028181", -"9 c #038181", -"0 c #038282", -"q c #048282", -"w c #058282", -"e c #068383", -"r c #078383", -"t c #088484", -"y c #0A8585", -"u c #0B8686", -"i c #0C8686", -"p c #0D8686", -"a c #0F8787", -"s c #108888", -"d c #148A8A", -"f c #158A8A", -"g c #168A8A", -"h c #178B8B", -"j c #188C8C", -"k c #198C8C", -"l c #1A8D8D", -"z c #1B8D8D", -"x c #1C8D8D", -"c c #1E8E8E", -"v c #1E8F8F", -"b c #1F8F8F", -"n c #208F8F", -"m c #219090", -"M c #229191", -"N c #259191", -"B c #279393", -"V c #289393", -"C c #299494", -"Z c #2B9595", -"A c #2C9595", -"S c #329999", -"D c #359A9A", -"F c #379A9A", -"G c #389B9B", -"H c #3A9898", -"J c #3B9D9D", -"K c #3F9898", -"L c #3C9D9D", -"P c #3D9E9E", -"I c #3F9F9F", -"U c #469494", -"Y c #469797", -"T c #4E9494", -"R c #549393", -"E c #579393", -"W c #42A0A0", -"Q c #43A0A0", -"! c #43A1A1", -"~ c #44A0A0", -"^ c #46A2A2", -"/ c #4AA4A4", -"( c #4BA5A5", -") c #4CA5A5", -"_ c #4EA6A6", -"` c #57A3A3", -"' c #52A8A8", -"] c #59ACAC", -"[ c #5AACAC", -"{ c #5FAEAE", -"} c #62A7A7", -"| c #64B1B1", -" . c #66B2B2", -".. c #7EAAAA", -"X. c #77BABA", -"o. c #7BBCBC", -"O. c #7DBEBE", -"+. c #7EBEBE", -"@. c gray51", -"#. c #868686", -"$. c gray53", -"%. c gray54", -"&. c #8D8D8D", -"*. c #889A9A", -"=. c #9F9F9F", -"-. c #86A0A0", -";. c #80ABAB", -":. c gray72", -">. c #B8BBBB", -",. c #8CC4C4", -"<. c #8FC6C6", -"1. c #9CCCCC", -"2. c #A0CECE", -"3. c #A3D0D0", -"4. c #A5D1D1", -"5. c #A6D2D2", -"6. c #A8D2D2", -"7. c #AED5D5", -"8. c #AFD6D6", -"9. c #B0D7D7", -"0. c #B1D7D7", -"q. c #B8DADA", -"w. c #B9DBDB", -"e. c #BFDEDE", -"r. c #C3C3C3", -"t. c gray81", -"y. c #C0DFDF", -"u. c #D7DDDD", -"i. c #C6E1E1", -"p. c #C9E3E3", -"a. c #D0E6E6", -"s. c #D6E9E9", -"d. c #D7EAEA", -"f. c #DBE7E7", -"g. c #D8EAEA", -"h. c #DBECEC", -"j. c #DDECEC", -"k. c #E4E4E4", -"l. c #E1EEEE", -"z. c #E6F1F1", -"x. c #EAF3F3", -"c. c #EEF5F5", -"v. c gray94", -"b. c #F0F6F6", -"n. c #F6F9F9", -"m. c #F9FAFA", -"M. c gray99", -/* pixels */ -"b.^ h h j d j h h d j j d d d d j d d d j d d d j d j d h _ ", -"a.l j Y ! Y W u Z Y ! Y D e P ! ! Y M u ^ Y W G t G ! Y N 8.", -"w.s ' m.m.m.b.n 5.m.m.m.9.d l.m.M.M. .Z m.m.m.w.v e.m.n.[ e.", -"9.u O.M.M.M.s.h p.M.M.M.<.v z.M.M.M.] Y M.M.M.5.M p.M.x.P 2.", -"3.u X.e.e.e.<.h 1.e.e.e. .v 9.e.e.e.P / e.e.e.o.v 2.e.2.b +.", -",.0 e t t t r 7 r e u r t 0 t t u r 7 e e u e e 0 t u e 7 _ ", -"{ 7 7 7 7 7 5 5 7 5 5 5 5 5 7 7 5 5 5 5 5 5 7 7 7 7 7 5 7 S ", -"J s K R T H 7 7 5 5 5 5 5 5 7 7 5 5 7 N U E Y l 7 7 7 7 5 V ", -"Z } 1 X # 4 _ 5 5 5 7 5 5 5 5 5 7 7 M -.& ; ..p 5 5 5 7 M ", -"P *.. :.%.+ ..n l l l l h l l h j j ` > , r.= 3 Y l l l l V ", -"h.:.o @.2 $ u.g.g.g.s.g.s.s.s.s.s.s.g.< - &.% #.l.d.s.s.s.s.", -"M.v.#.# * =.M.M.M.M.M.M.M.M.M.M.M.M.M.t.> O < k.M.M.M.M.M.M." -}; +static char *dummy[]={ +"16 16 62 1", +". c None", +"S c #070707", +"6 c #121212", +"T c #151515", +"Z c #161616", +"U c #171717", +"Y c #181818", +"5 c #191919", +"2 c #212121", +"R c #242424", +"W c #262626", +"1 c #282828", +"I c #292929", +"V c #2c2c2c", +"0 c #2d2d2d", +"4 c #2e2e2e", +"P c #303030", +"X c #313131", +"K c #333333", +"N c #343434", +"D c #3b3b3b", +"E c #3c3c3c", +"G c #3d3d3d", +"L c #3e3e3e", +"M c #444444", +"J c #474747", +"Q c #484848", +"F c #494949", +"H c #4f4f4f", +"C c #555555", +"3 c #585858", +"7 c #595959", +"u c #5b5b5b", +"O c #5c5c5c", +"B c #737373", +"x c #747474", +"w c #767676", +"i c #787878", +"m c #7a7a7a", +"k c #7b7b7b", +"# c #7c7c7c", +"n c #7f7f7f", +"s c #808080", +"d c #838383", +"b c #848484", +"h c #888888", +"f c #8a8a8a", +"A c #8d8d8d", +"v c #909090", +"p c #969696", +"g c #9d9d9d", +"a c #a2a2a2", +"c c #a3a3a3", +"e c #a4a4a4", +"q c #a8a8a8", +"z c #aaaaaa", +"y c #b7b7b7", +"r c #bbbbbb", +"o c #c0c0c0", +"j c #c2c2c2", +"l c #c3c3c3", +"t c #c4c4c4", +"................", +"................", +"................", +"................", +"................", +".#abcdebefgghe..", +".ijklmlnopqrstu.", +".vtwtxldyzAlBtCD", +"DEFGHIJKLMNOPQRS", +"TUVWXTYZUY012YTD", +".3.4G33333.5633.", +"...........7....", +"................", +"................", +"................", +"................"}; Added: trunk/navit/navit/xpm/bus_halt.xpm =================================================================== --- trunk/navit/navit/xpm/bus_halt.xpm (rev 0) +++ trunk/navit/navit/xpm/bus_halt.xpm 2008-08-28 23:06:31 UTC (rev 1338) @@ -0,0 +1,51 @@ +/* XPM */ +static char *dummy[]={ +"16 16 32 1", +". c None", +"f c #009933", +"e c #019933", +"h c #149d33", +"i c #1a9e33", +"k c #1b9e33", +"r c #1c9e33", +"A c #2ca133", +"v c #2fa233", +"y c #40a533", +"D c #49a733", +"j c #4ea833", +"d c #53a933", +"z c #57aa33", +"B c #68ad33", +"b c #7cb133", +"u c #83b333", +"C c #8fb533", +"m c #9bb833", +"a c #9cb833", +"q c #a0b933", +"g c #b4bd33", +"x c #b7bd33", +"t c #bbbe33", +"# c #c7c033", +"l c #d3c333", +"c c #d4c333", +"s c #e4c633", +"w c #ecc833", +"p c #f1c933", +"n c #f7ca33", +"o c #ffcc33", +".....#abba#.....", +"...cdeffffedc...", +"..ghffijjkffhg..", +".lhfkmnoopqkfhl.", +".dfrsftoouvwrfd.", +"#efxnftoouvoxfe#", +"afionftoouvooifa", +"bfjonfyzzAvoojfb", +"bfjonfBCCDvoojfb", +"afionftoouvooifa", +"#efxnftoouvoxfe#", +".dfrsftoouvwrfd.", +".lhfkmnoopqkfhl.", +"..ghffijjkffhg..", +"...cdeffffedc...", +".....#abba#....."}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-30 13:05:51
|
Revision: 1344 http://navit.svn.sourceforge.net/navit/?rev=1344&view=rev Author: christeck Date: 2008-08-30 13:06:01 +0000 (Sat, 30 Aug 2008) Log Message: ----------- added three contour lines (wiki updated as well): contour_line_major contour_line_medium contour_line_minor Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/osm2navit.c Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-08-30 00:30:45 UTC (rev 1343) +++ trunk/navit/navit/item_def.h 2008-08-30 13:06:01 UTC (rev 1344) @@ -364,6 +364,9 @@ ITEM(piste_downhill_advanced) ITEM(piste_downhill_expert) ITEM(piste_downhill_freeride) +ITEM(contour_line_major) +ITEM(contour_line_medium) +ITEM(contour_line_minor) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-08-30 00:30:45 UTC (rev 1343) +++ trunk/navit/navit/osm2navit.c 2008-08-30 13:06:01 UTC (rev 1344) @@ -155,6 +155,9 @@ "n amenity=toilets poi_toilets\n" "n tourism=viewpoint poi_viewpoint\n" "w *=* street_unkn\n" + "w contour_ext=elevation_major contour_line_major\n" + "w contour_ext=elevation_medium contour_line_medium\n" + "w contour_ext=elevation_minor contour_line_minor\n" "w amenity=place_of_worship poly_building\n" "w building=* poly_building\n" "w aeroway=aerodrome poly_airport\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-30 14:55:55
|
Revision: 1345 http://navit.svn.sourceforge.net/navit/?rev=1345&view=rev Author: christeck Date: 2008-08-30 14:56:05 +0000 (Sat, 30 Aug 2008) Log Message: ----------- revert: While introducing contour_line_* I have completely overseen that hight_line_* already exists. Wiki updated. Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/navit.xml trunk/navit/navit/osm2navit.c Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-08-30 13:06:01 UTC (rev 1344) +++ trunk/navit/navit/item_def.h 2008-08-30 14:56:05 UTC (rev 1345) @@ -364,9 +364,6 @@ ITEM(piste_downhill_advanced) ITEM(piste_downhill_expert) ITEM(piste_downhill_freeride) -ITEM(contour_line_major) -ITEM(contour_line_medium) -ITEM(contour_line_minor) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-08-30 13:06:01 UTC (rev 1344) +++ trunk/navit/navit/navit.xml 2008-08-30 14:56:05 UTC (rev 1345) @@ -1542,16 +1542,33 @@ <polygon color="#ff6347" /> </item> </layer> - - <layer name="Elevation Lines"> - <item type="height_line_1" order="0-"> - <polyline color="#000000" width="1" /> + + <layer name="Contour Lines"> + <item type="height_line_1" order="8"> + <polyline color="#A9A9A9" width="1" /> + <label label_size="8" /> </item> - <item type="height_line_2" order="0-"> - <polyline color="#000000" width="2" /> + <item type="height_line_1" order="9"> + <polyline color="#A9A9A9" width="2" /> + <label label_size="8" /> </item> - </layer> - + <item type="height_line_2" order="9"> + <polyline color="#A9A9A9" width="1" /> + <label label_size="8" /> + </item> + <item type="height_line_1" order="10-"> + <polyline color="#A9A9A9" width="3" /> + <label label_size="8" /> + </item> + <item type="height_line_2" order="10-"> + <polyline color="#A9A9A9" width="2" /> + <label label_size="8" /> + </item> + <item type="height_line_3" order="10-"> + <polyline color="#A9A9A9" width="1" /> + </item> + </layer> <!-- "Contour Lines" --> + <layer name="Waterways"> <item type="water_line" order="0-"> <polyline color="#82c8ea" width="2" /> Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-08-30 13:06:01 UTC (rev 1344) +++ trunk/navit/navit/osm2navit.c 2008-08-30 14:56:05 UTC (rev 1345) @@ -155,9 +155,9 @@ "n amenity=toilets poi_toilets\n" "n tourism=viewpoint poi_viewpoint\n" "w *=* street_unkn\n" - "w contour_ext=elevation_major contour_line_major\n" - "w contour_ext=elevation_medium contour_line_medium\n" - "w contour_ext=elevation_minor contour_line_minor\n" + "w contour_ext=elevation_major height_line_1\n" + "w contour_ext=elevation_medium height_line_2\n" + "w contour_ext=elevation_minor height_line_3\n" "w amenity=place_of_worship poly_building\n" "w building=* poly_building\n" "w aeroway=aerodrome poly_airport\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2008-09-01 09:45:27
|
Revision: 1354 http://navit.svn.sourceforge.net/navit/?rev=1354&view=rev Author: kazer_ Date: 2008-09-01 09:45:27 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Patch:Core:Patch from Helge to add offset to dashed polylines. Thank you Modified Paths: -------------- trunk/navit/navit/graphics.c trunk/navit/navit/item_def.h trunk/navit/navit/layout.c trunk/navit/navit/layout.h trunk/navit/navit/navit.xml trunk/navit/navit/osm2navit.c trunk/navit/navit/xmlconfig.c Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/graphics.c 2008-09-01 09:45:27 UTC (rev 1354) @@ -673,7 +673,8 @@ if (e->u.polyline.width > 1) gc->meth.gc_set_linewidth(gc->priv, e->u.polyline.width); if (e->u.polyline.width > 0 && e->u.polyline.dash_num > 0) - graphics_gc_set_dashes(gc, e->u.polyline.width, 0, + graphics_gc_set_dashes(gc, e->u.polyline.width, + e->u.polyline.dash_offset, e->u.polyline.dash_table, e->u.polyline.dash_num); gra->meth.draw_lines(gra->priv, gc->priv, di->pnt, di->count); Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/item_def.h 2008-09-01 09:45:27 UTC (rev 1354) @@ -364,6 +364,7 @@ ITEM(piste_downhill_advanced) ITEM(piste_downhill_expert) ITEM(piste_downhill_freeride) +ITEM(footway_and_piste_nordic) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) Modified: trunk/navit/navit/layout.c =================================================================== --- trunk/navit/navit/layout.c 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/layout.c 2008-09-01 09:45:27 UTC (rev 1354) @@ -100,7 +100,7 @@ struct element * polyline_new(struct color *color, int width, int directed, - int *dash_table, int dash_num) + int dash_offset, int *dash_table, int dash_num) { struct element *e; int i; @@ -110,6 +110,7 @@ e->color=*color; e->u.polyline.width=width; e->u.polyline.directed=directed; + e->u.polyline.dash_offset = dash_offset; e->u.polyline.dash_num=dash_num; for (i=0; i<dash_num; i++) e->u.polyline.dash_table[i] = dash_table[i]; Modified: trunk/navit/navit/layout.h =================================================================== --- trunk/navit/navit/layout.h 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/layout.h 2008-09-01 09:45:27 UTC (rev 1354) @@ -37,6 +37,7 @@ int width; int directed; int dash_num; + int dash_offset; unsigned char dash_table[4]; } polyline; struct element_polygon { @@ -79,7 +80,7 @@ void itemtype_add_element(struct itemtype *itemtype, struct element *element); struct element *polygon_new(struct color *color); struct element *polyline_new(struct color *color, int width, int directed, - int *dash_table, int dash_num); + int dash_offset, int *dash_table, int dash_num); struct element *circle_new(struct color *color, int radius, int width, int label_size); struct element *label_new(int label_size); struct element *icon_new(const char *src); Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/navit.xml 2008-09-01 09:45:27 UTC (rev 1354) @@ -481,17 +481,39 @@ <polyline color="#696969" width="1" dash="5" /> </item> <item type="piste_nordic" order="10-12"> - <polyline color="#0000ff" width="1" dash="3,6" /> + <polyline color="#0000ff" width="1" dash="3,6" offset="4" /> </item> <item type="piste_nordic" order="13-14"> - <polyline color="#0000ff" width="2" dash="4,8" /> + <polyline color="#ffffff" width="4" dash="4,8" offset="6" /> + <polyline color="#0000ff" width="2" dash="4,8" offset="6" /> </item> <item type="piste_nordic" order="15-16"> - <polyline color="#0000ff" width="3" dash="5,10" /> + <polyline color="#ffffff" width="5" dash="5,10" offset="7" /> + <polyline color="#0000ff" width="3" dash="5,10" offset="7" /> </item> <item type="piste_nordic" order="17-"> - <polyline color="#0000ff" width="5" dash="7,15" /> + <polyline color="#ffffff" width="7" dash="7,15" offset="10" /> + <polyline color="#0000ff" width="5" dash="7,15" offset="10" /> </item> + <item type="footway_and_piste_nordic" order="10-12"> + <polyline color="#ff0000" width="1" dash="3,15" /> + <polyline color="#0000ff" width="1" dash="3,15" offset="9" /> + </item> + <item type="footway_and_piste_nordic" order="13-14"> + <polyline color="#ffffff" width="4" dash="4,8" /> + <polyline color="#ff0000" width="2" dash="4,20" /> + <polyline color="#0000ff" width="2" dash="4,20" offset="12" /> + </item> + <item type="footway_and_piste_nordic" order="15-16"> + <polyline color="#ffffff" width="5" dash="5,10" /> + <polyline color="#ff0000" width="3" dash="5,25" /> + <polyline color="#0000ff" width="3" dash="5,25" offset="15" /> + </item> + <item type="footway_and_piste_nordic" order="17-"> + <polyline color="#ffffff" width="7" dash="7,15" /> + <polyline color="#ff0000" width="5" dash="7,37" /> + <polyline color="#0000ff" width="5" dash="7,37" offset="22" /> + </item> <item type="footway" order="10-12"> <polyline color="#ff0000" width="1" dash="3,6" /> </item> Modified: trunk/navit/navit/osm2navit.c =================================================================== --- trunk/navit/navit/osm2navit.c 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/osm2navit.c 2008-09-01 09:45:27 UTC (rev 1354) @@ -172,6 +172,7 @@ "w highway=path,bicycle=designated cycleway\n" "w highway=footway footway\n" "w piste:type=nordic piste_nordic\n" + "w highway=footway,piste:type=nordic footway_and_piste_nordic\n" "w route=ski piste_nordic\n" "w piste:type=downhill,piste:difficulty=novice piste_downhill_novice\n" "w piste:type=downhill,piste:difficulty=easy piste_downhill_easy\n" Modified: trunk/navit/navit/xmlconfig.c =================================================================== --- trunk/navit/navit/xmlconfig.c 2008-09-01 08:52:10 UTC (rev 1353) +++ trunk/navit/navit/xmlconfig.c 2008-09-01 09:45:27 UTC (rev 1354) @@ -522,8 +522,8 @@ xmlconfig_polyline(struct xmlstate *state) { struct color color; - const char *width, *dash, *directed; - int w=0, d=0, dt[4], ds=0; + const char *width, *dash, *directed, *dash_offset; + int w=0, d=0, doff=0, dt[4], ds=0; if (! find_color(state, 1, &color)) return 0; @@ -533,11 +533,14 @@ dash=find_attribute(state, "dash", 0); if (dash) ds=convert_number_list(dash, dt, sizeof(dt)/sizeof(*dt)); + dash_offset=find_attribute(state, "offset", 0); + if (dash_offset) + doff=convert_number(dash_offset); directed=find_attribute(state, "directed", 0); if (directed) d=convert_number(directed); - state->element_attr.u.data=polyline_new(&color, w, d, dt, ds); + state->element_attr.u.data=polyline_new(&color, w, d, doff, dt, ds); if (! state->element_attr.u.data) return 0; itemtype_add_element(state->parent->element_attr.u.data, state->element_attr.u.data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ome...@us...> - 2008-09-02 13:39:59
|
Revision: 1359 http://navit.svn.sourceforge.net/navit/?rev=1359&view=rev Author: OmegA_MRS Date: 2008-09-02 13:40:05 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Fix:directfb:fixed autotools Modified Paths: -------------- trunk/navit/navit/graphics/Makefile.am trunk/navit/navit/graphics/directfb/graphics_directfb.c trunk/navit/navit/gui/Makefile.am Modified: trunk/navit/navit/graphics/Makefile.am =================================================================== --- trunk/navit/navit/graphics/Makefile.am 2008-09-02 12:37:17 UTC (rev 1358) +++ trunk/navit/navit/graphics/Makefile.am 2008-09-02 13:40:05 UTC (rev 1359) @@ -2,7 +2,7 @@ if GRAPHICS_GTK_DRAWING_AREA SUBDIRS+=gtk_drawing_area endif -if GRAPHICS_DIRECTFB +if DIRECTFB SUBDIRS+=directfb endif if GRAPHICS_OPENGL Modified: trunk/navit/navit/graphics/directfb/graphics_directfb.c =================================================================== --- trunk/navit/navit/graphics/directfb/graphics_directfb.c 2008-09-02 12:37:17 UTC (rev 1358) +++ trunk/navit/navit/graphics/directfb/graphics_directfb.c 2008-09-02 13:40:05 UTC (rev 1359) @@ -249,8 +249,9 @@ graphics_directfb_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs) { fprintf(stderr,"graphics_directfb_new"); + struct graphics_priv *this=g_new0(struct graphics_priv,1); *meth=graphics_methods; - return &graphics_priv; + return this; } plugin_init(void) Modified: trunk/navit/navit/gui/Makefile.am =================================================================== --- trunk/navit/navit/gui/Makefile.am 2008-09-02 12:37:17 UTC (rev 1358) +++ trunk/navit/navit/gui/Makefile.am 2008-09-02 13:40:05 UTC (rev 1359) @@ -8,6 +8,6 @@ if GUI_CLUTTER SUBDIRS += clutter endif -if GUI_DIRECTFB +if DIRECTFB SUBDIRS += directfb endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2008-09-02 15:02:19
|
Revision: 1360 http://navit.svn.sourceforge.net/navit/?rev=1360&view=rev Author: aurel_j Date: 2008-09-02 15:02:24 +0000 (Tue, 02 Sep 2008) Log Message: ----------- fix:directfb:Makefile.in shouldn't ever be commited in the repository Removed Paths: ------------- trunk/navit/navit/graphics/directfb/Makefile.in trunk/navit/navit/gui/directfb/Makefile.in Deleted: trunk/navit/navit/graphics/directfb/Makefile.in =================================================================== --- trunk/navit/navit/graphics/directfb/Makefile.in 2008-09-02 13:40:05 UTC (rev 1359) +++ trunk/navit/navit/graphics/directfb/Makefile.in 2008-09-02 15:02:24 UTC (rev 1360) @@ -1,578 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.inc -subdir = navit/graphics/directfb -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(modulegraphicsdir)" -modulegraphicsLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(modulegraphics_LTLIBRARIES) -libgraphics_directfb_la_LIBADD = -am_libgraphics_directfb_la_OBJECTS = graphics_directfb.lo -libgraphics_directfb_la_OBJECTS = \ - $(am_libgraphics_directfb_la_OBJECTS) -libgraphics_directfb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgraphics_directfb_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libgraphics_directfb_la_SOURCES) -DIST_SOURCES = $(libgraphics_directfb_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CEGUI_CFLAGS = @CEGUI_CFLAGS@ -CEGUI_LIBS = @CEGUI_LIBS@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@ -DIRECTFB_LIBS = @DIRECTFB_LIBS@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ -FREETYPE2_LIBS = @FREETYPE2_LIBS@ -GENCAT = @GENCAT@ -GLC_CFLAGS = @GLC_CFLAGS@ -GLC_LIBS = @GLC_LIBS@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GPSD_CFLAGS = @GPSD_CFLAGS@ -GPSD_LIBS = @GPSD_LIBS@ -GREP = @GREP@ -GTK2_CFLAGS = @GTK2_CFLAGS@ -GTK2_LIBS = @GTK2_LIBS@ -GYPSY_CFLAGS = @GYPSY_CFLAGS@ -GYPSY_LIBS = @GYPSY_LIBS@ -HAVE_ASPRINTF = @HAVE_ASPRINTF@ -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ -HAVE_SNPRINTF = @HAVE_SNPRINTF@ -HAVE_WPRINTF = @HAVE_WPRINTF@ -HILDON_CFLAGS = @HILDON_CFLAGS@ -HILDON_LIBS = @HILDON_LIBS@ -IMLIB2_CFLAGS = @IMLIB2_CFLAGS@ -IMLIB2_LIBS = @IMLIB2_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLIBS = @INTLIBS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -KSVGTOPNG = @KSVGTOPNG@ -LDFLAGS = @LDFLAGS@ -LIBGARMIN_CFLAGS = @LIBGARMIN_CFLAGS@ -LIBGARMIN_LIBS = @LIBGARMIN_LIBS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MOFILES = @MOFILES@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NAVIT_CFLAGS = @NAVIT_CFLAGS@ -NAVIT_LIBS = @NAVIT_LIBS@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OPENGL_CFLAGS = @OPENGL_CFLAGS@ -OPENGL_LIBS = @OPENGL_LIBS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PG_CONFIG = @PG_CONFIG@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ -POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ -POSUB = @POSUB@ -PYTHON_CFLAGS = @PYTHON_CFLAGS@ -PYTHON_LIBS = @PYTHON_LIBS@ -QT_GUI_CFLAGS = @QT_GUI_CFLAGS@ -QT_GUI_LIBS = @QT_GUI_LIBS@ -RANLIB = @RANLIB@ -SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ -SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@ -SDL_LIBS = @SDL_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPEECHD_CFLAGS = @SPEECHD_CFLAGS@ -SPEECHD_LIBS = @SPEECHD_LIBS@ -STRIP = @STRIP@ -SVG2PNG_SCALES = @SVG2PNG_SCALES@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ZLIB_LIBS = @ZLIB_LIBS@ -_PATH_PYTHON = @_PATH_PYTHON@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -cross_compiling = @cross_compiling@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_hildon_CFLAGS = @enable_hildon_CFLAGS@ -enable_hildon_LIBS = @enable_hildon_LIBS@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -modulebindingdir = $(pkglibdir)/binding -moduledatadir = $(pkglibdir)/data -modulegraphicsdir = $(pkglibdir)/graphics -moduleguidir = $(pkglibdir)/gui -modulespeechdir = $(pkglibdir)/speech -moduleosddir = $(pkglibdir)/osd -modulevehicledir = $(pkglibdir)/vehicle -pkgdocdir = $(pkgdatadir) -xpmdir = $(pkgdatadir)/xpm -mapsdir = $(pkgdatadir)/maps -AM_CPPFLAGS = @NAVIT_CFLAGS@ @DIRECTFB_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_directfb -modulegraphics_LTLIBRARIES = libgraphics_directfb.la -libgraphics_directfb_la_SOURCES = graphics_directfb.c -libgraphics_directfb_la_LDFLAGS = @DIRECTFB_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @IMLIB2_LIBS@ -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign navit/graphics/directfb/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign navit/graphics/directfb/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-modulegraphicsLTLIBRARIES: $(modulegraphics_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(modulegraphicsdir)" || $(MKDIR_P) "$(DESTDIR)$(modulegraphicsdir)" - @list='$(modulegraphics_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulegraphicsLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(modulegraphicsdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulegraphicsLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(modulegraphicsdir)/$$f"; \ - else :; fi; \ - done - -uninstall-modulegraphicsLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(modulegraphics_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(modulegraphicsdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(modulegraphicsdir)/$$p"; \ - done - -clean-modulegraphicsLTLIBRARIES: - -test -z "$(modulegraphics_LTLIBRARIES)" || rm -f $(modulegraphics_LTLIBRARIES) - @list='$(modulegraphics_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgraphics_directfb.la: $(libgraphics_directfb_la_OBJECTS) $(libgraphics_directfb_la_DEPENDENCIES) - $(libgraphics_directfb_la_LINK) -rpath $(modulegraphicsdir) $(libgraphics_directfb_la_OBJECTS) $(libgraphics_directfb_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_directfb.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(modulegraphicsdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-modulegraphicsLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-modulegraphicsLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-modulegraphicsLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-modulegraphicsLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-modulegraphicsLTLIBRARIES install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-modulegraphicsLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: trunk/navit/navit/gui/directfb/Makefile.in =================================================================== --- trunk/navit/navit/gui/directfb/Makefile.in 2008-09-02 13:40:05 UTC (rev 1359) +++ trunk/navit/navit/gui/directfb/Makefile.in 2008-09-02 15:02:24 UTC (rev 1360) @@ -1,573 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.inc -subdir = navit/gui/directfb -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(moduleguidir)" -moduleguiLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(modulegui_LTLIBRARIES) -libgui_directfb_la_DEPENDENCIES = -am_libgui_directfb_la_OBJECTS = gui_directfb.lo -libgui_directfb_la_OBJECTS = $(am_libgui_directfb_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libgui_directfb_la_SOURCES) -DIST_SOURCES = $(libgui_directfb_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CEGUI_CFLAGS = @CEGUI_CFLAGS@ -CEGUI_LIBS = @CEGUI_LIBS@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@ -DIRECTFB_LIBS = @DIRECTFB_LIBS@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ -FREETYPE2_LIBS = @FREETYPE2_LIBS@ -GENCAT = @GENCAT@ -GLC_CFLAGS = @GLC_CFLAGS@ -GLC_LIBS = @GLC_LIBS@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GPSD_CFLAGS = @GPSD_CFLAGS@ -GPSD_LIBS = @GPSD_LIBS@ -GREP = @GREP@ -GTK2_CFLAGS = @GTK2_CFLAGS@ -GTK2_LIBS = @GTK2_LIBS@ -GYPSY_CFLAGS = @GYPSY_CFLAGS@ -GYPSY_LIBS = @GYPSY_LIBS@ -HAVE_ASPRINTF = @HAVE_ASPRINTF@ -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ -HAVE_SNPRINTF = @HAVE_SNPRINTF@ -HAVE_WPRINTF = @HAVE_WPRINTF@ -HILDON_CFLAGS = @HILDON_CFLAGS@ -HILDON_LIBS = @HILDON_LIBS@ -IMLIB2_CFLAGS = @IMLIB2_CFLAGS@ -IMLIB2_LIBS = @IMLIB2_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLIBS = @INTLIBS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -KSVGTOPNG = @KSVGTOPNG@ -LDFLAGS = @LDFLAGS@ -LIBGARMIN_CFLAGS = @LIBGARMIN_CFLAGS@ -LIBGARMIN_LIBS = @LIBGARMIN_LIBS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MOFILES = @MOFILES@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NAVIT_CFLAGS = @NAVIT_CFLAGS@ -NAVIT_LIBS = @NAVIT_LIBS@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OPENGL_CFLAGS = @OPENGL_CFLAGS@ -OPENGL_LIBS = @OPENGL_LIBS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PG_CONFIG = @PG_CONFIG@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ -POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ -POSUB = @POSUB@ -PYTHON_CFLAGS = @PYTHON_CFLAGS@ -PYTHON_LIBS = @PYTHON_LIBS@ -QT_GUI_CFLAGS = @QT_GUI_CFLAGS@ -QT_GUI_LIBS = @QT_GUI_LIBS@ -RANLIB = @RANLIB@ -SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ -SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@ -SDL_LIBS = @SDL_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPEECHD_CFLAGS = @SPEECHD_CFLAGS@ -SPEECHD_LIBS = @SPEECHD_LIBS@ -STRIP = @STRIP@ -SVG2PNG_SCALES = @SVG2PNG_SCALES@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ZLIB_LIBS = @ZLIB_LIBS@ -_PATH_PYTHON = @_PATH_PYTHON@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -cross_compiling = @cross_compiling@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_hildon_CFLAGS = @enable_hildon_CFLAGS@ -enable_hildon_LIBS = @enable_hildon_LIBS@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -modulebindingdir = $(pkglibdir)/binding -moduledatadir = $(pkglibdir)/data -modulegraphicsdir = $(pkglibdir)/graphics -moduleguidir = $(pkglibdir)/gui -modulespeechdir = $(pkglibdir)/speech -moduleosddir = $(pkglibdir)/osd -modulevehicledir = $(pkglibdir)/vehicle -pkgdocdir = $(pkgdatadir) -xpmdir = $(pkgdatadir)/xpm -mapsdir = $(pkgdatadir)/maps -AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @DIRECTFB_CFLAGS@ -DMODULE=gui_directfb -modulegui_LTLIBRARIES = libgui_directfb.la -libgui_directfb_la_SOURCES = gui_directfb.c gui_directfb.h -libgui_directfb_la_LIBADD = @DIRECTFB_LIBS@ -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign navit/gui/directfb/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign navit/gui/directfb/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-moduleguiLTLIBRARIES: $(modulegui_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(moduleguidir)" || $(MKDIR_P) "$(DESTDIR)$(moduleguidir)" - @list='$(modulegui_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleguiLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduleguidir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleguiLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduleguidir)/$$f"; \ - else :; fi; \ - done - -uninstall-moduleguiLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(modulegui_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduleguidir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduleguidir)/$$p"; \ - done - -clean-moduleguiLTLIBRARIES: - -test -z "$(modulegui_LTLIBRARIES)" || rm -f $(modulegui_LTLIBRARIES) - @list='$(modulegui_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgui_directfb.la: $(libgui_directfb_la_OBJECTS) $(libgui_directfb_la_DEPENDENCIES) - $(LINK) -rpath $(moduleguidir) $(libgui_directfb_la_OBJECTS) $(libgui_directfb_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_directfb.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(moduleguidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-moduleguiLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-moduleguiLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-moduleguiLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-moduleguiLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-moduleguiLTLIBRARIES install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-moduleguiLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-04 16:50:57
|
Revision: 1365 http://navit.svn.sourceforge.net/navit/?rev=1365&view=rev Author: martin-s Date: 2008-09-04 16:51:05 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Add:core:Further works on event system abstraction Modified Paths: -------------- trunk/navit/navit/Makefile.am trunk/navit/navit/event.c trunk/navit/navit/event.h trunk/navit/navit/plugin.h trunk/navit/navit/plugin_def.h trunk/navit/navit/start.c Added Paths: ----------- trunk/navit/navit/event_glib.c trunk/navit/navit/event_glib.h Modified: trunk/navit/navit/Makefile.am =================================================================== --- trunk/navit/navit/Makefile.am 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/Makefile.am 2008-09-04 16:51:05 UTC (rev 1365) @@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libnavit.la libnavit_la_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \ - event.c file.c graphics.c gui.c item.c layout.c log.c main.c map.c \ + event.c event_glib.c file.c graphics.c gui.c item.c layout.c log.c main.c map.c \ mapset.c maptype.c menu.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \ profile.c projection.c route.c search.c speech.c transform.c track.c \ util.c vehicle.c xmlconfig.c attr.h attr_def.h callback.h color.h compass.h coord.h country.h \ Modified: trunk/navit/navit/event.c =================================================================== --- trunk/navit/navit/event.c 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/event.c 2008-09-04 16:51:05 UTC (rev 1365) @@ -17,52 +17,87 @@ * Boston, MA 02110-1301, USA. */ -#include <glib.h> +#include <string.h> +#include <stdlib.h> #include "event.h" +#include "plugin.h" +#include "debug.h" -static GMainLoop *loop; +static struct event_methods event_methods; +static char *e_requestor; +static char *e_system; void event_main_loop_run(void) { - loop = g_main_loop_new (NULL, TRUE); - if (g_main_loop_is_running (loop)) - { - g_main_loop_run (loop); + if (! event_methods.main_loop_run) { + dbg(0,"no event system set\n"); + exit(1); } + event_methods.main_loop_run(); } void event_main_loop_quit(void) { - if (loop) - g_main_loop_quit(loop); -} + event_methods.main_loop_quit(); +} -void * +struct event_watch * event_add_watch(int fd, int w, struct callback *cb) { + return event_methods.add_watch(fd, w, cb); } void -event_remove_watch(void *data) +event_remove_watch(struct event_watch *ev) { + event_methods.remove_watch(ev); } -void * -event_add_timeout(int timeout, struct callback *cb) +struct event_timeout * +event_add_timeout(int timeout, int multi, struct callback *cb) { + return event_methods.add_timeout(timeout, multi, cb); } void -event_remove_timeout(void *data) +event_remove_timeout(struct event_timeout *ev) { + event_methods.remove_timeout(ev); } -void * +struct event_idle * event_add_idle(struct callback *cb) { + return event_methods.add_idle(cb); } void -event_remove_idle(void *data) +event_remove_idle(struct event_idle *ev) { + event_methods.remove_idle(ev); } + +int +event_request_system(char *system, char *requestor) +{ + void (*event_type_new)(struct event_methods *meth); + if (e_system) { + if (strcmp(e_system, system)) { + dbg(0,"system '%s' already requested by '%s', can't set to '%s' as requested from '%s'\n", e_system, e_requestor, system, requestor); + return 0; + } + return 1; + } + event_type_new=plugin_get_event_type(system); + if (! event_type_new) { + dbg(0,"unsupported event system '%s' requested from '%s'\n", system, requestor); + return 0; + } + event_type_new(&event_methods); + e_system=system; + e_requestor=requestor; + + return 1; +} + + Modified: trunk/navit/navit/event.h =================================================================== --- trunk/navit/navit/event.h 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/event.h 2008-09-04 16:51:05 UTC (rev 1365) @@ -17,5 +17,30 @@ * Boston, MA 02110-1301, USA. */ +struct event_idle; +struct event_timeout; +struct event_watch; +struct callback; + +struct event_methods { + void (*main_loop_run)(void); + void (*main_loop_quit)(void); + struct event_watch *(*add_watch)(int fd, int w, struct callback *cb); + void (*remove_watch)(struct event_watch *ev); + struct event_timeout *(*add_timeout)(int timeout, int multi, struct callback *cb); + void (*remove_timeout)(struct event_timeout *ev); + struct event_idle *(*add_idle)(struct callback *cb); + void (*remove_idle)(struct event_idle *ev); +}; + +/* prototypes */ void event_main_loop_run(void); void event_main_loop_quit(void); +struct event_watch *event_add_watch(int fd, int w, struct callback *cb); +void event_remove_watch(struct event_watch *ev); +struct event_timeout *event_add_timeout(int timeout, int multi, struct callback *cb); +void event_remove_timeout(struct event_timeout *ev); +struct event_idle *event_add_idle(struct callback *cb); +void event_remove_idle(struct event_idle *ev); +int event_request_system(char *system, char *requestor); +/* end of prototypes */ Added: trunk/navit/navit/event_glib.c =================================================================== --- trunk/navit/navit/event_glib.c (rev 0) +++ trunk/navit/navit/event_glib.c 2008-09-04 16:51:05 UTC (rev 1365) @@ -0,0 +1,143 @@ +/** + * Navit, a modular navigation system. + * Copyright (C) 2005-2008 Navit Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include <glib.h> +#include "event.h" +#include "event_glib.h" +#include "debug.h" +#include "callback.h" + +static GMainLoop *loop; + +static void event_glib_main_loop_run(void) +{ + loop = g_main_loop_new (NULL, TRUE); + if (g_main_loop_is_running (loop)) + { + g_main_loop_run (loop); + } +} + +static void event_glib_main_loop_quit(void) +{ + if (loop) + g_main_loop_quit(loop); +} + +struct event_watch { + GIOChannel *iochan; + guint source; +}; + +static gboolean +event_glib_call_watch(GIOChannel * iochan, GIOCondition condition, gpointer t) +{ + struct callback *cb=t; + callback_call_0(cb); + return TRUE; +} + +static struct event_watch * +event_glib_add_watch(int fd, int w, struct callback *cb) +{ + struct event_watch *ret=g_new0(struct event_watch, 1); + ret->iochan = g_io_channel_unix_new(fd); + ret->source = g_io_add_watch(ret->iochan, G_IO_IN | G_IO_ERR | G_IO_HUP, event_glib_call_watch, (gpointer)cb); + return ret; +} + +static void +event_glib_remove_watch(struct event_watch *ev) +{ + GError *error = NULL; + g_source_remove(ev->source); + g_io_channel_shutdown(ev->iochan, 0, &error); + g_free(ev); +} + +struct event_timeout { + guint source; +}; + +static gboolean +event_glib_call_timeout_single(gpointer t) +{ + struct callback *cb=t; + callback_call_0(cb); + return FALSE; +} + +static gboolean +event_glib_call_timeout_multi(gpointer t) +{ + struct callback *cb=t; + callback_call_0(cb); + return TRUE; +} + + +static struct event_timeout * +event_glib_add_timeout(int timeout, int multi, struct callback *cb) +{ + struct event_timeout *ret=g_new0(struct event_timeout, 1); + ret->source = g_timeout_add(timeout, multi ? (GSourceFunc)event_glib_call_timeout_multi : (GSourceFunc)event_glib_call_timeout_single, (gpointer)cb); + + return ret; +} + +static void +event_glib_remove_timeout(struct event_timeout *ev) +{ + g_source_remove(ev->source); + g_free(ev); +} + +static struct event_idle * +event_glib_add_idle(struct callback *cb) +{ + return NULL; +} + +static void +event_glib_remove_idle(struct event_idle *ev) +{ +} + +static struct event_methods event_glib_methods = { + event_glib_main_loop_run, + event_glib_main_loop_quit, + event_glib_add_watch, + event_glib_remove_watch, + event_glib_add_timeout, + event_glib_remove_timeout, + event_glib_add_idle, + event_glib_remove_idle, +}; + +static void +event_glib_new(struct event_methods *meth) +{ + *meth=event_glib_methods; +} + +void +event_glib_init(void) +{ + plugin_register_event_type("glib", event_glib_new); +} Added: trunk/navit/navit/event_glib.h =================================================================== --- trunk/navit/navit/event_glib.h (rev 0) +++ trunk/navit/navit/event_glib.h 2008-09-04 16:51:05 UTC (rev 1365) @@ -0,0 +1,3 @@ +/* prototypes */ +void event_glib_init(void); +/* end of prototypes */ Modified: trunk/navit/navit/plugin.h =================================================================== --- trunk/navit/navit/plugin.h 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/plugin.h 2008-09-04 16:51:05 UTC (rev 1365) @@ -32,6 +32,7 @@ plugin_type_osd, plugin_type_speech, plugin_type_vehicle, + plugin_type_event, plugin_type_last, }; #endif Modified: trunk/navit/navit/plugin_def.h =================================================================== --- trunk/navit/navit/plugin_def.h 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/plugin_def.h 2008-09-04 16:51:05 UTC (rev 1365) @@ -28,3 +28,4 @@ PLUGIN_TYPE(osd, (struct navit *nav, struct osd_methods *meth, struct attr **attrs)) PLUGIN_TYPE(speech, (char *data, struct speech_methods *meth)) PLUGIN_TYPE(vehicle, (struct vehicle_methods *meth, struct callback_list *cbl, struct attr **attrs)) +PLUGIN_TYPE(event, (struct event_methods *meth)) Modified: trunk/navit/navit/start.c =================================================================== --- trunk/navit/navit/start.c 2008-09-04 09:23:29 UTC (rev 1364) +++ trunk/navit/navit/start.c 2008-09-04 16:51:05 UTC (rev 1365) @@ -30,6 +30,7 @@ #include "navigation.h" #include "debug.h" #include "event.h" +#include "event_glib.h" #include "xmlconfig.h" #include "file.h" #include "search.h" @@ -71,6 +72,7 @@ GList *list = NULL, *li; + event_glib_init(); main_init(argv[0]); main_init_nls(); debug_init(argv[0]); @@ -153,6 +155,7 @@ printf(_("No instance has been created, exiting\n")); exit(1); } + event_request_system("glib","start"); event_main_loop_run(); return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-15 09:17:38
|
Revision: 1385 http://navit.svn.sourceforge.net/navit/?rev=1385&view=rev Author: martin-s Date: 2008-09-15 09:17:48 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Add:Core:Improved navigation map support Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/navigation.c Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-09-13 19:25:45 UTC (rev 1384) +++ trunk/navit/navit/item_def.h 2008-09-15 09:17:48 UTC (rev 1385) @@ -273,6 +273,7 @@ ITEM(poi_toilets) ITEM(poi_viewpoint) ITEM(poi_ruins) +ITEM(nav_none) /* Line */ ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2008-09-13 19:25:45 UTC (rev 1384) +++ trunk/navit/navit/navigation.c 2008-09-15 09:17:48 UTC (rev 1385) @@ -133,11 +133,13 @@ struct item item; int angle_start; int angle_end; + struct coord c; int time; int length; int dest_time; int dest_length; int told; + int dest_count; struct navigation_itm *next; struct navigation_itm *prev; }; @@ -303,6 +305,7 @@ l=3; ret->angle_start=road_angle(&c[0], &c[1], 0); ret->angle_end=road_angle(&c[l-1], &c[l], 0); + ret->c=c[0]; dbg(1,"i=%d start %d end %d '%s' '%s'\n", i, ret->angle_start, ret->angle_end, ret->name1, ret->name2); map_rect_destroy(mr); } @@ -320,7 +323,7 @@ static void calculate_dest_distance(struct navigation *this_, int incr) { - int len=0, time=0; + int len=0, time=0, count=0; struct navigation_itm *next,*itm=this_->last; dbg(1, "enter this_=%p, incr=%d\n", this_, incr); if (incr) { @@ -333,6 +336,7 @@ dbg(2, "itm values: time=%d lenght=%d\n", itm->length, itm->time); dbg(2, "next values: (%p) time=%d lenght=%d\n", next, next->dest_length, next->dest_time); itm->dest_length=next->dest_length+itm->length; + itm->dest_count=next->dest_count+1; itm->dest_time=next->dest_time+itm->time; dbg(2, "new values: time=%d lenght=%d\n", itm->dest_length, itm->dest_time); return; @@ -342,6 +346,7 @@ time+=itm->time; itm->dest_length=len; itm->dest_time=time; + itm->dest_count=count++; itm=itm->prev; } dbg(1,"len %d time %d\n", len, time); @@ -368,7 +373,6 @@ dbg(1,"enter %p %p %p\n",old, new, delta); if (new->item.type == old->item.type || (new->item.type != type_ramp && old->item.type != type_ramp)) { if (is_same_street2(old, new)) { - dbg(1, "maneuver_required: is_same_street: no\n"); return 0; } } else @@ -863,13 +867,24 @@ struct navigation_command *cmd_next; struct navigation_itm *itm; struct navigation_itm *itm_next; + struct navigation_itm *cmd_itm; + struct navigation_itm *cmd_itm_next; struct item item; + enum attr_type attr_next; + int ccount; + int debug_idx; + int show_all; }; static int navigation_map_item_coord_get(void *priv_data, struct coord *c, int count) { - return 0; + struct map_rect_priv *this=priv_data; + if (this->ccount || ! count) + return 0; + *c=this->itm->c; + this->ccount=1; + return 1; } static int @@ -877,25 +892,88 @@ { struct map_rect_priv *this_=priv_data; attr->type=attr_type; + struct navigation_command *cmd=this_->cmd; + if (cmd) { + if (cmd->itm != this_->itm) + cmd=NULL; + } switch(attr_type) { case attr_navigation_short: + this_->attr_next=attr_navigation_long; + if (cmd) { + attr->u.str=show_maneuver(this_->nav, this_->cmd_itm, cmd, attr_type); + return 1; + } + return 0; case attr_navigation_long: + this_->attr_next=attr_navigation_long_exact; + if (cmd) { + attr->u.str=show_maneuver(this_->nav, this_->cmd_itm, cmd, attr_type); + return 1; + } + return 0; case attr_navigation_long_exact: + this_->attr_next=attr_navigation_speech; + if (cmd) { + attr->u.str=show_maneuver(this_->nav, this_->cmd_itm, cmd, attr_type); + return 1; + } + return 0; case attr_navigation_speech: - attr->u.str=show_maneuver(this_->nav, this_->itm, this_->cmd, attr_type); - return 1; + this_->attr_next=attr_length; + if (cmd) { + attr->u.str=show_maneuver(this_->nav, this_->cmd_itm, this_->cmd, attr_type); + return 1; + } + return 0; case attr_length: - attr->u.num=this_->itm->dest_length-this_->cmd->itm->dest_length; - return 1; + this_->attr_next=attr_time; + if (cmd) { + attr->u.num=this_->cmd_itm->dest_length-cmd->itm->dest_length; + return 1; + } + return 0; case attr_time: - attr->u.num=this_->itm->dest_time-this_->cmd->itm->dest_time; - return 1; + this_->attr_next=attr_destination_length; + if (cmd) { + attr->u.num=this_->cmd_itm->dest_time-cmd->itm->dest_time; + return 1; + } + return 0; case attr_destination_length: attr->u.num=this_->itm->dest_length; + this_->attr_next=attr_destination_time; return 1; case attr_destination_time: attr->u.num=this_->itm->dest_time; + this_->attr_next=attr_street_name; return 1; + case attr_street_name: + attr->u.str=this_->itm->name1; + this_->attr_next=attr_street_name_systematic; + return 1; + case attr_street_name_systematic: + attr->u.str=this_->itm->name2; + this_->attr_next=attr_debug; + return 1; + case attr_debug: + switch(this_->debug_idx) { + case 0: + attr->u.str=g_strdup_printf("%p vs %p\n", this_->itm,this_->cmd->itm); + this_->attr_next=attr_none; + break; + default: + this_->attr_next=attr_none; + return 0; + } + this_->debug_idx++; + return 1; + case attr_any: + while (this_->attr_next != attr_none) { + if (navigation_map_item_attr_get(priv_data, this_->attr_next, attr)) + return 1; + } + return 0; default: attr->type=attr_none; return 0; @@ -916,14 +994,20 @@ g_free(priv); } +static void +navigation_map_rect_init(struct map_rect_priv *priv) +{ + priv->cmd_next=priv->nav->cmd_first; + priv->cmd_itm_next=priv->itm_next=priv->nav->first; +} + static struct map_rect_priv * navigation_map_rect_new(struct map_priv *priv, struct map_selection *sel) { struct navigation *nav=priv->navigation; struct map_rect_priv *ret=g_new0(struct map_rect_priv, 1); ret->nav=nav; - ret->cmd_next=nav->cmd_first; - ret->itm_next=nav->first; + navigation_map_rect_init(ret); ret->item.meth=&navigation_map_item_methods; ret->item.priv_data=ret; return ret; @@ -938,38 +1022,50 @@ static struct item * navigation_map_get_item(struct map_rect_priv *priv) { - struct item *ret; + struct item *ret=&priv->item; int delta; - if (!priv->cmd_next) + if (!priv->itm_next) return NULL; - ret=&priv->item; + priv->itm=priv->itm_next; priv->cmd=priv->cmd_next; - priv->itm=priv->itm_next; - priv->itm_next=priv->cmd->itm; - priv->cmd_next=priv->cmd->next; + priv->cmd_itm=priv->cmd_itm_next; + if (!priv->show_all) { + if (!priv->cmd) + return NULL; + priv->itm=priv->cmd->itm; + } + priv->itm_next=priv->itm->next; + ret->type=type_nav_none; + if (priv->cmd->itm == priv->itm) { + priv->cmd_itm_next=priv->cmd->itm; + priv->cmd_next=priv->cmd->next; + delta=priv->cmd->delta; + if (delta < 0) { + delta=-delta; + if (delta < 45) + ret->type=type_nav_left_1; + else if (delta < 105) + ret->type=type_nav_left_2; + else if (delta < 165) + ret->type=type_nav_left_3; + else + ret->type=type_none; + } else { + if (delta < 45) + ret->type=type_nav_right_1; + else if (delta < 105) + ret->type=type_nav_right_2; + else if (delta < 165) + ret->type=type_nav_right_3; + else + ret->type=type_none; + } + } + priv->ccount=0; + priv->debug_idx=0; + priv->attr_next=attr_navigation_short; - delta=priv->cmd->delta; - dbg(1,"delta=%d\n", delta); - if (delta < 0) { - delta=-delta; - if (delta < 45) - ret->type=type_nav_left_1; - else if (delta < 105) - ret->type=type_nav_left_2; - else if (delta < 165) - ret->type=type_nav_left_3; - else - ret->type=type_none; - } else { - if (delta < 45) - ret->type=type_nav_right_1; - else if (delta < 105) - ret->type=type_nav_right_2; - else if (delta < 165) - ret->type=type_nav_right_3; - else - ret->type=type_none; - } + ret->id_lo=priv->itm->dest_count; dbg(1,"type=%d\n", ret->type); return ret; } @@ -977,13 +1073,18 @@ static struct item * navigation_map_get_item_byid(struct map_rect_priv *priv, int id_hi, int id_lo) { - dbg(0,"stub"); + struct item *ret; + navigation_map_rect_init(priv); + while ((ret=navigation_map_get_item(priv))) { + if (ret->id_hi == id_hi && ret->id_lo == id_lo) + return ret; + } return NULL; } static struct map_methods navigation_map_meth = { projection_mg, - NULL, + "utf-8", navigation_map_destroy, navigation_map_rect_new, navigation_map_rect_destroy, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-21 12:33:15
|
Revision: 1388 http://navit.svn.sourceforge.net/navit/?rev=1388&view=rev Author: martin-s Date: 2008-09-21 12:33:06 +0000 (Sun, 21 Sep 2008) Log Message: ----------- Add:Core:Added a selection feature to search.c Modified Paths: -------------- trunk/navit/navit/search.c trunk/navit/navit/search.h Modified: trunk/navit/navit/search.c =================================================================== --- trunk/navit/navit/search.c 2008-09-21 12:32:17 UTC (rev 1387) +++ trunk/navit/navit/search.c 2008-09-21 12:33:06 UTC (rev 1388) @@ -32,6 +32,7 @@ struct item *parent; struct attr attr; int partial; + int selected; struct mapset_search *search; GHashTable *hash; GList *list,*curr,*last; @@ -74,34 +75,37 @@ } static void search_list_search_free(struct search_list *sl, int level); -void -search_list_search(struct search_list *this_, struct attr *search_attr, int partial) + +static int +search_list_level(enum attr_type attr_type) { - int level=-1; - struct search_list_level *le; - switch(search_attr->type) { + switch(attr_type) { case attr_country_all: case attr_country_id: case attr_country_iso2: case attr_country_iso3: case attr_country_car: case attr_country_name: - level=0; - break; + return 0; case attr_town_postal: - level=1; - break; + return 1; case attr_town_name: - level=1; - break; + return 1; case attr_street_name: - level=2; - break; + return 2; default: - break; + return -1; } +} + +void +search_list_search(struct search_list *this_, struct attr *search_attr, int partial) +{ + struct search_list_level *le; + int level=search_list_level(search_attr->type); dbg(0,"level=%d\n", level); if (level != -1) { + this_->result.id=0; this_->level=level; le=&this_->levels[level]; le->attr=*search_attr; @@ -117,6 +121,35 @@ } } +int +search_list_select(struct search_list *this_, enum attr_type attr_type, int id, int mode) +{ + int level=search_list_level(attr_type); + int num=0; + struct search_list_level *le; + struct search_list_common *slc; + GList *curr; + le=&this_->levels[level]; + curr=le->list; + if (mode > 0) + le->selected=mode; + dbg(0,"enter %d %d\n", id, mode); + while (curr) { + num++; + if (! id || num == id) { + slc=curr->data; + slc->selected=mode; + if (id) { + dbg(0,"found\n"); + return 1; + } + } + curr=g_list_next(curr); + } + dbg(0,"not found\n"); + return 0; +} + static struct search_list_country * search_list_country_new(struct item *item) { @@ -290,11 +323,19 @@ else { leu=&this_->levels[level-1]; dbg(1,"leu->curr=%p\n", leu->curr); - if (! leu->curr) - break; - le->parent=leu->curr->data; - leu->last=leu->curr; - leu->curr=g_list_next(leu->curr); + for (;;) { + struct search_list_common *slc; + if (! leu->curr) + return NULL; + le->parent=leu->curr->data; + leu->last=leu->curr; + leu->curr=g_list_next(leu->curr); + slc=(struct search_list_common *)(le->parent); + if (!slc) + break; + if (slc->selected == leu->selected) + break; + } } if (le->parent) dbg(1,"mapset_search_new with item(%d,%d)\n", le->parent->id_hi, le->parent->id_lo); @@ -332,9 +373,10 @@ break; } if (p) { - if (search_add_result(le, p)) + if (search_add_result(le, p)) { + this_->result.id++; return &this_->result; - else + } else search_list_result_destroy(level, p); } } else { Modified: trunk/navit/navit/search.h =================================================================== --- trunk/navit/navit/search.h 2008-09-21 12:32:17 UTC (rev 1387) +++ trunk/navit/navit/search.h 2008-09-21 12:33:06 UTC (rev 1388) @@ -23,8 +23,16 @@ #ifdef __cplusplus extern "C" { #endif +struct search_list_common { + struct item item; + int selected; + struct pcoord *c; +}; + struct search_list_country { struct item item; + int selected; + struct pcoord *c; char *car; char *iso2; char *iso3; @@ -34,8 +42,9 @@ struct search_list_town { struct item item; + int selected; + struct pcoord *c; struct item itemt; - struct pcoord *c; char *postal; char *name; char *district; @@ -43,11 +52,13 @@ struct search_list_street { struct item item; + int selected; struct pcoord *c; char *name; }; struct search_list_result { + int id; struct pcoord *c; struct search_list_country *country; struct search_list_town *town; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-21 18:38:33
|
Revision: 1391 http://navit.svn.sourceforge.net/navit/?rev=1391&view=rev Author: martin-s Date: 2008-09-21 18:38:29 +0000 (Sun, 21 Sep 2008) Log Message: ----------- Fix:Core:Cleaned up map api a bit Modified Paths: -------------- trunk/navit/navit/attr.c trunk/navit/navit/attr.h trunk/navit/navit/graphics.c trunk/navit/navit/gui/gtk/gui_gtk_window.c trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/gui.c trunk/navit/navit/log.c trunk/navit/navit/map.c trunk/navit/navit/mapset.c trunk/navit/navit/navigation.c trunk/navit/navit/navit.c trunk/navit/navit/route.c trunk/navit/navit/xmlconfig.c Modified: trunk/navit/navit/attr.c =================================================================== --- trunk/navit/navit/attr.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/attr.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -141,9 +141,14 @@ if (type >= attr_type_item_begin && type <= attr_type_item_end) { struct item *item=attr->u.item; + struct attr type, data; if (! item) return g_strdup("(nil)"); - return g_strdup_printf("type=0x%x id=0x%x,0x%x map=%p (%s:%s)", item->type, item->id_hi, item->id_lo, item->map, item->map ? map_get_type(item->map) : "", item->map ? map_get_filename(item->map) : ""); + if (! item->map || !map_get_attr(item->map, attr_type, &type, NULL)) + type.u.str=""; + if (! item->map || !map_get_attr(item->map, attr_data, &data, NULL)) + data.u.str=""; + return g_strdup_printf("type=0x%x id=0x%x,0x%x map=%p (%s:%s)", item->type, item->id_hi, item->id_lo, item->map, type.u.str, data.u.str); } if (type >= attr_type_string_begin && type <= attr_type_string_end) { if (map) { @@ -173,18 +178,48 @@ } int -attr_generic_get_attr(struct attr **attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter) +attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter) { - while (*attrs) { + while (attrs && *attrs) { if ((*attrs)->type == type) { *attr=**attrs; return 1; } attrs++; } + while (def_attrs && *def_attrs) { + if ((*def_attrs)->type == type) { + *attr=**def_attrs; + return 1; + } + def_attrs++; + } return 0; } +struct attr ** +attr_generic_set_attr(struct attr **attrs, struct attr *attr) +{ + struct attr **curr=attrs; + int i,count=0; + while (curr && *curr) { + if ((*curr)->type == attr->type) { + attr_free(*curr); + *curr=attr_dup(attr); + return attrs; + } + curr++; + count++; + } + curr=g_new0(struct attr *, count+2); + for (i = 0 ; i < count ; i++) + curr[i]=attrs[i]; + curr[count]=attr_dup(attr); + curr[count+1]=NULL; + g_free(attrs); + return curr; +} + int attr_data_size(struct attr *attr) { Modified: trunk/navit/navit/attr.h =================================================================== --- trunk/navit/navit/attr.h 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/attr.h 2008-09-21 18:38:29 UTC (rev 1391) @@ -82,7 +82,7 @@ struct attr *attr_new_from_text(const char *name, const char *value); char *attr_to_text(struct attr *attr, struct map *map, int pretty); struct attr *attr_search(struct attr **attrs, struct attr *last, enum attr_type attr); -int attr_generic_get_attr(struct attr **attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter); +int attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter); int attr_data_size(struct attr *attr); void *attr_data_get(struct attr *attr); void attr_data_set(struct attr *attr, void *data); Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/graphics.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -104,7 +104,7 @@ */ int graphics_get_attr(struct graphics *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { - return attr_generic_get_attr(this_->attrs, type, attr, iter); + return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); } /** Modified: trunk/navit/navit/gui/gtk/gui_gtk_window.c =================================================================== --- trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -266,7 +266,10 @@ static void gui_gtk_action_toggled(GtkToggleAction *action, struct action_cb_data *data) { - map_set_active(data->attr.u.map, gtk_toggle_action_get_active(action)); + struct attr active; + active.type=attr_active; + active.u.num=gtk_toggle_action_get_active(action); + map_set_attr(data->attr.u.map, &active); navit_draw(data->gui->nav); } @@ -374,20 +377,26 @@ gui_gtk_maps_init(struct gui_priv *this) { struct attr_iter *iter; - struct attr attr; - struct action_cb_data *data; + struct attr attr,active,type,data; + struct action_cb_data *cb_data; int count=0; char *name, *label; iter=navit_attr_iter_new(); while(navit_get_attr(this->nav, attr_map, &attr, iter)) { name=g_strdup_printf("Map %d", count++); - label=g_strdup_printf("%s:%s", map_get_type(attr.u.map), map_get_filename(attr.u.map)); - data=g_new(struct action_cb_data, 1); - data->gui=this; - data->attr.type=attr_map; - data->attr.u.map=attr.u.map; - gui_gtk_add_toggle_menu(this, name, label, "/ui/MenuBar/Map/MapMenuAdditions", data, map_get_active(attr.u.map)); + if (! map_get_attr(attr.u.map, attr_type, &type, NULL)) + type.u.str=""; + if (! map_get_attr(attr.u.map, attr_data, &data, NULL)) + data.u.str=""; + label=g_strdup_printf("%s:%s", type.u.str, data.u.str); + cb_data=g_new(struct action_cb_data, 1); + cb_data->gui=this; + cb_data->attr.type=attr_map; + cb_data->attr.u.map=attr.u.map; + if (! map_get_attr(attr.u.map, attr_active, &active, NULL)) + active.u.num=1; + gui_gtk_add_toggle_menu(this, name, label, "/ui/MenuBar/Map/MapMenuAdditions", cb_data, active.u.num); g_free(name); g_free(label); } Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/gui/internal/gui_internal.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -132,6 +132,7 @@ struct callback *cb; struct attr on; struct attr off; + int deflt; int is_on; int redraw; GList *children; @@ -413,6 +414,8 @@ if (w->get_attr(w->instance, w->on.type, &curr, NULL)) is_on=curr.u.data == w->on.u.data; + else + is_on=w->deflt; if (is_on != w->is_on) { if (w->redraw) this->redraw=1; @@ -471,7 +474,7 @@ } static struct widget * -gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off) +gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt) { struct graphics_image *image=image_new_xs(this, "gui_inactive"); struct widget *ret; @@ -480,6 +483,7 @@ ret->on=*on; if (off) ret->off=*off; + ret->deflt=deflt; ret->get_attr=map_get_attr; ret->set_attr=map_set_attr; ret->remove_cb=map_remove_callback; @@ -2125,11 +2129,10 @@ static void gui_internal_cmd_maps(struct gui_priv *this, struct widget *wm) { - struct attr attr; + struct attr attr, on, off, description, type, data; struct widget *w,*wb,*wma; char *label; struct attr_iter *iter; - struct attr on, off; wb=gui_internal_menu(this, "Maps"); @@ -2141,9 +2144,17 @@ on.u.num=1; off.u.num=0; while(navit_get_attr(this->nav, attr_map, &attr, iter)) { - label=g_strdup_printf("%s:%s", map_get_type(attr.u.map), map_get_filename(attr.u.map)); + if (map_get_attr(attr.u.map, attr_description, &description, NULL)) { + label=g_strdup(description.u.str); + } else { + if (!map_get_attr(attr.u.map, attr_type, &type, NULL)) + type.u.str=""; + if (!map_get_attr(attr.u.map, attr_data, &data, NULL)) + data.u.str=""; + label=g_strdup_printf("%s:%s", type.u.str, data.u.str); + } wma=gui_internal_button_map_attr_new(this, label, gravity_left_center|orientation_horizontal|flags_fill, - attr.u.map, &on, &off); + attr.u.map, &on, &off, 1); gui_internal_widget_append(w, wma); g_free(label); } Modified: trunk/navit/navit/gui.c =================================================================== --- trunk/navit/navit/gui.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/gui.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -55,7 +55,7 @@ int gui_get_attr(struct gui *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { - return attr_generic_get_attr(this_->attrs, type, attr, iter); + return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); } struct menu * Modified: trunk/navit/navit/log.c =================================================================== --- trunk/navit/navit/log.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/log.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -193,7 +193,7 @@ int log_get_attr(struct log *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { - return attr_generic_get_attr(this_->attrs, type, attr, iter); + return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); } Modified: trunk/navit/navit/map.c =================================================================== --- trunk/navit/navit/map.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/map.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -34,10 +34,8 @@ struct map { struct map_methods meth; struct map_priv *priv; - char *type; - char *filename; + struct attr **attrs; struct callback_list *attr_cbl; - int active; }; struct map_rect { @@ -50,7 +48,6 @@ { struct map *m; struct map_priv *(*maptype_new)(struct map_methods *meth, struct attr **attrs); - struct attr *data=attr_search(attrs, NULL, attr_data); struct attr *type=attr_search(attrs, NULL, attr_type); if (! type) { @@ -64,10 +61,7 @@ } m=g_new0(struct map, 1); - m->active=1; - m->type=g_strdup(type->u.str); - if (data) - m->filename=g_strdup(data->u.str); + m->attrs=attr_list_dup(attrs); m->priv=maptype_new(&m->meth, attrs); if (! m->priv) { g_free(m); @@ -78,60 +72,20 @@ return m; } -char * -map_get_filename(struct map *this_) -{ - return this_->filename; -} - -char * -map_get_type(struct map *this_) -{ - return this_->type; -} - int -map_get_active(struct map *this_) -{ - return this_->active; -} - -void -map_set_active(struct map *this_, int active) -{ - this_->active=active; -} - -int map_get_attr(struct map *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { - switch (type) { - case attr_active: - attr->u.num=this_->active; - break; - default: - return 0; - } - return 1; + return xxx(this_, type, attr, iter); +#if 0 + return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); +#endif } int map_set_attr(struct map *this_, struct attr *attr) { - int attr_updated=0; - - switch (attr->type) { - case attr_active: - if (this_->active != !!attr->u.num) { - this_->active=!!attr->u.num; - attr_updated=1; - } - break; - default: - return 0; - } - if (attr_updated) - callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr); + this_->attrs=attr_generic_set_attr(this_->attrs, attr); + callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr); return 1; } @@ -183,6 +137,7 @@ map_destroy(struct map *m) { m->meth.map_destroy(m->priv); + attr_list_free(m->attrs); g_free(m); } Modified: trunk/navit/navit/mapset.c =================================================================== --- trunk/navit/navit/mapset.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/mapset.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -74,14 +74,19 @@ struct map * mapset_next(struct mapset_handle *msh, int active) { struct map *ret; + struct attr active_attr; for (;;) { if (!msh->l) return NULL; ret=msh->l->data; msh->l=g_list_next(msh->l); - if (!active || map_get_active(ret)) + if (!active) + return ret; + if (!map_get_attr(ret, attr_active, &active_attr, NULL)) return ret; + if (active_attr.u.num) + return ret; } } @@ -117,12 +122,20 @@ mapset_search_get_item(struct mapset_search *this) { struct item *ret=NULL; + struct attr active_attr; + while (!this->ms || !(ret=map_search_get_item(this->ms))) { if (this->search_attr->type >= attr_country_all && this->search_attr->type <= attr_country_name) break; - do { + for (;;) { this->map=g_list_next(this->map); - } while (this->map && ! map_get_active(this->map->data)); + if (! this->map) + break; + if (!map_get_attr(this->map, attr_active, &active_attr, NULL)) + break; + if (active_attr.u.num) + break; + } if (! this->map) break; map_search_destroy(this->ms); Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/navigation.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -847,14 +847,14 @@ struct map * navigation_get_map(struct navigation *this_) { - struct attr type_attr={attr_type, {"navigation"}}; - struct attr navigation_attr={attr_navigation, .u.navigation=this_}; - struct attr data_attr={attr_data, {""}}; - struct attr *attrs_navigation[]={&type_attr, &navigation_attr, &data_attr, NULL}; - if (! this_->map) - this_->map=map_new(attrs_navigation); - return this_->map; + this_->map=map_new((struct attr*[]){ + &(struct attr){attr_type,{"navigation"}}, + &(struct attr){attr_navigation,.u.navigation=this_}, + &(struct attr){attr_data,{""}}, + &(struct attr){attr_description,{"Navigation"}}, + NULL}); + return this_->map; } struct map_priv { Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/navit.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -1176,7 +1176,7 @@ mapset_add(ms, map); if ((map=route_get_graph_map(this_->route))) { mapset_add(ms, map); - map_set_active(map, 0); + map_set_attr(map, &(struct attr ){attr_active,.u.num=0}); } route_set_mapset(this_->route, ms); } @@ -1185,7 +1185,7 @@ if (this_->navigation) { if ((map=navigation_get_map(this_->navigation))) { mapset_add(ms, map); - map_set_active(map, 0); + map_set_attr(map, &(struct attr ){attr_active,.u.num=0}); } } navit_add_bookmarks_from_file(this_); Modified: trunk/navit/navit/route.c =================================================================== --- trunk/navit/navit/route.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/route.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -1534,13 +1534,14 @@ } static struct map * -route_get_map_helper(struct route *this_, struct map **map, char *type) +route_get_map_helper(struct route *this_, struct map **map, char *type, char *description) { if (! *map) *map=map_new((struct attr*[]){ &(struct attr){attr_type,{type}}, &(struct attr){attr_route,.u.route=this_}, &(struct attr){attr_data,{""}}, + &(struct attr){attr_description,{description}}, NULL}); return *map; } @@ -1548,14 +1549,14 @@ struct map * route_get_map(struct route *this_) { - return route_get_map_helper(this_, &this_->map, "route"); + return route_get_map_helper(this_, &this_->map, "route","Route"); } struct map * route_get_graph_map(struct route *this_) { - return route_get_map_helper(this_, &this_->graph_map, "route_graph"); + return route_get_map_helper(this_, &this_->graph_map, "route_graph","Route Graph"); } void Modified: trunk/navit/navit/xmlconfig.c =================================================================== --- trunk/navit/navit/xmlconfig.c 2008-09-21 18:36:08 UTC (rev 1390) +++ trunk/navit/navit/xmlconfig.c 2008-09-21 18:38:29 UTC (rev 1391) @@ -455,8 +455,6 @@ state->element_attr.u.data = map_new(attrs); if (! state->element_attr.u.data) return 0; - if (!find_boolean(state, "active", 1, 0)) - map_set_active(state->element_attr.u.data, 0); mapset_add(state->parent->element_attr.u.data, state->element_attr.u.data); return 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lat...@us...> - 2008-09-22 13:07:29
|
Revision: 1396 http://navit.svn.sourceforge.net/navit/?rev=1396&view=rev Author: latouche Date: 2008-09-22 13:07:04 +0000 (Mon, 22 Sep 2008) Log Message: ----------- Add:graphics:Add WM_Class support to windows Modified Paths: -------------- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c trunk/navit/navit/gui/gtk/datawindow.c trunk/navit/navit/gui/gtk/destination.c trunk/navit/navit/gui/gtk/gui_gtk_window.c Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2008-09-22 06:01:20 UTC (rev 1395) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2008-09-22 13:07:04 UTC (rev 1396) @@ -1024,6 +1024,7 @@ this->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size(GTK_WINDOW(this->win), this->win_w, this->win_h); gtk_window_set_title(GTK_WINDOW(this->win), "Navit"); + gtk_window_set_wmclass (GTK_WINDOW (this->win), "navit", "Navit"); gtk_widget_realize(this->win); gtk_container_add(GTK_CONTAINER(this->win), this->widget); gtk_widget_show_all(this->win); Modified: trunk/navit/navit/gui/gtk/datawindow.c =================================================================== --- trunk/navit/navit/gui/gtk/datawindow.c 2008-09-22 06:01:20 UTC (rev 1395) +++ trunk/navit/navit/gui/gtk/datawindow.c 2008-09-22 13:07:04 UTC (rev 1396) @@ -171,6 +171,7 @@ win->window=gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size(GTK_WINDOW(win->window), 320, 200); gtk_window_set_title(GTK_WINDOW(win->window), name); + gtk_window_set_wmclass (GTK_WINDOW (win->window), "navit", "Navit"); win->scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (win->scrolled_window), Modified: trunk/navit/navit/gui/gtk/destination.c =================================================================== --- trunk/navit/navit/gui/gtk/destination.c 2008-09-22 06:01:20 UTC (rev 1395) +++ trunk/navit/navit/gui/gtk/destination.c 2008-09-22 13:07:04 UTC (rev 1396) @@ -424,6 +424,7 @@ window2 = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window2),_("Enter Destination")); + gtk_window_set_wmclass (GTK_WINDOW (window2), "navit", "Navit"); vbox = gtk_vbox_new(FALSE, 0); table = gtk_table_new(3, 8, FALSE); Modified: trunk/navit/navit/gui/gtk/gui_gtk_window.c =================================================================== --- trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-09-22 06:01:20 UTC (rev 1395) +++ trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-09-22 13:07:04 UTC (rev 1396) @@ -166,6 +166,7 @@ vbox=gtk_vbox_new(FALSE, 0); gtk_container_add (GTK_CONTAINER (gui->dialog_win), vbox); gtk_window_set_title(GTK_WINDOW(gui->dialog_win),_("Add Bookmark")); + gtk_window_set_wmclass (GTK_WINDOW (gui->dialog_win), "navit", "Navit"); gtk_window_set_transient_for(GTK_WINDOW(gui->dialog_win), GTK_WINDOW(gui->win)); gtk_window_set_modal(GTK_WINDOW(gui->dialog_win), TRUE); label=gtk_label_new(_("Name")); @@ -552,6 +553,7 @@ this->vbox = gtk_vbox_new(FALSE, 0); gtk_window_set_default_size(GTK_WINDOW(this->win), w, h); gtk_window_set_title(GTK_WINDOW(this->win), "Navit"); + gtk_window_set_wmclass (GTK_WINDOW (this->win), "navit", "Navit"); gtk_widget_realize(this->win); gui_gtk_ui_init(this); if (this->menubar_enable) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-24 12:07:02
|
Revision: 1412 http://navit.svn.sourceforge.net/navit/?rev=1412&view=rev Author: martin-s Date: 2008-09-24 12:06:55 +0000 (Wed, 24 Sep 2008) Log Message: ----------- Add:Core:Added tracking map for better diagnosing tracking problems Modified Paths: -------------- trunk/navit/navit/attr.h trunk/navit/navit/attr_def.h trunk/navit/navit/item_def.h trunk/navit/navit/navit.c trunk/navit/navit/navit.xml trunk/navit/navit/start.c trunk/navit/navit/track.c trunk/navit/navit/track.h Modified: trunk/navit/navit/attr.h =================================================================== --- trunk/navit/navit/attr.h 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/attr.h 2008-09-24 12:06:55 UTC (rev 1412) @@ -69,6 +69,7 @@ struct pcoord *pcoord; struct gui *gui; struct graphics *graphics; + struct tracking *tracking; } u; }; Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/attr_def.h 2008-09-24 12:06:55 UTC (rev 1412) @@ -164,6 +164,7 @@ ATTR(former_destination_map) ATTR(graphics) ATTR(gui) +ATTR(trackingo) /* fixme */ ATTR2(0x0008ffff,type_object_end) ATTR2(0x00090000,type_coord_begin) ATTR2(0x0009ffff,type_coord_end) Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/item_def.h 2008-09-24 12:06:55 UTC (rev 1412) @@ -366,6 +366,17 @@ ITEM(piste_downhill_expert) ITEM(piste_downhill_freeride) ITEM(footway_and_piste_nordic) +ITEM(tracking_0) +ITEM(tracking_10) +ITEM(tracking_20) +ITEM(tracking_30) +ITEM(tracking_40) +ITEM(tracking_50) +ITEM(tracking_60) +ITEM(tracking_70) +ITEM(tracking_80) +ITEM(tracking_90) +ITEM(tracking_100) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/navit.c 2008-09-24 12:06:55 UTC (rev 1412) @@ -1188,6 +1188,12 @@ map_set_attr(map, &(struct attr ){attr_active,.u.num=0}); } } + if (this_->tracking) { + if ((map=tracking_get_map(this_->tracking))) { + mapset_add(ms, map); + map_set_attr(map, &(struct attr ){attr_active,.u.num=0}); + } + } navit_add_bookmarks_from_file(this_); navit_add_former_destinations_from_file(this_); navit_add_menu_former_destinations(this_, NULL, this_->route); Modified: trunk/navit/navit/navit.xml =================================================================== --- trunk/navit/navit/navit.xml 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/navit.xml 2008-09-24 12:06:55 UTC (rev 1412) @@ -870,7 +870,39 @@ <polyline color="#8080ff" width="3" /> </item> --> - + <item type="tracking_0" order="0-"> + <polyline color="#000000" width="3" /> + </item> + <item type="tracking_10" order="0-"> + <polyline color="#191919" width="3" /> + </item> + <item type="tracking_20" order="0-"> + <polyline color="#333333" width="3" /> + </item> + <item type="tracking_30" order="0-"> + <polyline color="#4c4c4c" width="3" /> + </item> + <item type="tracking_40" order="0-"> + <polyline color="#666666" width="3" /> + </item> + <item type="tracking_50" order="0-"> + <polyline color="#7f7f7f" width="3" /> + </item> + <item type="tracking_60" order="0-"> + <polyline color="#999999" width="3" /> + </item> + <item type="tracking_70" order="0-"> + <polyline color="#b2b2b2" width="3" /> + </item> + <item type="tracking_80" order="0-"> + <polyline color="#cccccc" width="3" /> + </item> + <item type="tracking_90" order="0-"> + <polyline color="#e5e5e5" width="3" /> + </item> + <item type="tracking_100" order="0-"> + <polyline color="#ffffff" width="3" /> + </item> <item type="highway_exit_label" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> Modified: trunk/navit/navit/start.c =================================================================== --- trunk/navit/navit/start.c 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/start.c 2008-09-24 12:06:55 UTC (rev 1412) @@ -28,6 +28,7 @@ #include "main.h" #include "route.h" #include "navigation.h" +#include "track.h" #include "debug.h" #include "event.h" #include "event_glib.h" @@ -82,6 +83,7 @@ #endif route_init(); navigation_init(); + tracking_init(); search_init(); config_file=NULL; opterr=0; //don't bomb out on errors. Modified: trunk/navit/navit/track.c =================================================================== --- trunk/navit/navit/track.c 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/track.c 2008-09-24 12:06:55 UTC (rev 1412) @@ -29,6 +29,7 @@ #include "projection.h" #include "map.h" #include "mapset.h" +#include "plugin.h" struct tracking_line { @@ -48,6 +49,7 @@ struct tracking { struct mapset *ms; + struct map *map; #if 0 struct transformation t; #endif @@ -58,9 +60,9 @@ #endif struct tracking_line *curr_line; int pos; - struct coord curr[2]; - struct coord last_in; - struct coord last_out; + struct coord curr[2], curr_in, curr_out; + int curr_angle; + struct coord last[2], last_in, last_out; }; @@ -73,7 +75,7 @@ struct coord * tracking_get_pos(struct tracking *tr) { - return &tr->last_out; + return &tr->curr_out; } int @@ -204,14 +206,17 @@ } static int -tracking_angle_delta(int vehicle_angle, int street_angle, int dir) +tracking_angle_delta(int vehicle_angle, int street_angle, int flags) { int full=180; int ret; - if (dir) { + if (flags) { full=360; - if (dir < 0) + if (flags & 2) { street_angle=(street_angle+180)%360; + if (flags & 1) + return 360*360; + } } ret=tracking_angle_abs_diff(vehicle_angle, street_angle, full); @@ -232,6 +237,32 @@ return 0; } +static int +tracking_value(struct tracking *tr, struct tracking_line *t, int offset, struct coord *lpnt, int flags) +{ + int value=0; + struct street_data *sd=t->street; + dbg(2, "%d: (0x%x,0x%x)-(0x%x,0x%x)\n", offset, sd->c[offset].x, sd->c[offset].y, sd->c[offset+1].x, sd->c[offset+1].y); + if (flags & 1) { + value+=transform_distance_line_sq(&sd->c[offset], &sd->c[offset+1], &tr->curr_in, lpnt); + if (value >= INT_MAX/2) + return value; + } + if (flags & 2) + value += tracking_angle_delta(tr->curr_angle, t->angle[offset], sd->flags)*angle_factor>>4; + if (flags & 4) { + if (tracking_is_connected(tr->last, &sd->c[offset])) + value += connected_pref; + } + if (flags & 8) { + if (lpnt->x == tr->last_out.x && lpnt->y == tr->last_out.y) + value += nostop_pref; + } + return value; +} + + + int tracking_update(struct tracking *tr, struct coord *c, int angle) { @@ -245,12 +276,17 @@ dbg(1,"enter(%p,%p,%d)\n", tr, c, angle); dbg(1,"c=0x%x,0x%x\n", c->x, c->y); - if (c->x == tr->last_in.x && c->y == tr->last_in.y) { - if (tr->last_out.x && tr->last_out.y) - *c=tr->last_out; + if (c->x == tr->curr_in.x && c->y == tr->curr_in.y) { + if (tr->curr_out.x && tr->curr_out.y) + *c=tr->curr_out; return 0; } - tr->last_in=*c; + tr->last_in=tr->curr_in; + tr->last_out=tr->curr_out; + tr->last[0]=tr->curr[0]; + tr->last[1]=tr->curr[1]; + tr->curr_in=*c; + tr->curr_angle=angle; if (!tr->lines || transform_distance_sq(&tr->last_updated, c) > 250000) { dbg(1, "update\n"); tracking_free_lines(tr); @@ -265,55 +301,35 @@ tr->curr_line=NULL; while (t) { struct street_data *sd=t->street; - int dir = 0; - switch(sd->flags & AF_ONEWAYMASK) { - case 0: - dir=0; - break; - case 1: - dir=1; - break; - case 2: - dir=-1; - break; - case 3: + if ((sd->flags & 3) == 3) { t=t->next; continue; } for (i = 0; i < sd->count-1 ; i++) { - dbg(2, "%d: (0x%x,0x%x)-(0x%x,0x%x)\n", i, sd->c[i].x, sd->c[i].y, sd->c[i+1].x, sd->c[i+1].y); - value=transform_distance_line_sq(&sd->c[i], &sd->c[i+1], c, &lpnt); - if (value < INT_MAX/2) { - value += tracking_angle_delta(angle, t->angle[i], dir)*angle_factor>>4; - if (tracking_is_connected(tr->curr, &sd->c[i])) - value += connected_pref; - if (lpnt.x == tr->last_out.x && lpnt.y == tr->last_out.y) - value += nostop_pref; - if (! tr->curr_line || value < min) { - tr->curr_line=t; - tr->pos=i; - tr->curr[0]=sd->c[i]; - tr->curr[1]=sd->c[i+1]; - dbg(1,"lpnt.x=0x%x,lpnt.y=0x%x pos=%d %d+%d+%d+%d=%d\n", lpnt.x, lpnt.y, i, - transform_distance_line_sq(&sd->c[i], &sd->c[i+1], c, &lpnt), - tracking_angle_delta(angle, t->angle[i], 0)*angle_factor, - tracking_is_connected(tr->curr, &sd->c[i]) ? connected_pref : 0, - lpnt.x == tr->last_out.x && lpnt.y == tr->last_out.y ? nostop_pref : 0, - value - ); - tr->last_out=lpnt; - min=value; - } - - } + value=tracking_value(tr,t,i,&lpnt,-1); + if (value < INT_MAX/2 && (! tr->curr_line || value < min)) { + tr->curr_line=t; + tr->pos=i; + tr->curr[0]=sd->c[i]; + tr->curr[1]=sd->c[i+1]; + dbg(1,"lpnt.x=0x%x,lpnt.y=0x%x pos=%d %d+%d+%d+%d=%d\n", lpnt.x, lpnt.y, i, + transform_distance_line_sq(&sd->c[i], &sd->c[i+1], c, &lpnt), + tracking_angle_delta(angle, t->angle[i], 0)*angle_factor, + tracking_is_connected(tr->last, &sd->c[i]) ? connected_pref : 0, + lpnt.x == tr->last_out.x && lpnt.y == tr->last_out.y ? nostop_pref : 0, + value + ); + tr->curr_out=lpnt; + min=value; + } } t=t->next; } - dbg(1,"tr->curr_line=%p min=%d\n", tr->curr_line, min); + dbg(0,"tr->curr_line=%p min=%d\n", tr->curr_line, min); if (!tr->curr_line || min > offroad_limit_pref) return 0; - dbg(1,"found 0x%x,0x%x\n", tr->last_out.x, tr->last_out.y); - *c=tr->last_out; + dbg(0,"found 0x%x,0x%x\n", tr->curr_out.x, tr->curr_out.y); + *c=tr->curr_out; return 1; } @@ -338,3 +354,245 @@ tracking_free_lines(tr); g_free(tr); } + +struct map * +tracking_get_map(struct tracking *this_) +{ + if (! this_->map) + this_->map=map_new((struct attr*[]){ + &(struct attr){attr_type,{"tracking"}}, + &(struct attr){attr_trackingo,.u.tracking=this_}, + &(struct attr){attr_data,{""}}, + &(struct attr){attr_description,{"Tracking"}}, + NULL}); + return this_->map; +} + + +struct map_priv { + struct tracking *tracking; +}; + +struct map_rect_priv { + struct tracking *tracking; + struct item item; + struct tracking_line *curr,*next; + int coord; + enum attr_type attr_next; + int ccount; + int debug_idx; + char *str; +}; + +static int +tracking_map_item_coord_get(void *priv_data, struct coord *c, int count) +{ + struct map_rect_priv *this=priv_data; + int ret=0; + dbg(1,"enter\n"); + while (this->ccount < 2 && count > 0) { + *c=this->curr->street->c[this->ccount+this->coord]; + dbg(1,"coord %d 0x%x,0x%x\n",this->ccount,c->x,c->y); + this->ccount++; + ret++; + c++; + count--; + } + return ret; +} + +static int +tracking_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr) +{ + struct map_rect_priv *this_=priv_data; + attr->type=attr_type; + struct coord lpnt,*c; + struct tracking *tr=this_->tracking; + int value; + + if (this_->str) { + g_free(this_->str); + this_->str=NULL; + } + + switch(attr_type) { + case attr_debug: + switch(this_->debug_idx) { + case 0: + this_->debug_idx++; + this_->str=attr->u.str=g_strdup_printf("overall: %d",tracking_value(tr, this_->curr, this_->coord, &lpnt, -1)); + return 1; + case 1: + this_->debug_idx++; + c=&this_->curr->street->c[this_->coord]; + value=tracking_value(tr, this_->curr, this_->coord, &lpnt, 1); + this_->str=attr->u.str=g_strdup_printf("distance: (0x%x,0x%x) from (0x%x,0x%x)-(0x%x,0x%x) at (0x%x,0x%x) %d", + tr->curr_in.x, tr->curr_in.y, + c[0].x, c[0].y, c[1].x, c[1].y, + lpnt.x, lpnt.y, value); + return 1; + case 2: + this_->debug_idx++; + this_->str=attr->u.str=g_strdup_printf("angle: %d to %d (flags %d) %d", + tr->curr_angle, this_->curr->angle[this_->coord], this_->curr->street->flags & 3, + tracking_value(tr, this_->curr, this_->coord, &lpnt, 2)); + return 1; + case 3: + this_->debug_idx++; + this_->str=attr->u.str=g_strdup_printf("line %p", this_->curr); + return 1; + default: + this_->attr_next=attr_none; + return 0; + } + case attr_any: + while (this_->attr_next != attr_none) { + if (tracking_map_item_attr_get(priv_data, this_->attr_next, attr)) + return 1; + } + return 0; + default: + attr->type=attr_none; + return 0; + } +} + +static struct item_methods tracking_map_item_methods = { + NULL, + tracking_map_item_coord_get, + NULL, + tracking_map_item_attr_get, +}; + + +static void +tracking_map_destroy(struct map_priv *priv) +{ + g_free(priv); +} + +static void +tracking_map_rect_init(struct map_rect_priv *priv) +{ + priv->next=priv->tracking->lines; + priv->curr=NULL; + priv->coord=0; + priv->item.id_lo=0; + priv->item.id_hi=0; +} + +static struct map_rect_priv * +tracking_map_rect_new(struct map_priv *priv, struct map_selection *sel) +{ + struct tracking *tracking=priv->tracking; + struct map_rect_priv *ret=g_new0(struct map_rect_priv, 1); + ret->tracking=tracking; + tracking_map_rect_init(ret); + ret->item.meth=&tracking_map_item_methods; + ret->item.priv_data=ret; + ret->item.type=type_tracking_100; + return ret; +} + +static void +tracking_map_rect_destroy(struct map_rect_priv *priv) +{ + g_free(priv); +} + +static struct item * +tracking_map_get_item(struct map_rect_priv *priv) +{ + struct item *ret=&priv->item; + int value; + struct coord lpnt; + + if (!priv->next) + return NULL; + if (! priv->curr || priv->coord + 2 >= priv->curr->street->count) { + priv->curr=priv->next; + priv->next=priv->curr->next; + priv->coord=0; + priv->item.id_lo=0; + priv->item.id_hi++; + } else { + priv->coord++; + priv->item.id_lo++; + } + value=tracking_value(priv->tracking, priv->curr, priv->coord, &lpnt, -1); + if (value < 64) + priv->item.type=type_tracking_100; + else if (value < 128) + priv->item.type=type_tracking_90; + else if (value < 256) + priv->item.type=type_tracking_80; + else if (value < 512) + priv->item.type=type_tracking_70; + else if (value < 1024) + priv->item.type=type_tracking_60; + else if (value < 2048) + priv->item.type=type_tracking_50; + else if (value < 4096) + priv->item.type=type_tracking_40; + else if (value < 8192) + priv->item.type=type_tracking_30; + else if (value < 16384) + priv->item.type=type_tracking_20; + else if (value < 32768) + priv->item.type=type_tracking_10; + else + priv->item.type=type_tracking_0; + dbg(1,"item %d %d points\n", priv->coord, priv->curr->street->count); + priv->ccount=0; + priv->attr_next=attr_debug; + priv->debug_idx=0; + return ret; +} + +static struct item * +tracking_map_get_item_byid(struct map_rect_priv *priv, int id_hi, int id_lo) +{ + struct item *ret; + tracking_map_rect_init(priv); + while ((ret=tracking_map_get_item(priv))) { + if (ret->id_hi == id_hi && ret->id_lo == id_lo) + return ret; + } + return NULL; +} + +static struct map_methods tracking_map_meth = { + projection_mg, + "utf-8", + tracking_map_destroy, + tracking_map_rect_new, + tracking_map_rect_destroy, + tracking_map_get_item, + tracking_map_get_item_byid, + NULL, + NULL, + NULL, +}; + +static struct map_priv * +tracking_map_new(struct map_methods *meth, struct attr **attrs) +{ + struct map_priv *ret; + struct attr *tracking_attr; + + tracking_attr=attr_search(attrs, NULL, attr_trackingo); + if (! tracking_attr) + return NULL; + ret=g_new0(struct map_priv, 1); + *meth=tracking_map_meth; + ret->tracking=tracking_attr->u.tracking; + + return ret; +} + + +void +tracking_init(void) +{ + plugin_register_map_type("tracking", tracking_map_new); +} Modified: trunk/navit/navit/track.h =================================================================== --- trunk/navit/navit/track.h 2008-09-24 11:33:11 UTC (rev 1411) +++ trunk/navit/navit/track.h 2008-09-24 12:06:55 UTC (rev 1412) @@ -37,6 +37,8 @@ int tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr); struct item *tracking_get_current_item(struct tracking *_this); void tracking_destroy(struct tracking *tr); +struct map * tracking_get_map(struct tracking *this_); +void tracking_init(void); /* end of prototypes */ #ifdef __cplusplus } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |