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

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

revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC revision 136 by harbaum, Mon Oct 19 13:02:41 2009 UTC
# Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
315  #endif  #endif
316    
317  static void  static void
318  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
319    cache_t *cache = (cache_t*)data;    map_context_t *context = (map_context_t*)data;
320      cache_t *cache = context->balloon;
 #if 0  
   /* draw pink background to check clipping */  
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
   
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
321    
322    /* draw the cache type icon ... */    printf("balloon event: ");
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
   
   if(cache->notes && cache->notes->override) {  
     GdkPixbuf *over = icon_get(ICON_MISC, 1);  
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
323    
324    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
325    cairo_text_extents_t extents;      printf("draw\n");
326    
327    if(cache->id) {  #if 0
328      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
329                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
330                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
331                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
332        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
333        cairo_fill_preserve (event->data.draw.cr);
334        cairo_set_line_width (event->data.draw.cr, 0);
335        cairo_stroke (event->data.draw.cr);
336    #endif
337    
338        /* leave a little border top and left */
339        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
340    
341        /* draw the cache type icon ... */
342        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
343        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
344    
345        if(cache->notes && cache->notes->override) {
346          GdkPixbuf *over = icon_get(ICON_MISC, 1);
347          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
348        }
349    
350        /* ... and right of it the waypoint id */
351        cairo_text_extents_t extents;
352    
353        if(cache->id) {
354          cairo_select_font_face (event->data.draw.cr, "Sans",
355                                  CAIRO_FONT_SLANT_NORMAL,
356                                  CAIRO_FONT_WEIGHT_BOLD);
357    
358  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
359      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
360  #else  #else
361      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
362  #endif  #endif
363    
364      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
365    
366      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
367      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
368      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
369      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
370      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
371      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
372      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
373    
374      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
375    } else      } else
376      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
377    
378    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
379    x = rect->x;      x = event->data.draw.rect->x;
380    
381    /* everything from here uses the same font */      /* everything from here uses the same font */
382    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
383                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
384  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
385    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
386  #else  #else
387    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
388  #endif  #endif
389    
390    if(cache->name) {      if(cache->name) {
391      /* draw cache name */        /* draw cache name */
392      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
393      y += extents.height;        y += extents.height;
394      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
395      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
396      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
397      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
398    
399      /* return to the left border and below text */        /* return to the left border and below text */
400      y += LINE_SKIP;        y += LINE_SKIP;
401      x = rect->x;        x = event->data.draw.rect->x;
402    }      }
403    
404    if(cache->terrain) {      if(cache->terrain) {
405      /* draw cache rating */        /* draw cache rating */
406      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
407      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
408      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
409      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
410    
411      /* draw "Terrain:" string */        /* draw "Terrain:" string */
412      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
413      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
414      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
415      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
416      x += extents.width + 2;        x += extents.width + 2;
417    
418      /* draw terrain stars */        /* draw terrain stars */
419      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
420                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
421    
422      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
423      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
424    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
425    
426      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
427      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
428          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
429          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
430    
431          /* draw "Difficulty:" string */
432          cairo_move_to (event->data.draw.cr, x, y);
433          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
434          cairo_show_text (event->data.draw.cr, _(difficulty));
435          cairo_stroke (event->data.draw.cr);
436          x += extents.width + 2;
437    
438          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
439          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
440                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
441        }
442      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
443        printf("click %s event at %d %d\n",
444               event->data.click.down?"down":"up",
445               event->data.click.x, event->data.click.y);
446    
447      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
448        printf("removed\n");
449        context->balloon = NULL;
450    }    }
451  }  }
452    
# Line 438  on_map_button_release_event(GtkWidget *w Line 455  on_map_button_release_event(GtkWidget *w
455                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
456    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
457    
458    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
459      /* and the map is in navigation mode. the balloon is */
460      /* pretty useless there */
461      if(context->press_on && (context->state != MAP_CACHE)) {
462    
463      coord_t coo;      coord_t coo;
464      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
465    
# Line 452  on_map_button_release_event(GtkWidget *w Line 473  on_map_button_release_event(GtkWidget *w
473        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
474        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
475    
476            context->balloon = nearest;
477          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
478                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
   
         osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);  
   
