Refactor: update OSM track upload

[andy/viking.git] / src / datasource_gps.c

diff --git a/src/datasource_gps.c b/src/datasource_gps.c
index 6d430eb3a8bfaa89d347edd52680ccf7b553ff03..aae81af827c2eef83134a3602f8da9073a7caad0 100644 (file)
--- a/src/datasource_gps.c
+++ b/src/datasource_gps.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * Copyright (C) 2006, Alex Foobarian <foobarian@gmail.com>
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * Copyright (C) 2006, Alex Foobarian <foobarian@gmail.com>

- * Copyright (C) 2010, Rob Norris <rw_norris@hotmail.com>
+ * Copyright (C) 2012, Rob Norris <rw_norris@hotmail.com>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -32,19 +32,18 @@
 #include <glib/gprintf.h>
 #include <glib/gi18n.h>
 
 #include <glib/gprintf.h>
 #include <glib/gi18n.h>
 

+#include "datasource_gps.h"

 #include "viking.h"
 #include "babel.h"
 #include "gpx.h"
 #include "acquire.h"
 
 #include "viking.h"
 #include "babel.h"
 #include "gpx.h"
 #include "acquire.h"
 

-#if GTK_CHECK_VERSION(2,6,0)
-#define USE_NEW_COMBO_BOX
-#endif
-

 static gboolean gps_acquire_in_progress = FALSE;
 
 static gboolean gps_acquire_in_progress = FALSE;
 

-static gpointer datasource_gps_init_func ( );
-static void datasource_gps_get_cmd_string ( gpointer add_widgets_data_not_used, gchar **babelargs, gchar **input_file );
+static gint last_active = -1;
+
+static gpointer datasource_gps_init_func ( acq_vik_t *avt );
+static void datasource_gps_get_cmd_string ( gpointer add_widgets_data_not_used, gchar **babelargs, gchar **input_file, gpointer not_used );

 static void datasource_gps_cleanup ( gpointer user_data );
 static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_dialog_widgets_t *w );
 static void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );
 static void datasource_gps_cleanup ( gpointer user_data );
 static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_dialog_widgets_t *w );
 static void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );


