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 233 by harbaum, Wed Dec 9 19:45:36 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;
121    static gboolean goto_is_enabled = FALSE;  
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
134      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136      goto_is_enabled = ok;      context->goto_is_enabled = ok;
137    }    }
138    
139    if(ok) {    if(ok) {
# Line 158  static void map_draw_cache(GtkWidget *ma Line 164  static void map_draw_cache(GtkWidget *ma
164    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165    
166    GdkPixbuf *icon = icon_get(type, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
167      GdkPixbuf *over = NULL;
168    
169      if(cache->mine)                   over = icon_get(type, 14);
170      else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172        if(cache->notes->found)         over = icon_get(type, 12);
173        else if(cache->notes->override) over = icon_get(type, 11);
174        else                            over = icon_get(type, 13);
175      }
176    
177      pos_t *pos = &cache->pos;
178    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
179    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
180      GdkPixbuf *over = icon_get(type, 11);      pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
184            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
185        if(over)
186          osm_gps_map_add_image(OSM_GPS_MAP(map),
187                                pos->lat, pos->lon, over);
188      }
189    }
190    
191      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
193    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
194      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
200                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
201        }
202    }    }
203  }  }
204    
# Line 195  static void map_draw_gpx(appdata_t *appd Line 222  static void map_draw_gpx(appdata_t *appd
222        /* if nav is not given do what semi sais */        /* if nav is not given do what semi sais */
223        map_draw_cache(map, cache, nav?(cache != nav):semi);        map_draw_cache(map, cache, nav?(cache != nav):semi);
224        caches[i].id = cache->id;        caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234      }      }
235    
236      cache = cache->next;      cache = cache->next;
# Line 226  static void map_setup(map_context_t *con Line 262  static void map_setup(map_context_t *con
262      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
263        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
264    
265          /* clear any pending balloon */
266          context->balloon = NULL;
267          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
268    
269  #ifdef OSD_NAV  #ifdef OSD_NAV
270        /* no navigation in this mode */        /* no navigation in this mode */
271        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 297  static void map_setup(map_context_t *con
297      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
298        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
299    
300          /* clear any pending balloon */
301          context->balloon = NULL;
302          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
303    
304  #ifdef OSD_NAV  #ifdef OSD_NAV
305        /* no navigation in this mode */        /* no navigation in this mode */
306        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
307  #endif  #endif
308    
309        /* clear all existing ccahe images */        /* clear all existing cache images */
310        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
311        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
312               (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 332  static void map_setup(map_context_t *con
332    
333      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
334    
335      /* no balloons in this mode */      /* clear any pending balloon */
336      context->balloon = NULL;      context->balloon = NULL;
337      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
338    
# Line 320  static void map_setup(map_context_t *con Line 364  static void map_setup(map_context_t *con
364  #endif  #endif
365    }    }
366    
367      /* also mark geomath position */
368    
369      /* remove all existing appearances of this icon first */
370      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                               icon_get(ICON_MISC, 4));
372    
373      if(!isnan(context->appdata->geomath.lat) &&
374         !isnan(context->appdata->geomath.lon))  {
375    
376        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377                              context->appdata->geomath.lat,
378                              context->appdata->geomath.lon,
379                              icon_get(ICON_MISC, 4));
380      }
381    
382    if(name) {    if(name) {
383      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
384      g_free(name);      g_free(name);
# Line 495  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 554  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
554    
555  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
556  #define ICON_SIZE  ICON_CACHE_TYPE  #define ICON_SIZE  ICON_CACHE_TYPE
 #define LINE_SKIP  7  
557  #else  #else
558  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
 #define LINE_SKIP  12  
559  #endif  #endif
560    
561    #ifndef BIG_BALLOONS
562    #define FONT_SIZE 14.0
563    #else
564    #define FONT_SIZE 22.0
565    #endif
566    #define LINE_SKIP  (FONT_SIZE/4)
567    
568    
569  static void  static void
570  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
571    printf("balloon event: ");    printf("balloon event: ");
# Line 566  balloon_cb(osm_gps_map_balloon_event_t * Line 631  balloon_cb(osm_gps_map_balloon_event_t *
631      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
632    
633      /* everything from here uses the same font */      /* everything from here uses the same font */
634      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
635                                CAIRO_FONT_SLANT_NORMAL,
636                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
 #ifndef BIG_BALLOONS  
 #define FONT_SIZE 14.0  
 #else  
 #define FONT_SIZE 22.0  
 #endif  
637    
638      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
639    
640      if(cache->name) {      if(cache->name) {
641        /* draw cache name */        /* draw cache name */
642        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
643        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
644        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
645        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
646        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
647    
648        /* return to the left border and below text */        /* return to the left border and below text */
649        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
650        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
651      }      }
652    
# Line 613  balloon_cb(osm_gps_map_balloon_event_t * Line 673  balloon_cb(osm_gps_map_balloon_event_t *
673        /* draw terrain stars */        /* draw terrain stars */
674        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
675    
676        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
677      }      }
678    
679      if(cache->difficulty) {      if(cache->difficulty) {
# Line 637  balloon_cb(osm_gps_map_balloon_event_t * Line 697  balloon_cb(osm_gps_map_balloon_event_t *
697    
698        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
699      }      }
700    
701        /* draw container info */
702        /* TODO ... */
703    
704    
705    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
706      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
707             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 700  on_map_button_release_event(GtkWidget *w Line 765  on_map_button_release_event(GtkWidget *w
765    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
766    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
767    /* pretty useless there */    /* pretty useless there */
768    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
769    
770      coord_t coo;      coord_t coo;
771      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 828  static void on_window_destroy(GtkWidget
828      context->caches_displayed = NULL;      context->caches_displayed = NULL;
829    }    }
830    
831      printf("destroy map context\n");
832    g_free(context);    g_free(context);
833    appdata->map.context = NULL;    appdata->map.context = NULL;
834  }  }
# Line 806  static gboolean on_focus_in(GtkWidget *w Line 872  static gboolean on_focus_in(GtkWidget *w
872    return FALSE;    return FALSE;
873  }  }
874    
 #ifdef USE_MAEMO  
875  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
876                           gpointer data) {                           gpointer data) {
877    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
878    
879    printf("map lost focus\n");    printf("map lost focus\n");
880    
881      /* save new map position */
882      gfloat lat, lon;
883      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
884    
885      context->appdata->map.pos.lat = lat;
886      context->appdata->map.pos.lon = lon;
887    
888    #ifdef USE_MAEMO
889    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
890    context->handler_id = 0;    context->handler_id = 0;
891    #endif
892    
893    return FALSE;    return FALSE;
894  }  }
 #endif  
895    
896  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
897    printf("map_update\n");    printf("map_update\n");
# Line 845  void map(appdata_t *appdata) { Line 919  void map(appdata_t *appdata) {
919    }    }
920    
921    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
922      printf("allocated new context at %p\n", context);
923    
924    context->appdata = appdata;    context->appdata = appdata;
925    context->map_complete = FALSE;    context->map_complete = FALSE;
926    context->state = MAP_NONE;    context->state = MAP_NONE;
# Line 912  void map(appdata_t *appdata) { Line 988  void map(appdata_t *appdata) {
988    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
989                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
990    
 #ifdef USE_MAEMO  
991    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
992                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
 #endif  
993    
994    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
995                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
Legend:
Removed from v.189  
changed lines
  Added in v.233