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

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

revision 149 by harbaum, Thu Oct 29 13:59:16 2009 UTC revision 152 by harbaum, Mon Nov 2 10:53:01 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23   */   */
24    
25    /*
26     * TODO:
27     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 146  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153    return TRUE;    return TRUE;
154  }  }
155    
156  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
157    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
158                                 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) {
# Line 165  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, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
180      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
181      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 173  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      map_draw_cache(map, cache);      /* if nav is given draw all other caches semitransparent. */
187        /* if nav is not given do what semi sais */
188        map_draw_cache(map, cache, nav?(cache != nav):semi);
189      cache = cache->next;      cache = cache->next;
190    }    }
191  }  }
# Line 182  static void map_draw_gpx(appdata_t *appd Line 194  static void map_draw_gpx(appdata_t *appd
194  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
195    char *name = NULL;    char *name = NULL;
196    
197      int cache_num = gpx_total_caches_global(context->appdata->gpx);
198    
199      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
200        g_free(context->caches_displayed);
201        context->caches_displayed = NULL;
202        context->cache_list_len = 0;
203      }
204    
205      /* allocate buffer */
206      if(cache_num) {
207        context->cache_list_len = cache_num;
208        context->caches_displayed = g_new0(cache_display_t, cache_num);
209        printf("allocated space to handle %d map icons\n", cache_num);
210      }
211    
212    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
213      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
214        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 191  static void map_setup(map_context_t *con Line 218  static void map_setup(map_context_t *con
218        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
219  #endif  #endif
220    
221        /* clear all existing ccahe images */        /* clear all existing cache images */
222        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
223    
224        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
225        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
226        while(gpx) {        while(gpx) {
227          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);
228          gpx = gpx->next;          gpx = gpx->next;
229        }        }
230        name = g_strdup(_("all"));        name = g_strdup(_("all"));
# Line 215  static void map_setup(map_context_t *con Line 242  static void map_setup(map_context_t *con
242        /* clear all existing ccahe images */        /* clear all existing ccahe images */
243        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
244    
245        map_draw_gpx(context->appdata, context->widget,        /* draw all geocaches and all other gpx files are semi-transparent */
246                     context->appdata->cur_gpx);        gpx_t *gpx = context->appdata->gpx;
247          while(gpx) {
248            map_draw_gpx(context->appdata, context->widget, gpx, NULL,
249                         gpx != context->appdata->cur_gpx);
250            gpx = gpx->next;
251          }
252    
253        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
254        context->state = MAP_GPX;        context->state = MAP_GPX;
255      }      }
# Line 232  static void map_setup(map_context_t *con Line 265  static void map_setup(map_context_t *con
265      /* clear all existing ccahe images */      /* clear all existing ccahe images */
266      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267    
268      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
269        gpx_t *gpx = context->appdata->gpx;
270        while(gpx) {
271          map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);
272          gpx = gpx->next;
273        }
274    
275      name = g_strdup(cache->name);      name = g_strdup(cache->name);
276      context->state = MAP_CACHE;      context->state = MAP_CACHE;
277    
# Line 408  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 447  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
447                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
448    
449    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
450      g_assert(image_surface);
451    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
452    
453    // Draw the image on the new Context    // Draw the image on the new Context
# Line 672  static void on_window_destroy(GtkWidget Line 712  static void on_window_destroy(GtkWidget
712    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
713    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
714    
715      if(context->caches_displayed) {
716        g_free(context->caches_displayed);
717        context->caches_displayed = NULL;
718      }
719    
720    g_free(context);    g_free(context);
721    appdata->map.context = NULL;    appdata->map.context = NULL;
722  }  }
Legend:
Removed from v.149  
changed lines
  Added in v.152