@@ -54,14 +53,16 @@ static void datasource_gps_off ( gpointer add_widgets_data_not_used, gchar **bab
 VikDataSourceInterface vik_datasource_gps_interface = {
   N_("Acquire from GPS"),
   N_("Acquired from GPS"),
 VikDataSourceInterface vik_datasource_gps_interface = {
   N_("Acquire from GPS"),
   N_("Acquired from GPS"),

-  VIK_DATASOURCE_GPSBABEL_DIRECT,

   VIK_DATASOURCE_CREATENEWLAYER,
   VIK_DATASOURCE_INPUTTYPE_NONE,
   TRUE,
   VIK_DATASOURCE_CREATENEWLAYER,
   VIK_DATASOURCE_INPUTTYPE_NONE,
   TRUE,

+  TRUE,
+  TRUE,

   (VikDataSourceInitFunc)              datasource_gps_init_func,
   (VikDataSourceCheckExistenceFunc)    NULL,
   (VikDataSourceAddSetupWidgetsFunc)   datasource_gps_add_setup_widgets,
   (VikDataSourceGetCmdStringFunc)      datasource_gps_get_cmd_string,
   (VikDataSourceInitFunc)              datasource_gps_init_func,
   (VikDataSourceCheckExistenceFunc)    NULL,
   (VikDataSourceAddSetupWidgetsFunc)   datasource_gps_add_setup_widgets,
   (VikDataSourceGetCmdStringFunc)      datasource_gps_get_cmd_string,

+  (VikDataSourceProcessFunc)        a_babel_convert_from,

   (VikDataSourceProgressFunc)          datasource_gps_progress,
   (VikDataSourceAddProgressWidgetsFunc)        datasource_gps_add_progress_widgets,
   (VikDataSourceCleanupFunc)           datasource_gps_cleanup,
   (VikDataSourceProgressFunc)          datasource_gps_progress,
   (VikDataSourceAddProgressWidgetsFunc)        datasource_gps_add_progress_widgets,
   (VikDataSourceCleanupFunc)           datasource_gps_cleanup,


@@ -78,11 +79,17 @@ VikDataSourceInterface vik_datasource_gps_interface = {
 typedef struct {
   /* setup dialog */
   GtkWidget *proto_l;
 typedef struct {
   /* setup dialog */
   GtkWidget *proto_l;

-  GtkComboBox *proto_b;
+  GtkWidget *proto_b;

   GtkWidget *ser_l;
   GtkWidget *ser_l;

-  GtkComboBox *ser_b;
+  GtkWidget *ser_b;

   GtkWidget *off_request_l;
   GtkCheckButton *off_request_b;
   GtkWidget *off_request_l;
   GtkCheckButton *off_request_b;

+  GtkWidget *get_tracks_l;
+  GtkCheckButton *get_tracks_b;
+  GtkWidget *get_routes_l;
+  GtkCheckButton *get_routes_b;
+  GtkWidget *get_waypoints_l;
+  GtkCheckButton *get_waypoints_b;

 
   /* progress dialog */
   GtkWidget *gps_label;
 
   /* progress dialog */
   GtkWidget *gps_label;


@@ -90,27 +97,118 @@ typedef struct {
   GtkWidget *id_label;
   GtkWidget *wp_label;
   GtkWidget *trk_label;
   GtkWidget *id_label;
   GtkWidget *wp_label;
   GtkWidget *trk_label;

+  GtkWidget *rte_label;

   GtkWidget *progress_label;
   GtkWidget *progress_label;

+  vik_gps_xfer_type progress_type;

 
   /* state */
   int total_count;
   int count;
 
   /* state */
   int total_count;
   int count;

+  // Know which way xfer is so xfer setting types are only stored for download
+  vik_gps_dir direction;

 } gps_user_data_t;
 
 } gps_user_data_t;
 

-static gpointer datasource_gps_init_func ()
+#define VIK_SETTINGS_GPS_GET_TRACKS "gps_download_tracks"
+#define VIK_SETTINGS_GPS_GET_ROUTES "gps_download_routes"
+#define VIK_SETTINGS_GPS_GET_WAYPOINTS "gps_download_waypoints"
+#define VIK_SETTINGS_GPS_PROTOCOL "gps_protocol"
+#define VIK_SETTINGS_GPS_PORT "gps_port"
+#define VIK_SETTINGS_GPS_POWER_OFF "gps_power_off"
+
+static gpointer datasource_gps_init_func ( acq_vik_t *avt )

 {
 {

-  return g_malloc (sizeof(gps_user_data_t));
+  gps_user_data_t *gps_ud = g_malloc (sizeof(gps_user_data_t));
+  gps_ud->direction = GPS_DOWN;
+  return gps_ud;

 }
 
 }
 

-static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelargs, gchar **input_file )
+/**
+ * datasource_gps_get_protocol:
+ *
+ * Method to get the communication protocol of the GPS device from the widget structure
+ */
+gchar* datasource_gps_get_protocol ( gpointer user_data )

 {
 {

-  char *proto = NULL;
-  char *ser = NULL;
-  char *device = NULL;
-#ifndef USE_NEW_COMBO_BOX
-  GtkTreeIter iter;
+  // Uses the list of supported devices
+  gps_user_data_t *w = (gps_user_data_t *)user_data;
+  last_active = gtk_combo_box_get_active(GTK_COMBO_BOX(w->proto_b));
+  if (a_babel_device_list) {
+    gchar *protocol = ((BabelDevice*)g_list_nth_data(a_babel_device_list, last_active))->name;
+    a_settings_set_string ( VIK_SETTINGS_GPS_PROTOCOL, protocol );
+    return protocol;
+  }
+
+  return NULL;
+}
+
+/**
+ * datasource_gps_get_descriptor:
+ *
+ * Method to get the descriptor from the widget structure
+ * "Everything is a file"
+ * Could actually be normal file or a serial port
+ */
+gchar* datasource_gps_get_descriptor ( gpointer user_data )
+{
+  gps_user_data_t *w = (gps_user_data_t *)user_data;
+
+#if GTK_CHECK_VERSION (2, 24, 0)
+  gchar *descriptor = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(w->ser_b));
+#else
+  gchar *descriptor = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b));

 #endif
 #endif

+  a_settings_set_string ( VIK_SETTINGS_GPS_PORT, descriptor );
+  return descriptor;
+}
+
+/**
+ * datasource_gps_get_do_tracks:
+ *
+ * Method to get the track handling behaviour from the widget structure
+ */
+gboolean datasource_gps_get_do_tracks ( gpointer user_data )
+{

   gps_user_data_t *w = (gps_user_data_t *)user_data;
   gps_user_data_t *w = (gps_user_data_t *)user_data;

+  gboolean get_tracks = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->get_tracks_b));
+  if ( w->direction == GPS_DOWN )
+    a_settings_set_boolean ( VIK_SETTINGS_GPS_GET_TRACKS, get_tracks );
+  return get_tracks;
+}
+
+/**
+ * datasource_gps_get_do_routes:
+ *
+ * Method to get the route handling behaviour from the widget structure
+ */
+gboolean datasource_gps_get_do_routes ( gpointer user_data )
+{
+  gps_user_data_t *w = (gps_user_data_t *)user_data;
+  gboolean get_routes = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->get_routes_b));
+  if ( w->direction == GPS_DOWN )
+    a_settings_set_boolean ( VIK_SETTINGS_GPS_GET_ROUTES, get_routes );
+  return get_routes;
+}
+
+/**
+ * datasource_gps_get_do_waypoints:
+ *
+ * Method to get the waypoint handling behaviour from the widget structure
+ */
+gboolean datasource_gps_get_do_waypoints ( gpointer user_data )
+{
+  gps_user_data_t *w = (gps_user_data_t *)user_data;
+  gboolean get_waypoints = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->get_waypoints_b));
+  if ( w->direction == GPS_DOWN )
+    a_settings_set_boolean ( VIK_SETTINGS_GPS_GET_WAYPOINTS, get_waypoints );
+  return get_waypoints;
+}
+
+static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelargs, gchar **input_file, gpointer not_used )
+{
+  char *device = NULL;
+  char *tracks = NULL;
+  char *routes = NULL;
+  char *waypoints = NULL;

 
   if (gps_acquire_in_progress) {
     *babelargs = *input_file = NULL;
 
   if (gps_acquire_in_progress) {
     *babelargs = *input_file = NULL;


@@ -118,41 +216,52 @@ static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelarg
   
   gps_acquire_in_progress = TRUE;
 
   
   gps_acquire_in_progress = TRUE;
 

-#ifdef USE_NEW_COMBO_BOX
-  proto = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->proto_b));
-#else
-  proto = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->proto_b),&iter);
-#endif
-  if (!strcmp(proto, "Garmin")) {
-    device = "garmin";
-  } else {
-    device = "magellan";
-  }
+  device = datasource_gps_get_protocol ( user_data );
+
+  if ( datasource_gps_get_do_tracks ( user_data ) )
+    tracks = "-t";
+  else
+    tracks = "";
+
+  if ( datasource_gps_get_do_routes ( user_data ) )
+    routes = "-r";
+  else
+    routes = "";

 
 

