--- trunk/src/osm-gps-map.c 2009/08/14 12:19:45 56 +++ trunk/src/osm-gps-map.c 2009/08/16 19:29:01 57 @@ -98,6 +98,10 @@ coord_t *gps; gboolean gps_valid; + //a balloon with additional info + coord_t *balloon; + gboolean balloon_valid; + //additional images or tracks added to the map GSList *tracks; GSList *images; @@ -631,63 +635,151 @@ (mr*2)+lw+lw); #endif } +} + +/* most visual effects are hardcoded by now, but may be made */ +/* available via properties later */ +#define BALLOON_CORNER_RADIUS 20 +#define BALLOON_WIDTH 150 +#define BALLOON_HEIGHT 75 +#define BALLOON_TRANSPARENCY 0.8 +#define POINTER_HEIGHT 20 +#define POINTER_FOOT_WIDTH 20 +#define POINTER_OFFSET (BALLOON_CORNER_RADIUS*3/4) +#define BALLOON_SHADOW 5 +#define BALLOON_SHADOW_TRANSPARENCY 0.2 + +/* draw the bubble shape. this is used twice, once for the shape and once */ +/* for the shadow */ +static void +osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1, + gboolean bottom, int px, int py, int px0, int px1) { + + cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS); + cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + BALLOON_CORNER_RADIUS, y0); + if(!bottom) { + /* insert bottom/left pointer */ + cairo_line_to (cr, px1, y0); + cairo_line_to (cr, px, py); + cairo_line_to (cr, px0, y0); + } + + cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0); + cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + BALLOON_CORNER_RADIUS); + cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS); + cairo_curve_to (cr, x1, y1, x1, y1, x1 - BALLOON_CORNER_RADIUS, y1); + if(bottom) { + /* insert bottom/left pointer */ + cairo_line_to (cr, px0, y1); + cairo_line_to (cr, px, py); + cairo_line_to (cr, px1, y1); + } + + cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1); + cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - BALLOON_CORNER_RADIUS); + + cairo_close_path (cr); } /* http://cairographics.org/samples/ */ static void -osm_gps_map_draw_balloon (OsmGpsMap *map) +osm_gps_map_draw_balloon_int (OsmGpsMap *map) { OsmGpsMapPrivate *priv = map->priv; - /* xyz */ -#define X 100 -#define Y 100 -#define RADIUS 20 -#define WIDTH 150 -#define HEIGHT 75 -#define TRANSPARENCY 0.7 -#define PIN_HEIGHT 20 -#define PIN_FOOT_WIDTH 20 -#define PIN_X (X + EXTRA_BORDER) -#define PIN_X0 (X + EXTRA_BORDER + RADIUS + PIN_FOOT_WIDTH) -#define PIN_X1 (X + EXTRA_BORDER + RADIUS) -#define PIN_Y (Y + EXTRA_BORDER + HEIGHT + PIN_HEIGHT) - -#ifdef USE_CAIRO - cairo_t *cr = gdk_cairo_create(priv->pixmap); + if (priv->balloon_valid) { - int x0 = X + EXTRA_BORDER, y0 = Y + EXTRA_BORDER; - int x1 = x0 + WIDTH, y1 = y0 + HEIGHT; + /* ------- convert given coordinate into screen position --------- */ + int x0 = lon2pixel(priv->map_zoom, priv->balloon->rlon) - + priv->map_x + EXTRA_BORDER; + int y0 = lat2pixel(priv->map_zoom, priv->balloon->rlat) - + priv->map_y + EXTRA_BORDER; - cairo_move_to (cr, x0, y0 + RADIUS); - cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + RADIUS, y0); - cairo_line_to (cr, x1 - RADIUS, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + RADIUS); - cairo_line_to (cr, x1 , y1 - RADIUS); - cairo_curve_to (cr, x1, y1, x1, y1, x1 - RADIUS, y1); - - /* insert pin */ - cairo_line_to (cr, PIN_X0, y1); - cairo_line_to (cr, PIN_X, PIN_Y); - cairo_line_to (cr, PIN_X1, y1); - + /* check position of this relative to screen center to determine */ + /* pointer direction ... */ + int pointer_x = x0, pointer_x0, pointer_x1; + int pointer_y = y0; - cairo_line_to (cr, x0 + RADIUS, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - RADIUS); + /* ... and calculate position */ + if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) { + x0 -= BALLOON_WIDTH - POINTER_OFFSET; + pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET); + pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH; + } else { + x0 -= POINTER_OFFSET; + pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET); + pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH; + } + + gboolean bottom = FALSE; + if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) { + bottom = TRUE; + y0 -= BALLOON_HEIGHT + POINTER_HEIGHT; + } else + y0 += POINTER_HEIGHT; + + /* calculate bottom/right of box */ + int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT; - cairo_close_path (cr); - cairo_set_source_rgba (cr, 1, 1, 1, TRANSPARENCY); - cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, 0, 0, 0, TRANSPARENCY); - cairo_set_line_width (cr, 1); - cairo_stroke (cr); - - gtk_widget_queue_draw_area (GTK_WIDGET(map), - x0, - y0, - WIDTH, - HEIGHT + PIN_HEIGHT); +#ifdef USE_CAIRO + cairo_t *cr = gdk_cairo_create(priv->pixmap); + + /* --------- draw shadow --------------- */ + osm_gps_map_draw_balloon_shape (cr, + x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW, + x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW, + bottom, pointer_x, pointer_y, + pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW); + + cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 1, 0, 0, 1.0); + cairo_set_line_width (cr, 0); + cairo_stroke (cr); + + /* --------- draw main shape ----------- */ + osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1, + bottom, pointer_x, pointer_y, pointer_x0, pointer_x1); + + cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY); + cairo_set_line_width (cr, 1); + cairo_stroke (cr); + + + /* ---------- draw close button --------- */ + + int cx = x1 - BALLOON_CORNER_RADIUS*3/4; + int cy = y0 + BALLOON_CORNER_RADIUS*3/4; + int crad = BALLOON_CORNER_RADIUS/3; + + cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI); + cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0); + cairo_set_line_width (cr, 1); + cairo_stroke(cr); + + int cs = crad/2; + cairo_set_source_rgba (cr, 1, 1, 1, 1.0); + cairo_set_line_width (cr, 3); + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_move_to (cr, cx - cs, cy - cs); + cairo_line_to (cr, cx + cs, cy + cs); + cairo_stroke (cr); + cairo_move_to (cr, cx + cs, cy - cs); + cairo_line_to (cr, cx - cs, cy + cs); + cairo_stroke (cr); + + + gtk_widget_queue_draw_area (GTK_WIDGET(map), + x0, y0, BALLOON_WIDTH, + BALLOON_HEIGHT + POINTER_HEIGHT); +#else +#warning "Balloon display lacks a non-cairo implementation!" #endif + } } static void @@ -1274,8 +1366,7 @@ osm_gps_map_print_tracks(map); osm_gps_map_draw_gps_point(map); osm_gps_map_print_images(map); - - osm_gps_map_draw_balloon(map); + osm_gps_map_draw_balloon_int(map); //osm_gps_map_osd_speed(map, 1.5); osm_gps_map_purge_cache(map); @@ -1307,6 +1398,9 @@ priv->gps = g_new0(coord_t, 1); priv->gps_valid = FALSE; + priv->balloon = g_new0(coord_t, 1); + priv->balloon_valid = FALSE; + priv->tracks = NULL; priv->images = NULL; @@ -1464,6 +1558,9 @@ if (priv->idle_map_redraw != 0) g_source_remove (priv->idle_map_redraw); + g_free(priv->gps); + g_free(priv->balloon); + G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object); } @@ -2612,3 +2709,34 @@ return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon); } +void +osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude) +{ + OsmGpsMapPrivate *priv; + + /* remove and previously installed balloon */ + osm_gps_map_clear_balloon (map); + + g_return_if_fail (OSM_IS_GPS_MAP (map)); + priv = map->priv; + + priv->balloon->rlat = deg2rad(latitude); + priv->balloon->rlon = deg2rad(longitude); + priv->balloon_valid = TRUE; + + // this redraws the map + osm_gps_map_map_redraw_idle(map); +} + +void +osm_gps_map_clear_balloon (OsmGpsMap *map) +{ + OsmGpsMapPrivate *priv; + + g_return_if_fail (OSM_IS_GPS_MAP (map)); + priv = map->priv; + + priv->balloon_valid = FALSE; + + osm_gps_map_map_redraw_idle(map); +}