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 220 by harbaum, Sat Nov 28 14:20:28 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),
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);    /* only draw wpts that don't equal the main point */
185    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
186      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
187          GdkPixbuf *icon =
188            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
189                     wpt->sym:WPT_SYM_REFPOINT);
190    
191        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
192                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
193        }
194    }    }
195  }  }
196    
# Line 195  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 226  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 257  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 288  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 320  static void map_setup(map_context_t *con Line 356  static void map_setup(map_context_t *con
356  #endif  #endif
357    }    }
358    
359      /* also mark geomath position */
360    
361      /* remove all existing appearances of this icon first */
362      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
363                               icon_get(ICON_MISC, 6));
364    
365      if(!isnan(context->appdata->geomath.lat) &&
366         !isnan(context->appdata->geomath.lon))  {
367    
368        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
369                              context->appdata->geomath.lat,
370                              context->appdata->geomath.lon,
371                              icon_get(ICON_MISC, 6));
372      }
373    
374    if(name) {    if(name) {
375      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
376      g_free(name);      g_free(name);
# Line 495  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 546  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
546    
547  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
548  #define ICON_SIZE  ICON_CACHE_TYPE  #define ICON_SIZE  ICON_CACHE_TYPE
 #define LINE_SKIP  7  
549  #else  #else
550  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
 #define LINE_SKIP  12  
551  #endif  #endif
552    
553    #ifndef BIG_BALLOONS
554    #define FONT_SIZE 14.0
555    #else
556    #define FONT_SIZE 22.0
557    #endif
558    #define LINE_SKIP  (FONT_SIZE/4)
559    
560    
561  static void  static void
562  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
563    printf("balloon event: ");    printf("balloon event: ");
# Line 566  balloon_cb(osm_gps_map_balloon_event_t * Line 623  balloon_cb(osm_gps_map_balloon_event_t *
623      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
624    
625      /* everything from here uses the same font */      /* everything from here uses the same font */
626      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
627                                CAIRO_FONT_SLANT_NORMAL,
628                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
 #ifndef BIG_BALLOONS  
 #define FONT_SIZE 14.0  
 #else  
 #define FONT_SIZE 22.0  
 #endif  
629    
630      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
631    
632      if(cache->name) {      if(cache->name) {
633        /* draw cache name */        /* draw cache name */
634        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
635        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
636        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
637        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
638        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
639    
640        /* return to the left border and below text */        /* return to the left border and below text */
641        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
642        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
643      }      }
644    
# Line 613  balloon_cb(osm_gps_map_balloon_event_t * Line 665  balloon_cb(osm_gps_map_balloon_event_t *
665        /* draw terrain stars */        /* draw terrain stars */
666        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
667    
668        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
669      }      }
670    
671      if(cache->difficulty) {      if(cache->difficulty) {
# Line 637  balloon_cb(osm_gps_map_balloon_event_t * Line 689  balloon_cb(osm_gps_map_balloon_event_t *
689    
690        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
691      }      }
692    
693        /* draw container info */
694        /* TODO ... */
695    
696    
697    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
698      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
699             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 700  on_map_button_release_event(GtkWidget *w Line 757  on_map_button_release_event(GtkWidget *w
757    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
758    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
759    /* pretty useless there */    /* pretty useless there */
760    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
761    
762      coord_t coo;      coord_t coo;
763      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 806  static gboolean on_focus_in(GtkWidget *w Line 863  static gboolean on_focus_in(GtkWidget *w
863    return FALSE;    return FALSE;
864  }  }
865    
 #ifdef USE_MAEMO  
866  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
867                           gpointer data) {                           gpointer data) {
868    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
869    
870    printf("map lost focus\n");    printf("map lost focus\n");
871    
872      /* save new map position */
873      gfloat lat, lon;
874      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
875    
876      context->appdata->map.pos.lat = lat;
877      context->appdata->map.pos.lon = lon;
878    
879    #ifdef USE_MAEMO
880    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
881    context->handler_id = 0;    context->handler_id = 0;
882    #endif
883    
884    return FALSE;    return FALSE;
885  }  }
 #endif  
886    
887  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
888    printf("map_update\n");    printf("map_update\n");
# Line 912  void map(appdata_t *appdata) { Line 977  void map(appdata_t *appdata) {
977    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
978                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
979    
 #ifdef USE_MAEMO  
980    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
981                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
 #endif  
982    
983    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
984                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
Legend:
Removed from v.189  
changed lines
  Added in v.220