-  *babelargs = g_strdup_printf("-D 9 -t -w -i %s", device);
+  if ( datasource_gps_get_do_waypoints ( user_data ) )
+    waypoints = "-w";
+  else
+    waypoints = "";
+
+  *babelargs = g_strdup_printf("-D 9 %s %s %s -i %s", tracks, routes, waypoints, device);

   /* device points to static content => no free */
   device = NULL;
   /* device points to static content => no free */
   device = NULL;

-  
-  /* Old stuff */
-#ifdef USE_NEW_COMBO_BOX
-  ser = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b));
-#else
-  ser = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->ser_b),&iter);
-#endif
-  *input_file = g_strdup(ser);
+  tracks = NULL;
+  routes = NULL;
+  waypoints = NULL;
+
+  *input_file = g_strdup(datasource_gps_get_descriptor(user_data));

 
   g_debug(_("using cmdline '%s' and file '%s'\n"), *babelargs, *input_file);
 }
 
 
   g_debug(_("using cmdline '%s' and file '%s'\n"), *babelargs, *input_file);
 }
 

+/**
+ * datasource_gps_get_off:
+ *
+ * Method to get the off behaviour from the widget structure
+ */
+gboolean datasource_gps_get_off ( gpointer user_data )
+{
+  gps_user_data_t *w = (gps_user_data_t *)user_data;
+  gboolean power_off = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->off_request_b));
+  a_settings_set_boolean ( VIK_SETTINGS_GPS_POWER_OFF, power_off );
+  return power_off;
+}

 
 static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar **input_file )
 {
 
 static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar **input_file )
 {

-  char *proto = NULL;

   char *ser = NULL;
   char *device = NULL;
   char *ser = NULL;
   char *device = NULL;

-#ifndef USE_NEW_COMBO_BOX
-  GtkTreeIter iter;
-#endif

   gps_user_data_t *w = (gps_user_data_t *)user_data;
 
   if (gps_acquire_in_progress) {
   gps_user_data_t *w = (gps_user_data_t *)user_data;
 
   if (gps_acquire_in_progress) {


@@ -160,18 +269,21 @@ static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar **
   }
 
   /* See if we should turn off the device */
   }
 
   /* See if we should turn off the device */

-  if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->off_request_b))) {
+  if (!datasource_gps_get_off ( user_data )){

     return;
   }
   
     return;
   }
   

