X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/2c3f09a62245787314f35d655819440ae7f31245..98b7eddc9f9fa0b72f2344cbabb0f69ee177906e:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index 41c91818..725b381b 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -2,6 +2,7 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2006-2008, Quy Tonthat * * 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 @@ -24,30 +25,45 @@ #endif #include +#ifdef HAVE_MATH_H #include +#endif #include "viking.h" -#include "vikgpslayer_pixmap.h" +#include "icons/icons.h" #include "babel.h" +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_STRING_H #include -#include +#endif +#include #include #include #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING #include #endif +#if ! GLIB_CHECK_VERSION(2,14,0) +inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data) { + return g_timeout_add(interval*1000, function, data); +} +#endif + #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) static VikGpsLayer *vik_gps_layer_create (VikViewport *vp); static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter ); static void vik_gps_layer_free ( VikGpsLayer *val ); static void vik_gps_layer_draw ( VikGpsLayer *val, gpointer data ); -VikGpsLayer *vik_gps_layer_new (); +static VikGpsLayer *vik_gps_layer_new ( VikViewport *vp ); static void gps_layer_marshall( VikGpsLayer *val, guint8 **data, gint *len ); static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); -static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ); -static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ); +static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ); +static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gboolean is_file_operation ); + +static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl ); static void gps_layer_change_coord_mode ( VikGpsLayer *val, VikCoordMode mode ); static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp ); @@ -58,17 +74,32 @@ static void gps_download_cb( gpointer layer_and_vlp[2] ); static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ); static void gps_empty_download_cb( gpointer layer_and_vlp[2] ); static void gps_empty_all_cb( gpointer layer_and_vlp[2] ); -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) +static void gps_empty_realtime_cb( gpointer layer_and_vlp[2] ); static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2] ); static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp); +static void rt_gpsd_disconnect(VikGpsLayer *vgl); +static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed); #endif -typedef enum {GARMIN_P = 0, MAGELLAN_P, NUM_PROTOCOLS} vik_gps_proto; -static gchar * params_protocols[] = {"Garmin", "Magellan", NULL}; -static gchar * protocols_args[] = {"garmin", "magellan"}; +typedef enum {GARMIN_P = 0, MAGELLAN_P, DELORME_P, NAVILINK_P, NUM_PROTOCOLS} vik_gps_proto; +static gchar * params_protocols[] = {"Garmin", "Magellan", "DeLorme", "NAViLink", NULL}; +static gchar * protocols_args[] = {"garmin", "magellan", "delbin", "navilink"}; /*#define NUM_PROTOCOLS (sizeof(params_protocols)/sizeof(params_protocols[0]) - 1) */ +#ifdef WINDOWS +static gchar * params_ports[] = {"com1", "usb:", NULL}; +#else static gchar * params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL}; -#define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1) +#endif +/* NUM_PORTS not actually used */ +/* #define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1) */ +/* Compatibility with previous versions */ +#ifdef WINDOWS +static gchar * old_params_ports[] = {"com1", "usb:", NULL}; +#else +static gchar * old_params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL}; +#endif +#define OLD_NUM_PORTS (sizeof(old_params_ports)/sizeof(old_params_ports[0]) - 1) typedef enum {GPS_DOWN=0, GPS_UP} gps_dir; typedef struct { @@ -89,40 +120,65 @@ typedef struct { GtkWidget *wp_label; GtkWidget *progress_label; GtkWidget *trk_label; + VikViewport *vvp; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + gboolean realtime_tracking; +#endif } GpsSession; static void gps_session_delete(GpsSession *sess); static gchar *params_groups[] = { "Data Mode", -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) "Realtime Tracking Mode", #endif }; enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE}; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) +static gchar *params_vehicle_position[] = { + "Keep vehicle at center", + "Keep vehicle on screen", + "Disable", + NULL +}; +enum { + VEHICLE_POSITION_CENTERED = 0, + VEHICLE_POSITION_ON_SCREEN, + VEHICLE_POSITION_NONE, +}; +#endif + static VikLayerParam gps_layer_params[] = { { "gps_protocol", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, params_protocols, NULL}, - { "gps_port", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL}, - -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + { "gps_port", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL}, + { "gps_download_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_upload_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_download_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_upload_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON}, { "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Jump to current position on start"), VIK_LAYER_WIDGET_CHECKBUTTON}, - { "centered_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Keep current position at center"), VIK_LAYER_WIDGET_CHECKBUTTON}, + { "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL}, { "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Host:"), VIK_LAYER_WIDGET_ENTRY}, { "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Port:"), VIK_LAYER_WIDGET_ENTRY}, + { "gpsd_retry_interval", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Retry Interval (seconds):"), VIK_LAYER_WIDGET_ENTRY}, #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ }; enum { PARAM_PROTOCOL=0, PARAM_PORT, -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_REALTIME_CENTERED, PARAM_GPSD_HOST, PARAM_GPSD_PORT, + PARAM_DOWNLOAD_TRACKS, PARAM_UPLOAD_TRACKS, + PARAM_DOWNLOAD_WAYPOINTS, PARAM_UPLOAD_WAYPOINTS, +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_VEHICLE_POSITION, PARAM_GPSD_HOST, PARAM_GPSD_PORT, PARAM_GPSD_RETRY_INTERVAL, #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ NUM_PARAMS}; VikLayerInterface vik_gps_layer_interface = { - "GPS", - &gpslayer_pixbuf, + N_("GPS"), + NULL, + &vikgpslayer_pixbuf, NULL, 0, @@ -132,7 +188,7 @@ VikLayerInterface vik_gps_layer_interface = { params_groups, sizeof(params_groups)/sizeof(params_groups[0]), - VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_COPY), + VIK_MENU_ITEM_ALL, (VikLayerFuncCreate) vik_gps_layer_create, (VikLayerFuncRealize) vik_gps_layer_realize, @@ -151,6 +207,9 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, + (VikLayerFuncSublayerTooltip) NULL, + (VikLayerFuncLayerTooltip) gps_layer_tooltip, + (VikLayerFuncLayerSelected) NULL, (VikLayerFuncMarshall) gps_layer_marshall, (VikLayerFuncUnmarshall) gps_layer_unmarshall, @@ -162,25 +221,31 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncWriteFileData) NULL, (VikLayerFuncDeleteItem) NULL, + (VikLayerFuncCutItem) NULL, (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request, + + (VikLayerFuncSelectClick) NULL, + (VikLayerFuncSelectMove) NULL, + (VikLayerFuncSelectRelease) NULL, + (VikLayerFuncSelectedViewportMenu) NULL, }; enum {TRW_DOWNLOAD=0, TRW_UPLOAD, -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) TRW_REALTIME, #endif NUM_TRW}; static gchar * trw_names[] = { N_("GPS Download"), N_("GPS Upload"), -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) N_("GPS Realtime Tracking"), #endif }; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) typedef struct { struct gps_data_t gpsd; VikGpsLayer *vgl; @@ -198,20 +263,18 @@ struct _VikGpsLayer { VikTrwLayer * trw_children[NUM_TRW]; GList * children; /* used only for writing file */ int cur_read_child; /* used only for reading file */ -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) VglGpsd *vgpsd; - gboolean realtime_tracking; - GMutex *realtime_tracking_mutex; + gboolean realtime_tracking; /* set/reset only by the callback */ + gboolean first_realtime_trackpoint; GpsFix realtime_fix; GpsFix last_fix; - enum unit realtime_gpsd_unit; - VikTrack *realtime_track; - gchar *realtime_track_name; GIOChannel *realtime_io_channel; guint realtime_io_watch_id; + guint realtime_retry_timer; GdkGC *realtime_track_gc; GdkGC *realtime_track_bg_gc; GdkGC *realtime_track_pt_gc; @@ -221,12 +284,17 @@ struct _VikGpsLayer { /* params */ gchar *gpsd_host; gchar *gpsd_port; + gint gpsd_retry_interval; gboolean realtime_record; gboolean realtime_jump_to_start; - gboolean realtime_keep_at_center; + guint vehicle_position; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ guint protocol_id; - guint serial_port_id; + gchar *serial_port; + gboolean download_tracks; + gboolean download_waypoints; + gboolean upload_tracks; + gboolean upload_waypoints; }; GType vik_gps_layer_get_type () @@ -267,6 +335,11 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp) return rv; } +static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl ) +{ + return params_protocols[vgl->protocol_id]; +} + /* "Copy" */ static void gps_layer_marshall( VikGpsLayer *vgl, guint8 **data, gint *datalen ) { @@ -308,7 +381,7 @@ static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *v len -= sizeof(gint) + alm_size; \ data += sizeof(gint) + alm_size; - VikGpsLayer *rv = vik_gps_layer_new(); + VikGpsLayer *rv = vik_gps_layer_new(vvp); VikLayer *child_layer; gint i; @@ -331,11 +404,10 @@ static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *v #undef alm_next } -static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ) +static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ) { switch ( id ) { - /* TODO: gpsd_host, gpsd_port */ case PARAM_PROTOCOL: if (data.u < NUM_PROTOCOLS) vgl->protocol_id = data.u; @@ -343,12 +415,37 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara g_warning(_("Unknown GPS Protocol")); break; case PARAM_PORT: - if (data.u < NUM_PORTS) - vgl->serial_port_id = data.u; + if (data.s) +{ + g_free(vgl->serial_port); + /* Compat: previous version stored serial_port as an array index */ + int index = data.s[0] - '0'; + if (data.s[0] != '\0' && + g_ascii_isdigit (data.s[0]) && + data.s[1] == '\0' && + index < OLD_NUM_PORTS) + /* It is a single digit: activate compatibility */ + vgl->serial_port = g_strdup(old_params_ports[index]); + else + vgl->serial_port = g_strdup(data.s); + g_debug("%s: %s", __FUNCTION__, vgl->serial_port); +} else g_warning(_("Unknown serial port device")); break; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + case PARAM_DOWNLOAD_TRACKS: + vgl->download_tracks = data.b; + break; + case PARAM_UPLOAD_TRACKS: + vgl->upload_tracks = data.b; + break; + case PARAM_DOWNLOAD_WAYPOINTS: + vgl->download_waypoints = data.b; + break; + case PARAM_UPLOAD_WAYPOINTS: + vgl->upload_waypoints = data.b; + break; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) case PARAM_GPSD_HOST: if (vgl->gpsd_host) g_free(vgl->gpsd_host); @@ -359,14 +456,17 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara g_free(vgl->gpsd_port); vgl->gpsd_port = g_strdup(data.s); /* TODO: check for number */ break; + case PARAM_GPSD_RETRY_INTERVAL: + vgl->gpsd_retry_interval = strtol(data.s, NULL, 10); + break; case PARAM_REALTIME_REC: vgl->realtime_record = data.b; break; case PARAM_REALTIME_CENTER_START: vgl->realtime_jump_to_start = data.b; break; - case PARAM_REALTIME_CENTERED: - vgl->realtime_keep_at_center = data.b; + case PARAM_VEHICLE_POSITION: + vgl->vehicle_position = data.u; break; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ default: @@ -376,33 +476,48 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara return TRUE; } -static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) +static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gboolean is_file_operation ) { VikLayerParamData rv; switch ( id ) { - /* TODO: gpsd_host, gpsd_port */ case PARAM_PROTOCOL: rv.u = vgl->protocol_id; break; case PARAM_PORT: - rv.u = vgl->serial_port_id; + rv.s = vgl->serial_port; + g_debug("%s: %s", __FUNCTION__, rv.s); break; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + case PARAM_DOWNLOAD_TRACKS: + rv.b = vgl->download_tracks; + break; + case PARAM_UPLOAD_TRACKS: + rv.b = vgl->upload_tracks; + break; + case PARAM_DOWNLOAD_WAYPOINTS: + rv.b = vgl->download_waypoints; + break; + case PARAM_UPLOAD_WAYPOINTS: + rv.b = vgl->upload_waypoints; + break; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) case PARAM_GPSD_HOST: rv.s = vgl->gpsd_host ? vgl->gpsd_host : ""; break; case PARAM_GPSD_PORT: rv.s = vgl->gpsd_port ? vgl->gpsd_port : g_strdup(DEFAULT_GPSD_PORT); break; + case PARAM_GPSD_RETRY_INTERVAL: + rv.s = g_strdup_printf("%d", vgl->gpsd_retry_interval); + break; case PARAM_REALTIME_REC: rv.b = vgl->realtime_record; break; case PARAM_REALTIME_CENTER_START: rv.b = vgl->realtime_jump_to_start; break; - case PARAM_REALTIME_CENTERED: - rv.b = vgl->realtime_keep_at_center; + case PARAM_VEHICLE_POSITION: + rv.u = vgl->vehicle_position; break; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ default: @@ -423,17 +538,18 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->children = NULL; vgl->cur_read_child = 0; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - vgl->realtime_tracking_mutex = g_mutex_new(); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) vgl->realtime_tracking = FALSE; + vgl->first_realtime_trackpoint = FALSE; vgl->vgpsd = NULL; + vgl->realtime_io_channel = NULL; + vgl->realtime_io_watch_id = 0; + vgl->realtime_retry_timer = 0; vgl->realtime_track_gc = vik_viewport_new_gc ( vp, "#203070", 2 ); vgl->realtime_track_bg_gc = vik_viewport_new_gc ( vp, "grey", 2 ); vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 ); vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 ); vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc; - vgl->realtime_gpsd_unit = gpsd_units(); - // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); vgl->realtime_track = NULL; /* Setting params here */ @@ -441,10 +557,30 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->gpsd_port = g_strdup(DEFAULT_GPSD_PORT); vgl->realtime_record = TRUE; vgl->realtime_jump_to_start = TRUE; - vgl->realtime_keep_at_center = FALSE; + vgl->vehicle_position = VEHICLE_POSITION_ON_SCREEN; + vgl->gpsd_retry_interval = 10; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ vgl->protocol_id = 0; - vgl->serial_port_id = 0; + vgl->serial_port = NULL; + vgl->download_tracks = TRUE; + vgl->download_waypoints = TRUE; + vgl->upload_tracks = TRUE; + vgl->upload_waypoints = TRUE; + +#ifndef WINDOWS + /* Attempt to auto set default USB serial port entry */ + /* Ordered to make lowest device favourite if available */ + if (g_access ("/dev/ttyUSB1", R_OK) == 0) { + if (vgl->serial_port != NULL) + g_free (vgl->serial_port); + vgl->serial_port = g_strdup ("/dev/ttyUSB1"); + } + if (g_access ("/dev/ttyUSB0", R_OK) == 0) { + if (vgl->serial_port != NULL) + g_free (vgl->serial_port); + vgl->serial_port = g_strdup ("/dev/ttyUSB0"); + } +#endif return vgl; } @@ -468,7 +604,7 @@ static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data ) if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data))) vik_layer_draw ( vl, data ); } -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) if (vgl->realtime_tracking) { if (VIK_LAYER(vgl) == trigger) { if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) { @@ -503,20 +639,26 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Upload to GPS") ); + /* Now with icons */ + item = gtk_image_menu_item_new_with_mnemonic ( _("_Upload to GPS") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_upload_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Download from GPS") ); + item = gtk_image_menu_item_new_with_mnemonic ( _("Download from _GPS") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_download_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - item = gtk_menu_item_new_with_label ( vgl->realtime_tracking ? - "Stop realtime tracking" : - "Start realtime tracking" ); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + item = gtk_image_menu_item_new_with_mnemonic ( vgl->realtime_tracking ? + "_Stop Realtime Tracking" : + "_Start Realtime Tracking" ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, vgl->realtime_tracking ? + gtk_image_new_from_stock (GTK_STOCK_MEDIA_STOP, GTK_ICON_SIZE_MENU) : + gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_start_stop_tracking_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); @@ -524,19 +666,28 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer item = gtk_menu_item_new(); gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); + + item = gtk_image_menu_item_new_with_mnemonic ( _("Empty _Realtime") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); + g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_realtime_cb), pass_along ); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show ( item ); #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ - item = gtk_menu_item_new_with_label ( _("Empty Upload") ); + item = gtk_image_menu_item_new_with_mnemonic ( _("E_mpty Upload") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_upload_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Empty Download") ); + item = gtk_image_menu_item_new_with_mnemonic ( _("_Empty Download") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_download_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Empty All") ); + item = gtk_image_menu_item_new_with_mnemonic ( _("Empty _All") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_all_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); @@ -545,7 +696,15 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer static void disconnect_layer_signal ( VikLayer *vl, VikGpsLayer *vgl ) { - g_assert(DISCONNECT_UPDATE_SIGNAL(vl,vgl)==1); + guint number_handlers = DISCONNECT_UPDATE_SIGNAL(vl,vgl); + if ( number_handlers != 1 ) { + /* + NB It's not fatal if this gives 2 for example! Hence removal of the g_assert + This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2) + I don't think there's any side effects and certainly better than the program just aborting + */ + g_warning(_("Unexpected number of disconnected handlers: %d"), number_handlers); + } } static void vik_gps_layer_free ( VikGpsLayer *vgl ) @@ -556,7 +715,8 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) disconnect_layer_signal(VIK_LAYER(vgl->trw_children[i]), vgl); g_object_unref(vgl->trw_children[i]); } -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + rt_gpsd_disconnect(vgl); if (vgl->realtime_track_gc != NULL) g_object_unref(vgl->realtime_track_gc); if (vgl->realtime_track_bg_gc != NULL) @@ -565,8 +725,6 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) g_object_unref(vgl->realtime_track_pt1_gc); if (vgl->realtime_track_pt2_gc != NULL) g_object_unref(vgl->realtime_track_pt2_gc); - if (vgl->realtime_tracking_mutex != NULL) - g_mutex_free(vgl->realtime_tracking_mutex); #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ } @@ -636,12 +794,9 @@ static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val { VikTreeview *vt = VIK_LAYER(val_src)->vt; VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter); - GtkTreeIter dest_iter; gchar *dp; - gboolean target_exists; dp = gtk_tree_path_to_string(dest_path); - target_exists = vik_treeview_get_iter_from_path_str(vt, &dest_iter, dp); /* vik_gps_layer_delete unrefs, but we don't want that here. * we're still using the layer. */ @@ -704,30 +859,30 @@ static void set_current_count(gint cnt, GpsSession *sess) if (sess->direction == GPS_DOWN) { if (sess->progress_label == sess->wp_label) - tmp_str = ngettext("Downloaded %d out of %d waypoint.", "Downloaded %d out of %d waypoints.", sess->total_count); + tmp_str = ngettext("Downloaded %d out of %d waypoint...", "Downloaded %d out of %d waypoints...", sess->total_count); else - tmp_str = ngettext("Downloaded %d out of %d trackpoint.", "Downloaded %d out of %d trackpoints.", sess->total_count); + tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->total_count); } else { if (sess->progress_label == sess->wp_label) - tmp_str = ngettext("Uploaded %d out of %d waypoint.", "Uploaded %d out of %d waypoints.", sess->total_count); + tmp_str = ngettext("Uploaded %d out of %d waypoint...", "Uploaded %d out of %d waypoints...", sess->total_count); else - tmp_str = ngettext("Uploaded %d out of %d trackpoint.", "Uploaded %d out of %d trackpoints.", sess->total_count); + tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->total_count); } g_snprintf(s, 128, tmp_str, cnt, sess->total_count); } else { if (sess->direction == GPS_DOWN) { if (sess->progress_label == sess->wp_label) - tmp_str = ngettext("Downloaded %d waypoint.", "Downloaded %d waypoints.", cnt); + tmp_str = ngettext("Downloaded %d waypoint", "Downloaded %d waypoints", cnt); else - tmp_str = ngettext("Downloaded %d trackpoint.", "Downloaded %d trackpoints.", cnt); + tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", cnt); } else { if (sess->progress_label == sess->wp_label) - tmp_str = ngettext("Uploaded %d waypoint.", "Uploaded %d waypoints.", cnt); + tmp_str = ngettext("Uploaded %d waypoint", "Uploaded %d waypoints", cnt); else - tmp_str = ngettext("Uploaded %d trackpoint.", "Uploaded %d trackpoints.", cnt); + tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", cnt); } g_snprintf(s, 128, tmp_str, cnt); } @@ -797,6 +952,18 @@ static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSe } g_strfreev(tokens); } + /* eg: "Unit:\teTrex Legend HCx Software Version 2.90\n" */ + if (strstr(line, "Unit:")) { + gchar **tokens = g_strsplit(line, "\t", 0); + int n_tokens = 0; + while (tokens[n_tokens]) + n_tokens++; + + if (n_tokens > 1) { + set_gps_info(tokens[1], sess); + } + g_strfreev(tokens); + } if (strstr(line, "RECORD")) { int lsb, msb, cnt; @@ -904,13 +1071,13 @@ static void gps_comm_thread(GpsSession *sess) gboolean result; if (sess->direction == GPS_DOWN) - result = a_babel_convert_from (sess->vtl, sess->cmd_args, - (BabelStatusFunc) gps_download_progress_func, sess->port, sess); - else - result = a_babel_convert_to (sess->vtl, sess->cmd_args, - (BabelStatusFunc) gps_upload_progress_func, sess->port, sess); + result = a_babel_convert_from (sess->vtl, sess->cmd_args, sess->port, + (BabelStatusFunc) gps_download_progress_func, sess); + else { + result = a_babel_convert_to (sess->vtl, sess->cmd_args, sess->port, + (BabelStatusFunc) gps_upload_progress_func, sess); + } - gdk_threads_enter(); if (!result) { gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Error: couldn't find gpsbabel.") ); } @@ -920,6 +1087,18 @@ static void gps_comm_thread(GpsSession *sess) gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Done.") ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT, TRUE ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_REJECT, FALSE ); + + /* Do not change the view if we are following the current GPS position */ +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + if (!sess->realtime_tracking) +#endif + { + if ( sess->vvp && sess->direction == GPS_DOWN ) { + /* View the data available */ + vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp) ; + vik_layer_emit_update ( VIK_LAYER(sess->vtl), TRUE ); // Yes update from background thread + } + } } else { /* canceled */ } @@ -935,21 +1114,50 @@ static void gps_comm_thread(GpsSession *sess) g_mutex_unlock(sess->mutex); gps_session_delete(sess); } - gdk_threads_leave(); g_thread_exit(NULL); } -static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port) { +static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port, gboolean tracking, VikViewport *vvp, VikLayersPanel *vlp, gboolean do_tracks, gboolean do_waypoints) { GpsSession *sess = g_malloc(sizeof(GpsSession)); + char *tracks = NULL; + char *waypoints = NULL; sess->mutex = g_mutex_new(); sess->direction = dir; sess->vtl = vtl; sess->port = g_strdup(port); sess->ok = TRUE; - sess->cmd_args = g_strdup_printf("-D 9 -t -w -%c %s", - (dir == GPS_DOWN) ? 'i' : 'o', protocols_args[proto]); sess->window_title = (dir == GPS_DOWN) ? _("GPS Download") : _("GPS Upload"); + sess->vvp = vvp; + + // This must be done inside the main thread as the uniquify causes screen updates + // (originally performed this nearer the point of upload in the thread) + if ( dir == GPS_UP ) { + // Enforce unique names in the layer upload to the GPS device + // NB this may only be a Garmin device restriction (and may be not every Garmin device either...) + // Thus this maintains the older code in built restriction + if ( ! vik_trw_layer_uniquify ( sess->vtl, vlp ) ) + vik_statusbar_set_message ( vik_window_get_statusbar (VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(sess->vtl))), VIK_STATUSBAR_INFO, + _("Warning - GPS Upload items may overwrite each other") ); + } + +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + sess->realtime_tracking = tracking; +#endif + + if (do_tracks) + tracks = "-t"; + else + tracks = ""; + if (do_waypoints) + waypoints = "-w"; + else + waypoints = ""; + + sess->cmd_args = g_strdup_printf("-D 9 %s %s -%c %s", + tracks, waypoints, (dir == GPS_DOWN) ? 'i' : 'o', protocols_args[proto]); + tracks = NULL; + waypoints = NULL; sess->dialog = gtk_dialog_new_with_buttons ( "", VIK_GTK_WINDOW_FROM_LAYER(vtl), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), @@ -979,6 +1187,7 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * /* TODO: starting gps read/write thread here */ g_thread_create((GThreadFunc)gps_comm_thread, sess, FALSE, NULL ); + gtk_dialog_set_default_response ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT ); gtk_dialog_run(GTK_DIALOG(sess->dialog)); gtk_widget_destroy(sess->dialog); @@ -999,20 +1208,34 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * static void gps_upload_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + VikLayersPanel *vlp = VIK_LAYERS_PANEL(layer_and_vlp[1]); VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD]; - gps_comm(vtl, GPS_UP, vgl->protocol_id, params_ports[vgl->serial_port_id]); + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); + gps_comm(vtl, GPS_UP, vgl->protocol_id, vgl->serial_port, FALSE, vvp, vlp, vgl->upload_tracks, vgl->upload_waypoints); } static void gps_download_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; VikTrwLayer *vtl = vgl->trw_children[TRW_DOWNLOAD]; - gps_comm(vtl, GPS_DOWN, vgl->protocol_id, params_ports[vgl->serial_port_id]); + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, vgl->realtime_tracking, vvp, NULL, vgl->download_tracks, vgl->download_waypoints); +#else + gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, FALSE, vvp, NULL, vgl->download_tracks, vgl->download_waypoints); +#endif } static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Upload data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_UPLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_UPLOAD]); } @@ -1020,20 +1243,48 @@ static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) static void gps_empty_download_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Download data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_DOWNLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); } +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) +static void gps_empty_realtime_cb( gpointer layer_and_vlp[2] ) +{ + VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Realtime data?"), + NULL ) ) + return; + vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_REALTIME]); + vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_REALTIME]); +} +#endif + static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete All GPS data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_UPLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_UPLOAD]); vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_DOWNLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_REALTIME]); + vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_REALTIME]); +#endif } -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) { struct LatLon ll; @@ -1052,7 +1303,7 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) gint half_back_x, half_back_y; gint half_back_bg_x, half_back_bg_y; gint pt_x, pt_y; - gint ptbg_x, ptbg_y; + gint ptbg_x; gint side1_x, side1_y, side2_x, side2_y; gint side1bg_x, side1bg_y, side2bg_x, side2bg_y; @@ -1071,7 +1322,7 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) pt_y = half_back_y-24*heading_cos; pt_x = half_back_x+24*heading_sin; - ptbg_y = half_back_bg_y-28*heading_cos; + //ptbg_y = half_back_bg_y-28*heading_cos; ptbg_x = half_back_bg_x+28*heading_sin; side1_y = half_back_y+9*heading_sin; @@ -1096,7 +1347,6 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) } } -/* lock/unlock realtime_tracking_mutex when call this */ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) { struct LatLon ll; @@ -1142,7 +1392,6 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) tp->course = vgl->realtime_fix.fix.track; tp->nsats = vgl->realtime_fix.satellites_used; tp->fix_mode = vgl->realtime_fix.fix.mode; - tp->extended = TRUE; ll.lat = vgl->realtime_fix.fix.latitude; ll.lon = vgl->realtime_fix.fix.longitude; @@ -1158,7 +1407,7 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) } -void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) +static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) { gboolean update_all = FALSE; VikGpsLayer *vgl = vgpsd->vgl; @@ -1172,38 +1421,77 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) !isnan(vgpsd->gpsd.fix.latitude) && !isnan(vgpsd->gpsd.fix.longitude) && !isnan(vgpsd->gpsd.fix.track)) { - g_mutex_lock(vgl->realtime_tracking_mutex); + + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); vgl->realtime_fix.fix = vgpsd->gpsd.fix; vgl->realtime_fix.satellites_used = vgpsd->gpsd.satellites_used; vgl->realtime_fix.dirty = TRUE; - if (vgl->realtime_keep_at_center || - (vgl->realtime_jump_to_start && !vgl->realtime_track->trackpoints)) { - struct LatLon ll; - VikCoord center; + struct LatLon ll; + VikCoord vehicle_coord; - ll.lat = vgl->realtime_fix.fix.latitude; - ll.lon = vgl->realtime_fix.fix.longitude; - vik_coord_load_from_latlon(¢er, - vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll); - VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); - VikViewport *vvp = vik_window_viewport(vw); - vik_viewport_set_center_coord(vvp, ¢er); + ll.lat = vgl->realtime_fix.fix.latitude; + ll.lon = vgl->realtime_fix.fix.longitude; + vik_coord_load_from_latlon(&vehicle_coord, + vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll); + + if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) || + (vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) { + vik_viewport_set_center_coord(vvp, &vehicle_coord); update_all = TRUE; } + else if (vgl->vehicle_position == VEHICLE_POSITION_ON_SCREEN) { + const int hdiv = 6; + const int vdiv = 6; + const int px = 20; /* adjust ment in pixels to make sure vehicle is inside the box */ + gint width = vik_viewport_get_width(vvp); + gint height = vik_viewport_get_height(vvp); + gint vx, vy; + + vik_viewport_coord_to_screen(vvp, &vehicle_coord, &vx, &vy); + update_all = TRUE; + if (vx < (width/hdiv)) + vik_viewport_set_center_screen(vvp, vx - width/2 + width/hdiv + px, vy); + else if (vx > (width - width/hdiv)) + vik_viewport_set_center_screen(vvp, vx + width/2 - width/hdiv - px, vy); + else if (vy < (height/vdiv)) + vik_viewport_set_center_screen(vvp, vx, vy - height/2 + height/vdiv + px); + else if (vy > (height - height/vdiv)) + vik_viewport_set_center_screen(vvp, vx, vy + height/2 - height/vdiv - px); + else + update_all = FALSE; + } + vgl->first_realtime_trackpoint = FALSE; create_realtime_trackpoint(vgl, FALSE); - g_mutex_unlock(vgl->realtime_tracking_mutex); - vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME])); + vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]), TRUE); // Yes update from background thread } } static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, gpointer data) { VikGpsLayer *vgl = data; - gps_poll(&vgl->vgpsd->gpsd); - return TRUE; + if (condition == G_IO_IN) { +#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 + if (!gps_poll(&vgl->vgpsd->gpsd)) { +#elif GPSD_API_MAJOR_VERSION == 5 + if (gps_read(&vgl->vgpsd->gpsd) > -1) { + // Reuse old function to perform operations on the new GPS data + gpsd_raw_hook(vgl->vgpsd, NULL); +#else + // Broken compile +#endif + return TRUE; + } + else { + g_warning("Disconnected from gpsd. Trying to reconnect"); + rt_gpsd_disconnect(vgl); + rt_gpsd_connect(vgl, FALSE); + } + } + return FALSE; /* no further calling */ } static gchar *make_track_name(VikTrwLayer *vtl) @@ -1222,6 +1510,131 @@ static gchar *make_track_name(VikTrwLayer *vtl) } +static gboolean rt_gpsd_try_connect(gpointer *data) +{ + VikGpsLayer *vgl = (VikGpsLayer *)data; +#if GPSD_API_MAJOR_VERSION == 3 + struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); + + if (gpsd == NULL) { +#elif GPSD_API_MAJOR_VERSION == 4 + vgl->vgpsd = g_malloc(sizeof(VglGpsd)); + + if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { +#elif GPSD_API_MAJOR_VERSION == 5 + vgl->vgpsd = g_malloc(sizeof(VglGpsd)); + if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) { +#else +// Delibrately break compilation... +#endif + g_warning("Failed to connect to gpsd at %s (port %s). Will retry in %d seconds", + vgl->gpsd_host, vgl->gpsd_port, vgl->gpsd_retry_interval); + return TRUE; /* keep timer running */ + } + +#if GPSD_API_MAJOR_VERSION == 3 + vgl->vgpsd = realloc(gpsd, sizeof(VglGpsd)); +#endif + vgl->vgpsd->vgl = vgl; + + vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE; + /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */ + vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE; + vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN; + + if (vgl->realtime_record) { + VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME]; + vgl->realtime_track = vik_track_new(); + vgl->realtime_track->visible = TRUE; + vik_trw_layer_add_track(vtl, make_track_name(vtl), vgl->realtime_track); + } + +#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 + gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); +#endif + + vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); + vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); + +#if GPSD_API_MAJOR_VERSION == 3 + gps_query(&vgl->vgpsd->gpsd, "w+x"); +#endif +#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL); +#endif + + return FALSE; /* no longer called by timeout */ +} + +static gboolean rt_ask_retry(VikGpsLayer *vgl) +{ + GtkWidget *dialog = gtk_message_dialog_new (VIK_GTK_WINDOW_FROM_LAYER(vgl), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "Failed to connect to gpsd at %s (port %s)\n" + "Should Viking keep trying (every %d seconds)?", + vgl->gpsd_host, vgl->gpsd_port, + vgl->gpsd_retry_interval); + + gint res = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + return (res == GTK_RESPONSE_YES); +} + +static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed) +{ + vgl->realtime_retry_timer = 0; + if (rt_gpsd_try_connect((gpointer *)vgl)) { + if (vgl->gpsd_retry_interval <= 0) { + g_warning("Failed to connect to gpsd but will not retry because retry intervel was set to %d (which is 0 or negative)", vgl->gpsd_retry_interval); + return FALSE; + } + else if (ask_if_failed && !rt_ask_retry(vgl)) + return FALSE; + else + vgl->realtime_retry_timer = g_timeout_add_seconds(vgl->gpsd_retry_interval, + (GSourceFunc)rt_gpsd_try_connect, (gpointer *)vgl); + } + return TRUE; +} + +static void rt_gpsd_disconnect(VikGpsLayer *vgl) +{ + if (vgl->realtime_retry_timer) { + g_source_remove(vgl->realtime_retry_timer); + vgl->realtime_retry_timer = 0; + } + if (vgl->realtime_io_watch_id) { + g_source_remove(vgl->realtime_io_watch_id); + vgl->realtime_io_watch_id = 0; + } + if (vgl->realtime_io_channel) { + GError *error = NULL; + g_io_channel_shutdown (vgl->realtime_io_channel, FALSE, &error); + vgl->realtime_io_channel = NULL; + } + if (vgl->vgpsd) { +#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL); +#endif + gps_close(&vgl->vgpsd->gpsd); +#if GPSD_API_MAJOR_VERSION == 3 + free(vgl->vgpsd); +#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + g_free(vgl->vgpsd); +#endif + vgl->vgpsd = NULL; + } + + if (vgl->realtime_record && vgl->realtime_track) { + if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL)) + vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track); + vgl->realtime_track = NULL; + } +} + static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; @@ -1231,59 +1644,15 @@ static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) g_assert((VIK_GPS_MODE_2D == MODE_2D) && (VIK_GPS_MODE_3D == MODE_3D)); if (vgl->realtime_tracking) { - struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); - if (gpsd == NULL) { - GtkWidget *dialog = gtk_message_dialog_new (VIK_GTK_WINDOW_FROM_LAYER(vgl), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Failed to connect to gpsd at %s (port %s)", - vgl->gpsd_host, vgl->gpsd_port); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - + vgl->first_realtime_trackpoint = TRUE; + if (!rt_gpsd_connect(vgl, TRUE)) { + vgl->first_realtime_trackpoint = FALSE; vgl->realtime_tracking = FALSE; - return; } - vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd)); - vgl->vgpsd->vgl = vgl; - - vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE; - /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */ - vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE; - vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN; - - if (vgl->realtime_record) { - VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME]; - vgl->realtime_track = vik_track_new(); - vgl->realtime_track->visible = TRUE; - vgl->realtime_track_name = make_track_name(vtl); - vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); - } - - gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); - vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); - vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, - G_IO_IN, gpsd_data_available, vgl); - - gps_query(&vgl->vgpsd->gpsd, "w+x"); - } else { /* stop realtime tracking */ - /* TODO: handle race condition here , make sure vgpsd is NULL */ - g_mutex_lock(vgl->realtime_tracking_mutex); - gps_close(&vgl->vgpsd->gpsd); - vgl->vgpsd = NULL; - // g_source_remove(vgl->realtime_timeout); - g_source_remove(vgl->realtime_io_watch_id); - g_io_channel_unref (vgl->realtime_io_channel); - - if (vgl->realtime_record) { - create_realtime_trackpoint(vgl, TRUE); - if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL)) - vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name); - } - g_mutex_unlock(vgl->realtime_tracking_mutex); + vgl->first_realtime_trackpoint = FALSE; + rt_gpsd_disconnect(vgl); } } #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */