X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7f44287fff695eddba291fa72a900e68ff7bd0a1..db771541ff9b86b3ef5e204d5d5d659ccf66e7e6:/src/viktrwlayer_propwin.c diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c index 30990056..be96f509 100644 --- a/src/viktrwlayer_propwin.c +++ b/src/viktrwlayer_propwin.c @@ -41,6 +41,8 @@ #include "dems.h" #include "viking.h" #include "vikviewport.h" /* ugh */ +#include "vikutils.h" +#include "ui_util.h" #include typedef enum { @@ -76,7 +78,7 @@ 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}; @@ -99,6 +101,16 @@ static const time_t chunkst[] = { 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; @@ -156,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; @@ -201,6 +214,7 @@ typedef struct _propwidgets { VikTrackpoint *blob_tp; gboolean is_blob_drawn; time_t duration; + gchar *tz; // TimeZone at track's location } PropWidgets; static PropWidgets *prop_widgets_new() @@ -327,6 +341,32 @@ static guint get_time_chunk_index (time_t duration) return ci; } +/** + * + */ +static guint get_distance_chunk_index (gdouble length) +{ + // 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; + } + // Use previous value + if ( ci != 0 ) + ci--; + + return ci; +} + static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_width, VikTrwLayer *vtl, @@ -709,6 +749,9 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, PropWidget 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); } @@ -789,6 +832,9 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, PropWidge 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); } @@ -850,13 +896,14 @@ static void time_label_update (GtkWidget *widget, time_t seconds_from_start) } // -static void real_time_label_update (GtkWidget *widget, VikTrackpoint *trackpoint) +static void real_time_label_update ( PropWidgets *widgets, GtkWidget *widget, VikTrackpoint *trackpoint) { static gchar tmp_buf[64]; - if ( trackpoint->has_timestamp ) + 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))); + 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); @@ -887,7 +934,7 @@ void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi } if (trackpoint && widgets->w_cur_time_real) { - real_time_label_update ( widgets->w_cur_time_real, trackpoint ); + real_time_label_update ( widgets, widgets->w_cur_time_real, trackpoint ); } gint ix = (gint)x; @@ -981,7 +1028,7 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi } if (trackpoint && widgets->w_cur_dist_time_real) { - real_time_label_update ( widgets->w_cur_dist_time_real, trackpoint ); + real_time_label_update ( widgets, widgets->w_cur_dist_time_real, trackpoint ); } gint ix = (gint)x; @@ -991,10 +1038,17 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi 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); } @@ -1060,7 +1114,7 @@ void track_et_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi } if (trackpoint && widgets->w_cur_elev_time_real) { - real_time_label_update ( widgets->w_cur_elev_time_real, trackpoint ); + real_time_label_update ( widgets, widgets->w_cur_elev_time_real, trackpoint ); } gint ix = (gint)x; @@ -1141,6 +1195,9 @@ void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi 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); } @@ -1236,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), @@ -1250,16 +1310,16 @@ 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); } } } @@ -1357,6 +1417,55 @@ static void draw_grid_x_time ( GtkWidget *window, GtkWidget *image, PropWidgets 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) */ @@ -1368,6 +1477,33 @@ static void clear_images (GdkPixmap *pix, GtkWidget *window, PropWidgets *widget 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 */ @@ -1403,7 +1539,6 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget // Assign locally gdouble mina = widgets->draw_min_altitude; - gdouble maxa = widgets->max_altitude; 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 ); @@ -1437,6 +1572,8 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget 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++ ) @@ -1468,11 +1605,11 @@ 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_Y, + widgets->profile_height, 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))); @@ -1565,6 +1702,8 @@ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets 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++ ) @@ -1770,16 +1909,23 @@ 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; } widgets->duration = vik_track_get_duration ( widgets->tr ); @@ -1796,10 +1942,17 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) // Assign locally // mind = 0.0; - Thus not used gdouble maxd; - if ( dist_units == VIK_UNITS_DISTANCE_MILES ) + 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) @@ -1812,10 +1965,17 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) for (i=0; i<=LINES; i++) { gchar s[32]; - 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; + } draw_grid_y ( window, image, widgets, pix, s, i ); } @@ -1927,21 +2087,52 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets ) 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 ( gtk_widget_get_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 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_X-2, y_speed-2, 4, 4); } + g_object_unref ( G_OBJECT(elev_speed_gc) ); } @@ -2036,6 +2227,8 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets) 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++ ) @@ -2640,8 +2833,19 @@ GtkWidget *vik_trw_layer_create_sddiag ( GtkWidget *window, PropWidgets *widgets 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 ) @@ -2993,21 +3197,24 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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), "%lu", tp_count ); - widgets->w_tp_count = content[cnt++] = gtk_label_new ( tmp_buf ); + 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); @@ -3032,7 +3239,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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 ) @@ -3056,7 +3263,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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' @@ -3084,7 +3291,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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: @@ -3094,10 +3301,13 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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 ) @@ -3115,7 +3325,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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 ) @@ -3133,7 +3343,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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); @@ -3156,14 +3366,24 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, t1 = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp; t2 = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp; - strftime (tmp_buf, sizeof(tmp_buf), "%c", localtime(&(t1))); - 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 ); + + widgets->tz = vu_get_tz_at_location ( &vc ); - strftime (tmp_buf, sizeof(tmp_buf), "%c", localtime(&(t2))); - widgets->w_time_end = content[cnt++] = gtk_label_new(tmp_buf); + 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")); @@ -3176,16 +3396,16 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, if ( widgets->elev_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, NULL, NULL, - widgets->w_show_dem, TRUE, - widgets->w_show_alt_gps_speed, TRUE); + 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"))); @@ -3193,14 +3413,14 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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, NULL, NULL, - widgets->w_show_gradient_gps_speed, TRUE, + 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"))); @@ -3208,15 +3428,15 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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_real = 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, - _("Date/Time:"), widgets->w_cur_time_real, - widgets->w_show_gps_speed, TRUE, + _("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"))); @@ -3224,15 +3444,15 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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_real = 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, - _("Date/Time:"), widgets->w_cur_dist_time_real, - widgets->w_show_dist_speed, FALSE, + _("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"))); @@ -3240,30 +3460,32 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, 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_real = 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, - _("Date/Time:"), widgets->w_cur_elev_time_real, - widgets->w_show_elev_speed, FALSE, - NULL, FALSE); + _("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, NULL, NULL, - widgets->w_show_sd_gps_speed, TRUE, + 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")));