-#ifdef USE_NEW_COMBO_BOX
-  proto = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->proto_b));
-#else
-  proto = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->proto_b),&iter);
-#endif
-  if (!strcmp(proto, "Garmin")) {
+  if (!a_babel_device_list)
+    return;
+  last_active = gtk_combo_box_get_active(GTK_COMBO_BOX(w->proto_b));
+  device = ((BabelDevice*)g_list_nth_data(a_babel_device_list, last_active))->name;
+  if (!strcmp(device, "garmin")) {

     device = "garmin,power_off";
     device = "garmin,power_off";

-  } else {
+  }
+  else if (!strcmp(device, "navilink")) {
+    device = "navilink,power_off";
+  }
+  else {

     return;
   }
 
     return;
   }
 


@@ -179,11 +291,10 @@ static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar **
   /* device points to static content => no free */
   device = NULL;
   
   /* device points to static content => no free */
   device = NULL;
   

-  /* Old stuff */
-#ifdef USE_NEW_COMBO_BOX
-  ser = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b));
+#if GTK_CHECK_VERSION (2, 24, 0)
+  ser = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(w->ser_b));

 #else
 #else

-  ser = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->ser_b),&iter);
+  ser = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b));

 #endif
   *input_file = g_strdup(ser);
 }
 #endif
   *input_file = g_strdup(ser);
 }


@@ -195,21 +306,38 @@ static void datasource_gps_cleanup ( gpointer user_data )
   gps_acquire_in_progress = FALSE;
 }
 
   gps_acquire_in_progress = FALSE;
 }
 

+/**
+ * datasource_gps_clean_up:
+ *
+ * External method to tidy up
+ */
+void datasource_gps_clean_up ( gpointer user_data )
+{
+  datasource_gps_cleanup ( user_data );
+}
+

 static void set_total_count(gint cnt, acq_dialog_widgets_t *w)
 {
   gchar *s = NULL;
   gdk_threads_enter();
 static void set_total_count(gint cnt, acq_dialog_widgets_t *w)
 {
   gchar *s = NULL;
   gdk_threads_enter();

-  if (w->ok) {
+  if (w->running) {

     gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data;
     const gchar *tmp_str;
     gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data;
     const gchar *tmp_str;

-    if (gps_data->progress_label == gps_data->wp_label)
-      tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", cnt);
-    else
-      tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt);
+    switch (gps_data->progress_type) {
+    case WPT: tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", cnt); gps_data->total_count = cnt; break;
+    case TRK: tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt); gps_data->total_count = cnt; break;
+    default:
+      {
+        // Maybe a gpsbabel bug/feature (upto at least v1.4.3 or maybe my Garmin device) but the count always seems x2 too many for routepoints
+        gint mycnt = (cnt / 2) + 1;
+        tmp_str = ngettext("Downloading %d routepoint...", "Downloading %d routepoints...", mycnt);
+        gps_data->total_count = mycnt;
+        break;
+      }
+    }

     s = g_strdup_printf(tmp_str, cnt);
     gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s );
     gtk_widget_show ( gps_data->progress_label );
     s = g_strdup_printf(tmp_str, cnt);
     gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s );
     gtk_widget_show ( gps_data->progress_label );

-    gps_data->total_count = cnt;

   }
   g_free(s); s = NULL;
   gdk_threads_leave();
   }
   g_free(s); s = NULL;
   gdk_threads_leave();


