Home / Browse / Viking GPS data editor and analyzer / Mail / Archive

Viking GPS data editor and analyzer

Email Archive: viking-devel (read-only)

2003:	_Jan	_Feb	_Mar	_Apr	_May	_Jun (1)	_Jul (5)	_Aug (1)	_Sep	_Oct	_Nov (6)	_Dec (2)
2004:	_Jan (1)	_Feb (2)	_Mar (2)	_Apr (6)	_May (3)	_Jun (7)	_Jul (4)	_Aug	_Sep (1)	_Oct	_Nov (2)	_Dec (1)
2005:	_Jan (20)	_Feb (4)	_Mar (2)	_Apr	_May	_Jun	_Jul (4)	_Aug (2)	_Sep (16)	_Oct (19)	_Nov (5)	_Dec
2006:	_Jan	_Feb	_Mar	_Apr (1)	_May (17)	_Jun (5)	_Jul (6)	_Aug (1)	_Sep (3)	_Oct (67)	_Nov (41)	_Dec (34)
2007:	_Jan (28)	_Feb (32)	_Mar	_Apr (15)	_May (98)	_Jun (88)	_Jul (101)	_Aug (110)	_Sep (169)	_Oct (193)	_Nov (63)	_Dec (177)
2008:	_Jan (48)	_Feb (177)	_Mar (78)	_Apr (72)	_May (41)	_Jun (48)	_Jul (92)	_Aug (63)	_Sep (49)	_Oct (58)	_Nov (68)	_Dec (32)
2009:	_Jan (37)	_Feb (12)	_Mar (45)	_Apr (44)	_May (29)	_Jun (10)	_Jul (55)	_Aug (7)	_Sep (35)	_Oct (15)	_Nov (1)	_Dec (4)
2010:	_Jan (26)	_Feb (20)	_Mar (28)	_Apr (41)	_May (28)	_Jun (22)	_Jul (19)	_Aug (31)	_Sep (58)	_Oct (42)	_Nov (17)	_Dec (17)
2011:	_Jan (13)	_Feb (17)	_Mar (27)	_Apr (10)	_May (58)	_Jun (12)	_Jul	_Aug (9)	_Sep (24)	_Oct (26)	_Nov (5)	_Dec (7)
2012:	_Jan (11)	_Feb (5)	_Mar (1)	_Apr (10)	_May (19)	_Jun (5)	_Jul (8)	_Aug (22)	_Sep (28)	_Oct (2)	_Nov (21)	_Dec (10)
2013:	_Jan (23)	_Feb (12)	_Mar (15)	_Apr (6)	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Viking-devel] [PATCH] Add support for any device known by gpsbabel

From: Guilhem Bonnefille <guilhem.bonnefille@gm...> - 2011-09-10 08:29

There is no specific reason to restrict the list of supported devices
to a small number. Now, we directly offer the ability to use any
device supported by gpsbabel.

Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@...>

---
 src/datasource_gps.c |   47 +++++++++++++++++------------------------------
 1 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/datasource_gps.c b/src/datasource_gps.c
index 3e6ccce..388a802 100644
--- a/src/datasource_gps.c
+++ b/src/datasource_gps.c
@@ -43,6 +43,8 @@
 
 static gboolean gps_acquire_in_progress = FALSE;
 
+static gint last_active = 0;
+
 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 );
@@ -105,7 +107,6 @@ 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
@@ -119,22 +120,8 @@ 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 if (!strcmp(proto, "Magellan")) {
-    device = "magellan";
-  }
-  else if (!strcmp(proto, "DeLorme")) {
-    device = "delbin";
-  }
-  else {
-    device = "navilink";
-  }
+  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;
 
   *babelargs = g_strdup_printf("-D 9 -t -w -i %s", device);
   /* device points to static content => no free */
