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

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

revision 41 by harbaum, Mon Aug 3 14:21:57 2009 UTC revision 45 by harbaum, Tue Aug 4 19:27:39 2009 UTC
# Line 24  Line 24 
24  #include "osm-gps-map.h"  #include "osm-gps-map.h"
25  #endif  #endif
26    
27    /* equatorial radius in meters */
28    #define EQ_RADIUS     (6378137.0)
29    
30    #define RAD2DEG(a)  (((a)*180.0)/M_PI)
31    #define DEG2RAD(a)  (((a)*M_PI)/180.0)
32    
33  typedef struct {  typedef struct {
34    appdata_t *appdata;    appdata_t *appdata;
35    GtkWidget *widget;    GtkWidget *widget;
36    GtkWidget *zoomin, *zoomout, *gps;    GtkWidget *zoomin, *zoomout, *gps;
37    gint handler_id;    gint handler_id;
38      cache_t *press_on;
39  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
40    GtkWidget *old_view;    GtkWidget *old_view;
41  #endif  #endif
# Line 115  static GtkWidget Line 122  static GtkWidget
122                  char *tooltip) {                  char *tooltip) {
123    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
124    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
125                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));
126    g_signal_connect(button, "clicked", cb, data);    g_signal_connect(button, "clicked", cb, data);
127  #ifndef USE_MAEMO  #ifndef USE_MAEMO
128    gtk_widget_set_tooltip_text(button, tooltip);    gtk_widget_set_tooltip_text(button, tooltip);
# Line 192  on_button_press_event(GtkWidget *widget, Line 199  on_button_press_event(GtkWidget *widget,
199                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
200    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
201    
202    printf("overlay button press(in = %d)\n", in);    printf("overlay button press (in = %d)\n", in);
203    return !in;    return !in;
204  }  }
205    
# Line 201  on_button_release_event(GtkWidget *widge Line 208  on_button_release_event(GtkWidget *widge
208                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
209    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
210    
211    printf("overlay button release(in = %d)\n", in);    printf("overlay button release (in = %d)\n", in);
212    
213    if(!in) {    if(!in) {
214      printf("destroying popup\n");      printf("destroying popup\n");
# Line 235  run_unmap_handler(GtkWindow *window, pop Line 242  run_unmap_handler(GtkWindow *window, pop
242    shutdown_loop(context);    shutdown_loop(context);
243  }  }
244    
245  void cache_popup(appdata_t *appdata, cache_t *cache) {  void cache_popup(map_context_t *mcontext, cache_t *cache) {
246    popup_context_t context;    popup_context_t pcontext;
247    context.appdata = appdata;    pcontext.appdata = mcontext->appdata;
248    
249    context.window = gtk_window_new(GTK_WINDOW_POPUP);    pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);
250    gtk_widget_realize(context.window);    gtk_widget_realize(pcontext.window);
251    gtk_window_set_default_size(GTK_WINDOW(context.window),    gtk_window_set_default_size(GTK_WINDOW(pcontext.window),
252                                POPUP_WIDTH, POPUP_HEIGHT);                                POPUP_WIDTH, POPUP_HEIGHT);
253    gtk_window_resize(GTK_WINDOW(context.window),    gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT);
254                      POPUP_WIDTH, POPUP_HEIGHT);    //  gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE);
255    //  gtk_window_set_resizable(GTK_WINDOW(context.window), FALSE);    gtk_window_set_transient_for(GTK_WINDOW(pcontext.window),
256    gtk_window_set_transient_for(GTK_WINDOW(context.window),                                 GTK_WINDOW(mcontext->appdata->window));
257                                 GTK_WINDOW(appdata->window));    gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE);
258    gtk_window_set_keep_above(GTK_WINDOW(context.window), TRUE);    gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE);
259    gtk_window_set_destroy_with_parent(GTK_WINDOW(context.window), TRUE);    gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC);
260    gtk_window_set_gravity(GTK_WINDOW(context.window), GDK_GRAVITY_STATIC);    gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE);
   gtk_window_set_modal(GTK_WINDOW(context.window), TRUE);  
261    
262    /* connect events */    /* connect events */
263    g_signal_connect(G_OBJECT(context.window), "button-press-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-press-event",
264                     G_CALLBACK(on_button_press_event), &context);                     G_CALLBACK(on_button_press_event), &pcontext);
265    g_signal_connect(G_OBJECT(context.window), "button-release-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-release-event",
266                     G_CALLBACK(on_button_release_event), &context);                     G_CALLBACK(on_button_release_event), &pcontext);
267    g_signal_connect(G_OBJECT(context.window), "delete-event",    g_signal_connect(G_OBJECT(pcontext.window), "delete-event",
268                     G_CALLBACK(run_delete_handler), &context);                     G_CALLBACK(run_delete_handler), &pcontext);
269    g_signal_connect(G_OBJECT(context.window), "destroy",    g_signal_connect(G_OBJECT(pcontext.window), "destroy",
270                     G_CALLBACK(run_destroy_handler), &context);                     G_CALLBACK(run_destroy_handler), &pcontext);
271    g_signal_connect(G_OBJECT(context.window), "unmap",    g_signal_connect(G_OBJECT(pcontext.window), "unmap",
272                     G_CALLBACK(run_unmap_handler), &context);                     G_CALLBACK(run_unmap_handler), &pcontext);
273    
274    gdk_pointer_grab(context.window->window, TRUE,    gdk_pointer_grab(pcontext.window->window, TRUE,
275       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,
276                     NULL, NULL, GDK_CURRENT_TIME);                     NULL, NULL, GDK_CURRENT_TIME);
277    gtk_grab_add(context.window);    gtk_grab_add(pcontext.window);
   
   //  gint x, y;  
   //  gdk_window_get_origin(button->window, &x, &y);  
   
   //  gtk_window_move(GTK_WINDOW(context.window),  
   //              x + button->allocation.x,  
   //              y + button->allocation.y - HEIGHT);  