@@ -219,14 +347,22 @@ static void set_current_count(gint cnt, acq_dialog_widgets_t *w)
 {
   gchar *s = NULL;
   gdk_threads_enter();
 {
   gchar *s = NULL;
   gdk_threads_enter();

-  if (w->ok) {
+  if (w->running) {

     gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data;
 
     if (cnt < gps_data->total_count) {
     gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data;
 
     if (cnt < gps_data->total_count) {

-      s = g_strdup_printf(_("Downloaded %d out of %d %s..."), cnt, gps_data->total_count, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints");
+      switch (gps_data->progress_type) {
+      case WPT: s = g_strdup_printf(_("Downloaded %d out of %d %s..."), cnt, gps_data->total_count, "waypoints"); break;
+      case TRK: s = g_strdup_printf(_("Downloaded %d out of %d %s..."), cnt, gps_data->total_count, "trackpoints"); break;
+      default: s = g_strdup_printf(_("Downloaded %d out of %d %s..."), cnt, gps_data->total_count, "routepoints"); break;
+      }

     } else {
     } else {

-      s = g_strdup_printf(_("Downloaded %d %s."), cnt, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints");
-    }    
+      switch (gps_data->progress_type) {
+      case WPT: s = g_strdup_printf(_("Downloaded %d %s."), cnt, "waypoints"); break;
+      case TRK: s = g_strdup_printf(_("Downloaded %d %s."), cnt, "trackpoints"); break;
+      default: s = g_strdup_printf(_("Downloaded %d %s."), cnt, "routepoints"); break;
+      }
+    }

     gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s );
   }
   g_free(s); s = NULL;
     gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s );
   }
   g_free(s); s = NULL;


@@ -237,7 +373,7 @@ static void set_gps_info(const gchar *info, acq_dialog_widgets_t *w)
 {
   gchar *s = NULL;
   gdk_threads_enter();
 {
   gchar *s = NULL;
   gdk_threads_enter();

-  if (w->ok) {
+  if (w->running) {

     s = g_strdup_printf(_("GPS Device: %s"), info);
     gtk_label_set_text ( GTK_LABEL(((gps_user_data_t *)w->user_data)->gps_label), s );
   }
     s = g_strdup_printf(_("GPS Device: %s"), info);
     gtk_label_set_text ( GTK_LABEL(((gps_user_data_t *)w->user_data)->gps_label), s );
   }


@@ -259,13 +395,26 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di
   case BABEL_DIAG_OUTPUT:
     line = (gchar *)data;
 
   case BABEL_DIAG_OUTPUT:
     line = (gchar *)data;
 

-    /* tells us how many items there will be */
-    if (strstr(line, "Xfer Wpt")) { 
+    gdk_threads_enter();
+    if (w->running) {
+      gtk_label_set_text ( GTK_LABEL(w->status), _("Status: Working...") );
+    }
+    gdk_threads_leave();
+
+    /* tells us the type of items that will follow */
+    if (strstr(line, "Xfer Wpt")) {

       gps_data->progress_label = gps_data->wp_label;
       gps_data->progress_label = gps_data->wp_label;

+      gps_data->progress_type = WPT;

     }
     }

-    if (strstr(line, "Xfer Trk")) { 
+    if (strstr(line, "Xfer Trk")) {

       gps_data->progress_label = gps_data->trk_label;
       gps_data->progress_label = gps_data->trk_label;

+      gps_data->progress_type = TRK;
+    }
+    if (strstr(line, "Xfer Rte")) {
+      gps_data->progress_label = gps_data->rte_label;
+      gps_data->progress_type = RTE;

     }
     }

+

     if (strstr(line, "PRDDAT")) {
       gchar **tokens = g_strsplit(line, " ", 0);
       gchar info[128];
     if (strstr(line, "PRDDAT")) {
       gchar **tokens = g_strsplit(line, " ", 0);
       gchar info[128];


@@ -299,7 +448,8 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di
       }
       g_strfreev(tokens);
     }
       }
       g_strfreev(tokens);
     }

-    if (strstr(line, "RECORD")) { 
+    /* tells us how many items there will be */
+    if (strstr(line, "RECORD")) {

       int lsb, msb, cnt;
 
       if (strlen(line) > 20) {
       int lsb, msb, cnt;
 
       if (strlen(line) > 20) {


@@ -310,7 +460,7 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di
        gps_data->count = 0;
       }
     }
        gps_data->count = 0;
       }
     }

-    if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) {
+    if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") || strstr(line, "RTEHDR") || strstr(line, "RTEWPT") ) {

       gps_data->count++;
       set_current_count(gps_data->count, w);
     }
       gps_data->count++;
       set_current_count(gps_data->count, w);
     }


@@ -322,57 +472,200 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di
   }
 }
 
   }
 }
 

