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

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

revision 155 by harbaum, Tue Nov 3 08:38:23 2009 UTC revision 219 by harbaum, Fri Nov 27 17:10:57 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 55  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 76  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 154  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153  }  }
154    
155  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                              cache->type);  
157    
158      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(ICON_MISC, 1);      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),
179                                pos->lat, pos->lon, over);
180      }
181    }
182    
183      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
184            cache->notes->pos.lat, cache->notes->pos.lon, over);  
185    } else {    /* only draw wpts that don't equal the main point */
186      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))    if(pos_differ(&cache->pos, &wpt->pos)) {
187        GdkPixbuf *icon =
188          icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
189                   wpt->sym:WPT_SYM_REFPOINT);
190    
191        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))
192        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
193                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
194    }    }
195  }  }
196    
# Line 193  static void map_draw_gpx(appdata_t *appd Line 214  static void map_draw_gpx(appdata_t *appd
214        /* if nav is not given do what semi sais */        /* if nav is not given do what semi sais */
215        map_draw_cache(map, cache, nav?(cache != nav):semi);        map_draw_cache(map, cache, nav?(cache != nav):semi);
216        caches[i].id = cache->id;        caches[i].id = cache->id;
217    
218          /* also draw waypoints of nav cache */
219          if(nav && cache == nav) {
220            wpt_t *wpt = cache->wpt;
221            while(wpt) {
222              map_draw_wpt(map, cache, wpt);
223              wpt = wpt->next;
224            }
225          }
226      }      }
227    
228      cache = cache->next;      cache = cache->next;
# Line 224  static void map_setup(map_context_t *con Line 254  static void map_setup(map_context_t *con
254      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
255        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
256    
257          /* clear any pending balloon */
258          context->balloon = NULL;
259          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
260    
261  #ifdef OSD_NAV  #ifdef OSD_NAV
262        /* no navigation in this mode */        /* no navigation in this mode */
263        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
# Line 255  static void map_setup(map_context_t *con Line 289  static void map_setup(map_context_t *con
289      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
290        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
291    
292          /* clear any pending balloon */
293          context->balloon = NULL;
294          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
295    
296  #ifdef OSD_NAV  #ifdef OSD_NAV
297        /* no navigation in this mode */        /* no navigation in this mode */
298        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
299  #endif  #endif
300    
301        /* clear all existing ccahe images */        /* clear all existing cache images */
302        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
304               (cache_num+1) * sizeof(cache_display_t));               (cache_num+1) * sizeof(cache_display_t));
# Line 286  static void map_setup(map_context_t *con Line 324  static void map_setup(map_context_t *con
324    
325      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
326    
327      /* no balloons in this mode */      /* clear any pending balloon */
328      context->balloon = NULL;      context->balloon = NULL;
329      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
330    
# Line 492  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 530  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
530  }  }
531    
532  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
533  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
534    #else
535    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
536    #endif
537    
538    #ifndef BIG_BALLOONS
539    #define FONT_SIZE 14.0
540  #else  #else
541  #define LINE_SKIP  12  #define FONT_SIZE 22.0
542  #endif  #endif
543    #define LINE_SKIP  (FONT_SIZE/4)
544    
545    
546  static void  static void
547  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
# Line 522  balloon_cb(osm_gps_map_balloon_event_t * Line 568  balloon_cb(osm_gps_map_balloon_event_t *
568      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
569    
570      /* draw the cache type icon ... */      /* draw the cache type icon ... */
571      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
572      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
573    
574      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
575        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
576        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
577      }      }
578    
# Line 562  balloon_cb(osm_gps_map_balloon_event_t * Line 608  balloon_cb(osm_gps_map_balloon_event_t *
608      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
609    
610      /* everything from here uses the same font */      /* everything from here uses the same font */
611      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
612                                CAIRO_FONT_SLANT_NORMAL,
613                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
614  #ifndef BIG_BALLOONS  
615      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
616    
617      if(cache->name) {      if(cache->name) {
618        /* draw cache name */        /* draw cache name */
619        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
620        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
621        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
622        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
623        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
624    
625        /* return to the left border and below text */        /* return to the left border and below text */
626        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
627        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
628      }      }
629    
630      if(cache->terrain) {      if(cache->terrain) {
631          int text_y = 0, icon_y = 0;
632    
633        /* draw cache rating */        /* draw cache rating */
634        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
635        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
636        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
637        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
638          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
639            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
640          else
641            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
642    
643        /* draw "Terrain:" string */        /* draw "Terrain:" string */
644        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
645        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
646        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
647        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
648        x += extents.width + 2;        x += extents.width + 2;
649    
650        /* draw terrain stars */        /* draw terrain stars */
651        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
652    
653        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
654      }      }
655    
656      if(cache->difficulty) {      if(cache->difficulty) {
657          int text_y = 0, icon_y = 0;
658    
659        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
660          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
661        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
662    
663          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
664            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
665          else
666            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
667    
668        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
669        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
670        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
671        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
672        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
673        x += extents.width + 2;        x += extents.width + 2;
674    
675        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
676      }      }
677    
678        /* draw container info */
679        /* TODO ... */
680    
681    
682    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
683      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
684             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 685  on_map_button_release_event(GtkWidget *w Line 742  on_map_button_release_event(GtkWidget *w
742    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
743    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
744    /* pretty useless there */    /* pretty useless there */
745    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
746    
747      coord_t coo;      coord_t coo;
748      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 777  on_window_realize(GtkWidget *widget, gpo Line 834  on_window_realize(GtkWidget *widget, gpo
834    
835  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
836                           gpointer data) {                           gpointer data) {
837      map_context_t *context = (map_context_t*)data;
838    
839    printf("map got focus\n");    printf("map got focus\n");
840    map_setup((map_context_t*)data);  
841    #ifdef USE_MAEMO
842      /* re-enable refresh of map */
843      if(!context->handler_id)
844        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
845    #endif
846    
847      map_setup(context);
848    return FALSE;    return FALSE;
849  }  }
850    
851    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
852                             gpointer data) {
853      map_context_t *context = (map_context_t*)data;
854    
855      printf("map lost focus\n");
856    
857      /* save new map position */
858      gfloat lat, lon;
859      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
860    
861      context->appdata->map.pos.lat = lat;
862      context->appdata->map.pos.lon = lon;
863    
864    #ifdef USE_MAEMO
865      gtk_timeout_remove(context->handler_id);
866      context->handler_id = 0;
867    #endif
868    
869      return FALSE;
870    }
871    
872  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
873    printf("map_update\n");    printf("map_update\n");
874  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 875  void map(appdata_t *appdata) { Line 962  void map(appdata_t *appdata) {
962    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
963                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
964    
965      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
966                       G_CALLBACK(on_focus_out), context);
967    
968    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
969                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
970    
Legend:
Removed from v.155  
changed lines
  Added in v.219