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

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

revision 189 by harbaum, Tue Nov 17 09:07:17 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 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 90  static void Line 88  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 117  static int dist2pixel(map_context_t *con Line 118  static int dist2pixel(map_context_t *con
118    
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
   static gboolean goto_is_enabled = FALSE;  
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
128      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130      goto_is_enabled = ok;      context->goto_is_enabled = ok;
131    }    }
132    
133    if(ok) {    if(ok) {
# Line 158  static void map_draw_cache(GtkWidget *ma Line 158  static void map_draw_cache(GtkWidget *ma
158    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159    
160    GdkPixbuf *icon = icon_get(type, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
161      GdkPixbuf *over = NULL;
162    
163      if(cache->mine)                   over = icon_get(type, 14);
164      else if(cache->found)             over = icon_get(type, 12);
165      else if(cache->notes) {
166        if(cache->notes->found)         over = icon_get(type, 12);
167        else if(cache->notes->override) over = icon_get(type, 11);
168        else                            over = icon_get(type, 13);
169      }
170    
171      pos_t *pos = &cache->pos;
172    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
173    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
174      GdkPixbuf *over = icon_get(type, 11);      pos = &cache->notes->pos;
175    
176      if(!isnan(pos->lat) && !isnan(pos->lon)) {
177      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
178            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
179        if(over)
180          osm_gps_map_add_image(OSM_GPS_MAP(map),
181                                pos->lat, pos->lon, over);
182      }
183    }
184    
185      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
186            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
187    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
188      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
189          GdkPixbuf *icon =
190            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
191                     wpt->sym:WPT_SYM_REFPOINT);
192    
193        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
194                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
195        }
196    }    }
197  }  }
198    
# Line 195  static void map_draw_gpx(appdata_t *appd Line 216  static void map_draw_gpx(appdata_t *appd
216        /* if nav is not given do what semi sais */        /* if nav is not given do what semi sais */
217        map_draw_cache(map, cache, nav?(cache != nav):semi);        map_draw_cache(map, cache, nav?(cache != nav):semi);
218        caches[i].id = cache->id;        caches[i].id = cache->id;
219    
220          /* also draw waypoints of nav cache */
221          if(nav && cache == nav) {
222            wpt_t *wpt = cache->wpt;
223            while(wpt) {
224              map_draw_wpt(map, cache, wpt);
225              wpt = wpt->next;
226            }
227          }
228      }      }
229    
230      cache = cache->next;      cache = cache->next;
# Line 226  static void map_setup(map_context_t *con Line 256  static void map_setup(map_context_t *con
256      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
257        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
258    
259          /* clear any pending balloon */
260          context->balloon = NULL;
261          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
262    
263  #ifdef OSD_NAV  #ifdef OSD_NAV
264        /* no navigation in this mode */        /* no navigation in this mode */
265        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 291  static void map_setup(map_context_t *con
291      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
292        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
293    
294          /* clear any pending balloon */
295          context->balloon = NULL;
296          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
297    
298  #ifdef OSD_NAV  #ifdef OSD_NAV
299        /* no navigation in this mode */        /* no navigation in this mode */
300        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
301  #endif  #endif
302    
303        /* clear all existing ccahe images */        /* clear all existing cache images */
304        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
305        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
306               (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 326  static void map_setup(map_context_t *con
326    
327      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
328    
329      /* no balloons in this mode */      /* clear any pending balloon */
330      context->balloon = NULL;      context->balloon = NULL;
331      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
332    
# Line 320  static void map_setup(map_context_t *con Line 358  static void map_setup(map_context_t *con
358  #endif  #endif
359    }    }
360    
361      /* also mark geomath position */
362    
363      /* remove all existing appearances of this icon first */
364      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
365                               icon_get(ICON_MISC, 6));
366    
367      if(!isnan(context->appdata->geomath.lat) &&
368         !isnan(context->appdata->geomath.lon))  {
369    
370        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
371                              context->appdata->geomath.lat,
372                              context->appdata->geomath.lon,
373                              icon_get(ICON_MISC, 6));
374      }
375    
376    if(name) {    if(name) {
377      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
378      g_free(name);      g_free(name);
# Line 495  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 548  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
548    
549  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
550  #define ICON_SIZE  ICON_CACHE_TYPE  #define ICON_SIZE  ICON_CACHE_TYPE
 #define LINE_SKIP  7  
551  #else  #else
552  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
 #define LINE_SKIP  12  
553  #endif  #endif
554    
555    #ifndef BIG_BALLOONS
556    #define FONT_SIZE 14.0
557    #else
558    #define FONT_SIZE 22.0
559    #endif
560    #define LINE_SKIP  (FONT_SIZE/4)
561    
562    
563  static void  static void
564  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
565    printf("balloon event: ");    printf("balloon event: ");
# Line 566  balloon_cb(osm_gps_map_balloon_event_t * Line 625  balloon_cb(osm_gps_map_balloon_event_t *
625      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
626    
627      /* everything from here uses the same font */      /* everything from here uses the same font */
628      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
629                                CAIRO_FONT_SLANT_NORMAL,
630                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
 #ifndef BIG_BALLOONS  
 #define FONT_SIZE 14.0  
 #else  
 #define FONT_SIZE 22.0  
 #endif  
631    
632      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
633    
634      if(cache->name) {      if(cache->name) {
635        /* draw cache name */        /* draw cache name */
636        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
637        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
638        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
639        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
640        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
641    
642        /* return to the left border and below text */        /* return to the left border and below text */
643        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
644        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
645      }      }
646    
# Line 613  balloon_cb(osm_gps_map_balloon_event_t * Line 667  balloon_cb(osm_gps_map_balloon_event_t *
667        /* draw terrain stars */        /* draw terrain stars */
668        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
669    
670        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
671      }      }
672    
673      if(cache->difficulty) {      if(cache->difficulty) {
# Line 637  balloon_cb(osm_gps_map_balloon_event_t * Line 691  balloon_cb(osm_gps_map_balloon_event_t *
691    
692        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
693      }      }
694    
695        /* draw container info */
696        /* TODO ... */
697    
698    
699    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
700      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
701             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 700  on_map_button_release_event(GtkWidget *w Line 759  on_map_button_release_event(GtkWidget *w
759    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
760    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
761    /* pretty useless there */    /* pretty useless there */
762    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
763    
764      coord_t coo;      coord_t coo;
765      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 763  static void on_window_destroy(GtkWidget Line 822  static void on_window_destroy(GtkWidget
822      context->caches_displayed = NULL;      context->caches_displayed = NULL;
823    }    }
824    
825      printf("destroy map context\n");
826    g_free(context);    g_free(context);
827    appdata->map.context = NULL;    appdata->map.context = NULL;
828  }  }
# Line 806  static gboolean on_focus_in(GtkWidget *w Line 866  static gboolean on_focus_in(GtkWidget *w
866    return FALSE;    return FALSE;
867  }  }
868    
 #ifdef USE_MAEMO  
