X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/d9ffd2671d8c0720e0f3ebe3791213e707f674ba..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/vikviewport.c?ds=sidebyside diff --git a/src/vikviewport.c b/src/vikviewport.c index b20646c1..7743ebbd 100644 --- a/src/vikviewport.c +++ b/src/vikviewport.c @@ -31,14 +31,13 @@ #include "coords.h" #include "vikcoord.h" +#include "vikwindow.h" #include "vikviewport.h" #include "mapcoord.h" /* for ALTI_TO_MPP */ #include "globals.h" -#include "googlemaps.h" -#include "khmaps.h" static gdouble EASTING_OFFSET = 500000.0; @@ -56,8 +55,6 @@ static void viewport_init_ra(); static GObjectClass *parent_class; -static void viewport_google_rezoom ( VikViewport *vvp ); - struct _VikViewport { GtkDrawingArea drawing_area; @@ -76,7 +73,9 @@ struct _VikViewport { GdkGC *background_gc; GdkColor background_color; + GdkGC *scale_bg_gc; gboolean draw_scale; + gboolean draw_centermark; /* subset of coord types. lat lon can be plotted in 2 ways, google or exp. */ VikViewportDrawMode drawmode; @@ -86,6 +85,11 @@ struct _VikViewport { gdouble google_calcy_fact; gdouble google_calcx_rev_fact; gdouble google_calcy_rev_fact; + + /* trigger stuff */ + gpointer trigger; + GdkPixmap *snapshot_buffer; + gboolean half_drawn; }; static gdouble @@ -145,7 +149,8 @@ static void viewport_class_init ( VikViewportClass *klass ) VikViewport *vik_viewport_new () { - return VIK_VIEWPORT ( g_object_new ( VIK_VIEWPORT_TYPE, NULL ) ); + VikViewport *vv = VIK_VIEWPORT ( g_object_new ( VIK_VIEWPORT_TYPE, NULL ) ); + return vv; } static void viewport_init ( VikViewport *vvp ) @@ -155,10 +160,11 @@ static void viewport_init ( VikViewport *vvp ) /* TODO: not static */ vvp->xmpp = 4.0; vvp->ympp = 4.0; - vvp->coord_mode = VIK_COORD_UTM; - vvp->drawmode = VIK_VIEWPORT_DRAWMODE_UTM; - vvp->center.north_south = 0; - vvp->center.east_west = -166021; + vvp->coord_mode = VIK_COORD_LATLON; + vvp->drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR; + vvp->center.mode = VIK_COORD_LATLON; + vvp->center.north_south = 40.714490; + vvp->center.east_west = -74.007130; vvp->center.utm_zone = 31; vvp->center.utm_letter = 'N'; vvp->scr_buffer = NULL; @@ -166,8 +172,17 @@ static void viewport_init ( VikViewport *vvp ) vvp->alpha_pixbuf_width = vvp->alpha_pixbuf_height = 0; vvp->utm_zone_width = 0.0; vvp->background_gc = NULL; + vvp->scale_bg_gc = NULL; vvp->draw_scale = TRUE; + vvp->draw_centermark = TRUE; + + vvp->trigger = NULL; + vvp->snapshot_buffer = NULL; + vvp->half_drawn = FALSE; + g_signal_connect (G_OBJECT(vvp), "configure_event", G_CALLBACK(vik_viewport_configure), NULL); + + GTK_WIDGET_SET_FLAGS(vvp, GTK_CAN_FOCUS); /* allow VVP to have focus -- enabling key events, etc */ } GdkColor *vik_viewport_get_background_gdkcolor ( VikViewport *vvp ) @@ -229,6 +244,11 @@ void vik_viewport_configure_manually ( VikViewport *vvp, gint width, guint heigh if ( vvp->scr_buffer ) g_object_unref ( G_OBJECT ( vvp->scr_buffer ) ); vvp->scr_buffer = gdk_pixmap_new ( GTK_WIDGET(vvp)->window, vvp->width, vvp->height, -1 ); + + /* TODO trigger: only if this is enabled !!! */ + if ( vvp->snapshot_buffer ) + g_object_unref ( G_OBJECT ( vvp->snapshot_buffer ) ); + vvp->snapshot_buffer = gdk_pixmap_new ( GTK_WIDGET(vvp)->window, vvp->width, vvp->height, -1 ); } @@ -249,12 +269,22 @@ gboolean vik_viewport_configure ( VikViewport *vvp ) vvp->scr_buffer = gdk_pixmap_new ( GTK_WIDGET(vvp)->window, vvp->width, vvp->height, -1 ); + /* TODO trigger: only if enabled! */ + if ( vvp->snapshot_buffer ) + g_object_unref ( G_OBJECT ( vvp->snapshot_buffer ) ); + + vvp->snapshot_buffer = gdk_pixmap_new ( GTK_WIDGET(vvp)->window, vvp->width, vvp->height, -1 ); + /* TODO trigger */ + /* this is down here so it can get a GC (necessary?) */ if ( ! vvp->background_gc ) { vvp->background_gc = vik_viewport_new_gc ( vvp, "", 1 ); vik_viewport_set_background_color ( vvp, DEFAULT_BACKGROUND_COLOR ); /* set to "backup" color in vvp->background_color */ } + if ( !vvp->scale_bg_gc) { + vvp->scale_bg_gc = vik_viewport_new_gc(vvp, "grey", 3); + } return FALSE; } @@ -268,12 +298,20 @@ static void viewport_finalize ( GObject *gob ) if ( vvp->scr_buffer ) g_object_unref ( G_OBJECT ( vvp->scr_buffer ) ); + if ( vvp->snapshot_buffer ) + g_object_unref ( G_OBJECT ( vvp->snapshot_buffer ) ); + if ( vvp->alpha_pixbuf ) g_object_unref ( G_OBJECT ( vvp->alpha_pixbuf ) ); if ( vvp->background_gc ) g_object_unref ( G_OBJECT ( vvp->background_gc ) ); + if ( vvp->scale_bg_gc ) { + g_object_unref ( G_OBJECT ( vvp->scale_bg_gc ) ); + vvp->scale_bg_gc = NULL; + } + G_OBJECT_CLASS(parent_class)->finalize(gob); } @@ -326,6 +364,14 @@ void vik_viewport_draw_scale ( VikViewport *vvp ) unit = old_unit; len = unit * ratio; + /* white background */ + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, + PAD, vvp->height-PAD, PAD + len, vvp->height-PAD); + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, + PAD, vvp->height-PAD, PAD, vvp->height-PAD-HEIGHT); + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, + PAD + len, vvp->height-PAD, PAD + len, vvp->height-PAD-HEIGHT); + /* black scale */ vik_viewport_draw_line(vvp, GTK_WIDGET(&vvp->drawing_area)->style->black_gc, PAD, vvp->height-PAD, PAD + len, vvp->height-PAD); vik_viewport_draw_line(vvp, GTK_WIDGET(&vvp->drawing_area)->style->black_gc, @@ -335,12 +381,16 @@ void vik_viewport_draw_scale ( VikViewport *vvp ) if (odd%2) { int i; for (i=1; i<5; i++) { + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, + PAD+i*len/5, vvp->height-PAD, PAD+i*len/5, vvp->height-PAD-((i==5)?(2*HEIGHT/3):(HEIGHT/2))); vik_viewport_draw_line(vvp, GTK_WIDGET(&vvp->drawing_area)->style->black_gc, PAD+i*len/5, vvp->height-PAD, PAD+i*len/5, vvp->height-PAD-((i==5)?(2*HEIGHT/3):(HEIGHT/2))); } } else { int i; for (i=1; i<10; i++) { + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, + PAD+i*len/10, vvp->height-PAD, PAD+i*len/10, vvp->height-PAD-((i==5)?(2*HEIGHT/3):(HEIGHT/2))); vik_viewport_draw_line(vvp, GTK_WIDGET(&vvp->drawing_area)->style->black_gc, PAD+i*len/10, vvp->height-PAD, PAD+i*len/10, vvp->height-PAD-((i==5)?(2*HEIGHT/3):(HEIGHT/2))); } @@ -361,6 +411,40 @@ void vik_viewport_draw_scale ( VikViewport *vvp ) } } +void vik_viewport_set_draw_centermark ( VikViewport *vvp, gboolean draw_centermark ) +{ + vvp->draw_centermark = draw_centermark; +} + +gboolean vik_viewport_get_draw_centermark ( VikViewport *vvp ) +{ + return vvp->draw_centermark; +} + +void vik_viewport_draw_centermark ( VikViewport *vvp ) +{ + if ( !vvp->draw_centermark ) + return; + + const int len = 30; + const int gap = 4; + int center_x = vvp->width/2; + int center_y = vvp->height/2; + GdkGC * black_gc = GTK_WIDGET(&vvp->drawing_area)->style->black_gc; + + /* white back ground */ + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, center_x - len, center_y, center_x - gap, center_y); + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, center_x + gap, center_y, center_x + len, center_y); + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, center_x, center_y - len, center_x, center_y - gap); + vik_viewport_draw_line(vvp, vvp->scale_bg_gc, center_x, center_y + gap, center_x, center_y + len); + /* black fore ground */ + vik_viewport_draw_line(vvp, black_gc, center_x - len, center_y, center_x - gap, center_y); + vik_viewport_draw_line(vvp, black_gc, center_x + gap, center_y, center_x + len, center_y); + vik_viewport_draw_line(vvp, black_gc, center_x, center_y - len, center_x, center_y - gap); + vik_viewport_draw_line(vvp, black_gc, center_x, center_y + gap, center_x, center_y + len); + +} + void vik_viewport_sync ( VikViewport *vvp ) { g_return_if_fail ( vvp != NULL ); @@ -400,8 +484,6 @@ void vik_viewport_set_zoom ( VikViewport *vvp, gdouble xympp ) if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM ) viewport_utm_zone_check(vvp); - else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); } /* or could do factor */ @@ -413,9 +495,6 @@ void vik_viewport_zoom_in ( VikViewport *vvp ) vvp->xmpp /= 2; vvp->ympp /= 2; - if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); - viewport_utm_zone_check(vvp); } } @@ -428,9 +507,6 @@ void vik_viewport_zoom_out ( VikViewport *vvp ) vvp->xmpp *= 2; vvp->ympp *= 2; - if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); - viewport_utm_zone_check(vvp); } } @@ -458,8 +534,6 @@ void vik_viewport_set_xmpp ( VikViewport *vvp, gdouble xmpp ) vvp->xmpp = xmpp; if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM ) viewport_utm_zone_check(vvp); - if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); } } @@ -469,8 +543,6 @@ void vik_viewport_set_ympp ( VikViewport *vvp, gdouble ympp ) vvp->ympp = ympp; if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM ) viewport_utm_zone_check(vvp); - if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); } } @@ -614,14 +686,7 @@ void vik_viewport_screen_to_coord ( VikViewport *vvp, int x, int y, VikCoord *co coord->mode = VIK_COORD_LATLON; if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_EXPEDIA ) calcxy_rev(&(coord->east_west), &(coord->north_south), x, y, vvp->center.east_west, vvp->center.north_south, vvp->xmpp * ALTI_TO_MPP, vvp->ympp * ALTI_TO_MPP, vvp->width/2, vvp->height/2); - else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) { - /* google */ - coord->east_west = (x - (vvp->width/2)) * vvp->google_calcx_rev_fact + vvp->center.east_west; - coord->north_south = ((vvp->height/2) - y) * vvp->google_calcy_rev_fact + vvp->center.north_south; - } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_KH ) { - coord->east_west = vvp->center.east_west + (180.0 * vvp->xmpp / 65536 / 256 * (x - vvp->width/2)); - coord->north_south = vvp->center.north_south + (180.0 * vvp->ympp / 65536 / 256 * (vvp->height/2 - y)); - } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) { + else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) { /* FIXMERCATOR */ coord->east_west = vvp->center.east_west + (180.0 * vvp->xmpp / 65536 / 256 * (x - vvp->width/2)); coord->north_south = DEMERCLAT ( MERCLAT(vvp->center.north_south) + (180.0 * vvp->ympp / 65536 / 256 * (vvp->height/2 - y)) ); @@ -668,14 +733,6 @@ void vik_viewport_coord_to_screen ( VikViewport *vvp, const VikCoord *coord, int if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_EXPEDIA ) { calcxy ( &xx, &yy, center->lon, center->lat, ll->lon, ll->lat, vvp->xmpp * ALTI_TO_MPP, vvp->ympp * ALTI_TO_MPP, vvp->width / 2, vvp->height / 2 ); *x = xx; *y = yy; - } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) { - /* google */ - *x = vvp->google_calcx_fact * (ll->lon - center->lon) + (vvp->width/2); - *y = vvp->google_calcy_fact * (center->lat - ll->lat) + (vvp->height/2); - } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_KH ) { - /* subtract, convert to KH coords; blow it up by 256 */ - *x = vvp->width/2 + (65536.0 / 180 / vvp->xmpp * (ll->lon - center->lon))*256.0; - *y = vvp->height/2 + (65536.0 / 180 / vvp->ympp * (center->lat - ll->lat))*256.0; } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) { /* FIXMERCATOR: Optimize */ *x = vvp->width/2 + (65536.0 / 180 / vvp->xmpp * (ll->lon - center->lon))*256.0; @@ -698,7 +755,7 @@ void a_viewport_clip_line ( gint *x1, gint *y1, gint *x2, gint *y2 ) gdouble shrinkfactor = ABS(20000.0 / (gdouble)*x2); *x2 = *x1 + (shrinkfactor * (*x2-*x1)); *y2 = *y1 + (shrinkfactor * (*y2-*y1)); - printf("%f, %d, %d\n", shrinkfactor, *x2, *y2); + g_print("%f, %d, %d\n", shrinkfactor, *x2, *y2); } else if ( *y2 > 20000 || *y2 < -20000 ) { gdouble shrinkfactor = ABS(20000.0 / (gdouble)*x2); *x2 = *x1 + (shrinkfactor * (*x2-*x1)); @@ -929,8 +986,6 @@ void vik_viewport_set_drawmode ( VikViewport *vvp, VikViewportDrawMode drawmode viewport_set_coord_mode ( vvp, VIK_COORD_UTM ); else { viewport_set_coord_mode ( vvp, VIK_COORD_LATLON ); - if ( drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) - viewport_google_rezoom ( vvp ); } } @@ -939,10 +994,71 @@ VikViewportDrawMode vik_viewport_get_drawmode ( VikViewport *vvp ) return vvp->drawmode; } -static void viewport_google_rezoom ( VikViewport *vvp ) +/******** triggering *******/ +void vik_viewport_set_trigger ( VikViewport *vp, gpointer trigger ) +{ + vp->trigger = trigger; +} + +gpointer vik_viewport_get_trigger ( VikViewport *vp ) +{ + return vp->trigger; +} + +void vik_viewport_snapshot_save ( VikViewport *vp ) +{ + gdk_draw_drawable ( vp->snapshot_buffer, vp->background_gc, vp->scr_buffer, 0, 0, 0, 0, -1, -1 ); +} + +void vik_viewport_snapshot_load ( VikViewport *vp ) +{ + gdk_draw_drawable ( vp->scr_buffer, vp->background_gc, vp->snapshot_buffer, 0, 0, 0, 0, -1, -1 ); +} + +void vik_viewport_set_half_drawn(VikViewport *vp, gboolean half_drawn) { - vvp->google_calcx_fact = (GOOGLEMAPS_ZOOM_ONE_MPP * 65536.0 * 0.7716245833877 / vvp->xmpp); - vvp->google_calcy_fact = (GOOGLEMAPS_ZOOM_ONE_MPP * 65536.0 / vvp->ympp); - vvp->google_calcx_rev_fact = 1 / vvp->google_calcx_fact; - vvp->google_calcy_rev_fact = 1 / vvp->google_calcy_fact; + vp->half_drawn = half_drawn; +} + +gboolean vik_viewport_get_half_drawn( VikViewport *vp ) +{ + return vp->half_drawn; +} + + +const gchar *vik_viewport_get_drawmode_name(VikViewport *vv, VikViewportDrawMode mode) + { + const gchar *name = NULL; + VikWindow *vw = NULL; + GtkWidget *mode_button; + GtkWidget *label; + + vw = VIK_WINDOW_FROM_WIDGET(vv); + mode_button = vik_window_get_drawmode_button(vw, mode); + label = gtk_bin_get_child(GTK_BIN(mode_button)); + + name = gtk_label_get_text ( GTK_LABEL(label) ); + + return name; + +} + +void vik_viewport_get_min_max_lat_lon ( VikViewport *vp, gdouble *min_lat, gdouble *max_lat, gdouble *min_lon, gdouble *max_lon ) +{ + VikCoord tleft, tright, bleft, bright; + + vik_viewport_screen_to_coord ( vp, 0, 0, &tleft ); + vik_viewport_screen_to_coord ( vp, vik_viewport_get_width(vp), 0, &tright ); + vik_viewport_screen_to_coord ( vp, 0, vik_viewport_get_height(vp), &bleft ); + vik_viewport_screen_to_coord ( vp, vp->width, vp->height, &bright ); + + vik_coord_convert(&tleft, VIK_COORD_LATLON); + vik_coord_convert(&tright, VIK_COORD_LATLON); + vik_coord_convert(&bleft, VIK_COORD_LATLON); + vik_coord_convert(&bright, VIK_COORD_LATLON); + + *max_lat = MAX(tleft.north_south, tright.north_south); + *min_lat = MIN(bleft.north_south, bright.north_south); + *max_lon = MAX(tright.east_west, bright.east_west); + *min_lon = MIN(tleft.east_west, bleft.east_west); }