-void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data )
+void append_element (gpointer elem, gpointer user_data)
+{
+  const gchar *text = ((BabelDevice*)elem)->label;
+  vik_combo_box_text_append (GTK_WIDGET(user_data), text);
+}
+
+static gint find_entry = -1;
+static gint wanted_entry = -1;
+
+static void find_protocol (gpointer elem, gpointer user_data)
+{
+  const gchar *name = ((BabelDevice*)elem)->name;
+  const gchar *protocol = user_data;
+  find_entry++;
+  if (!strcmp(name, protocol)) {
+    wanted_entry = find_entry;
+  }
+}
+
+static void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data )

 {
   gps_user_data_t *w = (gps_user_data_t *)user_data;
 {
   gps_user_data_t *w = (gps_user_data_t *)user_data;

-  GtkTable*  box;
+  GtkTable *box, *data_type_box;

 
   w->proto_l = gtk_label_new (_("GPS Protocol:"));
 
   w->proto_l = gtk_label_new (_("GPS Protocol:"));

-  w->proto_b = GTK_COMBO_BOX(gtk_combo_box_new_text ());
-  gtk_combo_box_append_text (w->proto_b, "Garmin");
-  gtk_combo_box_append_text (w->proto_b, "Magellan");
-  gtk_combo_box_set_active (w->proto_b, 0);
+  w->proto_b = vik_combo_box_text_new ();
+  g_list_foreach (a_babel_device_list, append_element, w->proto_b);
+
+  if ( last_active < 0 ) {
+    find_entry = -1;
+    wanted_entry = -1;
+    gchar *protocol = NULL;
+    if ( a_settings_get_string ( VIK_SETTINGS_GPS_PROTOCOL, &protocol ) ) {
+      // Use setting
+      if ( protocol )
+        g_list_foreach (a_babel_device_list, find_protocol, protocol);
+    }
+    else {
+      // Attempt to maintain default to Garmin devices (assumed most popular/numerous device)
+      g_list_foreach (a_babel_device_list, find_protocol, "garmin");
+    }
+    // If not found set it to the first entry, otherwise use the entry
+    last_active = ( wanted_entry < 0 ) ? 0 : wanted_entry;
+  }
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX(w->proto_b), last_active);

   g_object_ref(w->proto_b);
 
   w->ser_l = gtk_label_new (_("Serial Port:"));
   g_object_ref(w->proto_b);
 
   w->ser_l = gtk_label_new (_("Serial Port:"));

-  w->ser_b = GTK_COMBO_BOX(gtk_combo_box_entry_new_text ());
+#if GTK_CHECK_VERSION (2, 24, 0)
+  w->ser_b = gtk_combo_box_text_new_with_entry ();
+#else
+  w->ser_b = gtk_combo_box_entry_new_text ();
+#endif
+  // Value from the settings is promoted to the top
+  gchar *gps_port = NULL;
+  if ( a_settings_get_string ( VIK_SETTINGS_GPS_PORT, &gps_port ) ) {
+    // Use setting if available
+    if ( gps_port ) {
+#ifndef WINDOWS
+      if ( !strncmp (gps_port, "/dev/tty", 6) ) {
+        if (g_access (gps_port, R_OK) == 0) {
+          vik_combo_box_text_append (w->ser_b, gps_port);
+       }
+      }
+      else
+#endif
+        vik_combo_box_text_append (w->ser_b, gps_port);
+    }
+  }
+
+  // Note avoid appending the port selected from the settings

 #ifdef WINDOWS
 #ifdef WINDOWS

-  gtk_combo_box_append_text (w->ser_b, "com1");
+  if ( gps_port && strcmp (gps_port, "com1") )
+    vik_combo_box_text_append (w->ser_b, "com1");

 #else
   /* Here just try to see if the device is available which gets passed onto gpsbabel
      List USB devices first as these will generally only be present if autogenerated by udev or similar
      User is still able to set their own free text entry */
 #else
   /* Here just try to see if the device is available which gets passed onto gpsbabel
      List USB devices first as these will generally only be present if autogenerated by udev or similar
      User is still able to set their own free text entry */

-  if (g_access ("/dev/ttyUSB0", R_OK) == 0)
-    gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB0");
-  if (g_access ("/dev/ttyUSB1", R_OK) == 0)
-    gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB1");
-  if (g_access ("/dev/ttyS0", R_OK) == 0)
-    gtk_combo_box_append_text (w->ser_b, "/dev/ttyS0");
-  if (g_access ("/dev/ttyS1", R_OK) == 0)
-    gtk_combo_box_append_text (w->ser_b, "/dev/ttyS1");
+  if ( gps_port && strcmp (gps_port, "/dev/ttyUSB0") )
+    if (g_access ("/dev/ttyUSB0", R_OK) == 0)
+      vik_combo_box_text_append (w->ser_b, "/dev/ttyUSB0");
+  if ( gps_port && strcmp (gps_port, "/dev/ttyUSB1") )
+    if (g_access ("/dev/ttyUSB1", R_OK) == 0)
+      vik_combo_box_text_append (w->ser_b, "/dev/ttyUSB1");
+  if ( gps_port && strcmp (gps_port, "/dev/ttyS0") )
+    if (g_access ("/dev/ttyS0", R_OK) == 0)
+      vik_combo_box_text_append (w->ser_b, "/dev/ttyS0");
+  if ( gps_port && strcmp (gps_port, "/dev/ttyS1") )
+    if (g_access ("/dev/ttyS1", R_OK) == 0)
+      vik_combo_box_text_append (w->ser_b, "/dev/ttyS1");

 #endif
 #endif

-  gtk_combo_box_append_text (w->ser_b, "usb:");
-  gtk_combo_box_set_active (w->ser_b, 0);
+  if ( gps_port && strcmp (gps_port, "usb:") )
+    vik_combo_box_text_append (w->ser_b, "usb:");
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX(w->ser_b), 0);

   g_object_ref(w->ser_b);
 
   g_object_ref(w->ser_b);
 

