X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/dc27aba1a8ffdc5414daa39e66ada3e47af1f66c..64d557a287f0e695856d6bc579293b399b8a07ea:/src/viktrwlayer_propwin.c diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c index dc973511..1ca135e4 100644 --- a/src/viktrwlayer_propwin.c +++ b/src/viktrwlayer_propwin.c @@ -19,10 +19,20 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_MATH_H #include +#endif + #include +#include #include +#ifdef HAVE_STRING_H #include +#endif #include "coords.h" #include "vikcoord.h" #include "viktrack.h" @@ -56,6 +66,7 @@ typedef struct _propwidgets { VikTrack *tr; VikLayersPanel *vlp; gchar *track_name; + GtkWidget *dialog; GtkWidget *w_comment; GtkWidget *w_track_length; GtkWidget *w_tp_count; @@ -69,9 +80,14 @@ typedef struct _propwidgets { GtkWidget *w_time_start; GtkWidget *w_time_end; GtkWidget *w_time_dur; - GtkWidget *w_dist_time; + GtkWidget *w_cur_dist; /*< Current distance */ + GtkWidget *w_cur_time; /*< Current time */ + gdouble track_length; PropSaved elev_graph_saved_img; PropSaved speed_graph_saved_img; + GtkWidget *elev_box; + GtkWidget *speed_box; + VikTrackpoint *marker_tp; } PropWidgets; static PropWidgets *prop_widgets_new() @@ -106,9 +122,9 @@ static void minmax_alt(const gdouble *altitudes, gdouble *min, gdouble *max) } } -#define MARGIN 50 +#define MARGIN 70 #define LINES 5 -static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base) +static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base) { VikTrackpoint *trackpoint; gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2; @@ -127,33 +143,40 @@ static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLay vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord ); vik_layers_panel_emit_update ( vlp ); } + return trackpoint; } -static void draw_graph_mark(GtkWidget *image, gdouble x, GdkGC *gc, PropSaved *saved_img) +static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img) { - GdkPixmap *pix; - const int saved_width = 5; + GdkPixmap *pix = NULL; + /* the pixmap = margin + graph area */ + gdouble x = event_x - img_width/2 + PROFILE_WIDTH/2 + MARGIN/2; + + // fprintf(stderr, "event_x=%f img_width=%d x=%f\n", event_x, img_width, x); gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL); + /* Restore previously saved image */ if (saved_img->saved) { gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, saved_img->pos, 0, -1, -1); saved_img->saved = FALSE; - gtk_widget_queue_draw_area(image, saved_img->pos, 0, + gtk_widget_queue_draw_area(image, + saved_img->pos + img_width/2 - PROFILE_WIDTH/2 - MARGIN/2, 0, saved_img->img->width, saved_img->img->height); } if ((x >= MARGIN) && (x < (PROFILE_WIDTH + MARGIN))) { + /* Save part of the image */ if (saved_img->img) gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, - x - (saved_width/2), 0, 0, 0, saved_img->img->width, saved_img->img->height); + x, 0, 0, 0, saved_img->img->width, saved_img->img->height); else saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), - saved_img->img, x - (saved_width/2), 0, 0, 0, saved_width, PROFILE_HEIGHT); - saved_img->pos = x - (saved_width/2); + saved_img->img, x, 0, 0, 0, 1, PROFILE_HEIGHT); + saved_img->pos = x; saved_img->saved = TRUE; gdk_draw_line (GDK_DRAWABLE(pix), gc, x, 0, x, image->allocation.height); /* redraw the area which contains the line, saved_width is just convenient */ - gtk_widget_queue_draw_area(image, x - saved_width/2, 0, saved_width, PROFILE_HEIGHT); + gtk_widget_queue_draw_area(image, event_x, 0, 1, PROFILE_HEIGHT); } } @@ -167,10 +190,49 @@ static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpoi GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box)); - set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph); - draw_graph_mark(image, event->x, window->style->black_gc, + VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph); + draw_graph_mark(image, event->x, event_box->allocation.width, window->style->black_gc, is_vt_graph ? &widgets->speed_graph_saved_img : &widgets->elev_graph_saved_img); g_list_free(child); + widgets->marker_tp = trackpoint; + gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, TRUE); + + /* draw on the other graph */ + if (trackpoint == NULL || widgets->elev_box == NULL || widgets->speed_box == NULL) + /* This test assumes we have only 2 graphs */ + return; + + gdouble pc = NAN; + gdouble x2; + GList *other_child = gtk_container_get_children(GTK_CONTAINER( + is_vt_graph ? widgets->elev_box : widgets->speed_box)); + GtkWidget *other_image = GTK_WIDGET(other_child->data); + if (is_vt_graph) { + gdouble dist = 0.0; + GList *iter; + for (iter = tr->trackpoints->next; iter != NULL; iter = iter->next) { + dist += vik_coord_diff(&(VIK_TRACKPOINT(iter->data)->coord), + &(VIK_TRACKPOINT(iter->prev->data)->coord)); + /* Assuming trackpoint is not a copy */ + if (trackpoint == VIK_TRACKPOINT(iter->data)) + break; + } + if (iter != NULL) + pc = dist/widgets->track_length; + } else { + time_t t_start, t_end, t_total; + t_start = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp; + t_end = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp; + t_total = t_end - t_start; + pc = (gdouble)(trackpoint->timestamp - t_start)/t_total; + } + if (!isnan(pc)) { + x2 = pc * PROFILE_WIDTH + MARGIN + (event_box->allocation.width/2 - PROFILE_WIDTH/2 - MARGIN/2); + draw_graph_mark(other_image, x2, event_box->allocation.width, window->style->black_gc, + is_vt_graph ? &widgets->elev_graph_saved_img : &widgets->speed_graph_saved_img); + } + + g_list_free(other_child); } @@ -206,10 +268,20 @@ void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass gdouble meters_from_start; VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / PROFILE_WIDTH, &meters_from_start ); - if (trackpoint && widgets->w_dist_time) { + if (trackpoint && widgets->w_cur_dist) { static gchar tmp_buf[20]; - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m", meters_from_start); - gtk_label_set_text(GTK_LABEL(widgets->w_dist_time), tmp_buf); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", meters_from_start/1000.0); + break; + case VIK_UNITS_DISTANCE_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", meters_from_start/1600.0); + break; + default: + g_critical("Houston, we've had a problem. distance=%d", dist_units); + } + gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist), tmp_buf); } } @@ -233,7 +305,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon time_t seconds_from_start; VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / PROFILE_WIDTH, &seconds_from_start ); - if (trackpoint && widgets->w_dist_time) { + if (trackpoint && widgets->w_cur_time) { static gchar tmp_buf[20]; guint h, m, s; h = seconds_from_start/3600; @@ -241,7 +313,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon 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(widgets->w_dist_time), tmp_buf); + gtk_label_set_text(GTK_LABEL(widgets->w_cur_time), tmp_buf); } } @@ -266,7 +338,7 @@ static void draw_dem_alt_speed_dist(VikTrack *tr, GdkDrawable *pix, GdkGC *alt_g &(VIK_TRACKPOINT(iter->prev->data)->coord) ); x = (width * dist)/total_length + margin; if ( elev != VIK_DEM_INVALID_ELEVATION ) { - y_alt = height - (height * elev)/alt_diff; + y_alt = height - ((height * elev)/alt_diff); gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4); } if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) { @@ -309,10 +381,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpoin minmax_alt(altitudes, min_alt, max_alt); mina = *min_alt; - maxa = *max_alt * 110 / 100; - if (maxa-mina < MIN_ALT_DIFF) { - maxa = mina + MIN_ALT_DIFF; - } + maxa = *max_alt + ((*max_alt - *min_alt) * 0.25); /* clear the image */ gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], @@ -321,22 +390,38 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpoin TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT); /* draw grid */ -#define LABEL_FONT "Sans 8" +#define LABEL_FONT "Sans 7" + vik_units_height_t height_units = a_vik_get_units_height (); 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 (LABEL_FONT); pango_layout_set_font_description (pl, pfd); pango_font_description_free (pfd); - sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES)); + switch (height_units) { + case VIK_UNITS_HEIGHT_METRES: + sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES)); + break; + case VIK_UNITS_HEIGHT_FEET: + sprintf(s, "%8dft", (int)((mina + (LINES-i)*(maxa-mina)/LINES)*3.2808399)); + break; + default: + sprintf(s, "--"); + g_critical("Houston, we've had a problem. height=%d", height_units); + } pango_layout_set_text(pl, s, -1); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], 0, - CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl); + 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*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl); gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i); + g_object_unref ( G_OBJECT ( pl ) ); + pl = NULL; } /* draw elevations */ @@ -378,12 +463,6 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpoin return eventbox; } -#define METRIC 1 -#ifdef METRIC -#define MTOK(v) ( (v)*3.6) /* m/s to km/h */ -#else -#define MTOK(v) ( (v)*3600.0/1000.0 * 0.6214) /* m/s to mph - we'll handle this globally eventually but for now ...*/ -#endif GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, PropWidgets *widgets) { @@ -400,19 +479,18 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint pass_along[2] = widgets; gdouble *speeds = vik_track_make_speed_map ( tr, PROFILE_WIDTH ); - if ( speeds == NULL ) + if ( speeds == NULL ) { + g_free(pass_along); return NULL; + } pix = gdk_pixmap_new( window->window, PROFILE_WIDTH + MARGIN, PROFILE_HEIGHT, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); - for (i=0; istyle->fg_gc[0], 0, - CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl); + 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*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl); gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i); + g_object_unref ( G_OBJECT ( pl ) ); + pl = NULL; } + /* draw speeds */ for ( i = 0; i < PROFILE_WIDTH; i++ ) @@ -487,7 +585,7 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint if (isnan(gps_speed)) continue; int x = MARGIN + PROFILE_WIDTH * (VIK_TRACKPOINT(iter->data)->timestamp - beg_time) / dur; - int y = PROFILE_HEIGHT - PROFILE_HEIGHT*(MTOK(gps_speed) - mins)/(maxs - mins); + int y = PROFILE_HEIGHT - PROFILE_HEIGHT*(gps_speed - mins)/(maxs - mins); gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4); } @@ -512,15 +610,11 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint #undef MARGIN #undef LINES -/* Notes: first and third arguments are swapped around compared to the manuals */ -//static void propwin_response_cb( GtkDialog *widgets, gint resp, PropWidgets *widgets) -static void propwin_response_cb( gpointer p_widgets, gint resp, gpointer p_dialog) +static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets) { - PropWidgets *widgets = (PropWidgets *) p_widgets; - GtkDialog * dialog = p_dialog; - VikTrack *tr = widgets->tr; VikTrwLayer *vtl = widgets->vtl; + gboolean keep_dialog = FALSE; /* FIXME: check and make sure the track still exists before doing anything to it */ /* Note: destroying diaglog (eg, parent window exit) won't give "response" */ @@ -580,15 +674,76 @@ static void propwin_response_cb( gpointer p_widgets, gint resp, gpointer p_dialo } } break; + case VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER: + { + GList *iter = tr->trackpoints; + while ((iter = iter->next)) { + if (widgets->marker_tp == VIK_TRACKPOINT(iter->data)) + break; + } + if (iter == NULL) { + a_dialog_msg(VIK_GTK_WINDOW_FROM_LAYER(vtl), GTK_MESSAGE_ERROR, + _("Failed spliting track. Track unchanged"), NULL); + keep_dialog = TRUE; + break; + } + + gchar *r_name = g_strdup_printf("%s #R", widgets->track_name); + if (vik_trw_layer_get_track(vtl, r_name ) && + ( ! a_dialog_overwrite( 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) ); + 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; + } + } + 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->trackpoints = iter; + + vik_trw_layer_add_track(vtl, r_name, tr_right); + vik_layer_emit_update ( VIK_LAYER(vtl) ); + } + break; default: fprintf(stderr, "DEBUG: unknown response\n"); return; } /* Keep same behaviour for now: destroy dialog if click on any button */ - prop_widgets_free(widgets); - vik_track_clear_property_dialog(tr); - gtk_widget_destroy ( GTK_WIDGET(dialog) ); + if (!keep_dialog) { + prop_widgets_free(widgets); + vik_track_clear_property_dialog(tr); + gtk_widget_destroy ( GTK_WIDGET(dialog) ); + } +} + +static GtkWidget *create_graph_page ( GtkWidget *graph, + const gchar *markup, + GtkWidget *value) +{ + GtkWidget *hbox = gtk_hbox_new ( FALSE, 10 ); + GtkWidget *vbox = gtk_vbox_new ( FALSE, 10 ); + GtkWidget *label = gtk_label_new (NULL); + gtk_box_pack_start (GTK_BOX(vbox), graph, FALSE, FALSE, 0); + gtk_label_set_markup ( GTK_LABEL(label), markup ); + 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(vbox), hbox, FALSE, FALSE, 0); + + return vbox; } void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name ) @@ -599,18 +754,20 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * widgets->tr = tr; widgets->vlp = vlp; widgets->track_name = track_name; - gchar *title = g_strdup_printf("%s - Track Properties", track_name); + gchar *title = g_strdup_printf(_("%s - Track Properties"), track_name); GtkWidget *dialog = gtk_dialog_new_with_buttons (title, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - "Split Segments", VIK_TRW_LAYER_PROPWIN_SPLIT, - "Reverse", VIK_TRW_LAYER_PROPWIN_REVERSE, - "Delete Dupl.", VIK_TRW_LAYER_PROPWIN_DEL_DUP, + _("Split at Marker"), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, + _("Split Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT, + _("Reverse"), VIK_TRW_LAYER_PROPWIN_REVERSE, + _("Delete Dupl."), VIK_TRW_LAYER_PROPWIN_DEL_DUP, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + widgets->dialog = dialog; g_free(title); - g_signal_connect_swapped(dialog, "response", G_CALLBACK(propwin_response_cb), widgets); + g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets); //fprintf(stderr, "DEBUG: dialog=0x%p\n", dialog); GtkTable *table; gdouble tr_len; @@ -621,11 +778,14 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, widgets); GtkWidget *graphs = gtk_notebook_new(); + widgets->elev_box = profile; + widgets->speed_box = vtdiag; + GtkWidget *content[20]; int cnt; int i; - static gchar *label_texts[] = { "Comment:", "Track Length:", "Trackpoints:", "Segments:", "Duplicate Points:", "Max Speed:", "Avg. Speed:", "Avg. Dist. Between TPs:", "Elevation Range:", "Total Elevation Gain/Loss:", "Start:", "End:", "Duration:", "Track Distance/Time:" }; + static gchar *label_texts[] = { N_("Comment:"), N_("Track Length:"), N_("Trackpoints:"), N_("Segments:"), N_("Duplicate Points:"), N_("Max Speed:"), N_("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; @@ -636,8 +796,19 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); content[cnt++] = widgets->w_comment; - tr_len = vik_track_get_length(tr); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", tr_len ); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + + tr_len = widgets->track_length = vik_track_get_length(tr); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", tr_len/1000.0 ); + break; + case VIK_UNITS_DISTANCE_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", tr_len/1600.0 ); + 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 ); tp_count = vik_track_get_tp_count(tr); @@ -651,34 +822,102 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * 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 ); + vik_units_speed_t speed_units = a_vik_get_units_speed (); tmp_speed = vik_track_get_max_speed(tr); if ( tmp_speed == 0 ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); - else - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s (%.0f km/h)", tmp_speed, MTOK(tmp_speed) ); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); + else { + switch (speed_units) { + case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km/h", tmp_speed*3.6 ); + break; + case VIK_UNITS_SPEED_MILES_PER_HOUR: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f mph", tmp_speed*2.23693629 ); + break; + case VIK_UNITS_SPEED_METRES_PER_SECOND: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s", tmp_speed ); + break; + case VIK_UNITS_SPEED_KNOTS: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f knots", tmp_speed*1.94384449 ); + break; + default: + g_snprintf (tmp_buf, sizeof(tmp_buf), "--" ); + g_critical("Houston, we've had a problem. speed=%d", speed_units); + } + } widgets->w_max_speed = content[cnt++] = gtk_label_new ( tmp_buf ); tmp_speed = vik_track_get_average_speed(tr); if ( tmp_speed == 0 ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); - else - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s (%.0f km/h)", tmp_speed, MTOK(tmp_speed) ); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); + else { + switch (speed_units) { + case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km/h", tmp_speed*3.6 ); + break; + case VIK_UNITS_SPEED_MILES_PER_HOUR: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f mph", tmp_speed* 2.23693629 ); + break; + case VIK_UNITS_SPEED_METRES_PER_SECOND: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s", tmp_speed ); + break; + case VIK_UNITS_SPEED_KNOTS: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f knots", tmp_speed*1.94384449 ); + break; + default: + g_snprintf (tmp_buf, sizeof(tmp_buf), "--" ); + g_critical("Houston, we've had a problem. speed=%d", speed_units); + } + } widgets->w_avg_speed = content[cnt++] = gtk_label_new ( tmp_buf ); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", (tp_count - seg_count) == 0 ? 0 : tr_len / ( tp_count - seg_count ) ); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + // Even though kilometres, the average distance between points is going to be quite small so keep in metres + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", (tp_count - seg_count) == 0 ? 0 : tr_len / ( tp_count - seg_count ) ); + break; + case VIK_UNITS_DISTANCE_MILES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.3f miles", (tp_count - seg_count) == 0 ? 0 : (tr_len / ( tp_count - seg_count )) / 1600.0 ); + 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 ); + vik_units_height_t height_units = a_vik_get_units_height (); if ( min_alt == VIK_DEFAULT_ALTITUDE ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); - else - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt ); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); + else { + switch (height_units) { + case VIK_UNITS_HEIGHT_METRES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt ); + break; + case VIK_UNITS_HEIGHT_FEET: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet - %.0f feet", min_alt*3.2808399, max_alt*3.2808399 ); + break; + default: + g_snprintf(tmp_buf, sizeof(tmp_buf), "--" ); + g_critical("Houston, we've had a problem. height=%d", height_units); + } + } widgets->w_elev_range = content[cnt++] = gtk_label_new ( tmp_buf ); vik_track_get_total_elevation_gain(tr, &max_alt, &min_alt ); if ( min_alt == VIK_DEFAULT_ALTITUDE ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); - else - g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt ); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); + else { + switch (height_units) { + case VIK_UNITS_HEIGHT_METRES: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt ); + break; + case VIK_UNITS_HEIGHT_FEET: + g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet / %.0f feet", max_alt*3.2808399, min_alt*3.2808399 ); + break; + default: + g_snprintf(tmp_buf, sizeof(tmp_buf), "--" ); + g_critical("Houston, we've had a problem. height=%d", height_units); + } + } widgets->w_elev_gain = content[cnt++] = gtk_label_new ( tmp_buf ); #if 0 @@ -712,14 +951,13 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * g_strchomp(tmp_buf); widgets->w_time_end = content[cnt++] = gtk_label_new(tmp_buf); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%d minutes", (int)(t2-t1)/60); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("%d minutes"), (int)(t2-t1)/60); widgets->w_time_dur = content[cnt++] = gtk_label_new(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"); + 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")); } - widgets->w_dist_time = content[cnt++] = gtk_label_new("No Data"); table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE)); gtk_table_set_col_spacing (table, 0, 10); @@ -728,7 +966,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * label = gtk_label_new(NULL); gtk_misc_set_alignment ( GTK_MISC(label), 1, 0 ); - gtk_label_set_markup ( GTK_LABEL(label), label_texts[i] ); + gtk_label_set_markup ( GTK_LABEL(label), _(label_texts[i]) ); gtk_table_attach_defaults ( table, label, 0, 1, i, i+1 ); if (GTK_IS_MISC(content[i])) { gtk_misc_set_alignment ( GTK_MISC(content[i]), 0, 0 ); @@ -736,20 +974,29 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack * gtk_table_attach_defaults ( table, content[i], 1, 2, i, i+1 ); } - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(table), FALSE, FALSE, 0); + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), GTK_WIDGET(table), gtk_label_new(_("Statistics"))); - if ( profile ) - gtk_notebook_append_page(GTK_NOTEBOOK(graphs), profile, gtk_label_new("Elevation-distance")); + if ( profile ) { + GtkWidget *page = NULL; + widgets->w_cur_dist = gtk_label_new(_("No Data")); + page = create_graph_page (profile, _("Track Distance:"), widgets->w_cur_dist ); + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-distance"))); + } - if ( vtdiag ) - gtk_notebook_append_page(GTK_NOTEBOOK(graphs), vtdiag, gtk_label_new("Speed-time")); + if ( vtdiag ) { + GtkWidget *page = NULL; + widgets->w_cur_time = gtk_label_new(_("No Data")); + page = create_graph_page (vtdiag, _("Track Time:"), widgets->w_cur_time ); + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-time"))); + } gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE); if (seg_count <= 1) - gtk_dialog_set_response_sensitive(dialog, VIK_TRW_LAYER_PROPWIN_SPLIT, FALSE); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT, FALSE); if (vik_track_get_dup_point_count(tr) <= 0) - gtk_dialog_set_response_sensitive(dialog, VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE); vik_track_set_property_dialog(tr, dialog); gtk_widget_show_all ( dialog );