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

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

revision 152 by harbaum, Mon Nov 2 10:53:01 2009 UTC revision 203 by harbaum, Sun Nov 22 20:39:46 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;
157                               cache->type);  
158      GdkPixbuf *icon = icon_get(type, cache->type);
159    
160    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
161    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
162      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
163    
164      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
165            cache->notes->pos.lat, cache->notes->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
# Line 173  static void map_draw_cache(GtkWidget *ma Line 173  static void map_draw_cache(GtkWidget *ma
173    }    }
174  }  }
175    
176  static void map_draw_gpx(appdata_t *appdata,  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
177                           GtkWidget *map, gpx_t *gpx,                           GtkWidget *map, gpx_t *gpx,
178                           cache_t *nav, gboolean semi) {                           cache_t *nav, gboolean semi) {
179    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
# Line 183  static void map_draw_gpx(appdata_t *appd Line 183  static void map_draw_gpx(appdata_t *appd
183    
184    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
185    while(cache) {    while(cache) {
186      /* if nav is given draw all other caches semitransparent. */      /* search if we have that cache already in our list/displayed */
187      /* if nav is not given do what semi sais */      int i=0;
188      map_draw_cache(map, cache, nav?(cache != nav):semi);      while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
189          i++;
190    
191        if(!caches[i].id) {
192          /* if nav is given draw all other caches semitransparent. */
193          /* if nav is not given do what semi sais */
194          map_draw_cache(map, cache, nav?(cache != nav):semi);
195          caches[i].id = cache->id;
196        }
197    
198      cache = cache->next;      cache = cache->next;
199    }    }
200  }  }
# Line 197  static void map_setup(map_context_t *con Line 206  static void map_setup(map_context_t *con
206    int cache_num = gpx_total_caches_global(context->appdata->gpx);    int cache_num = gpx_total_caches_global(context->appdata->gpx);
207    
208    if(context->caches_displayed && (cache_num != context->cache_list_len)) {    if(context->caches_displayed && (cache_num != context->cache_list_len)) {
209        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
210        //     cache_num, context->cache_list_len);
211      g_free(context->caches_displayed);      g_free(context->caches_displayed);
212      context->caches_displayed = NULL;      context->caches_displayed = NULL;
213      context->cache_list_len = 0;      context->cache_list_len = 0;
214    }    }
215    
216    /* allocate buffer */    /* allocate buffer */
217    if(cache_num) {    if(cache_num && !context->caches_displayed) {
218      context->cache_list_len = cache_num;      context->cache_list_len = cache_num;
219      context->caches_displayed = g_new0(cache_display_t, cache_num);      context->caches_displayed = g_new0(cache_display_t, cache_num+1);
220      printf("allocated space to handle %d map icons\n", cache_num);      printf("allocated space to handle %d map icons\n", cache_num);
221    }    }
222    
# Line 213  static void map_setup(map_context_t *con Line 224  static void map_setup(map_context_t *con
224      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
225        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
226    
227          /* clear any pending balloon */
228          context->balloon = NULL;
229          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
230    
231  #ifdef OSD_NAV  #ifdef OSD_NAV
232        /* no navigation in this mode */        /* no navigation in this mode */
233        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
# Line 220  static void map_setup(map_context_t *con Line 235  static void map_setup(map_context_t *con
235    
236        /* clear all existing cache images */        /* clear all existing cache images */
237        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
238          memset(context->caches_displayed, 0,
239                 (cache_num+1) * sizeof(cache_display_t));
240    
241        /* draw all geocaches and none is semi-transparent */        /* draw all geocaches and none is semi-transparent */
242        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
243        while(gpx) {        while(gpx) {
244          map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);          map_draw_gpx(context->appdata, context->caches_displayed,
245                         context->widget, gpx, NULL, FALSE);
246          gpx = gpx->next;          gpx = gpx->next;
247        }        }
248    
249          {
250            int i=0;
251            while(context->caches_displayed[i].id) i++;
252            printf("number of caches actually displayed: %d\n", i);
253          }
254    
255        name = g_strdup(_("all"));        name = g_strdup(_("all"));
256        context->state = MAP_ALL;        context->state = MAP_ALL;
257      }      }
# Line 234  static void map_setup(map_context_t *con Line 259  static void map_setup(map_context_t *con
259      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
260        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
261    
262          /* clear any pending balloon */
263          context->balloon = NULL;
264          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
265    
266  #ifdef OSD_NAV  #ifdef OSD_NAV
267        /* no navigation in this mode */        /* no navigation in this mode */
268        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
269  #endif  #endif
270    
271        /* clear all existing ccahe images */        /* clear all existing cache images */
272        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
273          memset(context->caches_displayed, 0,
274                 (cache_num+1) * sizeof(cache_display_t));
275    
276        /* draw all geocaches and all other gpx files are semi-transparent */        /* draw all geocaches and all other gpx files are semi-transparent */
277          map_draw_gpx(context->appdata, context->caches_displayed,
278                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
279    
280        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
281        while(gpx) {        while(gpx) {
282          map_draw_gpx(context->appdata, context->widget, gpx, NULL,          if(gpx != context->appdata->cur_gpx)
283                       gpx != context->appdata->cur_gpx);            map_draw_gpx(context->appdata, context->caches_displayed,
284                           context->widget, gpx, NULL, TRUE);
285    
286          gpx = gpx->next;          gpx = gpx->next;
287        }        }
288    
# Line 256  static void map_setup(map_context_t *con Line 292  static void map_setup(map_context_t *con
292    } else {    } else {
293      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
294    
295      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
296    
297      /* no balloons in this mode */      /* clear any pending balloon */
298      context->balloon = NULL;      context->balloon = NULL;
299      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
300    
301      /* clear all existing ccahe images */      /* clear all existing ccahe 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,
304               (cache_num+1) * sizeof(cache_display_t));
305    
306      /* draw all geocaches and all but selected one are semi-transparent */      /* draw all geocaches and all but selected one are semi-transparent */
307      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
308      while(gpx) {      while(gpx) {
309        map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);        map_draw_gpx(context->appdata, context->caches_displayed,
310                       context->widget, gpx, cache, FALSE);
311        gpx = gpx->next;        gpx = gpx->next;
312      }      }
313    
# Line 461  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 500  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
500  }  }
501    
502  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
503  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
504    #else
505    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
506    #endif
507    
508    #ifndef BIG_BALLOONS
509    #define FONT_SIZE 14.0
510  #else  #else
511  #define LINE_SKIP  12  #define FONT_SIZE 22.0
512  #endif  #endif
513    #define LINE_SKIP  (FONT_SIZE/4)
514    
515    
516  static void  static void
517  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
# Line 491  balloon_cb(osm_gps_map_balloon_event_t * Line 538  balloon_cb(osm_gps_map_balloon_event_t *
538      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;
539    
540      /* draw the cache type icon ... */      /* draw the cache type icon ... */
541      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
542      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
543    
544      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
545        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
546        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
547      }      }
548    
# Line 531  balloon_cb(osm_gps_map_balloon_event_t * Line 578  balloon_cb(osm_gps_map_balloon_event_t *
578      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
579    
580      /* everything from here uses the same font */      /* everything from here uses the same font */
581      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
582                                CAIRO_FONT_SLANT_NORMAL,
583                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
584  #ifndef BIG_BALLOONS  
585      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  
586    
587      if(cache->name) {      if(cache->name) {
588        /* draw cache name */        /* draw cache name */
589        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
590        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
591        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
592        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
593        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
594    
595        /* return to the left border and below text */        /* return to the left border and below text */
596        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
597        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
598      }      }
599    
600      if(cache->terrain) {      if(cache->terrain) {
601          int text_y = 0, icon_y = 0;
602    
603        /* draw cache rating */        /* draw cache rating */
604        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
605        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
606        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
607        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
608          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
609            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
610          else
611            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
612    
613        /* draw "Terrain:" string */        /* draw "Terrain:" string */
614        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
615        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
616        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
617        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
618        x += extents.width + 2;        x += extents.width + 2;
619    
620        /* draw terrain stars */        /* draw terrain stars */
621        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);  
622    
623        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;  
624      }      }
625    
626      if(cache->difficulty) {      if(cache->difficulty) {
627          int text_y = 0, icon_y = 0;
628    
629        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
630          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
631        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;  
632    
633          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
634            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
635          else
636            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
637    
638        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
639        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
640        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
641        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
642        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
643        x += extents.width + 2;        x += extents.width + 2;
644    
645        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);  
646      }      }
647    
648        /* draw container info */
649        /* TODO ... */
650    
651    
652    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
653      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
654             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 654  on_map_button_release_event(GtkWidget *w Line 712  on_map_button_release_event(GtkWidget *w
712    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
713    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
714    /* pretty useless there */    /* pretty useless there */
715    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
716    
717      coord_t coo;      coord_t coo;
718      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 746  on_window_realize(GtkWidget *widget, gpo Line 804  on_window_realize(GtkWidget *widget, gpo
804    
805  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
806                           gpointer data) {                           gpointer data) {
807      map_context_t *context = (map_context_t*)data;
808    
809    printf("map got focus\n");    printf("map got focus\n");
810    map_setup((map_context_t*)data);  
811    #ifdef USE_MAEMO
812      /* re-enable refresh of map */
813      if(!context->handler_id)
814        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
815    #endif
816    
817      map_setup(context);
818    return FALSE;    return FALSE;
819  }  }
820    
821    #ifdef USE_MAEMO
822    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
823                             gpointer data) {
824      map_context_t *context = (map_context_t*)data;
825    
826      printf("map lost focus\n");
827      gtk_timeout_remove(context->handler_id);
828      context->handler_id = 0;
829    
830      return FALSE;
831    }
832    #endif
833    
834  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
835    printf("map_update\n");    printf("map_update\n");
836  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 844  void map(appdata_t *appdata) { Line 924  void map(appdata_t *appdata) {
924    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
925                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
926    
927    #ifdef USE_MAEMO
928      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
929                       G_CALLBACK(on_focus_out), context);
930    #endif
931    
932    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
933                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
934    
Legend:
Removed from v.152  
changed lines
  Added in v.203