-  w->off_request_l = gtk_label_new (_("Turn Off After Transfer\n(Garmin Only)"));
+  w->off_request_l = gtk_label_new (_("Turn Off After Transfer\n(Garmin/NAViLink Only)"));

   w->off_request_b = GTK_CHECK_BUTTON ( gtk_check_button_new () );
   w->off_request_b = GTK_CHECK_BUTTON ( gtk_check_button_new () );

+  gboolean power_off;
+  if ( ! a_settings_get_boolean ( VIK_SETTINGS_GPS_POWER_OFF, &power_off ) )
+    power_off = FALSE;
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->off_request_b), power_off);
+
+  w->get_tracks_l = gtk_label_new (_("Tracks:"));
+  w->get_tracks_b = GTK_CHECK_BUTTON ( gtk_check_button_new () );
+  gboolean get_tracks;
+  if ( ! a_settings_get_boolean ( VIK_SETTINGS_GPS_GET_TRACKS, &get_tracks ) )
+    get_tracks = TRUE;
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->get_tracks_b), get_tracks);
+
+  w->get_routes_l = gtk_label_new (_("Routes:"));
+  w->get_routes_b = GTK_CHECK_BUTTON ( gtk_check_button_new () );
+  gboolean get_routes;
+  if ( ! a_settings_get_boolean ( VIK_SETTINGS_GPS_GET_ROUTES, &get_routes ) )
+    get_routes = FALSE;
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->get_routes_b), get_routes);
+
+  w->get_waypoints_l = gtk_label_new (_("Waypoints:"));
+  w->get_waypoints_b = GTK_CHECK_BUTTON ( gtk_check_button_new () );
+  gboolean get_waypoints;
+  if ( ! a_settings_get_boolean ( VIK_SETTINGS_GPS_GET_WAYPOINTS, &get_waypoints ) )
+    get_waypoints = TRUE;
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->get_waypoints_b), get_waypoints);
+
+  box = GTK_TABLE(gtk_table_new(2, 4, FALSE));
+  data_type_box = GTK_TABLE(gtk_table_new(4, 1, FALSE));

 
 

-  box = GTK_TABLE(gtk_table_new(2, 3, FALSE));

   gtk_table_attach_defaults(box, GTK_WIDGET(w->proto_l), 0, 1, 0, 1);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->proto_b), 1, 2, 0, 1);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->ser_l), 0, 1, 1, 2);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->ser_b), 1, 2, 1, 2);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->proto_l), 0, 1, 0, 1);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->proto_b), 1, 2, 0, 1);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->ser_l), 0, 1, 1, 2);
   gtk_table_attach_defaults(box, GTK_WIDGET(w->ser_b), 1, 2, 1, 2);

