]> git.street.me.uk Git - andy/viking.git/blobdiff - src/viktrwlayer_propwin.c
[QA] Fix clang warning: format string is not a string literal
[andy/viking.git] / src / viktrwlayer_propwin.c
index 654c443698b209f22a793fea25d5b6aaf5d52f0f..be96f509a6786bd39a042e92ab5ca7d3dcf0d318 100644 (file)
@@ -41,6 +41,8 @@
 #include "dems.h"
 #include "viking.h"
 #include "vikviewport.h" /* ugh */
+#include "vikutils.h"
+#include "ui_util.h"
 #include <gdk-pixbuf/gdk-pixdata.h>
 
 typedef enum {
@@ -76,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;
@@ -138,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;
@@ -182,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()
@@ -236,6 +269,7 @@ static void minmax_array(const gdouble *array, gdouble *min, gdouble *max, gbool
 }
 
 #define MARGIN_X 70
+#define MARGIN_Y 20
 #define LINES 5
 /**
  * get_new_min_and_chunk_index:
@@ -284,6 +318,55 @@ static void get_new_min_and_chunk_index (gdouble mina, gdouble maxa, const gdoub
   }
 }
 
+static guint get_time_chunk_index (time_t duration)
+{
+  // 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--;
+
+  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,
@@ -341,28 +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_X+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_X+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_X+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_X) && (marker_x < (PROFILE_WIDTH + MARGIN_X))) {
-    GtkAllocation allocation;
-    gtk_widget_get_allocation ( image, &allocation );
-    gdk_draw_line (GDK_DRAWABLE(pix), gc, marker_x, 0, marker_x, allocation.height);
+    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_X) && (blob_x < (PROFILE_WIDTH + MARGIN_X)) && (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;
   }
@@ -491,7 +572,7 @@ static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, Prop
        pc = tp_percentage_by_distance ( widgets->tr, trackpoint, widgets->track_length_inc_gaps );
 
       if (!isnan(pc)) {
-       gdouble marker_x = (pc * widgets->profile_width) + MARGIN_X;
+        gdouble marker_x = (pc * widgets->profile_width) + MARGIN_X;
        save_image_and_draw_graph_marks(image,
                                        marker_x,
                                        gtk_widget_get_style(window)->black_gc,
@@ -668,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);
     }
@@ -707,7 +791,7 @@ void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, PropWidget
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->elev_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -748,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);
     }
@@ -787,7 +874,7 @@ void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, PropWidge
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->gradient_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -809,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);
@@ -846,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;
@@ -901,7 +989,7 @@ void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->speed_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -940,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;
@@ -950,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);
   }
 
@@ -980,7 +1075,7 @@ void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->dist_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -1019,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;
@@ -1059,7 +1154,7 @@ void track_et_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->elev_time_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -1100,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);
     }
@@ -1158,7 +1256,7 @@ void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *wi
                                   marker_x,
                                   gtk_widget_get_style(window)->black_gc,
                                   MARGIN_X+x,
-                                  y_blob,
+                                  MARGIN_Y+y_blob,
                                   &widgets->speed_dist_graph_saved_img,
                                   widgets->profile_width,
                                   widgets->profile_height,
@@ -1195,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),
@@ -1209,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);
       }
     }
   }
@@ -1246,12 +1347,123 @@ static void draw_grid_y ( GtkWidget *window, GtkWidget *image, PropWidgets *widg
 
   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, 0, widgets->profile_height-h), pl );
+                    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, widgets->profile_height/LINES * i, MARGIN_X + widgets->profile_width, widgets->profile_height/LINES * i );
-  g_object_unref ( G_OBJECT ( pl ) );
-  pl = NULL;
+                  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 ( "<span size=\"small\">%d %s</span>", tt/60, _("mins") );
+      break;
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+      // Hours
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60), _("h") );
+      break;
+    case 8:
+    case 9:
+    case 10:
+      // Days
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60*24), _("d") );
+      break;
+    case 11:
+    case 12:
+      // Weeks
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60*24*7), _("w") );
+      break;
+    case 13:
+      // 'Months'
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (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 ( "<span size=\"small\">%d %s</span>", (guint)dd, _("miles") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", dd, _("miles") );
+    break;
+  case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+    if ( ii > 4 )
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", (guint)dd, _("NM") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", dd, _("NM") );
+    break;
+  default:
+    // VIK_UNITS_DISTANCE_KILOMETRES:
+    if ( ii > 4 )
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", (guint)dd, _("km") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", 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 );
 }
 
 /**
@@ -1260,9 +1472,36 @@ static void draw_grid_y ( GtkWidget *window, GtkWidget *image, PropWidgets *widg
 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);
+                     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);
+                     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 );
+  }
 }
 
 /**
@@ -1270,9 +1509,6 @@ static void clear_images (GdkPixmap *pix, GtkWidget *window, PropWidgets *widget
  */
 static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
 {
-  GtkWidget *window;
-  GdkPixmap *pix;
-  gdouble mina, maxa;
   guint i;
 
   GdkGC *no_alt_info;
@@ -1302,12 +1538,10 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget
   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;
+  gdouble mina = widgets->draw_min_altitude;
 
-  window = gtk_widget_get_toplevel (widgets->elev_box);
-
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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 );
 
@@ -1338,14 +1572,17 @@ 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++ )
     if ( widgets->altitudes[i] == VIK_DEFAULT_ALTITUDE )
       gdk_draw_line ( GDK_DRAWABLE(pix), no_alt_info, 
-                      i + MARGIN_X, 0, i + MARGIN_X, widgets->profile_height );
+                      i + MARGIN_X, MARGIN_Y, i + MARGIN_X, height );
     else 
       gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
