X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/65f0ccab491b6f0bc5325b20063e0ec11642c003..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/datasource_gps.c diff --git a/src/datasource_gps.c b/src/datasource_gps.c index 65fc9aa2..6c341b1e 100644 --- a/src/datasource_gps.c +++ b/src/datasource_gps.c @@ -18,14 +18,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include + #include +#include #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 gpointer datasource_gps_init_func ( ); @@ -36,10 +45,12 @@ static void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *v static void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data ); VikDataSourceInterface vik_datasource_gps_interface = { - "Acquire from GPS", - "Acquired from GPS", + N_("Acquire from GPS"), + N_("Acquired from GPS"), VIK_DATASOURCE_GPSBABEL_DIRECT, VIK_DATASOURCE_CREATENEWLAYER, + VIK_DATASOURCE_INPUTTYPE_NONE, + TRUE, (VikDataSourceInitFunc) datasource_gps_init_func, (VikDataSourceCheckExistenceFunc) NULL, (VikDataSourceAddSetupWidgetsFunc) datasource_gps_add_setup_widgets, @@ -83,6 +94,12 @@ static gpointer datasource_gps_init_func () static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelargs, gchar **input_file ) { + char *proto = 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) { @@ -91,14 +108,29 @@ static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelarg gps_acquire_in_progress = TRUE; - if (!strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->proto_b)), "Garmin")) { - *babelargs = g_strdup_printf("%s", "-D 9 -t -w -i garmin"); +#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 { - *babelargs = g_strdup_printf("%s", "-D 9 -t -w -i magellan"); + device = "magellan"; } - *input_file = g_strdup_printf("%s", gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b))); - - fprintf(stderr, "using cmdline '%s' and file '%s'\n", *babelargs, *input_file); + *babelargs = g_strdup_printf("-D 9 -t -w -i %s", device); + /* 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); + + g_debug(_("using cmdline '%s' and file '%s'\n"), *babelargs, *input_file); } static void datasource_gps_cleanup ( gpointer user_data ) @@ -109,43 +141,51 @@ static void datasource_gps_cleanup ( gpointer user_data ) static void set_total_count(gint cnt, acq_dialog_widgets_t *w) { - gchar s[128]; + gchar *s = NULL; gdk_threads_enter(); if (w->ok) { gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data; - g_sprintf(s, "Downloading %d %s...", cnt, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints"); + 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); + 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(); } static void set_current_count(gint cnt, acq_dialog_widgets_t *w) { - gchar s[128]; + gchar *s = NULL; gdk_threads_enter(); if (w->ok) { gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data; if (cnt < gps_data->total_count) { - g_sprintf(s, "Downloaded %d out of %d %s...", cnt, gps_data->total_count, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints"); + 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"); } else { - g_sprintf(s, "Downloaded %d %s.", cnt, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints"); + s = g_strdup_printf(_("Downloaded %d %s."), cnt, (gps_data->progress_label == gps_data->wp_label) ? "waypoints" : "trackpoints"); } gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s ); } + g_free(s); s = NULL; gdk_threads_leave(); } static void set_gps_info(const gchar *info, acq_dialog_widgets_t *w) { - gchar s[256]; + gchar *s = NULL; gdk_threads_enter(); if (w->ok) { - g_sprintf(s, "GPS Device: %s", info); + s = g_strdup_printf(_("GPS Device: %s"), info); gtk_label_set_text ( GTK_LABEL(((gps_user_data_t *)w->user_data)->gps_label), s ); } + g_free(s); s = NULL; gdk_threads_leave(); } @@ -175,23 +215,32 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di gchar info[128]; int ilen = 0; int i; - - for (i=8; tokens[i] && ilen < sizeof(info)-2 && strcmp(tokens[i], "00"); i++) { - guint ch; - sscanf(tokens[i], "%x", &ch); - info[ilen++] = ch; + int n_tokens = 0; + + while (tokens[n_tokens]) + n_tokens++; + + if (n_tokens > 8) { + for (i=8; tokens[i] && ilen < sizeof(info)-2 && strcmp(tokens[i], "00"); i++) { + guint ch; + sscanf(tokens[i], "%x", &ch); + info[ilen++] = ch; + } + info[ilen++] = 0; + set_gps_info(info, w); } - info[ilen++] = 0; - set_gps_info(info, w); + g_strfreev(tokens); } if (strstr(line, "RECORD")) { int lsb, msb, cnt; - sscanf(line+17, "%x", &lsb); - sscanf(line+20, "%x", &msb); - cnt = lsb + msb * 256; - set_total_count(cnt, w); - gps_data->count = 0; + if (strlen(line) > 20) { + sscanf(line+17, "%x", &lsb); + sscanf(line+20, "%x", &msb); + cnt = lsb + msb * 256; + set_total_count(cnt, w); + gps_data->count = 0; + } } if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) { gps_data->count++; @@ -210,19 +259,24 @@ void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpo gps_user_data_t *w = (gps_user_data_t *)user_data; GtkTable* 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); g_object_ref(w->proto_b); - w->ser_l = gtk_label_new ("Serial Port:"); + w->ser_l = gtk_label_new (_("Serial Port:")); w->ser_b = GTK_COMBO_BOX(gtk_combo_box_entry_new_text ()); +#ifdef WINDOWS + gtk_combo_box_append_text (w->ser_b, "com1"); +#else gtk_combo_box_append_text (w->ser_b, "/dev/ttyS0"); gtk_combo_box_append_text (w->ser_b, "/dev/ttyS1"); gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB0"); gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB1"); +#endif + gtk_combo_box_append_text (w->ser_b, "usb:"); gtk_combo_box_set_active (w->ser_b, 0); g_object_ref(w->ser_b); @@ -242,7 +296,7 @@ void datasource_gps_add_progress_widgets ( GtkWidget *dialog, gpointer user_data gps_user_data_t *w_gps = (gps_user_data_t *)user_data; - gpslabel = gtk_label_new ("GPS device: N/A"); + gpslabel = gtk_label_new (_("GPS device: N/A")); verlabel = gtk_label_new (""); idlabel = gtk_label_new (""); wplabel = gtk_label_new ("");