479        }        }
480      }      }
481      context->press_on = NULL;      context->press_on = NULL;
# Line 525  on_window_realize(GtkWidget *widget, gpo Line 544  on_window_realize(GtkWidget *widget, gpo
544  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
545    char *name = NULL;    char *name = NULL;
546    
   /* clear all existing ccahe images */  
   osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
547    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
548      /* draw all geocaches */      if(context->state != MAP_ALL) {
549      gpx_t *gpx = context->appdata->gpx;        printf("map_setp(ALL)\n");
550      while(gpx) {  
551        map_draw_gpx(context->appdata, context->widget, gpx);        /* no navigation in this mode */
552        gpx = gpx->next;        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
553    
554          /* clear all existing ccahe images */
555          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
556    
557          /* draw all geocaches */
558          gpx_t *gpx = context->appdata->gpx;
559          while(gpx) {
560            map_draw_gpx(context->appdata, context->widget, gpx);
561            gpx = gpx->next;
562          }
563          name = g_strdup(_("all"));
564          context->state = MAP_ALL;
565      }      }
     name = g_strdup(_("all"));  
     context->state = MAP_ALL;  
     context->gpx = context->appdata->gpx;  
566    } else if(!context->appdata->cur_cache) {    } else if(!context->appdata->cur_cache) {
567      map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);      if(context->state != MAP_GPX) {
568      name = g_strdup(context->appdata->cur_gpx->name);        printf("map_setp(GPX)\n");
569      context->state = MAP_GPX;  
570      context->gpx = context->appdata->cur_gpx;        /* no navigation in this mode */
571          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
572    
573          /* clear all existing ccahe images */
574          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
575    
576          map_draw_gpx(context->appdata, context->widget,
577                       context->appdata->cur_gpx);
578          name = g_strdup(context->appdata->cur_gpx->name);
579          context->state = MAP_GPX;
580        }
581    } else {    } else {
582      map_draw_cache(context->widget, context->appdata->cur_cache);      cache_t *cache = context->appdata->cur_cache;
583      name = g_strdup(context->appdata->cur_cache->name);  
584        printf("map_setp(CACHE)\n");
585    
586        /* no balloons in this mode */
587        context->balloon = NULL;
588        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
589    
590        /* clear all existing ccahe images */
591        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
592    
593        map_draw_cache(context->widget, cache);
594        name = g_strdup(cache->name);
595      context->state = MAP_CACHE;      context->state = MAP_CACHE;
596      context->cache = context->appdata->cur_cache;  
597        /* navigation in this mode! */
598        pos_t cpos = gpx_cache_pos(cache);
599        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
600                                  context->appdata->imperial,
601                                  cpos.lat, cpos.lon, cache->name);
602    }    }
603    
604    char *title = g_strdup_printf(_("Map - %s"), name);    if(name) {
605    g_free(name);      char *title = g_strdup_printf(_("Map - %s"), name);
606        g_free(name);
607    
608    gtk_window_set_title(GTK_WINDOW(context->window), title);      gtk_window_set_title(GTK_WINDOW(context->window), title);
609    
610    g_free(title);      g_free(title);
611      } else
612        printf("map_setup(keep)\n");
613  }  }
614    
615  /* on maemo a window is either on top or completely invisible. this means that */  /* on maemo a window is either on top or completely invisible. this means that */
# Line 563  static void map_setup(map_context_t *con Line 617  static void map_setup(map_context_t *con
617  /* is different and we always update */  /* is different and we always update */
618  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
619                           gpointer data) {                           gpointer data) {
620    map_context_t *context = (map_context_t*)data;    printf("map got focus\n");
621      map_setup((map_context_t*)data);
   printf("map focus in!\n");  
   
622    return FALSE;    return FALSE;
623  }  }
624    
625  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
626    if(appdata->map.context) {  #ifndef USE_MAEMO
627      printf("map update\n");    if(appdata->map.context)
628    }      map_setup(appdata->map.context);
629    #endif
630  }  }
631    
632  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
# Line 590  void map(appdata_t *appdata) { Line 643  void map(appdata_t *appdata) {
643    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
644    context->appdata = appdata;    context->appdata = appdata;
645    context->map_complete = FALSE;    context->map_complete = FALSE;
646      context->state = MAP_NONE;
647    
648    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
649    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
Legend:
Removed from v.129  
changed lines
  Added in v.136