-                      i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->altitudes[i]-mina)/(chunksa[widgets->cia]*LINES) );
+                      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)) ) {
@@ -1368,7 +1605,7 @@ 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,
@@ -1382,7 +1619,7 @@ static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widget
   }
 
   /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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) );
@@ -1414,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)) {
@@ -1430,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 );
@@ -1451,11 +1683,10 @@ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets
   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( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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 );
 
@@ -1471,14 +1702,18 @@ 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++ )
     gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
-                    i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->gradients[i]-mina)/(chunksg[widgets->cig]*LINES) );
+                    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 ( gtk_widget_get_window(window) );
 
+    GdkColor color;
     gdk_color_parse ( "red", &color );
     gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
 
@@ -1499,19 +1734,30 @@ static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets
   }
 
   /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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
@@ -1522,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) {
@@ -1546,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( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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 );
 
@@ -1560,8 +1810,8 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
   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;
-  
+  gdouble mins = widgets->draw_min_speed;
+
   // Reset before redrawing
   clear_images (pix, window, widgets);
 
@@ -1590,13 +1840,14 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
 
     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), gtk_widget_get_style(window)->dark_gc[3],
-                    i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->speeds[i]-mins)/(chunkss[widgets->cis]*LINES) );
-
+                    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)) ) {
 
@@ -1629,14 +1880,14 @@ static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
        break;
       }
       int x = MARGIN_X + 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 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), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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) );
 }
@@ -1646,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
@@ -1661,31 +1909,50 @@ 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( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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)
@@ -1698,18 +1965,28 @@ 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 );
   }
   
+  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), gtk_widget_get_style(window)->dark_gc[3],
-                    i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->distances[i])/(chunksd[widgets->cid]*LINES) );
+                    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)) ) {
@@ -1730,7 +2007,7 @@ static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
   }
 
   /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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) );
 
@@ -1741,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
@@ -1770,11 +2044,15 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
   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( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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 );
 
@@ -1801,34 +2079,67 @@ static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
     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), gtk_widget_get_style(window)->dark_gc[3],
-                    i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->ats[i]-mina)/(chunksa[widgets->ciat]*LINES) );
+                    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) );
   }
 
   /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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) );
