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

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

revision 151 by harbaum, Fri Oct 30 20:09:13 2009 UTC revision 161 by harbaum, Thu Nov 5 08:58:28 2009 UTC
# Line 55  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 76  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 173  static void map_draw_cache(GtkWidget *ma Line 174  static void map_draw_cache(GtkWidget *ma
174    }    }
175  }  }
176    
177  static void map_draw_gpx(appdata_t *appdata,  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
178                           GtkWidget *map, gpx_t *gpx,                           GtkWidget *map, gpx_t *gpx,
179                           cache_t *nav, gboolean semi) {                           cache_t *nav, gboolean semi) {
180    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
# Line 183  static void map_draw_gpx(appdata_t *appd Line 184  static void map_draw_gpx(appdata_t *appd
184    
185    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
186    while(cache) {    while(cache) {
187      /* if nav is given draw all other caches semitransparent. */      /* search if we have that cache already in our list/displayed */
188      /* if nav is not given do what semi sais */      int i=0;
189      map_draw_cache(map, cache, nav?(cache != nav):semi);      while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
190          i++;
191    
192        if(!caches[i].id) {
193          /* if nav is given draw all other caches semitransparent. */
194          /* if nav is not given do what semi sais */
195          map_draw_cache(map, cache, nav?(cache != nav):semi);
196          caches[i].id = cache->id;
197        }
198    
199      cache = cache->next;      cache = cache->next;
200    }    }
201  }  }
# Line 194  static void map_draw_gpx(appdata_t *appd Line 204  static void map_draw_gpx(appdata_t *appd
204  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
205    char *name = NULL;    char *name = NULL;
206    
207      int cache_num = gpx_total_caches_global(context->appdata->gpx);
208    
209      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
210        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
211        //     cache_num, context->cache_list_len);
212        g_free(context->caches_displayed);
213        context->caches_displayed = NULL;
214        context->cache_list_len = 0;
215      }
216    
217      /* allocate buffer */
218      if(cache_num && !context->caches_displayed) {
219        context->cache_list_len = cache_num;
220        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
221        printf("allocated space to handle %d map icons\n", cache_num);
222      }
223    
224    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
225      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
226        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 205  static void map_setup(map_context_t *con Line 232  static void map_setup(map_context_t *con
232    
233        /* clear all existing cache images */        /* clear all existing cache images */
234        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
235          memset(context->caches_displayed, 0,
236                 (cache_num+1) * sizeof(cache_display_t));
237    
238        /* draw all geocaches and none is semi-transparent */        /* draw all geocaches and none is semi-transparent */
239        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
240        while(gpx) {        while(gpx) {
241          map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);          map_draw_gpx(context->appdata, context->caches_displayed,
242                         context->widget, gpx, NULL, FALSE);
243          gpx = gpx->next;          gpx = gpx->next;
244        }        }
245    
246          {
247            int i=0;
248            while(context->caches_displayed[i].id) i++;
249            printf("number of caches actually displayed: %d\n", i);
250          }
251    
252        name = g_strdup(_("all"));        name = g_strdup(_("all"));
253        context->state = MAP_ALL;        context->state = MAP_ALL;
254      }      }
# Line 226  static void map_setup(map_context_t *con Line 263  static void map_setup(map_context_t *con
263    
264        /* clear all existing ccahe images */        /* clear all existing ccahe images */
265        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
266          memset(context->caches_displayed, 0,
267                 (cache_num+1) * sizeof(cache_display_t));
268    
269        /* draw all geocaches and all other gpx files are semi-transparent */        /* draw all geocaches and all other gpx files are semi-transparent */
270          map_draw_gpx(context->appdata, context->caches_displayed,
271                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
272    
273        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
274        while(gpx) {        while(gpx) {
275          map_draw_gpx(context->appdata, context->widget, gpx, NULL,          if(gpx != context->appdata->cur_gpx)
276                       gpx != context->appdata->cur_gpx);            map_draw_gpx(context->appdata, context->caches_displayed,
277                           context->widget, gpx, NULL, TRUE);
278    
279          gpx = gpx->next;          gpx = gpx->next;
280        }        }
281    
# Line 241  static void map_setup(map_context_t *con Line 285  static void map_setup(map_context_t *con
285    } else {    } else {
286      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
287    
288      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
289    
290      /* no balloons in this mode */      /* no balloons in this mode */
291      context->balloon = NULL;      context->balloon = NULL;
# Line 249  static void map_setup(map_context_t *con Line 293  static void map_setup(map_context_t *con
293    
294      /* clear all existing ccahe images */      /* clear all existing ccahe images */
295      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
296        memset(context->caches_displayed, 0,
297               (cache_num+1) * sizeof(cache_display_t));
298    
299      /* draw all geocaches and all but selected one are semi-transparent */      /* draw all geocaches and all but selected one are semi-transparent */
300      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
301      while(gpx) {      while(gpx) {
302        map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);        map_draw_gpx(context->appdata, context->caches_displayed,
303                       context->widget, gpx, cache, FALSE);
304        gpx = gpx->next;        gpx = gpx->next;
305      }      }
306    
# Line 432  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 479  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
479                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
480    
481    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
482      g_assert(image_surface);
483    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
484    
485    // Draw the image on the new Context    // Draw the image on the new Context
# Line 696  static void on_window_destroy(GtkWidget Line 744  static void on_window_destroy(GtkWidget
744    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
745    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
746    
747      if(context->caches_displayed) {
748        g_free(context->caches_displayed);
749        context->caches_displayed = NULL;
750      }
751    
752    g_free(context);    g_free(context);
753    appdata->map.context = NULL;    appdata->map.context = NULL;
754  }  }
Legend:
Removed from v.151  
changed lines
  Added in v.161