X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0ba33e1d93b885c5c51d348b82c9506f02276795..db771541ff9b86b3ef5e204d5d5d659ccf66e7e6:/src/viktrwlayer_propwin.c diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c index 43e86df1..be96f509 100644 --- a/src/viktrwlayer_propwin.c +++ b/src/viktrwlayer_propwin.c @@ -4,7 +4,7 @@ * Copyright (C) 2003-2005, Evan Battaglia * Copyright (C) 2005-2007, Alex Foobarian * Copyright (C) 2007-2008, Quy Tonthat - * Copyright (C) 2011, Rob Norris + * Copyright (C) 2012-2014, Rob Norris * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,27 +36,14 @@ #ifdef HAVE_STRING_H #include #endif -#include "coords.h" -#include "vikcoord.h" -#include "viktrack.h" #include "viktrwlayer.h" #include "viktrwlayer_propwin.h" -#include "vikwaypoint.h" -#include "dialog.h" -#include "globals.h" #include "dems.h" - +#include "viking.h" #include "vikviewport.h" /* ugh */ -#include "viktreeview.h" /* ugh */ +#include "vikutils.h" +#include "ui_util.h" #include -#include "viklayer.h" /* ugh */ -#include "vikaggregatelayer.h" -#include "viklayerspanel.h" /* ugh */ - -#define PROPWIN_PROFILE_WIDTH 600 -#define PROPWIN_PROFILE_HEIGHT 300 - -#define PROPWIN_LABEL_FONT "Sans 7" typedef enum { PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE, @@ -78,7 +65,10 @@ static const gdouble chunksa[] = {2.0, 5.0, 10.0, 15.0, 20.0, static const gdouble chunksg[] = {1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0, 12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 75.0, 100.0, 150.0, 200.0, 250.0, 375.0, 500.0, - 750.0, 1000.0, 10000.0}; + 750.0, 1000.0, 10000.0, 100000.0}; +// Normally gradients should range up to couple hundred precent at most, +// however there are possibilities of having points with no altitude after a point with a big altitude +// (such as places with invalid DEM values in otherwise mountainous regions) - thus giving huge negative gradients. /* (Hopefully!) Human friendly grid sizes - note no fixed 'ratio' just numbers that look nice...*/ /* As need to cover walking speeds - have many low numbers (but also may go up to airplane speeds!) */ @@ -88,11 +78,39 @@ static const gdouble chunkss[] = {1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0, 750.0, 1000.0, 10000.0}; /* (Hopefully!) Human friendly distance grid sizes - note no fixed 'ratio' just numbers that look nice...*/ -static const gdouble chunksd[] = {0.1, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0, +static const gdouble chunksd[] = {0.1, 0.2, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0, 15.0, 20.0, 25.0, 40.0, 50.0, 75.0, 100.0, 150.0, 200.0, 250.0, 375.0, 500.0, 750.0, 1000.0, 10000.0}; +// Time chunks in seconds +static const time_t chunkst[] = { + 60, // 1 minute + 120, // 2 minutes + 300, // 5 minutes + 900, // 15 minutes + 1800, // half hour + 3600, // 1 hour + 10800, // 3 hours + 21600, // 6 hours + 43200, // 12 hours + 86400, // 1 day + 172800, // 2 days + 604800, // 1 week + 1209600,// 2 weeks + 2419200,// 4 weeks +}; + +// Local show settings to restore on dialog opening +static gboolean show_dem = TRUE; +static gboolean show_alt_gps_speed = TRUE; +static gboolean show_gps_speed = TRUE; +static gboolean show_gradient_gps_speed = TRUE; +static gboolean show_dist_speed = FALSE; +static gboolean show_elev_speed = FALSE; +static gboolean show_elev_dem = FALSE; +static gboolean show_sd_gps_speed = TRUE; + typedef struct _propsaved { gboolean saved; GdkImage *img; @@ -102,7 +120,8 @@ typedef struct _propwidgets { gboolean configure_dialog; VikTrwLayer *vtl; VikTrack *tr; - gchar *track_name; + VikViewport *vvp; + VikLayersPanel *vlp; gint profile_width; gint profile_height; gint profile_width_old; @@ -111,6 +130,7 @@ typedef struct _propwidgets { gint profile_height_offset; GtkWidget *dialog; GtkWidget *w_comment; + GtkWidget *w_description; GtkWidget *w_track_length; GtkWidget *w_tp_count; GtkWidget *w_segment_count; @@ -124,16 +144,22 @@ typedef struct _propwidgets { GtkWidget *w_time_start; GtkWidget *w_time_end; GtkWidget *w_time_dur; + GtkWidget *w_color; + GtkWidget *w_namelabel; + GtkWidget *w_number_distlabels; GtkWidget *w_cur_dist; /*< Current distance */ GtkWidget *w_cur_elevation; GtkWidget *w_cur_gradient_dist; /*< Current distance on gradient graph */ GtkWidget *w_cur_gradient_gradient; /*< Current gradient on gradient graph */ - GtkWidget *w_cur_time; /*< Current time */ + GtkWidget *w_cur_time; /*< Current track time */ + GtkWidget *w_cur_time_real; /*< Actual time as on a clock */ GtkWidget *w_cur_speed; GtkWidget *w_cur_dist_dist; /*< Current distance on distance graph */ - GtkWidget *w_cur_dist_time; /*< Current time on distance graph */ + GtkWidget *w_cur_dist_time; /*< Current track time on distance graph */ + GtkWidget *w_cur_dist_time_real; // Clock time GtkWidget *w_cur_elev_elev; - GtkWidget *w_cur_elev_time; + GtkWidget *w_cur_elev_time; // Track time + GtkWidget *w_cur_elev_time_real; // Clock time GtkWidget *w_cur_speed_dist; GtkWidget *w_cur_speed_speed; GtkWidget *w_show_dem; @@ -142,6 +168,7 @@ typedef struct _propwidgets { GtkWidget *w_show_gradient_gps_speed; GtkWidget *w_show_dist_speed; GtkWidget *w_show_elev_speed; + GtkWidget *w_show_elev_dem; GtkWidget *w_show_sd_gps_speed; gdouble track_length; gdouble track_length_inc_gaps; @@ -186,6 +213,8 @@ typedef struct _propwidgets { gboolean is_marker_drawn; VikTrackpoint *blob_tp; gboolean is_blob_drawn; + time_t duration; + gchar *tz; // TimeZone at track's location } PropWidgets; static PropWidgets *prop_widgets_new() @@ -239,26 +268,31 @@ static void minmax_array(const gdouble *array, gdouble *min, gdouble *max, gbool } } -#define MARGIN 70 +#define MARGIN_X 70 +#define MARGIN_Y 20 #define LINES 5 /** + * get_new_min_and_chunk_index: * Returns via pointers: - * the new minimum value to be used for the altitude graph - * the index in to the altitudes chunk sizes array (ci = Chunk Index) + * the new minimum value to be used for the graph + * the index in to the chunk sizes array (ci = Chunk Index) */ -static void get_new_min_and_chunk_index_altitude (gdouble mina, gdouble maxa, gdouble *new_min, gint *ci) +static void get_new_min_and_chunk_index (gdouble mina, gdouble maxa, const gdouble *chunks, size_t chunky, gdouble *new_min, gint *ci) { /* Get unitized chunk */ /* Find suitable chunk index */ *ci = 0; - gdouble diffa_chunk = (maxa - mina)/LINES; + gdouble diff_chunk = (maxa - mina)/LINES; /* Loop through to find best match */ - while (diffa_chunk > chunksa[*ci]) { + while (diff_chunk > chunks[*ci]) { (*ci)++; /* Last Resort Check */ - if ( *ci == sizeof(chunksa)/sizeof(chunksa[0]) ) + if ( *ci == chunky ) { + // Use previous value and exit loop + (*ci)--; break; + } } /* Ensure adjusted minimum .. maximum covers mina->maxa */ @@ -266,87 +300,71 @@ static void get_new_min_and_chunk_index_altitude (gdouble mina, gdouble maxa, gd // Now work out adjusted minimum point to the nearest lowest chunk divisor value // When negative ensure logic uses lowest value if ( mina < 0 ) - *new_min = (gdouble) ( ( (gint)(mina - chunksa[*ci]) / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] ); + *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] ); else - *new_min = (gdouble) ( ( (gint)mina / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] ); + *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] ); // Range not big enough - as new minimum has lowered - if ((*new_min + (chunksa[*ci] * LINES) < maxa)) { + if ((*new_min + (chunks[*ci] * LINES) < maxa)) { // Next chunk should cover it - if ( *ci < sizeof(chunksa)/sizeof(chunksa[0]) ) { + if ( *ci < chunky-1 ) { (*ci)++; // Remember to adjust the minimum too... if ( mina < 0 ) - *new_min = (gdouble) ( ( (gint)(mina - chunksa[*ci]) / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] ); + *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] ); else - *new_min = (gdouble) ( ( (gint)mina / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] ); + *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] ); } } } -/** - * Returns via pointers: - * the new minimum value to be used for the altitude graph - * the index in to the altitudes chunk sizes array (ci = Chunk Index) - */ -static void get_new_min_and_chunk_index_gradient (gdouble mina, gdouble maxa, gdouble *new_min, gint *ci) +static guint get_time_chunk_index (time_t duration) { - /* Get unitized chunk */ - /* Find suitable chunk index */ - *ci = 0; - gdouble diffa_chunk = (maxa - mina)/LINES; - - /* Loop through to find best match */ - while (diffa_chunk > chunksg[*ci]) { - (*ci)++; - /* Last Resort Check */ - if ( *ci == sizeof(chunksg)/sizeof(chunksg[0]) ) + // Grid split + time_t myduration = duration / LINES; + + // Search nearest chunk index + guint ci = 0; + guint last_chunk = G_N_ELEMENTS(chunkst); + + // Loop through to find best match + while (myduration > chunkst[ci]) { + ci++; + // Last Resort Check + if ( ci == last_chunk ) break; } + // Use previous value + if ( ci != 0 ) + ci--; - /* Ensure adjusted minimum .. maximum covers mina->maxa */ - - // Now work out adjusted minimum point to the nearest lowest chunk divisor value - // When negative ensure logic uses lowest value - if ( mina < 0 ) - *new_min = (gdouble) ( ( (gint)(mina - chunksg[*ci]) / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] ); - else - *new_min = (gdouble) ( ( (gint)mina / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] ); - - // Range not big enough - as new minimum has lowered - if ((*new_min + (chunksg[*ci] * LINES) < maxa)) { - // Next chunk should cover it - if ( *ci < sizeof(chunksg)/sizeof(chunksg[0]) ) { - (*ci)++; - // Remember to adjust the minimum too... - if ( mina < 0 ) - *new_min = (gdouble) ( ( (gint)(mina - chunksg[*ci]) / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] ); - else - *new_min = (gdouble) ( ( (gint)mina / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] ); - } - } + return ci; } /** - * Returns via pointers: - * the new minimum value to be used for the appropriate graph - * the index in to that array (ci = Chunk Index) + * */ -static void get_new_min_and_chunk_index (gdouble mins, gdouble maxs, const gdouble *chunks, size_t chunky, gdouble *new_min, gint *ci) +static guint get_distance_chunk_index (gdouble length) { - *ci = 0; - gdouble diff_chunk = (maxs - mins)/LINES; - - /* Loop through to find best match */ - while (diff_chunk > chunks[*ci]) { - (*ci)++; - /* Last Resort Check */ - if ( *ci == chunky ) + // Grid split + gdouble mylength = length / LINES; + + // Search nearest chunk index + guint ci = 0; + guint last_chunk = G_N_ELEMENTS(chunksd); + + // Loop through to find best match + while (mylength > chunksd[ci]) { + ci++; + // Last Resort Check + if ( ci == last_chunk ) break; } - *new_min = (gdouble) ( (gint)((mins / chunks[*ci] ) * chunks[*ci]) ); + // Use previous value + if ( ci != 0 ) + ci--; - // Speeds are never negative so don't need to worry about a negative new minimum + return ci; } static VikTrackpoint *set_center_at_graph_position(gdouble event_x, @@ -359,7 +377,7 @@ static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint PROFILE_WIDTH) { VikTrackpoint *trackpoint; - gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2; + gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > PROFILE_WIDTH) @@ -373,14 +391,14 @@ static VikTrackpoint *set_center_at_graph_position(gdouble event_x, if ( trackpoint ) { VikCoord coord = trackpoint->coord; if ( vlp ) { - vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord ); + vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord, TRUE ); vik_layers_panel_emit_update ( vlp ); } else { /* since vlp not set, vvp should be valid instead! */ if ( vvp ) - vik_viewport_set_center_coord ( vvp, &coord ); - vik_layer_emit_update ( VIK_LAYER(vtl), FALSE ); + vik_viewport_set_center_coord ( vvp, &coord, TRUE ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); } } return trackpoint; @@ -406,26 +424,26 @@ static void save_image_and_draw_graph_marks (GtkWidget *image, /* Restore previously saved image */ if (saved_img->saved) { - gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, 0, 0, MARGIN+PROFILE_WIDTH, PROFILE_HEIGHT); + gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT); saved_img->saved = FALSE; } // ATM always save whole image - as anywhere could have changed if (saved_img->img) - gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN+PROFILE_WIDTH, PROFILE_HEIGHT); + gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT); else - saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN+PROFILE_WIDTH, PROFILE_HEIGHT); + saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT); saved_img->saved = TRUE; - if ((marker_x >= MARGIN) && (marker_x < (PROFILE_WIDTH + MARGIN))) { - gdk_draw_line (GDK_DRAWABLE(pix), gc, marker_x, 0, marker_x, image->allocation.height); + if ((marker_x >= MARGIN_X) && (marker_x < (PROFILE_WIDTH + MARGIN_X))) { + gdk_draw_line (GDK_DRAWABLE(pix), gc, marker_x, MARGIN_Y, marker_x, PROFILE_HEIGHT + MARGIN_Y); *marker_drawn = TRUE; } else *marker_drawn = FALSE; // Draw a square blob to indicate where we are on track for this graph - if ( (blob_x >= MARGIN) && (blob_x < (PROFILE_WIDTH + MARGIN)) && (blob_y < PROFILE_HEIGHT) ) { + if ( (blob_x >= MARGIN_X) && (blob_x < (PROFILE_WIDTH + MARGIN_X)) && (blob_y < PROFILE_HEIGHT+MARGIN_Y) ) { gdk_draw_rectangle (GDK_DRAWABLE(pix), gc, TRUE, blob_x-3, blob_y-3, 6, 6); *blob_drawn = TRUE; } @@ -475,19 +493,17 @@ static gdouble tp_percentage_by_distance ( VikTrack *tr, VikTrackpoint *trackpoi return pc; } -static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along, VikPropWinGraphType_t graph_type ) +static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, PropWidgets *widgets, VikPropWinGraphType_t graph_type ) { - VikTrack *tr = pass_along[0]; - VikLayersPanel *vlp = pass_along[1]; - VikViewport *vvp = pass_along[2]; - PropWidgets *widgets = pass_along[3]; - gboolean is_time_graph = ( graph_type == PROPWIN_GRAPH_TYPE_SPEED_TIME || graph_type == PROPWIN_GRAPH_TYPE_DISTANCE_TIME || graph_type == PROPWIN_GRAPH_TYPE_ELEVATION_TIME ); - VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, event_box->allocation.width, widgets->vtl, vlp, vvp, tr, is_time_graph, widgets->profile_width); + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, allocation.width, widgets->vtl, widgets->vlp, widgets->vvp, widgets->tr, is_time_graph, widgets->profile_width); // Unable to get the point so give up if ( trackpoint == NULL ) { gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE); @@ -551,15 +567,15 @@ static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpoi image = GTK_WIDGET(child->data); if (is_time_graph) - pc = tp_percentage_by_time ( tr, trackpoint ); + pc = tp_percentage_by_time ( widgets->tr, trackpoint ); else - pc = tp_percentage_by_distance ( tr, trackpoint, widgets->track_length_inc_gaps ); + pc = tp_percentage_by_distance ( widgets->tr, trackpoint, widgets->track_length_inc_gaps ); if (!isnan(pc)) { - gdouble marker_x = (pc * widgets->profile_width) + MARGIN; + gdouble marker_x = (pc * widgets->profile_width) + MARGIN_X; save_image_and_draw_graph_marks(image, marker_x, - window->style->black_gc, + gtk_widget_get_style(window)->black_gc, -1, // Don't draw blob on clicks 0, graph_saved_img, @@ -575,39 +591,39 @@ static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpoi gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, widgets->is_marker_drawn); } -static gboolean track_profile_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_profile_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE); return TRUE; /* don't call other (further) callbacks */ } -static gboolean track_gradient_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_gradient_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_GRADIENT_DISTANCE); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_GRADIENT_DISTANCE); return TRUE; /* don't call other (further) callbacks */ } -static gboolean track_vt_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_vt_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_SPEED_TIME); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_SPEED_TIME); return TRUE; /* don't call other (further) callbacks */ } -static gboolean track_dt_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_dt_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_DISTANCE_TIME); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_DISTANCE_TIME); return TRUE; /* don't call other (further) callbacks */ } -static gboolean track_et_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_et_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_ELEVATION_TIME); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_ELEVATION_TIME); return TRUE; /* don't call other (further) callbacks */ } -static gboolean track_sd_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +static gboolean track_sd_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr ) { - track_graph_click(event_box, event, pass_along, PROPWIN_GRAPH_TYPE_SPEED_DISTANCE); + track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_SPEED_DISTANCE); return TRUE; /* don't call other (further) callbacks */ } @@ -702,10 +718,8 @@ static gint blobby_speed_dist ( gdouble x_blob, PropWidgets *widgets ) } -void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -714,14 +728,17 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, gpointer * else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; gdouble meters_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / widgets->profile_width, &meters_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start ); if (trackpoint && widgets->w_cur_dist) { static gchar tmp_buf[20]; vik_units_distance_t dist_units = a_vik_get_units_distance (); @@ -732,6 +749,9 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, gpointer * case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) ); break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) ); + break; default: g_critical("Houston, we've had a problem. distance=%d", dist_units); } @@ -761,17 +781,17 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, gpointer * gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->elev_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -781,10 +801,8 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, gpointer * g_list_free(child); } -void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -793,14 +811,17 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, gpointer else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; gdouble meters_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / widgets->profile_width, &meters_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start ); if (trackpoint && widgets->w_cur_gradient_dist) { static gchar tmp_buf[20]; vik_units_distance_t dist_units = a_vik_get_units_distance (); @@ -811,6 +832,9 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, gpointer case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) ); break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) ); + break; default: g_critical("Houston, we've had a problem. distance=%d", dist_units); } @@ -840,17 +864,17 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, gpointer gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->gradient_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -860,10 +884,33 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, gpointer g_list_free(child); } -void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +// +static void time_label_update (GtkWidget *widget, time_t seconds_from_start) +{ + static gchar tmp_buf[20]; + guint h = seconds_from_start/3600; + guint m = (seconds_from_start - h*3600)/60; + guint s = seconds_from_start - (3600*h) - (60*m); + g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s); + gtk_label_set_text(GTK_LABEL(widget), tmp_buf); +} + +// +static void real_time_label_update ( PropWidgets *widgets, GtkWidget *widget, VikTrackpoint *trackpoint) +{ + static gchar tmp_buf[64]; + if ( trackpoint->has_timestamp ) { + // Alternatively could use %c format but I prefer a slightly more compact form here + // The full date can of course be seen on the Statistics tab + strftime (tmp_buf, sizeof(tmp_buf), "%X %x %Z", localtime(&(trackpoint->timestamp))); + } + else + g_snprintf (tmp_buf, sizeof(tmp_buf), _("No Data")); + gtk_label_set_text(GTK_LABEL(widget), tmp_buf); +} + +void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -872,23 +919,22 @@ void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; time_t seconds_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); if (trackpoint && widgets->w_cur_time) { - static gchar tmp_buf[20]; - guint h, m, s; - h = seconds_from_start/3600; - m = (seconds_from_start - h*3600)/60; - s = seconds_from_start - (3600*h) - (60*m); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s); + time_label_update ( widgets->w_cur_time, seconds_from_start ); + } - gtk_label_set_text(GTK_LABEL(widgets->w_cur_time), tmp_buf); + if (trackpoint && widgets->w_cur_time_real) { + real_time_label_update ( widgets, widgets->w_cur_time_real, trackpoint ); } gint ix = (gint)x; @@ -933,17 +979,17 @@ void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->speed_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -956,10 +1002,8 @@ void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ /** * Update labels and blob marker on mouse moves in the distance/time graph */ -void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -968,23 +1012,23 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; time_t seconds_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); if (trackpoint && widgets->w_cur_dist_time) { - static gchar tmp_buf[20]; - guint h, m, s; - h = seconds_from_start/3600; - m = (seconds_from_start - h*3600)/60; - s = seconds_from_start - (3600*h) - (60*m); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s); + time_label_update ( widgets->w_cur_dist_time, seconds_from_start ); + } - gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist_time), tmp_buf); + if (trackpoint && widgets->w_cur_dist_time_real) { + real_time_label_update ( widgets, widgets->w_cur_dist_time_real, trackpoint ); } gint ix = (gint)x; @@ -994,10 +1038,17 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ if (trackpoint && widgets->w_cur_dist_dist) { static gchar tmp_buf[20]; - if ( a_vik_get_units_distance () == VIK_UNITS_DISTANCE_MILES ) + switch ( a_vik_get_units_distance () ) { + case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", widgets->distances[ix]); - else + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", widgets->distances[ix]); + break; + default: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", widgets->distances[ix]); + break; + } gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist_dist), tmp_buf); } @@ -1014,17 +1065,17 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->dist_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -1037,10 +1088,8 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ /** * Update labels and blob marker on mouse moves in the elevation/time graph */ -void track_et_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +void track_et_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -1049,23 +1098,23 @@ void track_et_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; time_t seconds_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start ); if (trackpoint && widgets->w_cur_elev_time) { - static gchar tmp_buf[20]; - guint h, m, s; - h = seconds_from_start/3600; - m = (seconds_from_start - h*3600)/60; - s = seconds_from_start - (3600*h) - (60*m); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s); + time_label_update ( widgets->w_cur_elev_time, seconds_from_start ); + } - gtk_label_set_text(GTK_LABEL(widgets->w_cur_elev_time), tmp_buf); + if (trackpoint && widgets->w_cur_elev_time_real) { + real_time_label_update ( widgets, widgets->w_cur_elev_time_real, trackpoint ); } gint ix = (gint)x; @@ -1095,17 +1144,17 @@ void track_et_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->elev_time_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -1115,10 +1164,8 @@ void track_et_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ g_list_free(child); } -void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_along ) +void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; int mouse_x, mouse_y; GdkModifierType state; @@ -1127,14 +1174,17 @@ void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ else mouse_x = event->x; - gdouble x = mouse_x - event_box->allocation.width / 2 + widgets->profile_width / 2 - MARGIN / 2; + GtkAllocation allocation; + gtk_widget_get_allocation ( event_box, &allocation ); + + gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2; if (x < 0) x = 0; if (x > widgets->profile_width) x = widgets->profile_width; gdouble meters_from_start; - VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / widgets->profile_width, &meters_from_start ); + VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start ); if (trackpoint && widgets->w_cur_speed_dist) { static gchar tmp_buf[20]; vik_units_distance_t dist_units = a_vik_get_units_distance (); @@ -1145,6 +1195,9 @@ void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) ); break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) ); + break; default: g_critical("Houston, we've had a problem. distance=%d", dist_units); } @@ -1193,17 +1246,17 @@ void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, gpointer *pass_ gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (widgets->is_marker_drawn) { - gdouble pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - MARGIN+x, - y_blob, + gtk_widget_get_style(window)->black_gc, + MARGIN_X+x, + MARGIN_Y+y_blob, &widgets->speed_dist_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -1240,6 +1293,9 @@ static void draw_dem_alt_speed_dist(VikTrack *tr, max_speed = max_speed_in * 110 / 100; gdouble dist = 0; + gint h2 = height + MARGIN_Y; // Adjust height for x axis labelling offset + gint achunk = chunksa[cia]*LINES; + for (iter = tr->trackpoints->next; iter; iter = iter->next) { int x; dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), @@ -1254,29 +1310,205 @@ static void draw_dem_alt_speed_dist(VikTrack *tr, elev = VIK_METERS_TO_FEET(elev); // No conversion needed if already in metres - // consider chunk size - int y_alt = height - ((height * elev)/(chunksa[cia]*LINES) ); - gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4); + // consider chunk size + int y_alt = h2 - ((height * elev)/achunk ); + gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4); } } if (do_speed) { // This is just a speed indicator - no actual values can be inferred by user if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) { - int y_speed = height - (height * VIK_TRACKPOINT(iter->data)->speed)/max_speed; - gdk_draw_rectangle(GDK_DRAWABLE(pix), speed_gc, TRUE, x-2, y_speed-2, 4, 4); + int y_speed = h2 - (height * VIK_TRACKPOINT(iter->data)->speed)/max_speed; + gdk_draw_rectangle(GDK_DRAWABLE(pix), speed_gc, TRUE, x-2, y_speed-2, 4, 4); } } } } +/** + * draw_grid_y: + * + * A common way to draw the grid with y axis labels + * + */ +static void draw_grid_y ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, gchar *ss, gint i ) +{ + PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); + + pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); + pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc); + + gchar *label_markup = g_strdup_printf ( "%s", ss ); + pango_layout_set_markup ( pl, label_markup, -1 ); + g_free ( label_markup ); + + int w, h; + pango_layout_get_pixel_size ( pl, &w, &h ); + + gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0], + MARGIN_X-w-3, + CLAMP((int)i*widgets->profile_height/LINES - h/2 + MARGIN_Y, 0, widgets->profile_height-h+MARGIN_Y), + pl ); + g_object_unref ( G_OBJECT ( pl ) ); + + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0], + MARGIN_X, MARGIN_Y + widgets->profile_height/LINES * i, + MARGIN_X + widgets->profile_width, MARGIN_Y + widgets->profile_height/LINES * i ); +} + +/** + * draw_grid_x_time: + * + * A common way to draw the grid with x axis labels for time graphs + * + */ +static void draw_grid_x_time ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, guint ii, guint tt, guint xx ) +{ + gchar *label_markup = NULL; + switch (ii) { + case 0: + case 1: + case 2: + case 3: + // Minutes + label_markup = g_strdup_printf ( "%d %s", tt/60, _("mins") ); + break; + case 4: + case 5: + case 6: + case 7: + // Hours + label_markup = g_strdup_printf ( "%.1f %s", (gdouble)tt/(60*60), _("h") ); + break; + case 8: + case 9: + case 10: + // Days + label_markup = g_strdup_printf ( "%.1f %s", (gdouble)tt/(60*60*24), _("d") ); + break; + case 11: + case 12: + // Weeks + label_markup = g_strdup_printf ( "%.1f %s", (gdouble)tt/(60*60*24*7), _("w") ); + break; + case 13: + // 'Months' + label_markup = g_strdup_printf ( "%.1f %s", (gdouble)tt/(60*60*24*28), _("M") ); + break; + default: + break; + } + if ( label_markup ) { + + PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); + pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc); + + pango_layout_set_markup ( pl, label_markup, -1 ); + g_free ( label_markup ); + int ww, hh; + pango_layout_get_pixel_size ( pl, &ww, &hh ); + + gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0], + MARGIN_X+xx-ww/2, MARGIN_Y/2-hh/2, pl ); + g_object_unref ( G_OBJECT ( pl ) ); + } + + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0], + MARGIN_X+xx, MARGIN_Y, MARGIN_X+xx, MARGIN_Y+widgets->profile_height ); +} + +/** + * draw_grid_x_distance: + * + * A common way to draw the grid with x axis labels for distance graphs + * + */ +static void draw_grid_x_distance ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, guint ii, gdouble dd, guint xx, vik_units_distance_t dist_units ) +{ + gchar *label_markup = NULL; + switch ( dist_units ) { + case VIK_UNITS_DISTANCE_MILES: + if ( ii > 4 ) + label_markup = g_strdup_printf ( "%d %s", (guint)dd, _("miles") ); + else + label_markup = g_strdup_printf ( "%.1f %s", dd, _("miles") ); + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + if ( ii > 4 ) + label_markup = g_strdup_printf ( "%d %s", (guint)dd, _("NM") ); + else + label_markup = g_strdup_printf ( "%.1f %s", dd, _("NM") ); + break; + default: + // VIK_UNITS_DISTANCE_KILOMETRES: + if ( ii > 4 ) + label_markup = g_strdup_printf ( "%d %s", (guint)dd, _("km") ); + else + label_markup = g_strdup_printf ( "%.1f %s", dd, _("km") ); + break; + } + + if ( label_markup ) { + PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); + pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc); + + pango_layout_set_markup ( pl, label_markup, -1 ); + g_free ( label_markup ); + int ww, hh; + pango_layout_get_pixel_size ( pl, &ww, &hh ); + + gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0], + MARGIN_X+xx-ww/2, MARGIN_Y/2-hh/2, pl ); + g_object_unref ( G_OBJECT ( pl ) ); + } + + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0], + MARGIN_X+xx, MARGIN_Y, MARGIN_X+xx, MARGIN_Y+widgets->profile_height ); +} + +/** + * clear the images (scale texts & actual graph) + */ +static void clear_images (GdkPixmap *pix, GtkWidget *window, PropWidgets *widgets) +{ + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->bg_gc[0], + TRUE, 0, 0, widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->mid_gc[0], + TRUE, 0, 0, widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y); +} + +/** + * + */ +static void draw_distance_divisions ( GtkWidget *window, GtkWidget *image, GdkPixmap *pix, PropWidgets *widgets, vik_units_distance_t dist_units ) +{ + // Set to display units from length in metres. + gdouble length = widgets->track_length_inc_gaps; + switch (dist_units) { + case VIK_UNITS_DISTANCE_MILES: + length = VIK_METERS_TO_MILES(length); + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + length = VIK_METERS_TO_NAUTICAL_MILES(length); + break; + default: + // KM + length = length/1000.0; + break; + } + guint index = get_distance_chunk_index ( length ); + gdouble dist_per_pixel = length/widgets->profile_width; + + for (guint i=1; chunksd[index]*i <= length; i++) { + draw_grid_x_distance ( window, image, widgets, pix, index, chunksd[index]*i, (guint)(chunksd[index]*i/dist_per_pixel), dist_units ); + } +} + /** * Draw just the height profile image */ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) { - GtkWidget *window; - GdkPixmap *pix; - gdouble mina, maxa; guint i; GdkGC *no_alt_info; @@ -1303,39 +1535,27 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget minmax_array(widgets->altitudes, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width); - get_new_min_and_chunk_index_altitude (widgets->min_altitude, widgets->max_altitude, &widgets->draw_min_altitude, &widgets->cia); + get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude, &widgets->cia); // Assign locally - mina = widgets->draw_min_altitude; - maxa = widgets->max_altitude; - - window = gtk_widget_get_toplevel (widgets->elev_box); + gdouble mina = widgets->draw_min_altitude; - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->elev_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); - no_alt_info = gdk_gc_new ( window->window ); + no_alt_info = gdk_gc_new ( gtk_widget_get_window(window) ); gdk_color_parse ( "yellow", &color ); gdk_gc_set_rgb_fg_color ( no_alt_info, &color); - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); - + // Reset before redrawing + clear_images (pix, window, widgets); + /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); switch (height_units) { case VIK_UNITS_HEIGHT_METRES: sprintf(s, "%8dm", (int)(mina + (LINES-i)*chunksa[widgets->cia])); @@ -1348,31 +1568,27 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget sprintf(s, "--"); g_critical("Houston, we've had a problem. height=%d", height_units); } - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } + draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() ); + /* draw elevations */ + guint height = MARGIN_Y+widgets->profile_height; for ( i = 0; i < widgets->profile_width; i++ ) if ( widgets->altitudes[i] == VIK_DEFAULT_ALTITUDE ) gdk_draw_line ( GDK_DRAWABLE(pix), no_alt_info, - i + MARGIN, 0, i + MARGIN, widgets->profile_height ); + i + MARGIN_X, MARGIN_Y, i + MARGIN_X, height ); else - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->altitudes[i]-mina)/(chunksa[widgets->cia]*LINES) ); + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height-widgets->profile_height*(widgets->altitudes[i]-mina)/(chunksa[widgets->cia]*LINES) ); if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_dem)) || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed)) ) { - GdkGC *dem_alt_gc = gdk_gc_new ( window->window ); - GdkGC *gps_speed_gc = gdk_gc_new ( window->window ); + GdkGC *dem_alt_gc = gdk_gc_new ( gtk_widget_get_window(window) ); + GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); gdk_color_parse ( "green", &color ); gdk_gc_set_rgb_fg_color ( dem_alt_gc, &color); @@ -1389,12 +1605,12 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget dem_alt_gc, gps_speed_gc, mina, - maxa - mina, + widgets->max_altitude - mina, widgets->max_speed, widgets->cia, widgets->profile_width, widgets->profile_height, - MARGIN, + MARGIN_X, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_dem)), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed))); @@ -1403,7 +1619,7 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); g_object_unref ( G_OBJECT(no_alt_info) ); @@ -1435,7 +1651,7 @@ static void draw_speed_dist(VikTrack *tr, int x; dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), &(VIK_TRACKPOINT(iter->prev->data)->coord) ); - x = (width * dist)/total_length + margin; + x = (width * dist)/total_length + MARGIN_X; if (do_speed) { // This is just a speed indicator - no actual values can be inferred by user if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) { @@ -1451,13 +1667,8 @@ static void draw_speed_dist(VikTrack *tr, */ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) { - GtkWidget *window; - GdkPixmap *pix; - gdouble mina; guint i; - GdkColor color; - // Free previous allocation if ( widgets->gradients ) g_free ( widgets->gradients ); @@ -1469,54 +1680,40 @@ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets minmax_array(widgets->gradients, &widgets->min_gradient, &widgets->max_gradient, TRUE, widgets->profile_width); - get_new_min_and_chunk_index_gradient (widgets->min_gradient, widgets->max_gradient, &widgets->draw_min_gradient, &widgets->cig); + get_new_min_and_chunk_index (widgets->min_gradient, widgets->max_gradient, chunksg, G_N_ELEMENTS(chunksg), &widgets->draw_min_gradient, &widgets->cig); // Assign locally - mina = widgets->draw_min_gradient; - - window = gtk_widget_get_toplevel (widgets->gradient_box); + gdouble mina = widgets->draw_min_gradient; - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->gradient_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); - + // Reset before redrawing + clear_images (pix, window, widgets); + /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); sprintf(s, "%8d%%", (int)(mina + (LINES-i)*chunksg[widgets->cig])); - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } + draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() ); + /* draw gradients */ + guint height = widgets->profile_height + MARGIN_Y; for ( i = 0; i < widgets->profile_width; i++ ) - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->gradients[i]-mina)/(chunksg[widgets->cig]*LINES) ); + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->gradients[i]-mina)/(chunksg[widgets->cig]*LINES) ); if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_gradient_gps_speed)) ) { - GdkGC *gps_speed_gc = gdk_gc_new ( window->window ); + GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); + GdkColor color; gdk_color_parse ( "red", &color ); gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color); @@ -1530,26 +1727,37 @@ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets widgets->max_speed, widgets->profile_width, widgets->profile_height, - MARGIN, + MARGIN_X, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed))); g_object_unref ( G_OBJECT(gps_speed_gc) ); } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); } +static void draw_time_lines ( GtkWidget *window, GtkWidget *image, GdkPixmap *pix, PropWidgets *widgets ) +{ + guint index = get_time_chunk_index ( widgets->duration ); + gdouble time_per_pixel = (gdouble)(widgets->duration)/widgets->profile_width; + + // If stupidly long track in time - don't bother trying to draw grid lines + if ( widgets->duration > chunkst[G_N_ELEMENTS(chunkst)-1]*LINES*LINES ) + return; + + for (guint i=1; chunkst[index]*i <= widgets->duration; i++) { + draw_grid_x_time ( window, image, widgets, pix, index, chunkst[index]*i, (guint)(chunkst[index]*i/time_per_pixel) ); + } +} + /** * Draw just the speed (velocity)/time image */ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) { - GtkWidget *window; - GdkPixmap *pix; - gdouble mins; guint i; // Free previous allocation @@ -1560,6 +1768,11 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) if ( widgets->speeds == NULL ) return; + widgets->duration = vik_track_get_duration ( tr ); + // Negative time or other problem + if ( widgets->duration <= 0 ) + return; + // Convert into appropriate units vik_units_speed_t speed_units = a_vik_get_units_speed (); switch (speed_units) { @@ -1584,9 +1797,8 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) break; } - window = gtk_widget_get_toplevel (widgets->speed_box); - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->speed_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); @@ -1595,28 +1807,18 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) widgets->min_speed = 0; /* splines sometimes give negative speeds */ /* Find suitable chunk index */ - get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed, chunkss, sizeof(chunkss)/sizeof(chunkss[0]), &widgets->draw_min_speed, &widgets->cis); + get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cis); // Assign locally - mins = widgets->draw_min_speed; - - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); + gdouble mins = widgets->draw_min_speed; + + // Reset before redrawing + clear_images (pix, window, widgets); /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); // NB: No need to convert here anymore as numbers are in the appropriate units switch (speed_units) { case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR: @@ -1636,27 +1838,20 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) g_critical("Houston, we've had a problem. speed=%d", speed_units); } - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } - + + draw_time_lines ( window, image, pix, widgets ); /* draw speeds */ + guint height = widgets->profile_height + MARGIN_Y; for ( i = 0; i < widgets->profile_width; i++ ) - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->speeds[i]-mins)/(chunkss[widgets->cis]*LINES) ); - + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->speeds[i]-mins)/(chunkss[widgets->cis]*LINES) ); if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_gps_speed)) ) { - GdkGC *gps_speed_gc = gdk_gc_new ( window->window ); + GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); GdkColor color; gdk_color_parse ( "red", &color ); gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color); @@ -1684,15 +1879,15 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) // No need to convert as already in m/s break; } - int x = MARGIN + widgets->profile_width * (VIK_TRACKPOINT(iter->data)->timestamp - beg_time) / dur; - int y = widgets->profile_height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cis]*LINES); + int x = MARGIN_X + widgets->profile_width * (VIK_TRACKPOINT(iter->data)->timestamp - beg_time) / dur; + int y = height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cis]*LINES); gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4); } g_object_unref ( G_OBJECT(gps_speed_gc) ); } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); } @@ -1702,9 +1897,6 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) */ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) { - GtkWidget *window; - GdkPixmap *pix; - gdouble maxd; guint i; // Free previous allocation @@ -1717,77 +1909,88 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) // Convert into appropriate units vik_units_distance_t dist_units = a_vik_get_units_distance (); - if ( dist_units == VIK_UNITS_DISTANCE_MILES ) { - for ( i = 0; i < widgets->profile_width; i++ ) { - widgets->distances[i] = VIK_METERS_TO_MILES(widgets->distances[i]); - } - } - else { - // Metres - but want in kms - for ( i = 0; i < widgets->profile_width; i++ ) { - widgets->distances[i] = widgets->distances[i]/1000.0; - } + switch ( dist_units ) { + case VIK_UNITS_DISTANCE_MILES: + for ( i = 0; i < widgets->profile_width; i++ ) { + widgets->distances[i] = VIK_METERS_TO_MILES(widgets->distances[i]); + } + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + for ( i = 0; i < widgets->profile_width; i++ ) { + widgets->distances[i] = VIK_METERS_TO_NAUTICAL_MILES(widgets->distances[i]); + } + break; + default: + // Metres - but want in kms + for ( i = 0; i < widgets->profile_width; i++ ) { + widgets->distances[i] = widgets->distances[i]/1000.0; + } + break; } - window = gtk_widget_get_toplevel (widgets->dist_box); + widgets->duration = vik_track_get_duration ( widgets->tr ); + // Negative time or other problem + if ( widgets->duration <= 0 ) + return; - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->dist_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); // easy to work out min / max of distance! // Assign locally // mind = 0.0; - Thus not used - if ( dist_units == VIK_UNITS_DISTANCE_MILES ) + gdouble maxd; + switch ( dist_units ) { + case VIK_UNITS_DISTANCE_MILES: maxd = VIK_METERS_TO_MILES(vik_track_get_length_including_gaps (tr)); - else + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + maxd = VIK_METERS_TO_NAUTICAL_MILES(vik_track_get_length_including_gaps (tr)); + break; + default: maxd = vik_track_get_length_including_gaps (tr) / 1000.0; + break; + } /* Find suitable chunk index */ gdouble dummy = 0.0; // expect this to remain the same! (not that it's used) - get_new_min_and_chunk_index (0, maxd, chunksd, sizeof(chunksd)/sizeof(chunksd[0]), &dummy, &widgets->cid); + get_new_min_and_chunk_index (0, maxd, chunksd, G_N_ELEMENTS(chunksd), &dummy, &widgets->cid); - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); + // Reset before redrawing + clear_images (pix, window, widgets); /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); - if ( dist_units == VIK_UNITS_DISTANCE_MILES ) + switch ( dist_units ) { + case VIK_UNITS_DISTANCE_MILES: sprintf(s, _("%.1f miles"), ((LINES-i)*chunksd[widgets->cid])); - else + break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + sprintf(s, _("%.1f NM"), ((LINES-i)*chunksd[widgets->cid])); + break; + default: sprintf(s, _("%.1f km"), ((LINES-i)*chunksd[widgets->cid])); + break; + } - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } + draw_time_lines ( window, image, pix, widgets ); + /* draw distance */ + guint height = widgets->profile_height + MARGIN_Y; for ( i = 0; i < widgets->profile_width; i++ ) - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->distances[i])/(chunksd[widgets->cid]*LINES) ); + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->distances[i])/(chunksd[widgets->cid]*LINES) ); // Show speed indicator if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_dist_speed)) ) { - GdkGC *dist_speed_gc = gdk_gc_new ( window->window ); + GdkGC *dist_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); GdkColor color; gdk_color_parse ( "red", &color ); gdk_gc_set_rgb_fg_color ( dist_speed_gc, &color); @@ -1796,16 +1999,15 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) max_speed = widgets->max_speed * 110 / 100; // This is just an indicator - no actual values can be inferred by user - gint i; for ( i = 0; i < widgets->profile_width; i++ ) { int y_speed = widgets->profile_height - (widgets->profile_height * widgets->speeds[i])/max_speed; - gdk_draw_rectangle(GDK_DRAWABLE(pix), dist_speed_gc, TRUE, i+MARGIN-2, y_speed-2, 4, 4); + gdk_draw_rectangle(GDK_DRAWABLE(pix), dist_speed_gc, TRUE, i+MARGIN_X-2, y_speed-2, 4, 4); } g_object_unref ( G_OBJECT(dist_speed_gc) ); } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); @@ -1816,9 +2018,6 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) */ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) { - GtkWidget *window; - GdkPixmap *pix; - gdouble mina; guint i; // Free previous allocation @@ -1842,34 +2041,28 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) minmax_array(widgets->ats, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width); - get_new_min_and_chunk_index_altitude (widgets->min_altitude, widgets->max_altitude, &widgets->draw_min_altitude_time, &widgets->ciat); + get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude_time, &widgets->ciat); // Assign locally - mina = widgets->draw_min_altitude_time; + gdouble mina = widgets->draw_min_altitude_time; - window = gtk_widget_get_toplevel (widgets->elev_time_box); + widgets->duration = vik_track_get_duration ( widgets->tr ); + // Negative time or other problem + if ( widgets->duration <= 0 ) + return; - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->elev_time_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); + // Reset before redrawing + clear_images (pix, window, widgets); /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); switch (height_units) { case VIK_UNITS_HEIGHT_METRES: sprintf(s, "%8dm", (int)(mina + (LINES-i)*chunksa[widgets->ciat])); @@ -1882,46 +2075,71 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) sprintf(s, "--"); g_critical("Houston, we've had a problem. height=%d", height_units); } - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } + draw_time_lines ( window, image, pix, widgets ); + /* draw elevations */ + guint height = widgets->profile_height + MARGIN_Y; for ( i = 0; i < widgets->profile_width; i++ ) - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->ats[i]-mina)/(chunksa[widgets->ciat]*LINES) ); + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height-widgets->profile_height*(widgets->ats[i]-mina)/(chunksa[widgets->ciat]*LINES) ); - // Show speed indicator + // Show DEMS + if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_elev_dem)) ) { + GdkColor color; + GdkGC *dem_alt_gc = gdk_gc_new ( gtk_widget_get_window(window) ); + gdk_color_parse ( "green", &color ); + gdk_gc_set_rgb_fg_color ( dem_alt_gc, &color); + + gint h2 = widgets->profile_height + MARGIN_Y; // Adjust height for x axis labelling offset + gint achunk = chunksa[widgets->ciat]*LINES; + + for ( i = 0; i < widgets->profile_width; i++ ) { + // This could be slow doing this each time... + VikTrackpoint *tp = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, ((gdouble)i/(gdouble)widgets->profile_width), NULL ); + if ( tp ) { + gint16 elev = a_dems_get_elev_by_coord(&(tp->coord), VIK_DEM_INTERPOL_SIMPLE); + elev -= mina; //? + if ( elev != VIK_DEM_INVALID_ELEVATION ) { + // Convert into height units + if ( a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET ) + elev = VIK_METERS_TO_FEET(elev); + // No conversion needed if already in metres + + // consider chunk size + int y_alt = h2 - ((widgets->profile_height * elev)/achunk ); + gdk_draw_rectangle(GDK_DRAWABLE(pix), dem_alt_gc, TRUE, i+MARGIN_X-2, y_alt-2, 4, 4); + } + } + } + g_object_unref ( G_OBJECT(dem_alt_gc) ); + } + + // Show speeds if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_elev_speed)) ) { - GdkGC *elev_speed_gc = gdk_gc_new ( window->window ); GdkColor color; + // This is just an indicator - no actual values can be inferred by user + GdkGC *elev_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); gdk_color_parse ( "red", &color ); gdk_gc_set_rgb_fg_color ( elev_speed_gc, &color); - gdouble max_speed = 0; - max_speed = widgets->max_speed * 110 / 100; + gdouble max_speed = widgets->max_speed * 110 / 100; - // This is just an indicator - no actual values can be inferred by user - gint i; for ( i = 0; i < widgets->profile_width; i++ ) { int y_speed = widgets->profile_height - (widgets->profile_height * widgets->speeds[i])/max_speed; - gdk_draw_rectangle(GDK_DRAWABLE(pix), elev_speed_gc, TRUE, i+MARGIN-2, y_speed-2, 4, 4); + gdk_draw_rectangle(GDK_DRAWABLE(pix), elev_speed_gc, TRUE, i+MARGIN_X-2, y_speed-2, 4, 4); } + g_object_unref ( G_OBJECT(elev_speed_gc) ); } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); - } /** @@ -1929,8 +2147,6 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) */ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) { - GtkWidget *window; - GdkPixmap *pix; gdouble mins; guint i; @@ -1966,9 +2182,8 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) break; } - window = gtk_widget_get_toplevel (widgets->speed_dist_box); - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + GtkWidget *window = gtk_widget_get_toplevel (widgets->speed_dist_box); + GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL ); @@ -1978,28 +2193,18 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) widgets->min_speed = 0; /* splines sometimes give negative speeds */ /* Find suitable chunk index */ - get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed_dist, chunkss, sizeof(chunkss)/sizeof(chunkss[0]), &widgets->draw_min_speed, &widgets->cisd); + get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed_dist, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cisd); // Assign locally mins = widgets->draw_min_speed; - /* clear the image */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], - TRUE, 0, 0, MARGIN, widgets->profile_height); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], - TRUE, MARGIN, 0, widgets->profile_width, widgets->profile_height); + // Reset before redrawing + clear_images (pix, window, widgets); /* draw grid */ for (i=0; i<=LINES; i++) { - PangoFontDescription *pfd; - PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; - int w, h; - pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); - pfd = pango_font_description_from_string (PROPWIN_LABEL_FONT); - pango_layout_set_font_description (pl, pfd); - pango_font_description_free (pfd); // NB: No need to convert here anymore as numbers are in the appropriate units switch (speed_units) { case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR: @@ -2019,27 +2224,21 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) g_critical("Houston, we've had a problem. speed=%d", speed_units); } - pango_layout_set_text(pl, s, -1); - pango_layout_get_pixel_size (pl, &w, &h); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, - CLAMP((int)i*widgets->profile_height/LINES - h/2, 0, widgets->profile_height-h), pl); - - gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], - MARGIN, widgets->profile_height/LINES * i, MARGIN + widgets->profile_width, widgets->profile_height/LINES * i); - g_object_unref ( G_OBJECT ( pl ) ); - pl = NULL; + draw_grid_y ( window, image, widgets, pix, s, i ); } - + + draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() ); /* draw speeds */ + guint height = widgets->profile_height + MARGIN_Y; for ( i = 0; i < widgets->profile_width; i++ ) - gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], - i + MARGIN, widgets->profile_height, i + MARGIN, widgets->profile_height-widgets->profile_height*(widgets->speeds_dist[i]-mins)/(chunkss[widgets->cisd]*LINES) ); + gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3], + i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->speeds_dist[i]-mins)/(chunkss[widgets->cisd]*LINES) ); if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_sd_gps_speed)) ) { - GdkGC *gps_speed_gc = gdk_gc_new ( window->window ); + GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) ); GdkColor color; gdk_color_parse ( "red", &color ); gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color); @@ -2068,15 +2267,15 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) break; } dist_tp += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), &(VIK_TRACKPOINT(iter->prev->data)->coord) ); - int x = MARGIN + (widgets->profile_width * dist_tp / dist); - int y = widgets->profile_height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cisd]*LINES); + int x = MARGIN_X + (widgets->profile_width * dist_tp / dist); + int y = height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cisd]*LINES); gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4); } g_object_unref ( G_OBJECT(gps_speed_gc) ); } /* draw border */ - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, widgets->profile_width-1, widgets->profile_height-1); + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1); g_object_unref ( G_OBJECT(pix) ); } @@ -2085,11 +2284,8 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) /** * Draw all graphs */ -static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean resized ) +static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean resized ) { - VikTrack *tr = pass_along[0]; - PropWidgets *widgets = pass_along[3]; - // Draw graphs even if they are not visible GList *child = NULL; @@ -2109,7 +2305,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->elev_box)); - draw_elevations (GTK_WIDGET(child->data), tr, widgets ); + draw_elevations (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2117,11 +2313,11 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_distance ( tr, widgets->blob_tp, widgets->track_length_inc_gaps ); + pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2130,14 +2326,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->elev_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2157,7 +2353,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->gradient_box)); - draw_gradients (GTK_WIDGET(child->data), tr, widgets ); + draw_gradients (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2165,11 +2361,11 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_distance ( tr, widgets->blob_tp, widgets->track_length_inc_gaps ); + pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2178,14 +2374,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->gradient_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2205,7 +2401,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->speed_box)); - draw_vt (GTK_WIDGET(child->data), tr, widgets ); + draw_vt (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2213,12 +2409,12 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_time ( tr, widgets->blob_tp ); + pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2228,14 +2424,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->speed_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2255,7 +2451,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->dist_box)); - draw_dt (GTK_WIDGET(child->data), tr, widgets ); + draw_dt (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2263,12 +2459,12 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_time ( tr, widgets->blob_tp ); + pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2278,14 +2474,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->dist_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2305,7 +2501,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->elev_time_box)); - draw_et (GTK_WIDGET(child->data), tr, widgets ); + draw_et (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2313,12 +2509,12 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_time ( tr, widgets->marker_tp ); + pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_time ( tr, widgets->blob_tp ); + pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2327,14 +2523,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->elev_time_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2354,7 +2550,7 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean } child = gtk_container_get_children(GTK_CONTAINER(widgets->speed_dist_box)); - draw_sd (GTK_WIDGET(child->data), tr, widgets ); + draw_sd (GTK_WIDGET(child->data), widgets->tr, widgets ); image = GTK_WIDGET(child->data); g_list_free(child); @@ -2362,11 +2558,11 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean // Ensure marker or blob are redrawn if necessary if (widgets->is_marker_drawn || widgets->is_blob_drawn) { - pc = tp_percentage_by_distance ( tr, widgets->marker_tp, widgets->track_length_inc_gaps ); - gdouble x_blob = -MARGIN - 1.0; // i.e. Don't draw unless we get a valid value + pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps ); + gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value gint y_blob = 0; if (widgets->is_blob_drawn) { - pc_blob = tp_percentage_by_distance ( tr, widgets->blob_tp, widgets->track_length_inc_gaps ); + pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps ); if (!isnan(pc_blob)) { x_blob = (pc_blob * widgets->profile_width); } @@ -2375,14 +2571,14 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value if (!isnan(pc)) { - marker_x = (pc * widgets->profile_width) + MARGIN; + marker_x = (pc * widgets->profile_width) + MARGIN_X; } save_image_and_draw_graph_marks (image, marker_x, - window->style->black_gc, - x_blob+MARGIN, - y_blob, + gtk_widget_get_style(window)->black_gc, + x_blob+MARGIN_X, + y_blob+MARGIN_Y, &widgets->speed_dist_graph_saved_img, widgets->profile_width, widgets->profile_height, @@ -2396,10 +2592,8 @@ static void draw_all_graphs ( GtkWidget *widget, gpointer *pass_along, gboolean /** * Configure/Resize the profile & speed/time images */ -static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, gpointer *pass_along ) +static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, PropWidgets *widgets ) { - PropWidgets *widgets = pass_along[3]; - if (widgets->configure_dialog) { // Determine size offsets between dialog size and size for images // Only on the initialisation of the dialog @@ -2408,8 +2602,11 @@ static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, g widgets->configure_dialog = FALSE; // Without this the settting, the dialog will only grow in vertical size - one can not then make it smaller! - gtk_widget_set_size_request ( widget, widgets->profile_width+widgets->profile_width_offset, widgets->profile_height ); - // In fact this allows one to compress it a bit more vertically as I don't add on the height offset + gtk_widget_set_size_request ( widget, widgets->profile_width+widgets->profile_width_offset, widgets->profile_height+widgets->profile_height_offset ); + + // Allow resizing back down to a minimal size (especially useful if the initial size has been made bigger after restoring from the saved settings) + GdkGeometry geom = { 600+widgets->profile_width_offset, 300+widgets->profile_height_offset, 0, 0, 0, 0, 0, 0, 0, 0, GDK_GRAVITY_STATIC }; + gdk_window_set_geometry_hints ( gtk_widget_get_window(widget), &geom, GDK_HINT_MIN_SIZE ); } else { widgets->profile_width_old = widgets->profile_width; @@ -2426,7 +2623,7 @@ static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, g return FALSE; // Draw stuff - draw_all_graphs ( widget, pass_along, TRUE ); + draw_all_graphs ( widget, widgets, TRUE ); return FALSE; } @@ -2434,15 +2631,14 @@ static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, g /** * Create height profile widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets, gdouble *min_alt, gdouble *max_alt) +GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, PropWidgets *widgets, gdouble *min_alt, gdouble *max_alt) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->altitudes = vik_track_make_elevation_map ( tr, widgets->profile_width ); + widgets->altitudes = vik_track_make_elevation_map ( widgets->tr, widgets->profile_width ); if ( widgets->altitudes == NULL ) { *min_alt = *max_alt = VIK_DEFAULT_ALTITUDE; @@ -2451,21 +2647,14 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpoin minmax_array(widgets->altitudes, min_alt, max_alt, TRUE, widgets->profile_width); - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); g_object_unref ( G_OBJECT(pix) ); - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_profile_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_profile_move), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK); @@ -2475,35 +2664,27 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpoin /** * Create height profile widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_gradient ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets) +GtkWidget *vik_trw_layer_create_gradient ( GtkWidget *window, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->gradients = vik_track_make_gradient_map ( tr, widgets->profile_width ); + widgets->gradients = vik_track_make_gradient_map ( widgets->tr, widgets->profile_width ); if ( widgets->gradients == NULL ) { return NULL; } - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); g_object_unref ( G_OBJECT(pix) ); - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_gradient_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_gradient_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_gradient_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_gradient_move), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK); @@ -2513,44 +2694,37 @@ GtkWidget *vik_trw_layer_create_gradient ( GtkWidget *window, VikTrack *tr, gpoi /** * Create speed/time widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets) +GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->speeds = vik_track_make_speed_map ( tr, widgets->profile_width ); + widgets->speeds = vik_track_make_speed_map ( widgets->tr, widgets->profile_width ); if ( widgets->speeds == NULL ) return NULL; - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); #if 0 /* XXX this can go out, it's just a helpful dev tool */ { int j; - GdkGC **colors[8] = { window->style->bg_gc, - window->style->fg_gc, - window->style->light_gc, - window->style->dark_gc, - window->style->mid_gc, - window->style->text_gc, - window->style->base_gc, - window->style->text_aa_gc }; + GdkGC **colors[8] = { gtk_widget_get_style(window)->bg_gc, + gtk_widget_get_style(window)->fg_gc, + gtk_widget_get_style(window)->light_gc, + gtk_widget_get_style(window)->dark_gc, + gtk_widget_get_style(window)->mid_gc, + gtk_widget_get_style(window)->text_gc, + gtk_widget_get_style(window)->base_gc, + gtk_widget_get_style(window)->text_aa_gc }; for (i=0; i<5; i++) { for (j=0; j<8; j++) { gdk_draw_rectangle(GDK_DRAWABLE(pix), colors[j][i], TRUE, i*20, j*20, 20, 20); - gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, + gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, i*20, j*20, 20, 20); } } @@ -2560,9 +2734,8 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint g_object_unref ( G_OBJECT(pix) ); eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_vt_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_vt_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_vt_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_vt_move), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); @@ -2572,33 +2745,26 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint /** * Create distance / time widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_dtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets) +GtkWidget *vik_trw_layer_create_dtdiag ( GtkWidget *window, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->distances = vik_track_make_distance_map ( tr, widgets->profile_width ); + widgets->distances = vik_track_make_distance_map ( widgets->tr, widgets->profile_width ); if ( widgets->distances == NULL ) return NULL; - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); g_object_unref ( G_OBJECT(pix) ); eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_dt_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_dt_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_dt_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_dt_move), widgets ); + //g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); @@ -2608,33 +2774,25 @@ GtkWidget *vik_trw_layer_create_dtdiag ( GtkWidget *window, VikTrack *tr, gpoint /** * Create elevation / time widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_etdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets) +GtkWidget *vik_trw_layer_create_etdiag ( GtkWidget *window, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->ats = vik_track_make_elevation_time_map ( tr, widgets->profile_width ); + widgets->ats = vik_track_make_elevation_time_map ( widgets->tr, widgets->profile_width ); if ( widgets->ats == NULL ) return NULL; - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); g_object_unref ( G_OBJECT(pix) ); eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_et_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_et_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_et_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_et_move), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); @@ -2644,41 +2802,59 @@ GtkWidget *vik_trw_layer_create_etdiag ( GtkWidget *window, VikTrack *tr, gpoint /** * Create speed/distance widgets including the image and callbacks */ -GtkWidget *vik_trw_layer_create_sddiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, VikViewport *vvp, PropWidgets *widgets) +GtkWidget *vik_trw_layer_create_sddiag ( GtkWidget *window, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; GtkWidget *eventbox; - gpointer *pass_along; // First allocation - widgets->speeds_dist = vik_track_make_speed_dist_map ( tr, widgets->profile_width ); + widgets->speeds_dist = vik_track_make_speed_dist_map ( widgets->tr, widgets->profile_width ); if ( widgets->speeds_dist == NULL ) return NULL; - pass_along = g_malloc ( sizeof(gpointer) * 4 ); /* FIXME: mem leak -- never be freed */ - pass_along[0] = tr; - pass_along[1] = vlp; - pass_along[2] = vvp; - pass_along[3] = widgets; - - pix = gdk_pixmap_new( window->window, widgets->profile_width + MARGIN, widgets->profile_height, -1 ); + pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); g_object_unref ( G_OBJECT(pix) ); eventbox = gtk_event_box_new (); - g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_sd_click), pass_along ); - g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_sd_move), pass_along ); - g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along ); + g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_sd_click), widgets ); + g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_sd_move), widgets ); gtk_container_add ( GTK_CONTAINER(eventbox), image ); gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); return eventbox; } -#undef MARGIN +#undef MARGIN_X + +#define VIK_SETTINGS_TRACK_PROFILE_WIDTH "track_profile_display_width" +#define VIK_SETTINGS_TRACK_PROFILE_HEIGHT "track_profile_display_height" + +static void save_values ( PropWidgets *widgets ) +{ + // Session settings + a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, widgets->profile_width ); + a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, widgets->profile_height ); + + // Just for this session ATM + show_dem = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_dem) ); + show_alt_gps_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed) ); + show_gps_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_gps_speed) ); + show_gradient_gps_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_gradient_gps_speed) ); + show_dist_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_dist_speed) ); + show_elev_dem = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_elev_dem) ); + show_elev_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_elev_speed) ); + show_sd_gps_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_sd_gps_speed) ); +} + +static void destroy_cb ( GtkDialog *dialog, PropWidgets *widgets ) +{ + save_values(widgets); + prop_widgets_free(widgets); +} -static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets) +static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets ) { VikTrack *tr = widgets->tr; VikTrwLayer *vtl = widgets->vtl; @@ -2692,53 +2868,59 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg break; case GTK_RESPONSE_ACCEPT: vik_track_set_comment(tr, gtk_entry_get_text(GTK_ENTRY(widgets->w_comment))); + vik_track_set_description(tr, gtk_entry_get_text(GTK_ENTRY(widgets->w_description))); + gtk_color_button_get_color ( GTK_COLOR_BUTTON(widgets->w_color), &(tr->color) ); + tr->draw_name_mode = gtk_combo_box_get_active ( GTK_COMBO_BOX(widgets->w_namelabel) ); + tr->max_number_dist_labels = gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->w_number_distlabels) ); + trw_layer_update_treeview ( widgets->vtl, widgets->tr ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); break; case VIK_TRW_LAYER_PROPWIN_REVERSE: vik_track_reverse(tr); - vik_layer_emit_update ( VIK_LAYER(vtl), FALSE ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); break; case VIK_TRW_LAYER_PROPWIN_DEL_DUP: - vik_track_remove_dup_points(tr); + vik_track_remove_dup_points(tr); // NB ignore the returned answer + // As we could have seen the nuber of dulplicates that would be deleted in the properties statistics tab, + // choose not to inform the user unnecessarily + /* above operation could have deleted current_tp or last_tp */ - trw_layer_cancel_tps_of_track ( vtl, widgets->track_name ); - vik_layer_emit_update ( VIK_LAYER(vtl), FALSE ); + trw_layer_cancel_tps_of_track ( vtl, tr ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); break; case VIK_TRW_LAYER_PROPWIN_SPLIT: { - /* get new tracks, add them, resolve naming conflicts (free if cancel), and delete old. old can still exist on clipboard. */ + /* get new tracks, add them and then the delete old one. old can still exist on clipboard. */ guint ntracks; + VikTrack **tracks = vik_track_split_into_segments(tr, &ntracks); gchar *new_tr_name; guint i; for ( i = 0; i < ntracks; i++ ) { - g_assert ( tracks[i] ); - new_tr_name = g_strdup_printf("%s #%d", widgets->track_name, i+1); - /* if ( (wp_exists) && (! overwrite) ) */ - /* don't need to upper case new_tr_name because old tr name was uppercase */ - if ( vik_trw_layer_get_track(vtl, new_tr_name ) && - ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_LAYER(vtl), "The track \"%s\" exists, do you wish to overwrite it?", new_tr_name ) ) ) - { - gchar *new_new_tr_name = a_dialog_new_track ( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl), NULL ); - g_free ( new_tr_name ); - if (new_new_tr_name) - new_tr_name = new_new_tr_name; + if ( tracks[i] ) { + new_tr_name = trw_layer_new_unique_sublayer_name ( vtl, + widgets->tr->is_route ? VIK_TRW_LAYER_SUBLAYER_ROUTE : VIK_TRW_LAYER_SUBLAYER_TRACK, + widgets->tr->name); + if ( widgets->tr->is_route ) + vik_trw_layer_add_route ( vtl, new_tr_name, tracks[i] ); else - { - new_tr_name = NULL; - vik_track_free ( tracks[i] ); - } - } - if ( new_tr_name ) - vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] ); + vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] ); + vik_track_calculate_bounds ( tracks[i] ); + + g_free ( new_tr_name ); + } } if ( tracks ) { g_free ( tracks ); /* Don't let track destroy this dialog */ vik_track_clear_property_dialog(tr); - vik_trw_layer_delete_track ( vtl, widgets->track_name ); - vik_layer_emit_update ( VIK_LAYER(vtl), FALSE ); /* chase thru the hoops */ + if ( widgets->tr->is_route ) + vik_trw_layer_delete_route ( vtl, tr ); + else + vik_trw_layer_delete_track ( vtl, tr ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); /* chase thru the hoops */ } } break; @@ -2756,33 +2938,28 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg break; } - gchar *r_name = g_strdup_printf("%s #2", widgets->track_name); - if (vik_trw_layer_get_track(vtl, r_name ) && - ( ! a_dialog_yes_or_no( VIK_GTK_WINDOW_FROM_LAYER(vtl), - "The track \"%s\" exists, do you wish to overwrite it?", r_name))) - { - gchar *new_r_name = a_dialog_new_track( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl), NULL ); - if (new_r_name) { - g_free( r_name ); - r_name = new_r_name; - } - else { - a_dialog_msg(VIK_GTK_WINDOW_FROM_LAYER(vtl), GTK_MESSAGE_WARNING, - _("Operation Aborted. Track unchanged"), NULL); - keep_dialog = TRUE; - break; - } - } + gchar *r_name = trw_layer_new_unique_sublayer_name(vtl, + widgets->tr->is_route ? VIK_TRW_LAYER_SUBLAYER_ROUTE : VIK_TRW_LAYER_SUBLAYER_TRACK, + widgets->tr->name); iter->prev->next = NULL; iter->prev = NULL; VikTrack *tr_right = vik_track_new(); if ( tr->comment ) vik_track_set_comment ( tr_right, tr->comment ); tr_right->visible = tr->visible; + tr_right->is_route = tr->is_route; tr_right->trackpoints = iter; - vik_trw_layer_add_track(vtl, r_name, tr_right); - vik_layer_emit_update ( VIK_LAYER(vtl), FALSE ); + if ( widgets->tr->is_route ) + vik_trw_layer_add_route(vtl, r_name, tr_right); + else + vik_trw_layer_add_track(vtl, r_name, tr_right); + vik_track_calculate_bounds ( tr ); + vik_track_calculate_bounds ( tr_right ); + + g_free ( r_name ); + + vik_layer_emit_update ( VIK_LAYER(vtl) ); } break; default: @@ -2792,7 +2969,6 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg /* Keep same behaviour for now: destroy dialog if click on any button */ if (!keep_dialog) { - prop_widgets_free(widgets); vik_track_clear_property_dialog(tr); gtk_widget_destroy ( GTK_WIDGET(dialog) ); } @@ -2801,12 +2977,11 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg /** * Force a redraw when checkbutton has been toggled to show/hide that information */ -static void checkbutton_toggle_cb ( GtkToggleButton *togglebutton, gpointer *pass_along, gpointer dummy) +static void checkbutton_toggle_cb ( GtkToggleButton *togglebutton, PropWidgets *widgets, gpointer dummy ) { - PropWidgets *widgets = pass_along[3]; // Even though not resized, we'll pretend it is - // as this invalidates the saved images (since the image may have changed) - draw_all_graphs ( widgets->dialog, pass_along, TRUE); + draw_all_graphs ( widgets->dialog, widgets, TRUE ); } /** @@ -2817,6 +2992,8 @@ static GtkWidget *create_graph_page ( GtkWidget *graph, GtkWidget *value, const gchar *markup2, GtkWidget *value2, + const gchar *markup3, + GtkWidget *value3, GtkWidget *checkbutton1, gboolean checkbutton1_default, GtkWidget *checkbutton2, @@ -2826,13 +3003,19 @@ static GtkWidget *create_graph_page ( GtkWidget *graph, GtkWidget *vbox = gtk_vbox_new ( FALSE, 10 ); GtkWidget *label = gtk_label_new (NULL); GtkWidget *label2 = gtk_label_new (NULL); + GtkWidget *label3 = gtk_label_new (NULL); gtk_box_pack_start (GTK_BOX(vbox), graph, FALSE, FALSE, 0); gtk_label_set_markup ( GTK_LABEL(label), markup ); gtk_label_set_markup ( GTK_LABEL(label2), markup2 ); + gtk_label_set_markup ( GTK_LABEL(label3), markup3 ); gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(hbox), value, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(hbox), label2, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(hbox), value2, FALSE, FALSE, 0); + if ( value3 ) { + gtk_box_pack_start (GTK_BOX(hbox), label3, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(hbox), value3, FALSE, FALSE, 0); + } if (checkbutton2) { gtk_box_pack_end (GTK_BOX(hbox), checkbutton2, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton2), checkbutton2_default); @@ -2846,16 +3029,62 @@ static GtkWidget *create_graph_page ( GtkWidget *graph, return vbox; } -void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name, VikViewport *vvp ) +static GtkWidget *create_table (int cnt, char *labels[], GtkWidget *contents[]) +{ + GtkTable *table; + int i; + + table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE)); + gtk_table_set_col_spacing (table, 0, 10); + for (i=0; ivtl = vtl; + widgets->vvp = vvp; + widgets->vlp = vlp; widgets->tr = tr; - widgets->profile_width = PROPWIN_PROFILE_WIDTH; - widgets->profile_height = PROPWIN_PROFILE_HEIGHT; - widgets->track_name = track_name; - gchar *title = g_strdup_printf(_("%s - Track Properties"), track_name); + + gint profile_size_value; + // Ensure minimum values + widgets->profile_width = 600; + if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, &profile_size_value ) ) + if ( profile_size_value > widgets->profile_width ) + widgets->profile_width = profile_size_value; + + widgets->profile_height = 300; + if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, &profile_size_value ) ) + if ( profile_size_value > widgets->profile_height ) + widgets->profile_height = profile_size_value; + + gchar *title = g_strdup_printf(_("%s - Track Properties"), tr->name); GtkWidget *dialog = gtk_dialog_new_with_buttons (title, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, @@ -2867,35 +3096,93 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); widgets->dialog = dialog; + g_signal_connect( G_OBJECT(dialog), "response", G_CALLBACK(propwin_response_cb), widgets); + g_free(title); - g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets); - GtkTable *table; + GtkWidget *table; gdouble tr_len; - guint32 tp_count, seg_count; + gulong tp_count; + guint seg_count; gdouble min_alt, max_alt; - widgets->elev_box = vik_trw_layer_create_profile(GTK_WIDGET(parent), tr, vlp, vvp, widgets, &min_alt, &max_alt); - widgets->gradient_box = vik_trw_layer_create_gradient(GTK_WIDGET(parent), tr, vlp, vvp, widgets); - widgets->speed_box = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, vvp, widgets); - widgets->dist_box = vik_trw_layer_create_dtdiag(GTK_WIDGET(parent), tr, vlp, vvp, widgets); - widgets->elev_time_box = vik_trw_layer_create_etdiag(GTK_WIDGET(parent), tr, vlp, vvp, widgets); - widgets->speed_dist_box = vik_trw_layer_create_sddiag(GTK_WIDGET(parent), tr, vlp, vvp, widgets); + widgets->elev_box = vik_trw_layer_create_profile(GTK_WIDGET(parent), widgets, &min_alt, &max_alt); + widgets->gradient_box = vik_trw_layer_create_gradient(GTK_WIDGET(parent), widgets); + widgets->speed_box = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), widgets); + widgets->dist_box = vik_trw_layer_create_dtdiag(GTK_WIDGET(parent), widgets); + widgets->elev_time_box = vik_trw_layer_create_etdiag(GTK_WIDGET(parent), widgets); + widgets->speed_dist_box = vik_trw_layer_create_sddiag(GTK_WIDGET(parent), widgets); GtkWidget *graphs = gtk_notebook_new(); - GtkWidget *content[20]; - int cnt; - int i; - - static gchar *label_texts[] = { N_("Comment:"), N_("Track Length:"), N_("Trackpoints:"), N_("Segments:"), N_("Duplicate Points:"), N_("Max Speed:"), N_("Avg. Speed:"), N_("Moving Avg. Speed:"), N_("Avg. Dist. Between TPs:"), N_("Elevation Range:"), N_("Total Elevation Gain/Loss:"), N_("Start:"), N_("End:"), N_("Duration:") }; + GtkWidget *content_prop[20]; + int cnt_prop = 0; + + static gchar *label_texts[] = { + N_("Comment:"), + N_("Description:"), + N_("Color:"), + N_("Draw Name:"), + N_("Distance Labels:"), + }; + static gchar *stats_texts[] = { + N_("Track Length:"), + N_("Trackpoints:"), + N_("Segments:"), + N_("Duplicate Points:"), + N_("Max Speed:"), + N_("Avg. Speed:"), + N_("Moving Avg. Speed:"), + N_("Avg. Dist. Between TPs:"), + N_("Elevation Range:"), + N_("Total Elevation Gain/Loss:"), + N_("Start:"), + N_("End:"), + N_("Duration:"), + }; static gchar tmp_buf[50]; gdouble tmp_speed; - cnt = 0; + // Properties widgets->w_comment = gtk_entry_new (); if ( tr->comment ) gtk_entry_set_text ( GTK_ENTRY(widgets->w_comment), tr->comment ); g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); - content[cnt++] = widgets->w_comment; + content_prop[cnt_prop++] = widgets->w_comment; + + widgets->w_description = gtk_entry_new (); + if ( tr->description ) + gtk_entry_set_text ( GTK_ENTRY(widgets->w_description), tr->description ); + g_signal_connect_swapped ( widgets->w_description, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); + content_prop[cnt_prop++] = widgets->w_description; + + widgets->w_color = content_prop[cnt_prop++] = gtk_color_button_new_with_color ( &(tr->color) ); + + static gchar *draw_name_labels[] = { + N_("No"), + N_("Centre"), + N_("Start only"), + N_("End only"), + N_("Start and End"), + N_("Centre, Start and End"), + NULL + }; + + widgets->w_namelabel = content_prop[cnt_prop++] = vik_combo_box_text_new (); + gchar **pstr = draw_name_labels; + while ( *pstr ) + vik_combo_box_text_append ( widgets->w_namelabel, *(pstr++) ); + gtk_combo_box_set_active ( GTK_COMBO_BOX(widgets->w_namelabel), tr->draw_name_mode ); + + widgets->w_number_distlabels = content_prop[cnt_prop++] = + gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new(tr->max_number_dist_labels, 0, 100, 1, 1, 0)), 1, 0 ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(widgets->w_number_distlabels), _("Maximum number of distance labels to be shown") ); + + table = create_table (cnt_prop, label_texts, content_prop); + + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), GTK_WIDGET(table), gtk_label_new(_("Properties"))); + + // Statistics + GtkWidget *content[20]; + int cnt = 0; vik_units_distance_t dist_units = a_vik_get_units_distance (); @@ -2910,21 +3197,24 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(tr_len) ); break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(tr_len) ); + break; default: g_critical("Houston, we've had a problem. distance=%d", dist_units); } - widgets->w_track_length = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_track_length = content[cnt++] = ui_label_new_selectable ( tmp_buf ); tp_count = vik_track_get_tp_count(tr); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", tp_count ); - widgets->w_tp_count = content[cnt++] = gtk_label_new ( tmp_buf ); + g_snprintf(tmp_buf, sizeof(tmp_buf), "%lu", tp_count ); + widgets->w_tp_count = content[cnt++] = ui_label_new_selectable ( tmp_buf ); seg_count = vik_track_get_segment_count(tr) ; g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", seg_count ); - widgets->w_segment_count = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_segment_count = content[cnt++] = ui_label_new_selectable ( tmp_buf ); g_snprintf(tmp_buf, sizeof(tmp_buf), "%lu", vik_track_get_dup_point_count(tr) ); - widgets->w_duptp_count = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_duptp_count = content[cnt++] = ui_label_new_selectable ( tmp_buf ); vik_units_speed_t speed_units = a_vik_get_units_speed (); tmp_speed = vik_track_get_max_speed(tr); @@ -2949,7 +3239,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_critical("Houston, we've had a problem. speed=%d", speed_units); } } - widgets->w_max_speed = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_max_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf ); tmp_speed = vik_track_get_average_speed(tr); if ( tmp_speed == 0 ) @@ -2973,7 +3263,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_critical("Houston, we've had a problem. speed=%d", speed_units); } } - widgets->w_avg_speed = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_avg_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf ); // Use 60sec as the default period to be considered stopped // this is the TrackWaypoint draw stops default value 'vtl->stop_length' @@ -3001,7 +3291,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_critical("Houston, we've had a problem. speed=%d", speed_units); } } - widgets->w_mvg_speed = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_mvg_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf ); switch (dist_units) { case VIK_UNITS_DISTANCE_KILOMETRES: @@ -3011,10 +3301,13 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * case VIK_UNITS_DISTANCE_MILES: g_snprintf(tmp_buf, sizeof(tmp_buf), "%.3f miles", (tp_count - seg_count) == 0 ? 0 : VIK_METERS_TO_MILES(tr_len / ( tp_count - seg_count )) ); break; + case VIK_UNITS_DISTANCE_NAUTICAL_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.3f NM", (tp_count - seg_count) == 0 ? 0 : VIK_METERS_TO_NAUTICAL_MILES(tr_len / ( tp_count - seg_count )) ); + break; default: g_critical("Houston, we've had a problem. distance=%d", dist_units); } - widgets->w_avg_dist = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_avg_dist = content[cnt++] = ui_label_new_selectable ( tmp_buf ); vik_units_height_t height_units = a_vik_get_units_height (); if ( min_alt == VIK_DEFAULT_ALTITUDE ) @@ -3032,7 +3325,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_critical("Houston, we've had a problem. height=%d", height_units); } } - widgets->w_elev_range = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_elev_range = content[cnt++] = ui_label_new_selectable ( tmp_buf ); vik_track_get_total_elevation_gain(tr, &max_alt, &min_alt ); if ( min_alt == VIK_DEFAULT_ALTITUDE ) @@ -3050,7 +3343,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_critical("Houston, we've had a problem. height=%d", height_units); } } - widgets->w_elev_gain = content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_elev_gain = content[cnt++] = ui_label_new_selectable ( tmp_buf ); #if 0 #define PACK(w) gtk_box_pack_start (GTK_BOX(right_vbox), w, FALSE, FALSE, 0); @@ -3073,137 +3366,132 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * t1 = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp; t2 = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp; - strncpy(tmp_buf, ctime(&t1), sizeof(tmp_buf)); - tmp_buf[sizeof(tmp_buf)-1] = 0; - g_strchomp(tmp_buf); - widgets->w_time_start = content[cnt++] = gtk_label_new(tmp_buf); + VikCoord vc; + // Notional center of a track is simply an average of the bounding box extremities + struct LatLon center = { (tr->bbox.north+tr->bbox.south)/2, (tr->bbox.east+tr->bbox.west)/2 }; + vik_coord_load_from_latlon ( &vc, vik_trw_layer_get_coord_mode(vtl), ¢er ); - strncpy(tmp_buf, ctime(&t2), sizeof(tmp_buf)); - tmp_buf[sizeof(tmp_buf)-1] = 0; - g_strchomp(tmp_buf); - widgets->w_time_end = content[cnt++] = gtk_label_new(tmp_buf); + widgets->tz = vu_get_tz_at_location ( &vc ); + + gchar *msg; + msg = vu_get_time_string ( &t1, "%c", &vc, widgets->tz ); + widgets->w_time_start = content[cnt++] = ui_label_new_selectable(msg); + g_free ( msg ); + + msg = vu_get_time_string ( &t2, "%c", &vc, widgets->tz ); + widgets->w_time_end = content[cnt++] = ui_label_new_selectable(msg); + g_free ( msg ); g_snprintf(tmp_buf, sizeof(tmp_buf), _("%d minutes"), (int)(t2-t1)/60); - widgets->w_time_dur = content[cnt++] = gtk_label_new(tmp_buf); + widgets->w_time_dur = content[cnt++] = ui_label_new_selectable(tmp_buf); } else { widgets->w_time_start = content[cnt++] = gtk_label_new(_("No Data")); widgets->w_time_end = content[cnt++] = gtk_label_new(_("No Data")); widgets->w_time_dur = content[cnt++] = gtk_label_new(_("No Data")); } - table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE)); - gtk_table_set_col_spacing (table, 0, 10); - for (i=0; ielev_box ) { GtkWidget *page = NULL; - widgets->w_cur_dist = gtk_label_new(_("No Data")); - widgets->w_cur_elevation = gtk_label_new(_("No Data")); + widgets->w_cur_dist = ui_label_new_selectable(_("No Data")); + widgets->w_cur_elevation = ui_label_new_selectable(_("No Data")); widgets->w_show_dem = gtk_check_button_new_with_mnemonic(_("Show D_EM")); widgets->w_show_alt_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed")); page = create_graph_page (widgets->elev_box, - _("Track Distance:"), widgets->w_cur_dist, - _("Track Height:"), widgets->w_cur_elevation, - widgets->w_show_dem, TRUE, - widgets->w_show_alt_gps_speed, TRUE); - g_signal_connect (widgets->w_show_dem, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); - g_signal_connect (widgets->w_show_alt_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Distance:"), widgets->w_cur_dist, + _("Track Height:"), widgets->w_cur_elevation, + NULL, NULL, + widgets->w_show_dem, show_dem, + widgets->w_show_alt_gps_speed, show_alt_gps_speed); + g_signal_connect (widgets->w_show_dem, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); + g_signal_connect (widgets->w_show_alt_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-distance"))); } if ( widgets->gradient_box ) { GtkWidget *page = NULL; - widgets->w_cur_gradient_dist = gtk_label_new(_("No Data")); - widgets->w_cur_gradient_gradient = gtk_label_new(_("No Data")); + widgets->w_cur_gradient_dist = ui_label_new_selectable(_("No Data")); + widgets->w_cur_gradient_gradient = ui_label_new_selectable(_("No Data")); widgets->w_show_gradient_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed")); page = create_graph_page (widgets->gradient_box, - _("Track Distance:"), widgets->w_cur_gradient_dist, - _("Track Gradient:"), widgets->w_cur_gradient_gradient, - widgets->w_show_gradient_gps_speed, TRUE, - NULL, FALSE); - g_signal_connect (widgets->w_show_gradient_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Distance:"), widgets->w_cur_gradient_dist, + _("Track Gradient:"), widgets->w_cur_gradient_gradient, + NULL, NULL, + widgets->w_show_gradient_gps_speed, show_gradient_gps_speed, + NULL, FALSE); + g_signal_connect (widgets->w_show_gradient_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Gradient-distance"))); } if ( widgets->speed_box ) { GtkWidget *page = NULL; - widgets->w_cur_time = gtk_label_new(_("No Data")); - widgets->w_cur_speed = gtk_label_new(_("No Data")); + widgets->w_cur_time = ui_label_new_selectable(_("No Data")); + widgets->w_cur_speed = ui_label_new_selectable(_("No Data")); + widgets->w_cur_time_real = ui_label_new_selectable(_("No Data")); widgets->w_show_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed")); page = create_graph_page (widgets->speed_box, - _("Track Time:"), widgets->w_cur_time, - _("Track Speed:"), widgets->w_cur_speed, - widgets->w_show_gps_speed, TRUE, - NULL, FALSE); - g_signal_connect (widgets->w_show_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Time:"), widgets->w_cur_time, + _("Track Speed:"), widgets->w_cur_speed, + _("Time/Date:"), widgets->w_cur_time_real, + widgets->w_show_gps_speed, show_gps_speed, + NULL, FALSE); + g_signal_connect (widgets->w_show_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-time"))); } if ( widgets->dist_box ) { GtkWidget *page = NULL; - widgets->w_cur_dist_time = gtk_label_new(_("No Data")); - widgets->w_cur_dist_dist = gtk_label_new(_("No Data")); + widgets->w_cur_dist_time = ui_label_new_selectable(_("No Data")); + widgets->w_cur_dist_dist = ui_label_new_selectable(_("No Data")); + widgets->w_cur_dist_time_real = ui_label_new_selectable(_("No Data")); widgets->w_show_dist_speed = gtk_check_button_new_with_mnemonic(_("Show S_peed")); page = create_graph_page (widgets->dist_box, - _("Track Distance:"), widgets->w_cur_dist_dist, - _("Track Time:"), widgets->w_cur_dist_time, - widgets->w_show_dist_speed, FALSE, - NULL, FALSE); - g_signal_connect (widgets->w_show_dist_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Distance:"), widgets->w_cur_dist_dist, + _("Track Time:"), widgets->w_cur_dist_time, + _("Time/Date:"), widgets->w_cur_dist_time_real, + widgets->w_show_dist_speed, show_dist_speed, + NULL, FALSE); + g_signal_connect (widgets->w_show_dist_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Distance-time"))); } if ( widgets->elev_time_box ) { GtkWidget *page = NULL; - widgets->w_cur_elev_time = gtk_label_new(_("No Data")); - widgets->w_cur_elev_elev = gtk_label_new(_("No Data")); + widgets->w_cur_elev_time = ui_label_new_selectable(_("No Data")); + widgets->w_cur_elev_elev = ui_label_new_selectable(_("No Data")); + widgets->w_cur_elev_time_real = ui_label_new_selectable(_("No Data")); widgets->w_show_elev_speed = gtk_check_button_new_with_mnemonic(_("Show S_peed")); + widgets->w_show_elev_dem = gtk_check_button_new_with_mnemonic(_("Show D_EM")); page = create_graph_page (widgets->elev_time_box, - _("Track Time:"), widgets->w_cur_elev_time, - _("Track Height:"), widgets->w_cur_elev_elev, - widgets->w_show_elev_speed, FALSE, - NULL, FALSE); - g_signal_connect (widgets->w_show_elev_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Time:"), widgets->w_cur_elev_time, + _("Track Height:"), widgets->w_cur_elev_elev, + _("Time/Date:"), widgets->w_cur_elev_time_real, + widgets->w_show_elev_dem, show_elev_dem, + widgets->w_show_elev_speed, show_elev_speed); + g_signal_connect (widgets->w_show_elev_dem, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); + g_signal_connect (widgets->w_show_elev_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-time"))); } if ( widgets->speed_dist_box ) { GtkWidget *page = NULL; - widgets->w_cur_speed_dist = gtk_label_new(_("No Data")); - widgets->w_cur_speed_speed = gtk_label_new(_("No Data")); + widgets->w_cur_speed_dist = ui_label_new_selectable(_("No Data")); + widgets->w_cur_speed_speed = ui_label_new_selectable(_("No Data")); widgets->w_show_sd_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed")); page = create_graph_page (widgets->speed_dist_box, - _("Track Distance:"), widgets->w_cur_speed_dist, - _("Track Speed:"), widgets->w_cur_speed_speed, - widgets->w_show_sd_gps_speed, TRUE, - NULL, FALSE); - g_signal_connect (widgets->w_show_sd_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), pass_along); + _("Track Distance:"), widgets->w_cur_speed_dist, + _("Track Speed:"), widgets->w_cur_speed_speed, + NULL, NULL, + widgets->w_show_sd_gps_speed, show_sd_gps_speed, + NULL, FALSE); + g_signal_connect (widgets->w_show_sd_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets); gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-distance"))); } - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), graphs, FALSE, FALSE, 0); gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE); if (seg_count <= 1) @@ -3211,11 +3499,37 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * if (vik_track_get_dup_point_count(tr) <= 0) gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE); - // On dialog realization configure_event casues the graphs to be initially drawn + // On dialog realization configure_event causes the graphs to be initially drawn widgets->configure_dialog = TRUE; - g_signal_connect ( G_OBJECT(dialog), "configure-event", G_CALLBACK (configure_event), pass_along); + g_signal_connect ( G_OBJECT(dialog), "configure-event", G_CALLBACK (configure_event), widgets ); + + g_signal_connect ( G_OBJECT(dialog), "destroy", G_CALLBACK (destroy_cb), widgets ); vik_track_set_property_dialog(tr, dialog); gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT ); gtk_widget_show_all ( dialog ); + + // Gtk note: due to historical reasons, this must be done after widgets are shown + if ( start_on_stats ) + gtk_notebook_set_current_page ( GTK_NOTEBOOK(graphs), 1 ); +} + + +/** + * Update this property dialog + * e.g. if the track has been renamed + */ +void vik_trw_layer_propwin_update ( VikTrack *trk ) +{ + // If not displayed do nothing + if ( !trk->property_dialog ) + return; + + // Update title with current name + if ( trk->name ) { + gchar *title = g_strdup_printf ( _("%s - Track Properties"), trk->name ); + gtk_window_set_title ( GTK_WINDOW(trk->property_dialog), title ); + g_free(title); + } + }