Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 190 by harbaum, Tue Nov 17 10:22:41 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 24  Line 24 
24    
25  /*  /*
26   * TODO:   * TODO:
  * - draw caches only once  
  * - prefer duplicates from selected files  
27   * - make semi-transparent caches selectable   * - make semi-transparent caches selectable
28   */   */
29    
# Line 158  static void map_draw_cache(GtkWidget *ma Line 156  static void map_draw_cache(GtkWidget *ma
156    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157    
158    GdkPixbuf *icon = icon_get(type, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
159      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
171    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
172      GdkPixbuf *over = icon_get(type, 11);      pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
176            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
177        if(over)
178      osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
179            cache->notes->pos.lat, cache->notes->pos.lon, over);                              pos->lat, pos->lon, over);
   } else {  
     if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))  
       osm_gps_map_add_image(OSM_GPS_MAP(map),  
                             cache->pos.lat, cache->pos.lon, icon);  
180    }    }
181  }  }
182    
# Line 226  static void map_setup(map_context_t *con Line 231  static void map_setup(map_context_t *con
231      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
232        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
233    
234          /* clear any pending balloon */
235          context->balloon = NULL;
236          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
237    
238  #ifdef OSD_NAV  #ifdef OSD_NAV
239        /* no navigation in this mode */        /* no navigation in this mode */
240        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
# Line 257  static void map_setup(map_context_t *con Line 266  static void map_setup(map_context_t *con
266      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
267        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
268    
269          /* clear any pending balloon */
270          context->balloon = NULL;
271          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
272    
273  #ifdef OSD_NAV  #ifdef OSD_NAV
274        /* no navigation in this mode */        /* no navigation in this mode */
275        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
276  #endif  #endif
277    
278        /* clear all existing ccahe images */        /* clear all existing cache images */
279        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
280        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
281               (cache_num+1) * sizeof(cache_display_t));               (cache_num+1) * sizeof(cache_display_t));
# Line 288  static void map_setup(map_context_t *con Line 301  static void map_setup(map_context_t *con
301    
302      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
303    
304      /* no balloons in this mode */      /* clear any pending balloon */
305      context->balloon = NULL;      context->balloon = NULL;
306      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
307    
# Line 495  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 508  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
508    
509  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
510  #define ICON_SIZE  ICON_CACHE_TYPE  #define ICON_SIZE  ICON_CACHE_TYPE
 #define LINE_SKIP  7  
511  #else  #else
512  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
 #define LINE_SKIP  7  
513  #endif  #endif
514    
515    #ifndef BIG_BALLOONS
516    #define FONT_SIZE 14.0
517    #else
518    #define FONT_SIZE 22.0
519    #endif
520    #define LINE_SKIP  (FONT_SIZE/4)
521    
522    
523  static void  static void
524  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
525    printf("balloon event: ");    printf("balloon event: ");
# Line 570  balloon_cb(osm_gps_map_balloon_event_t * Line 589  balloon_cb(osm_gps_map_balloon_event_t *
589                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
590                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
591    
 #ifndef BIG_BALLOONS  
 #define FONT_SIZE 14.0  
 #else  
 #define FONT_SIZE 22.0  
 #endif  
   
592      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
593    
594      if(cache->name) {      if(cache->name) {
595        /* draw cache name */        /* draw cache name */
596        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
597        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
598        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
599        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
600        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
601    
602        /* return to the left border and below text */        /* return to the left border and below text */
603        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
604        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
605      }      }
606    
# Line 615  balloon_cb(osm_gps_map_balloon_event_t * Line 627  balloon_cb(osm_gps_map_balloon_event_t *
627        /* draw terrain stars */        /* draw terrain stars */
628        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
629    
630        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
631      }      }
632    
633      if(cache->difficulty) {      if(cache->difficulty) {
# Line 639  balloon_cb(osm_gps_map_balloon_event_t * Line 651  balloon_cb(osm_gps_map_balloon_event_t *
651    
652        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
653      }      }
654    
655        /* draw container info */
656        /* TODO ... */
657    
658    
659    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
660      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
661             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 702  on_map_button_release_event(GtkWidget *w Line 719  on_map_button_release_event(GtkWidget *w
719    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
720    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
721    /* pretty useless there */    /* pretty useless there */
722    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
723    
724      coord_t coo;      coord_t coo;
725      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
Legend:
Removed from v.190  
changed lines
  Added in v.205