@@ -154,7 +141,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
@@ -171,15 +157,12 @@ 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 if (!strcmp(proto, "NAViLink")) {
+  else if (!strcmp(device, "navilink")) {
     device = "navilink,power_off";
   }
   else {
@@ -333,6 +316,13 @@ 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;
@@ -340,11 +330,8 @@ void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpo
 
   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_append_text (w->proto_b, "DeLorme");
-  gtk_combo_box_append_text (w->proto_b, "NAViLink");
-  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:"));
-- 
tg: (1611d03..) t/acquire/improve-gps (depends on: t/acquire/introspect-gpsbabel)

Re: [Viking-devel] [PATCH] Add support for any device known by gpsbabel

From: Guilhem Bonnefille <guilhem.bonnefille@gm...> - 2011-09-10 08:35

2011/9/10 Guilhem Bonnefille <guilhem.bonnefille@...>:
> There is no specific reason to restrict the list of supported devices
> to a small number. Now, we directly offer the ability to use any
> device supported by gpsbabel.
>
> Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@...>
>

Waiting for an improvement of the patch to import files, I suggest to
apply this patch. It use the previous patches to introspect gpsbabel
and discover the list of supported device.

A future path can certainly improve the dialog box to acquire data
from device. For example, adding track/route/waypoint options, or
other usefull options (I do not use this feature as my GPS device
implement usb_storage support).

Any comment?
-- 
Guilhem BONNEFILLE
-=- JID: guyou@... MSN: guilhem_bonnefille@...
-=- mailto:guilhem.bonnefille@...
-=- http://nathguil.free.fr/

Re: [Viking-devel] [PATCH] Add support for any device known by gpsbabel

From: Robert Norris <rw_norris@ho...> - 2011-09-10 09:45

>
> A future path can certainly improve the dialog box to acquire data
> from device. For example, adding track/route/waypoint options, or
> other usefull options (I do not use this feature as my GPS device
> implement usb_storage support).
>
> Any comment?

I have been working on this for a while see (newly published):

https://github.com/rnorris/viking/commits/GPS-DataTypes

[No routes yet...]


However I was waiting to complete the Route support first:

https://github.com/rnorris/viking/commits/GPX-RouteSupport

I also have code for GPS Device Defaults stored in new preferences - but that will have to be reworked now that the list of protocols is dynamic. 

I was also working on putting the Acquire menu into the trackwaypoint layer menu (newly published):
https://github.com/rnorris/viking/commits/TrackWaypoint-Acquire-GPSUp

This will need addition for your File import method.

Also I'm working on a GPS upload from the trackwaypoint layer.
This involves reworking the all the GPS code and commonizing stuff, and is a work in progress. (and better if route support changes applied first too).


Be Seeing You - Rob.
If at first you don't succeed,
then skydiving isn't for you.

Re: [Viking-devel] [PATCH] Add support for any device known by gpsbabel

From: Guilhem Bonnefille <guilhem.bonnefille@gm...> - 2011-09-10 11:39

2011/9/10 Robert Norris <rw_norris@...>:
>
>>
>> A future path can certainly improve the dialog box to acquire data
>> from device. For example, adding track/route/waypoint options, or
>> other usefull options (I do not use this feature as my GPS device
>> implement usb_storage support).
>>
>> Any comment?
>
> I have been working on this for a while see (newly published):
>
> https://github.com/rnorris/viking/commits/GPS-DataTypes
>
> [No routes yet...]
>
>
> However I was waiting to complete the Route support first:
>
> https://github.com/rnorris/viking/commits/GPX-RouteSupport
>
> I also have code for GPS Device Defaults stored in new preferences - but that will have to be reworked now that the list of protocols is dynamic.
>
> I was also working on putting the Acquire menu into the trackwaypoint layer menu (newly published):
> https://github.com/rnorris/viking/commits/TrackWaypoint-Acquire-GPSUp
>
> This will need addition for your File import method.
>
> Also I'm working on a GPS upload from the trackwaypoint layer.
> This involves reworking the all the GPS code and commonizing stuff, and is a work in progress. (and better if route support changes applied first too).

Nice.

Following your previous comments, I will keep my ImportFile patch in
work-in-progress state for some time.

As other patches do not conflict, I propose:
- you push TrackWaypoint-Acquire-GPSUp onto master
- if ready, you push GPS-Device-Defaults onto master
- I push the needed patches for my Dynamic-Device-List (updating it if
you decided to push GPS-Device-Defaults)

All this job can be done in the week-end.
-- 
Guilhem BONNEFILLE
-=- JID: guyou@... MSN: guilhem_bonnefille@...
-=- mailto:guilhem.bonnefille@...
-=- http://nathguil.free.fr/