869  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
870                           gpointer data) {                           gpointer data) {
871    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
872    
873    printf("map lost focus\n");    printf("map lost focus\n");
874    
875      /* save new map position */
876      gfloat lat, lon;
877      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
878    
879      context->appdata->map.pos.lat = lat;
880      context->appdata->map.pos.lon = lon;
881    
882    #ifdef USE_MAEMO
883    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
884    context->handler_id = 0;    context->handler_id = 0;
885    #endif
886    
887    return FALSE;    return FALSE;
888  }  }
 #endif  
889    
890  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
891    printf("map_update\n");    printf("map_update\n");
# Line 845  void map(appdata_t *appdata) { Line 913  void map(appdata_t *appdata) {
913    }    }
914    
915    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
916      printf("allocated new context at %p\n", context);
917    
918    context->appdata = appdata;    context->appdata = appdata;
919    context->map_complete = FALSE;    context->map_complete = FALSE;
920    context->state = MAP_NONE;    context->state = MAP_NONE;
# Line 912  void map(appdata_t *appdata) { Line 982  void map(appdata_t *appdata) {
982    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
983                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
984    
 #ifdef USE_MAEMO  
985    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
986                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
 #endif  
987    
988    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
989                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
Legend:
Removed from v.189  
changed lines
  Added in v.226