278    
279      /* check whether cache is in upper or lower half of window */
280      gint x, y, sx, sy;
281      osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),
282                                       cache->pos.lat, cache->pos.lon,
283                                       &sx, &sy);
284    
285      printf("screen pos %d/%d\n", sx, sy);
286    
287    gtk_window_move(GTK_WINDOW(context.window),    gdk_window_get_origin(mcontext->widget->window, &x, &y);
288                    100,    printf("window = %d/%d +%d+%d %d*%d\n", x, y,
289                    100);           mcontext->widget->allocation.x,
290             mcontext->widget->allocation.y,
291             mcontext->widget->allocation.width,
292             mcontext->widget->allocation.height
293             );
294    
295      gint ax = 0, ay = 0;
296      if(sx > mcontext->widget->allocation.width/2)
297        ax = POPUP_WIDTH;
298    
299      if(sy > mcontext->widget->allocation.height/2)
300        ay = POPUP_HEIGHT;
301    
302      gtk_window_move(GTK_WINDOW(pcontext.window),
303                      x + mcontext->widget->allocation.x + sx - ax,
304                      y + mcontext->widget->allocation.y + sy - ay);
305    
306    /* a frame with a vscale inside */    /* a frame with a vscale inside */
307    GtkWidget *frame = gtk_frame_new(NULL);    GtkWidget *frame = gtk_frame_new(NULL);
308    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
309    
310    gtk_container_add(GTK_CONTAINER(frame), gtk_label_new(cache->name));    gtk_container_add(GTK_CONTAINER(frame), gtk_label_new(cache->name));
311    gtk_container_add(GTK_CONTAINER(context.window), frame);    gtk_container_add(GTK_CONTAINER(pcontext.window), frame);
312    
313    gtk_widget_show_all(context.window);    gtk_widget_show_all(pcontext.window);
314    
315    /* handle this popup until it's gone */    /* handle this popup until it's gone */
316    
317    context.loop = g_main_loop_new(NULL, FALSE);    pcontext.loop = g_main_loop_new(NULL, FALSE);
318    
319    GDK_THREADS_LEAVE();    GDK_THREADS_LEAVE();
320    g_main_loop_run(context.loop);    g_main_loop_run(pcontext.loop);
321    GDK_THREADS_ENTER();    GDK_THREADS_ENTER();
322    
323    g_main_loop_unref(context.loop);    g_main_loop_unref(pcontext.loop);
324    
325    printf("cache popup removed\n");    printf("cache popup removed\n");
326  }  }
327    
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
   
328  static void  static void
329  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
330                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 354  pos_t coord2pos(coord_t coo) { Line 373  pos_t coord2pos(coord_t coo) {
373    return pos;    return pos;
374  }  }
375    
376    static int dist2pixel(map_context_t *context, float km, float lat) {
377      int zoom;
378      g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
379    
380      /* world at zoom 1 == 512 pixels */
381      float m_per_pix =
382        cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));
383    
384      return 1000.0*km/m_per_pix;
385    }
386    
387    #define CLICK_FUZZ (16)
388    
389  static gboolean  static gboolean
390  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
391                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
392    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
393    
394    pos_t pos =    /* got a press event without release event? eat it! */
395      coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));    if(context->press_on != NULL) {
396        printf("PRESS: already\n");
397        return TRUE;
398      }
399    
400    printf("clicked at %f/%f\n", pos.lat, pos.lon);    pos_t pos =
401        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
402    
403      cache_t *nearest = map_closest(context, &pos);
404      if(nearest) {
405        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
406        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
407          context->press_on = nearest;
408      }
409    
410    return FALSE;    return FALSE;
411  }  }
412    
413  static gboolean  static gboolean
414  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
415                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
416    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(context->press_on) {
417        OsmGpsMap *map = OSM_GPS_MAP(context->widget);
418    
419    pos_t pos =      pos_t pos =
420      coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
   
   printf("released at %f/%f\n", pos.lat, pos.lon);  
421    
422    /* return true if we clicked a cache */      cache_t *nearest = map_closest(context, &pos);
423    /* ... */      if(nearest && nearest == context->press_on) {
424          float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
425    cache_t *nearest = map_closest(context, &pos);        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
426            cache_popup(context, nearest);
427    if(nearest) {      }
428      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      context->press_on = NULL;
   
     printf("nearest = %s, distance = %fkm\n", nearest->name, dist);  
   
     cache_popup(context->appdata, nearest);  
   
     return TRUE;  
429    }    }
430    
431    return FALSE;    return FALSE;
432  }  }
433    
434    
435  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
436  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
437    printf("destroy map view\n");    printf("destroy map view\n");
# Line 438  void map(appdata_t *appdata) { Line 475  void map(appdata_t *appdata) {
475  #ifdef USE_MAEMO  #ifdef USE_MAEMO
476    } else {    } else {
477      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
478      name = g_strdup(_("appdata->cur_gpx->name"));      name = g_strdup(appdata->cur_gpx->name);
479    }    }
480  #endif  #endif
481    
# Line 456  void map(appdata_t *appdata) { Line 493  void map(appdata_t *appdata) {
493                            NULL);                            NULL);
494    
495  #ifndef USE_MAEMO  #ifndef USE_MAEMO
496    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);
497  #else  #else
498    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);
499  #endif  #endif
Legend:
Removed from v.41  
changed lines
  Added in v.45