-
 }
 
 /**
@@ -1836,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;
 
@@ -1873,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( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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 );
 
@@ -1919,10 +2227,13 @@ 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++ )
     gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
-                    i + MARGIN_X, widgets->profile_height, i + MARGIN_X, widgets->profile_height-widgets->profile_height*(widgets->speeds_dist[i]-mins)/(chunkss[widgets->cisd]*LINES) );
+                    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)) ) {
@@ -1957,14 +2268,14 @@ static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
       }
       dist_tp += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), &(VIK_TRACKPOINT(iter->prev->data)->coord) );
       int x = MARGIN_X + (widgets->profile_width * dist_tp / dist);
-      int y = widgets->profile_height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cisd]*LINES);
+      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), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, 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) );
 }
@@ -2022,7 +2333,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->elev_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2070,7 +2381,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->gradient_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2120,7 +2431,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->speed_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2170,7 +2481,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->dist_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2219,7 +2530,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->elev_time_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2267,7 +2578,7 @@ static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean
                                       marker_x,
                                       gtk_widget_get_style(window)->black_gc,
                                       x_blob+MARGIN_X,
-                                      y_blob,
+                                      y_blob+MARGIN_Y,
                                       &widgets->speed_dist_graph_saved_img,
                                       widgets->profile_width,
                                       widgets->profile_height,
@@ -2336,7 +2647,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, PropWidgets *widget
 
   minmax_array(widgets->altitudes, min_alt, max_alt, TRUE, widgets->profile_width);
   
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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) );
@@ -2366,7 +2677,7 @@ GtkWidget *vik_trw_layer_create_gradient ( GtkWidget *window, PropWidgets *widge
     return NULL;
   }
 
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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) );
@@ -2394,7 +2705,7 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, PropWidgets *widgets
   if ( widgets->speeds == NULL )
     return NULL;
 
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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
@@ -2445,7 +2756,7 @@ GtkWidget *vik_trw_layer_create_dtdiag ( GtkWidget *window, PropWidgets *widgets
   if ( widgets->distances == NULL )
     return NULL;
 
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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) );
@@ -2474,7 +2785,7 @@ GtkWidget *vik_trw_layer_create_etdiag ( GtkWidget *window, PropWidgets *widgets
   if ( widgets->ats == NULL )
     return NULL;
 
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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) );
@@ -2502,7 +2813,7 @@ GtkWidget *vik_trw_layer_create_sddiag ( GtkWidget *window, PropWidgets *widgets
   if ( widgets->speeds_dist == NULL )
     return NULL;
 
-  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width + MARGIN_X, 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) );
@@ -2522,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 )
@@ -2875,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);
@@ -2914,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 )
@@ -2938,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'
@@ -2966,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:
@@ -2976,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 )
@@ -2997,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 )
@@ -3015,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);
@@ -3038,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), &center );
+
+    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"));
@@ -3058,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,
                               _("<b>Track Distance:</b>"), widgets->w_cur_dist,
                               _("<b>Track Height:</b>"), 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")));
@@ -3075,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,
                               _("<b>Track Distance:</b>"), widgets->w_cur_gradient_dist,
                               _("<b>Track Gradient:</b>"), 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")));
@@ -3090,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,
                               _("<b>Track Time:</b>"), widgets->w_cur_time,
                               _("<b>Track Speed:</b>"), widgets->w_cur_speed,
-                              _("<b>Date/Time:</b>"), widgets->w_cur_time_real,
-                              widgets->w_show_gps_speed, TRUE,
+                              _("<b>Time/Date:</b>"), 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")));
@@ -3106,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,
                               _("<b>Track Distance:</b>"), widgets->w_cur_dist_dist,
                               _("<b>Track Time:</b>"), widgets->w_cur_dist_time,
-                              _("<b>Date/Time:</b>"), widgets->w_cur_dist_time_real,
-                              widgets->w_show_dist_speed, FALSE,
+                              _("<b>Time/Date:</b>"), 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")));
@@ -3122,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,
                               _("<b>Track Time:</b>"), widgets->w_cur_elev_time,
                               _("<b>Track Height:</b>"), widgets->w_cur_elev_elev,
-                              _("<b>Date/Time:</b>"), widgets->w_cur_elev_time_real,
-                              widgets->w_show_elev_speed, FALSE,
-                              NULL, FALSE);
+                              _("<b>Time/Date:</b>"), 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,
                               _("<b>Track Distance:</b>"), widgets->w_cur_speed_dist,
                               _("<b>Track Speed:</b>"), 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")));