-  gtk_table_attach_defaults(box, GTK_WIDGET(w->off_request_l), 0, 1, 2, 3);
-  gtk_table_attach_defaults(box, GTK_WIDGET(w->off_request_b), 1, 3, 2, 3);
-  gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(box), FALSE, FALSE, 5 );
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_tracks_l), 0, 1, 0, 1);
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_tracks_b), 1, 2, 0, 1);
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_routes_l), 2, 3, 0, 1);
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_routes_b), 3, 4, 0, 1);
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_waypoints_l), 4, 5, 0, 1);
+  gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_waypoints_b), 5, 6, 0, 1);
+  gtk_table_attach_defaults(box, GTK_WIDGET(data_type_box), 0, 2, 2, 3);
+  gtk_table_attach_defaults(box, GTK_WIDGET(w->off_request_l), 0, 1, 3, 4);
+  gtk_table_attach_defaults(box, GTK_WIDGET(w->off_request_b), 1, 3, 3, 4);
+  gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), GTK_WIDGET(box), FALSE, FALSE, 5 );

 
   gtk_widget_show_all ( dialog );
 }
 
 
   gtk_widget_show_all ( dialog );
 }
 

+/**
+ * datasource_gps_setup:
+ * @dialog: The GTK dialog. The caller is responsible for managing the dialog creation/deletion
+ * @xfer: The default type of items enabled for transfer, others disabled.
+ * @xfer_all: When specified all items are enabled for transfer.
+ *
+ * Returns: A gpointer to the private structure for GPS progress/information widgets
+ *          Pass this pointer back into the other exposed datasource_gps_X functions
+ */
+gpointer datasource_gps_setup ( GtkWidget *dialog, vik_gps_xfer_type xfer, gboolean xfer_all )
+{
+  gps_user_data_t *w_gps = (gps_user_data_t *)datasource_gps_init_func ( NULL );
+  w_gps->direction = GPS_UP;
+  datasource_gps_add_setup_widgets ( dialog, NULL, w_gps );
+
+  gboolean way = xfer_all;
+  gboolean trk = xfer_all;
+  gboolean rte = xfer_all;
+
+  // Selectively turn bits on
+  if ( !xfer_all ) {
+    switch (xfer) {
+    case WPT: way = TRUE; break;
+    case RTE: rte = TRUE; break;
+    default: trk = TRUE; break;
+    }
+  }
+
+  // Apply
+  gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(w_gps->get_tracks_b), trk );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_tracks_l), trk );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_tracks_b), trk );
+
+  gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(w_gps->get_routes_b), rte );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_routes_l), rte );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_routes_b), rte );
+
+  gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(w_gps->get_waypoints_b), way );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_waypoints_l), way );
+  gtk_widget_set_sensitive ( GTK_WIDGET(w_gps->get_waypoints_b), way );
+
+  return (gpointer)w_gps;
+}
+

 void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data )
 {
 void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data )
 {

-  GtkWidget *gpslabel, *verlabel, *idlabel, *wplabel, *trklabel;
+  GtkWidget *gpslabel, *verlabel, *idlabel, *wplabel, *trklabel, *rtelabel;

 
   gps_user_data_t *w_gps = (gps_user_data_t *)user_data;
 
 
   gps_user_data_t *w_gps = (gps_user_data_t *)user_data;
 


@@ -381,10 +674,12 @@ void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data
   idlabel = gtk_label_new ("");
   wplabel = gtk_label_new ("");
   trklabel = gtk_label_new ("");
   idlabel = gtk_label_new ("");
   wplabel = gtk_label_new ("");
   trklabel = gtk_label_new ("");

+  rtelabel = gtk_label_new ("");

 
 

-  gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), gpslabel, FALSE, FALSE, 5 );
-  gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), wplabel, FALSE, FALSE, 5 );
-  gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), trklabel, FALSE, FALSE, 5 );
+  gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), gpslabel, FALSE, FALSE, 5 );
+  gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), wplabel, FALSE, FALSE, 5 );
+  gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), trklabel, FALSE, FALSE, 5 );
+  gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), rtelabel, FALSE, FALSE, 5 );

 
   gtk_widget_show_all ( dialog );
 
 
   gtk_widget_show_all ( dialog );
 


@@ -393,5 +688,6 @@ void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data
   w_gps->ver_label = verlabel;
   w_gps->progress_label = w_gps->wp_label = wplabel;
   w_gps->trk_label = trklabel;
   w_gps->ver_label = verlabel;
   w_gps->progress_label = w_gps->wp_label = wplabel;
   w_gps->trk_label = trklabel;

+  w_gps->rte_label = rtelabel;

   w_gps->total_count = -1;
 }
   w_gps->total_count = -1;
 }