X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/37dd047d3bdd3ff58320c691545d5e6cf160738c..961e8114b32c207d5645c097c13ab0c65000938d:/src/datasource_gps.c diff --git a/src/datasource_gps.c b/src/datasource_gps.c index 95fcc371..28df2b15 100644 --- a/src/datasource_gps.c +++ b/src/datasource_gps.c @@ -2,6 +2,8 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2006, Alex Foobarian + * Copyright (C) 2010, Rob Norris * * 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 @@ -41,6 +43,10 @@ static gboolean gps_acquire_in_progress = FALSE; +static gint last_active = 0; +static gboolean last_get_tracks = TRUE; +static gboolean last_get_waypoints = TRUE; + 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 void datasource_gps_cleanup ( gpointer user_data ); @@ -56,6 +62,7 @@ VikDataSourceInterface vik_datasource_gps_interface = { VIK_DATASOURCE_CREATENEWLAYER, VIK_DATASOURCE_INPUTTYPE_NONE, TRUE, + TRUE, (VikDataSourceInitFunc) datasource_gps_init_func, (VikDataSourceCheckExistenceFunc) NULL, (VikDataSourceAddSetupWidgetsFunc) datasource_gps_add_setup_widgets, @@ -81,6 +88,10 @@ typedef struct { GtkComboBox *ser_b; GtkWidget *off_request_l; GtkCheckButton *off_request_b; + GtkWidget *get_tracks_l; + GtkCheckButton *get_tracks_b; + GtkWidget *get_waypoints_l; + GtkCheckButton *get_waypoints_b; /* progress dialog */ GtkWidget *gps_label; @@ -102,9 +113,10 @@ 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; + char *tracks = NULL; + char *waypoints = NULL; #ifndef USE_NEW_COMBO_BOX GtkTreeIter iter; #endif @@ -116,21 +128,26 @@ static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelarg 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"; - } - - *babelargs = g_strdup_printf("-D 9 -t -w -i %s", device); + 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; + + last_get_tracks = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->get_tracks_b)); + if (last_get_tracks) + tracks = "-t"; + else + tracks = ""; + last_get_waypoints = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->get_waypoints_b)); + if (last_get_waypoints) + waypoints = "-w"; + else + waypoints = ""; + + *babelargs = g_strdup_printf("-D 9 %s %s -i %s", tracks, waypoints, device); /* device points to static content => no free */ device = NULL; - + tracks = NULL; + waypoints = NULL; + /* Old stuff */ #ifdef USE_NEW_COMBO_BOX ser = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b)); @@ -145,7 +162,6 @@ static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelarg static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar **input_file ) { - char *proto = NULL; char *ser = NULL; char *device = NULL; #ifndef USE_NEW_COMBO_BOX @@ -162,14 +178,15 @@ static void datasource_gps_off ( gpointer user_data, gchar **babelargs, gchar ** 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")) { + 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"; - } else { + } + else if (!strcmp(device, "navilink")) { + device = "navilink,power_off"; + } + else { return; } @@ -320,16 +337,22 @@ static void datasource_gps_progress ( BabelProgressCode c, gpointer data, acq_di } } +void append_element (gpointer elem, gpointer user_data) +{ + GtkComboBox *combo = GTK_COMBO_BOX (user_data); + const gchar *text = ((BabelDevice*)elem)->label; + gtk_combo_box_append_text (combo, text); +} + void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer 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_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_list_foreach (a_babel_device_list, append_element, w->proto_b); + gtk_combo_box_set_active (w->proto_b, last_active); g_object_ref(w->proto_b); w->ser_l = gtk_label_new (_("Serial Port:")); @@ -353,16 +376,31 @@ void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpo gtk_combo_box_set_active (w->ser_b, 0); 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 () ); - box = GTK_TABLE(gtk_table_new(2, 3, FALSE)); + w->get_tracks_l = gtk_label_new (_("Tracks:")); + w->get_tracks_b = GTK_CHECK_BUTTON ( gtk_check_button_new () ); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->get_tracks_b), last_get_tracks); + + w->get_waypoints_l = gtk_label_new (_("Waypoints:")); + w->get_waypoints_b = GTK_CHECK_BUTTON ( gtk_check_button_new () ); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->get_waypoints_b), last_get_waypoints); + + box = GTK_TABLE(gtk_table_new(2, 4, FALSE)); + data_type_box = GTK_TABLE(gtk_table_new(4, 1, 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->off_request_l), 0, 1, 2, 3); - gtk_table_attach_defaults(box, GTK_WIDGET(w->off_request_b), 1, 3, 2, 3); + 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_waypoints_l), 2, 3, 0, 1); + gtk_table_attach_defaults(data_type_box, GTK_WIDGET(w->get_waypoints_b), 3, 4, 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(dialog)->vbox), GTK_WIDGET(box), FALSE, FALSE, 5 ); gtk_widget_show_all ( dialog );