*
* Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
* Copyright (C) 2006-2008, Quy Tonthat <qtonthat@gmail.com>
+ * Copyright (C) 2016, 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
#include "viking.h"
#include "icons/icons.h"
#include "babel.h"
+#include "viktrwlayer.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <gps.h>
#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 );
+static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIter *layer_iter );
+static void vik_gps_layer_free ( VikGpsLayer *vgl );
+static void vik_gps_layer_draw ( VikGpsLayer *vgl, VikViewport *vp );
static VikGpsLayer *vik_gps_layer_new ( VikViewport *vp );
+static void vik_gps_layer_post_read ( VikGpsLayer *vgl, VikViewport *vp, gboolean from_file );
-static void gps_layer_marshall( VikGpsLayer *val, guint8 **data, gint *len );
+static void gps_layer_marshall( VikGpsLayer *vgl, 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, gboolean is_file_operation );
+static gboolean gps_layer_set_param ( VikGpsLayer *vgl, VikLayerSetParam *vlsp );
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_change_coord_mode ( VikGpsLayer *vgl, VikCoordMode mode );
static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp );
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
static void gps_upload_cb( gpointer layer_and_vlp[2] );
static void gps_download_cb( gpointer layer_and_vlp[2] );
typedef struct {
GMutex *mutex;
+ gboolean ok;
+ gboolean thread_complete;
vik_gps_dir direction;
gchar *port;
- gboolean ok;
- gint total_count;
- gint count;
+ gint wpt_total_count;
+ gint wpt_count;
+ gint trk_total_count;
+ gint trk_count;
+ gint rte_total_count;
+ gint rte_count;
VikTrwLayer *vtl;
VikTrack *track;
- gchar *cmd_args;
- gchar *window_title;
+ gchar *babelargs;
GtkWidget *dialog;
GtkWidget *status_label;
GtkWidget *gps_label;
- GtkWidget *ver_label;
- GtkWidget *id_label;
- GtkWidget *wp_label;
- GtkWidget *progress_label;
+ GtkWidget *wpt_label;
GtkWidget *trk_label;
+ GtkWidget *rte_label;
+ vik_gps_xfer_type progress_type;
+ gboolean result;
+ gchar *info;
+ // GUI Updates
+ gint id_status_working;
+ gint id_status_end;
+ gint id_info;
+ gint id_total_count;
+ gint id_count;
VikViewport *vvp;
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
gboolean realtime_tracking;
static void gps_session_delete(GpsSession *sess);
static gchar *params_groups[] = {
- "Data Mode",
+ N_("Data Mode"),
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
- "Realtime Tracking Mode",
+ N_("Realtime Tracking Mode"),
#endif
};
enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE};
+
+static VikLayerParamData gps_protocol_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( "garmin" );
+ return data;
+}
+
+static VikLayerParamData gps_port_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( "usb:" );
+#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 ( data.s )
+ g_free ( (gchar *)data.s );
+ data.s = g_strdup ("/dev/ttyUSB1");
+ }
+ if (g_access ("/dev/ttyUSB0", R_OK) == 0) {
+ if ( data.s )
+ g_free ( (gchar *)data.s );
+ data.s = g_strdup ("/dev/ttyUSB0");
+ }
+#endif
+ return data;
+}
+
#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",
+ N_("Keep vehicle at center"),
+ N_("Keep vehicle on screen"),
+ N_("Disable"),
NULL
};
enum {
VEHICLE_POSITION_ON_SCREEN,
VEHICLE_POSITION_NONE,
};
+
+static VikLayerParamData moving_map_method_default ( void ) { return VIK_LPD_UINT ( VEHICLE_POSITION_ON_SCREEN ); }
+
+static VikLayerParamData gpsd_host_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( "localhost" );
+ return data;
+}
+
+static VikLayerParamData gpsd_port_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( DEFAULT_GPSD_PORT );
+ return data;
+}
+
+static VikLayerParamData gpsd_retry_interval_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( "10" );
+ return data;
+}
+
#endif
static VikLayerParam gps_layer_params[] = {
- { "gps_protocol", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL}, // List now assigned at runtime
- { "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},
+ // NB gps_layer_inst_init() is performed after parameter registeration
+ // thus to give the protocols some potential values use the old static list
+ // TODO: find another way to use gps_layer_inst_init()?
+ { VIK_LAYER_GPS, "gps_protocol", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, protocols_args, NULL, NULL, gps_protocol_default, NULL, NULL }, // List reassigned at runtime
+ { VIK_LAYER_GPS, "gps_port", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL, NULL, gps_port_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_download_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_upload_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_download_routes", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Routes:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_upload_routes", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Routes:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_download_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gps_upload_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, 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},
- { "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},
+ { VIK_LAYER_GPS, "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Jump to current position on start"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_false_default, NULL, NULL },
+ { VIK_LAYER_GPS, "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL, NULL, moving_map_method_default, NULL, NULL },
+ { VIK_LAYER_GPS, "realtime_update_statusbar", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Update Statusbar:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, N_("Display information in the statusbar on GPS updates"), vik_lpd_true_default, NULL, NULL },
+ { VIK_LAYER_GPS, "auto_connect", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Auto Connect"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, N_("Automatically connect to GPSD"), vik_lpd_false_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Host:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL, gpsd_host_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Port:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL, gpsd_port_default, NULL, NULL },
+ { VIK_LAYER_GPS, "gpsd_retry_interval", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Retry Interval (seconds):"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL, gpsd_retry_interval_default, NULL, NULL },
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
};
enum {
PARAM_PROTOCOL=0, PARAM_PORT,
PARAM_DOWNLOAD_TRACKS, PARAM_UPLOAD_TRACKS,
+ PARAM_DOWNLOAD_ROUTES, PARAM_UPLOAD_ROUTES,
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,
+ PARAM_REALTIME_REC,
+ PARAM_REALTIME_CENTER_START,
+ PARAM_VEHICLE_POSITION,
+ PARAM_REALTIME_UPDATE_STATUSBAR,
+ PARAM_GPSD_CONNECT,
+ PARAM_GPSD_HOST,
+ PARAM_GPSD_PORT,
+ PARAM_GPSD_RETRY_INTERVAL,
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
NUM_PARAMS};
(VikLayerFuncCreate) vik_gps_layer_create,
(VikLayerFuncRealize) vik_gps_layer_realize,
- (VikLayerFuncPostRead) NULL,
+ (VikLayerFuncPostRead) vik_gps_layer_post_read,
(VikLayerFuncFree) vik_gps_layer_free,
(VikLayerFuncProperties) NULL,
(VikLayerFuncDraw) vik_gps_layer_draw,
(VikLayerFuncChangeCoordMode) gps_layer_change_coord_mode,
+ (VikLayerFuncGetTimestamp) NULL,
+
(VikLayerFuncSetMenuItemsSelection) NULL,
(VikLayerFuncGetMenuItemsSelection) NULL,
(VikLayerFuncSetParam) gps_layer_set_param,
(VikLayerFuncGetParam) gps_layer_get_param,
+ (VikLayerFuncChangeParam) NULL,
(VikLayerFuncReadFileData) NULL,
(VikLayerFuncWriteFileData) NULL,
(VikLayerFuncCopyItem) NULL,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
- (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request,
+ (VikLayerFuncDragDropRequest) NULL,
(VikLayerFuncSelectClick) NULL,
(VikLayerFuncSelectMove) NULL,
typedef struct {
struct gps_data_t gpsd;
VikGpsLayer *vgl;
+ int gpsd_open;
} VglGpsd;
typedef struct {
int cur_read_child; /* used only for reading file */
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
VglGpsd *vgpsd;
- gboolean realtime_tracking; /* set/reset only by the callback */
+ gboolean connected_to_gpsd;
+ gboolean realtime_tracking;
gboolean first_realtime_trackpoint;
GpsFix realtime_fix;
GpsFix last_fix;
GdkGC *realtime_track_pt2_gc;
/* params */
+ gboolean auto_connect_to_gpsd;
gchar *gpsd_host;
gchar *gpsd_port;
gint gpsd_retry_interval;
gboolean realtime_record;
gboolean realtime_jump_to_start;
guint vehicle_position;
+ gboolean realtime_update_statusbar;
+ VikTrackpoint *trkpt;
+ VikTrackpoint *trkpt_prev;
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
gchar *protocol;
gchar *serial_port;
gboolean download_tracks;
+ gboolean download_routes;
gboolean download_waypoints;
gboolean upload_tracks;
+ gboolean upload_routes;
gboolean upload_waypoints;
};
{
gint new_proto = 0;
// +1 for luck (i.e the NULL terminator)
- gchar **new_protocols = g_malloc(1 + g_list_length(a_babel_device_list)*sizeof(gpointer));
+ gchar **new_protocols = g_malloc_n(1 + g_list_length(a_babel_device_list), sizeof(gpointer));
GList *gl = g_list_first ( a_babel_device_list );
while ( gl ) {
}
new_protocols[new_proto] = NULL;
- vik_gps_layer_interface.params[0].widget_data = new_protocols;
- // assigned to [0] because this^ is the GPS protocol in the params list
+ vik_gps_layer_interface.params[PARAM_PROTOCOL].widget_data = new_protocols;
}
GType vik_gps_layer_get_type ()
vik_layer_rename ( VIK_LAYER(rv), vik_gps_layer_interface.name );
for (i = 0; i < NUM_TRW; i++) {
- rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ));
+ rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, FALSE ));
vik_layer_set_menu_items_selection(VIK_LAYER(rv->trw_children[i]), VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_DELETE));
}
return rv;
static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl )
{
- return vgl->protocol;
+ static gchar buf1[256];
+ buf1[0] = '\0';
+ static gchar rbuf[512];
+ rbuf[0] = '\0';
+
+ g_snprintf (buf1, sizeof(buf1), "%s:%s", vgl->protocol, vgl->serial_port);
+
+#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
+ static gchar buf2[256];
+ buf2[0] = '\0';
+ if ( vgl->connected_to_gpsd )
+ g_snprintf (buf2, sizeof(buf2), "GPSD:%s:%s %s", vgl->gpsd_host, vgl->gpsd_port, _("Connected"));
+ else
+ g_snprintf (buf2, sizeof(buf2), "GPSD:%s:%s %s", vgl->gpsd_host, vgl->gpsd_port, _("Disconnected"));
+
+ g_snprintf (rbuf, sizeof(rbuf), "%s\n%s", buf1, buf2);
+#else
+ g_snprintf (rbuf, sizeof(rbuf), "%s", buf1);
+#endif
+ return rbuf;
}
/* "Copy" */
child_layer = vik_layer_unmarshall ( data + sizeof(gint), alm_size, vvp );
if (child_layer) {
rv->trw_children[i++] = (VikTrwLayer *)child_layer;
- g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update_secondary), rv );
+ // NB no need to attach signal update handler here
+ // as this will always be performed later on in vik_gps_layer_realize()
}
alm_next;
}
#undef alm_next
}
-static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation )
+static gboolean gps_layer_set_param ( VikGpsLayer *vgl, VikLayerSetParam *vlsp )
{
- switch ( id )
+ switch ( vlsp->id )
{
case PARAM_PROTOCOL:
- if (data.s) {
+ if (vlsp->data.s) {
g_free(vgl->protocol);
// Backwards Compatibility: previous versions <v1.4 stored protocol 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' &&
+ int index = vlsp->data.s[0] - '0';
+ if (vlsp->data.s[0] != '\0' &&
+ g_ascii_isdigit (vlsp->data.s[0]) &&
+ vlsp->data.s[1] == '\0' &&
index < OLD_NUM_PROTOCOLS)
// It is a single digit: activate compatibility
vgl->protocol = g_strdup(protocols_args[index]);
else
- vgl->protocol = g_strdup(data.s);
+ vgl->protocol = g_strdup(vlsp->data.s);
g_debug("%s: %s", __FUNCTION__, vgl->protocol);
}
else
g_warning(_("Unknown GPS Protocol"));
break;
case PARAM_PORT:
- if (data.s) {
+ if (vlsp->data.s) {
g_free(vgl->serial_port);
// Backwards Compatibility: previous versions <v0.9.91 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' &&
+ int index = vlsp->data.s[0] - '0';
+ if (vlsp->data.s[0] != '\0' &&
+ g_ascii_isdigit (vlsp->data.s[0]) &&
+ vlsp->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);
+ vgl->serial_port = g_strdup(vlsp->data.s);
g_debug("%s: %s", __FUNCTION__, vgl->serial_port);
}
else
g_warning(_("Unknown serial port device"));
break;
case PARAM_DOWNLOAD_TRACKS:
- vgl->download_tracks = data.b;
+ vgl->download_tracks = vlsp->data.b;
break;
case PARAM_UPLOAD_TRACKS:
- vgl->upload_tracks = data.b;
+ vgl->upload_tracks = vlsp->data.b;
+ break;
+ case PARAM_DOWNLOAD_ROUTES:
+ vgl->download_routes = vlsp->data.b;
+ break;
+ case PARAM_UPLOAD_ROUTES:
+ vgl->upload_routes = vlsp->data.b;
break;
case PARAM_DOWNLOAD_WAYPOINTS:
- vgl->download_waypoints = data.b;
+ vgl->download_waypoints = vlsp->data.b;
break;
case PARAM_UPLOAD_WAYPOINTS:
- vgl->upload_waypoints = data.b;
+ vgl->upload_waypoints = vlsp->data.b;
break;
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
+ case PARAM_GPSD_CONNECT:
+ vgl->auto_connect_to_gpsd = vlsp->data.b;
+ break;
case PARAM_GPSD_HOST:
- if (vgl->gpsd_host)
- g_free(vgl->gpsd_host);
- vgl->gpsd_host = g_strdup(data.s);
+ if (vlsp->data.s) {
+ if (vgl->gpsd_host)
+ g_free(vgl->gpsd_host);
+ vgl->gpsd_host = g_strdup(vlsp->data.s);
+ }
break;
case PARAM_GPSD_PORT:
- if (vgl->gpsd_port)
- g_free(vgl->gpsd_port);
- vgl->gpsd_port = g_strdup(data.s); /* TODO: check for number */
+ if (vlsp->data.s) {
+ if (vgl->gpsd_port)
+ g_free(vgl->gpsd_port);
+ vgl->gpsd_port = g_strdup(vlsp->data.s);
+ }
break;
case PARAM_GPSD_RETRY_INTERVAL:
- vgl->gpsd_retry_interval = strtol(data.s, NULL, 10);
+ vgl->gpsd_retry_interval = strtol(vlsp->data.s, NULL, 10);
break;
case PARAM_REALTIME_REC:
- vgl->realtime_record = data.b;
+ vgl->realtime_record = vlsp->data.b;
break;
case PARAM_REALTIME_CENTER_START:
- vgl->realtime_jump_to_start = data.b;
+ vgl->realtime_jump_to_start = vlsp->data.b;
break;
case PARAM_VEHICLE_POSITION:
- vgl->vehicle_position = data.u;
+ vgl->vehicle_position = vlsp->data.u;
+ break;
+ case PARAM_REALTIME_UPDATE_STATUSBAR:
+ vgl->realtime_update_statusbar = vlsp->data.b;
break;
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
default:
case PARAM_UPLOAD_TRACKS:
rv.b = vgl->upload_tracks;
break;
+ case PARAM_DOWNLOAD_ROUTES:
+ rv.b = vgl->download_routes;
+ break;
+ case PARAM_UPLOAD_ROUTES:
+ rv.b = vgl->upload_routes;
+ break;
case PARAM_DOWNLOAD_WAYPOINTS:
rv.b = vgl->download_waypoints;
break;
rv.b = vgl->upload_waypoints;
break;
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
+ case PARAM_GPSD_CONNECT:
+ rv.b = vgl->auto_connect_to_gpsd;
+ break;
case PARAM_GPSD_HOST:
rv.s = vgl->gpsd_host ? vgl->gpsd_host : "";
break;
case PARAM_VEHICLE_POSITION:
rv.u = vgl->vehicle_position;
break;
+ case PARAM_REALTIME_UPDATE_STATUSBAR:
+ rv.u = vgl->realtime_update_statusbar;
+ break;
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
default:
g_warning(_("%s: unknown parameter"), __FUNCTION__);
{
gint i;
VikGpsLayer *vgl = VIK_GPS_LAYER ( g_object_new ( VIK_GPS_LAYER_TYPE, NULL ) );
- vik_layer_init ( VIK_LAYER(vgl), VIK_LAYER_GPS );
+ vik_layer_set_type ( VIK_LAYER(vgl), VIK_LAYER_GPS );
for (i = 0; i < NUM_TRW; i++) {
vgl->trw_children[i] = NULL;
}
vgl->cur_read_child = 0;
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
- vgl->realtime_tracking = FALSE;
vgl->first_realtime_trackpoint = FALSE;
+ vgl->trkpt = NULL;
+ vgl->trkpt_prev = NULL;
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;
+ if ( vp ) {
+ 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_track = NULL;
+#endif // VIK_CONFIG_REALTIME_GPS_TRACKING
- /* Setting params here */
- vgl->gpsd_host = g_strdup("localhost");
- vgl->gpsd_port = g_strdup(DEFAULT_GPSD_PORT);
- vgl->realtime_record = TRUE;
- vgl->realtime_jump_to_start = TRUE;
- vgl->vehicle_position = VEHICLE_POSITION_ON_SCREEN;
- vgl->gpsd_retry_interval = 10;
-#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
- vgl->protocol = g_strdup("garmin");
- 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
+ vik_layer_set_defaults ( VIK_LAYER(vgl), vp );
return vgl;
}
-static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data )
+static void vik_gps_layer_post_read ( VikGpsLayer *vgl, VikViewport *vvp, gboolean from_file )
+{
+ for (guint i = 0; i < NUM_TRW; i++) {
+ trw_layer_calculate_bounds_waypoints ( vgl->trw_children[i] );
+ trw_layer_calculate_bounds_tracks ( vgl->trw_children[i] );
+ }
+}
+
+static void vik_gps_layer_draw ( VikGpsLayer *vgl, VikViewport *vp )
{
gint i;
VikLayer *vl;
- VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( VIK_VIEWPORT(data) ));
+ VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( vp ));
for (i = 0; i < NUM_TRW; i++) {
vl = VIK_LAYER(vgl->trw_children[i]);
if (vl == trigger) {
- if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) {
- vik_viewport_set_half_drawn ( VIK_VIEWPORT(data), FALSE );
- vik_viewport_snapshot_load( VIK_VIEWPORT(data) );
+ if ( vik_viewport_get_half_drawn ( vp ) ) {
+ vik_viewport_set_half_drawn ( vp, FALSE );
+ vik_viewport_snapshot_load( vp );
} else {
- vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
+ vik_viewport_snapshot_save( vp );
}
}
- if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
- vik_layer_draw ( vl, data );
+ if (!vik_viewport_get_half_drawn(vp))
+ vik_layer_draw ( vl, vp );
}
#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) ) ) {
- vik_viewport_set_half_drawn ( VIK_VIEWPORT(data), FALSE );
- vik_viewport_snapshot_load( VIK_VIEWPORT(data) );
+ if ( vik_viewport_get_half_drawn ( vp ) ) {
+ vik_viewport_set_half_drawn ( vp, FALSE );
+ vik_viewport_snapshot_load( vp );
} else {
- vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
+ vik_viewport_snapshot_save( vp );
}
}
- if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
- realtime_tracking_draw(vgl, VIK_VIEWPORT(data));
+ if (!vik_viewport_get_half_drawn(vp))
+ realtime_tracking_draw(vgl, vp);
}
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
}
static void disconnect_layer_signal ( VikLayer *vl, VikGpsLayer *vgl )
{
- guint number_handlers = DISCONNECT_UPDATE_SIGNAL(vl,vgl);
+ guint number_handlers = g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, 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);
+ g_critical(_("Unexpected number of disconnected handlers: %d"), number_handlers);
}
}
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
}
-gboolean vik_gps_layer_delete ( VikGpsLayer *vgl, GtkTreeIter *iter )
-{
- gint i;
- VikLayer *l = VIK_LAYER( vik_treeview_item_get_pointer ( VIK_LAYER(vgl)->vt, iter ) );
- gboolean was_visible = l->visible;
-
- vik_treeview_item_delete ( VIK_LAYER(vgl)->vt, iter );
- for (i = 0; i < NUM_TRW; i++) {
- if (VIK_LAYER(vgl->trw_children[i]) == l)
- vgl->trw_children[i] = NULL;
- }
- g_assert(DISCONNECT_UPDATE_SIGNAL(l,vgl)==1);
- g_object_unref ( l );
-
- return was_visible;
-}
-
static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIter *layer_iter )
{
GtkTreeIter iter;
for (ix = 0; ix < NUM_TRW; ix++) {
VikLayer * trw = VIK_LAYER(vgl->trw_children[ix]);
vik_treeview_add_layer ( VIK_LAYER(vgl)->vt, layer_iter, &iter,
- _(trw_names[ix]), vgl,
- trw, trw->type, trw->type );
+ _(trw_names[ix]), vgl, TRUE,
+ trw, trw->type, trw->type, vik_layer_get_timestamp(trw) );
if ( ! trw->visible )
vik_treeview_item_set_visible ( VIK_LAYER(vgl)->vt, &iter, FALSE );
vik_layer_realize ( trw, VIK_LAYER(vgl)->vt, &iter );
g_signal_connect_swapped ( G_OBJECT(trw), "update", G_CALLBACK(vik_layer_emit_update_secondary), vgl );
}
+
+#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
+ if ( vgl->auto_connect_to_gpsd ) {
+ vgl->realtime_tracking = TRUE;
+ vgl->first_realtime_trackpoint = TRUE;
+ (void)rt_gpsd_connect ( vgl, FALSE );
+ }
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
}
const GList *vik_gps_layer_get_children ( VikGpsLayer *vgl )
return TRUE;
}
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path )
-{
- VikTreeview *vt = VIK_LAYER(val_src)->vt;
- VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter);
- gchar *dp;
-
- dp = gtk_tree_path_to_string(dest_path);
-
- /* vik_gps_layer_delete unrefs, but we don't want that here.
- * we're still using the layer. */
- g_object_ref ( vl );
- vik_gps_layer_delete(val_src, src_item_iter);
-
- g_free(dp);
-}
-
static void gps_session_delete(GpsSession *sess)
{
- /* TODO */
- g_mutex_free(sess->mutex);
- g_free(sess->cmd_args);
-
+ vik_mutex_free(sess->mutex);
+ // Remove any outstanding GUI update requests
+ if ( sess->id_status_working )
+ g_source_remove ( sess->id_status_working );
+ if ( sess->id_status_end )
+ g_source_remove ( sess->id_status_end );
+ if ( sess->id_info )
+ g_source_remove ( sess->id_info );
+ if ( sess->id_total_count )
+ g_source_remove ( sess->id_total_count );
+ if ( sess->id_count )
+ g_source_remove ( sess->id_count );
+ g_free(sess->babelargs);
+ g_free(sess->info);
+ g_free(sess->port);
g_free(sess);
-
}
-static void set_total_count(gint cnt, GpsSession *sess)
+static gboolean show_total_count(GpsSession *sess)
{
- gchar s[128];
- gdk_threads_enter();
g_mutex_lock(sess->mutex);
if (sess->ok) {
const gchar *tmp_str;
+ gint tc;
+ GtkWidget *progress_label;
if (sess->direction == GPS_DOWN)
{
- if (sess->progress_label == sess->wp_label)
- tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", cnt);
- else
- tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt);
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", sess->wpt_total_count);
+ tc = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", sess->trk_total_count);
+ tc = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Downloading %d routepoint...", "Downloading %d routepoints...", sess->rte_total_count);
+ tc = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+/*
+ {
+ // 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);
+ tc = mycnt;
+ break;
+ }
+ */
+ }
}
- else
+ else
{
- if (sess->progress_label == sess->wp_label)
- tmp_str = ngettext("Uploading %d waypoint...", "Uploading %d waypoints...", cnt);
- else
- tmp_str = ngettext("Uploading %d trackpoint...", "Uploading %d trackpoints...", cnt);
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Uploading %d waypoint...", "Uploading %d waypoints...", sess->wpt_total_count);
+ tc = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Uploading %d trackpoint...", "Uploading %d trackpoints...", sess->trk_total_count);
+ tc = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Uploading %d routepoint...", "Uploading %d routepoints...", sess->rte_total_count);
+ tc = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+ }
}
- g_snprintf(s, 128, tmp_str, cnt);
- gtk_label_set_text ( GTK_LABEL(sess->progress_label), s );
- gtk_widget_show ( sess->progress_label );
- sess->total_count = cnt;
+ gchar s[128];
+ g_snprintf(s, 128, tmp_str, tc);
+ gtk_label_set_text ( GTK_LABEL(progress_label), s );
+ gtk_widget_show ( progress_label );
}
+ sess->id_total_count = 0;
g_mutex_unlock(sess->mutex);
- gdk_threads_leave();
+ return FALSE;
}
-static void set_current_count(gint cnt, GpsSession *sess)
+static gboolean show_current_count(GpsSession *sess)
{
- gchar s[128];
- const gchar *tmp_str;
-
- gdk_threads_enter();
g_mutex_lock(sess->mutex);
if (sess->ok) {
- if (cnt < sess->total_count) {
- 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);
- else
- tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->total_count);
+ gchar s[128];
+ gint count, total_count;
+ const gchar *tmp_str;
+ GtkWidget *progress_label;
+ if (sess->wpt_count < sess->wpt_total_count) {
+ if (sess->direction == GPS_DOWN) {
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Downloaded %d out of %d waypoint...", "Downloaded %d out of %d waypoints...", sess->wpt_total_count);
+ count = sess->wpt_count;
+ total_count = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->trk_total_count);
+ count = sess->trk_count;
+ total_count = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Downloaded %d out of %d routepoint...", "Downloaded %d out of %d routepoints...", sess->rte_total_count);
+ count = sess->rte_count;
+ total_count = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+ }
}
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);
- else
- tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->total_count);
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Uploaded %d out of %d waypoint...", "Uploaded %d out of %d waypoints...", sess->wpt_total_count);
+ count = sess->wpt_count;
+ total_count = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->trk_total_count);
+ count = sess->trk_count;
+ total_count = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Uploaded %d out of %d routepoint...", "Uploaded %d out of %d routepoints...", sess->rte_total_count);
+ count = sess->rte_count;
+ total_count = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+ }
}
- 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);
- else
- tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", cnt);
+ if (sess->direction == GPS_DOWN) {
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Downloaded %d waypoint", "Downloaded %d waypoints", sess->wpt_count);
+ count = sess->wpt_count;
+ total_count = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", sess->trk_count);
+ count = sess->trk_count;
+ total_count = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Downloaded %d routepoint", "Downloaded %d routepoints", sess->rte_count);
+ count = sess->rte_count;
+ total_count = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+ }
}
else {
- if (sess->progress_label == sess->wp_label)
- tmp_str = ngettext("Uploaded %d waypoint", "Uploaded %d waypoints", cnt);
- else
- tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", cnt);
+ switch (sess->progress_type) {
+ case WPT:
+ tmp_str = ngettext("Uploaded %d waypoint", "Uploaded %d waypoints", sess->wpt_count);
+ count = sess->wpt_count;
+ total_count = sess->wpt_total_count;
+ progress_label = sess->wpt_label;
+ break;
+ case TRK:
+ tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", sess->trk_count);
+ count = sess->trk_count;
+ total_count = sess->trk_total_count;
+ progress_label = sess->trk_label;
+ break;
+ default:
+ tmp_str = ngettext("Uploaded %d routepoint", "Uploaded %d routepoints", sess->rte_count);
+ count = sess->rte_count;
+ total_count = sess->rte_total_count;
+ progress_label = sess->rte_label;
+ break;
+ }
}
- g_snprintf(s, 128, tmp_str, cnt);
- }
- gtk_label_set_text ( GTK_LABEL(sess->progress_label), s );
+ }
+ g_snprintf(s, 128, tmp_str, count, total_count);
+ gtk_label_set_text ( GTK_LABEL(progress_label), s );
}
+ sess->id_count = 0;
g_mutex_unlock(sess->mutex);
- gdk_threads_leave();
+ return FALSE;
}
-static void set_gps_info(const gchar *info, GpsSession *sess)
+static gboolean show_gps_info(GpsSession *sess)
{
- gchar s[256];
- gdk_threads_enter();
g_mutex_lock(sess->mutex);
if (sess->ok) {
- g_snprintf(s, 256, _("GPS Device: %s"), info);
+ gchar s[256];
+ g_snprintf(s, 256, _("GPS Device: %s"), sess->info);
gtk_label_set_text ( GTK_LABEL(sess->gps_label), s );
}
+ sess->id_info = 0;
g_mutex_unlock(sess->mutex);
- gdk_threads_leave();
+ return FALSE;
+}
+
+/*
+ * Common processing for GPS Device information
+ * It doesn't matter whether we're uploading or downloading
+ */
+static void process_line_for_gps_info ( const gchar *line, GpsSession *sess )
+{
+ if (strstr(line, "PRDDAT")) {
+ gchar **tokens = g_strsplit(line, " ", 0);
+ gchar info[128];
+ int ilen = 0;
+ int i;
+ int n_tokens = 0;
+
+ while (tokens[n_tokens])
+ n_tokens++;
+
+ // I'm not entirely clear what information this is trying to get...
+ // Obviously trying to decipher some kind of text/naming scheme
+ // Anyway this will be superceded if there is 'Unit:' information
+ 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;
+ sess->info = g_strdup (info);
+ sess->id_info = gdk_threads_add_idle ( (GSourceFunc)show_gps_info, sess );
+ }
+ 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) {
+ sess->info = g_strdup (tokens[1]);
+ sess->id_info = gdk_threads_add_idle ( (GSourceFunc)show_gps_info, sess );
+ }
+ g_strfreev(tokens);
+ }
+
+ if (strstr(line, "[ERROR] GPS")) {
+ gchar **tokens = g_strsplit(line, "\n", 0);
+ sess->info = g_strdup(tokens[0]);
+ sess->id_info = gdk_threads_add_idle ( (GSourceFunc)show_gps_info, sess );
+ g_strfreev(tokens);
+ }
+
+ if (strstr(line, "an't in")) {
+ gchar **tokens = g_strsplit(line, "\n", 0);
+ sess->info = g_strdup(tokens[0]);
+ sess->id_info = gdk_threads_add_idle ( (GSourceFunc)show_gps_info, sess );
+ g_strfreev(tokens);
+ }
+
+ if (strstr(line, "Can't get waypoint")) {
+ gchar **tokens = g_strsplit(line, "\n", 0);
+ sess->info = g_strdup(tokens[0]);
+ sess->id_info = gdk_threads_add_idle ( (GSourceFunc)show_gps_info, sess );
+ g_strfreev(tokens);
+ }
+}
+
+static gboolean show_gps_status_working ( GpsSession *sess )
+{
+ g_mutex_lock(sess->mutex);
+ if ( sess->ok ) {
+ gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Status: Working...") );
+ }
+ sess->id_status_working = 0;
+ g_mutex_unlock(sess->mutex);
+ return FALSE;
}
static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSession * sess )
{
gchar *line;
- gdk_threads_enter ();
- g_mutex_lock(sess->mutex);
- if (!sess->ok) {
- g_mutex_unlock(sess->mutex);
- gps_session_delete(sess);
- gdk_threads_leave();
+ if ( !sess->ok ) {
+ //gps_session_delete(sess);
+ sess->thread_complete = TRUE;
+ g_debug ("THREAD EXIT INTERUPPT");
g_thread_exit ( NULL );
}
- g_mutex_unlock(sess->mutex);
- gdk_threads_leave ();
switch(c) {
case BABEL_DIAG_OUTPUT:
line = (gchar *)data;
- gdk_threads_enter();
- g_mutex_lock(sess->mutex);
- if (sess->ok) {
- gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Status: Working...") );
- }
- g_mutex_unlock(sess->mutex);
- gdk_threads_leave();
+ sess->id_status_working = gdk_threads_add_idle ( (GSourceFunc)show_gps_status_working, sess );
- /* tells us how many items there will be */
- if (strstr(line, "Xfer Wpt")) {
- sess->progress_label = sess->wp_label;
+ /* tells us the type of items that will follow */
+ if (strstr(line, "Xfer Wpt")) {
+ sess->progress_type = WPT;
}
- if (strstr(line, "Xfer Trk")) {
- sess->progress_label = sess->trk_label;
+ if (strstr(line, "Xfer Trk")) {
+ sess->progress_type = TRK;
}
- if (strstr(line, "PRDDAT")) {
- gchar **tokens = g_strsplit(line, " ", 0);
- gchar info[128];
- int ilen = 0;
- int i;
- 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, sess);
- }
- g_strfreev(tokens);
+ if (strstr(line, "Xfer Rte")) {
+ sess->progress_type = RTE;
}
- /* 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")) {
+
+ process_line_for_gps_info ( line, sess );
+
+ if (strstr(line, "RECORD")) {
int lsb, msb, cnt;
if (strlen(line) > 20) {
sscanf(line+17, "%x", &lsb);
sscanf(line+20, "%x", &msb);
cnt = lsb + msb * 256;
- set_total_count(cnt, sess);
- sess->count = 0;
+ if ( sess->progress_type == RTE ) {
+ // 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;
+ sess->rte_total_count = mycnt;
+ sess->rte_count = 0;
+ }
+ else if ( sess->progress_type == WPT ) {
+ sess->wpt_total_count = cnt;
+ sess->wpt_count = 0;
+ }
+ else {
+ sess->trk_total_count = cnt;
+ sess->trk_count = 0;
+ }
+ sess->id_total_count = gdk_threads_add_idle ( (GSourceFunc)show_total_count, sess);
}
}
- if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) {
- sess->count++;
- set_current_count(sess->count, sess);
+ if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") || strstr(line, "RTEHDR") || strstr(line, "RTEWPT") ) {
+ if ( strstr(line, "WPTDAT") )
+ sess->wpt_count++;
+ else if ( strstr(line, "TRKHDR") || strstr(line, "TRKDAT") )
+ sess->trk_count++;
+ else
+ // "RTEHDR" || "RTEWPT"
+ sess->rte_count++;
+ sess->id_count = gdk_threads_add_idle ( (GSourceFunc)show_current_count, sess);
}
break;
case BABEL_DONE:
default:
break;
}
-
}
static void gps_upload_progress_func(BabelProgressCode c, gpointer data, GpsSession * sess )
gchar *line;
static int cnt = 0;
- gdk_threads_enter ();
- g_mutex_lock(sess->mutex);
- if (!sess->ok) {
- g_mutex_unlock(sess->mutex);
- gps_session_delete(sess);
- gdk_threads_leave();
+ if ( !sess->ok ) {
+ //gps_session_delete(sess);
+ sess->thread_complete = TRUE;
g_thread_exit ( NULL );
}
- g_mutex_unlock(sess->mutex);
- gdk_threads_leave ();
switch(c) {
case BABEL_DIAG_OUTPUT:
line = (gchar *)data;
- gdk_threads_enter();
- g_mutex_lock(sess->mutex);
- if (sess->ok) {
- gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Status: Working...") );
- }
- g_mutex_unlock(sess->mutex);
- gdk_threads_leave();
-
- if (strstr(line, "PRDDAT")) {
- gchar **tokens = g_strsplit(line, " ", 0);
- gchar info[128];
- int ilen = 0;
- int i;
- 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, sess);
- }
- g_strfreev(tokens);
- }
+ sess->id_status_working = gdk_threads_add_idle ( (GSourceFunc)show_gps_status_working, sess );
+
+ process_line_for_gps_info ( line, sess );
+
if (strstr(line, "RECORD")) {
int lsb, msb;
sscanf(line+17, "%x", &lsb);
sscanf(line+20, "%x", &msb);
cnt = lsb + msb * 256;
- /* set_total_count(cnt, sess); */
- sess->count = 0;
+ //sess->count = 0; ?? wpt, trk and/or rte?? or none
}
}
if ( strstr(line, "WPTDAT")) {
- if (sess->count == 0) {
- sess->progress_label = sess->wp_label;
- set_total_count(cnt, sess);
+ sess->progress_type = WPT;
+ if (sess->wpt_count == 0) {
+ sess->wpt_total_count = cnt;
+ sess->id_total_count = gdk_threads_add_idle ( (GSourceFunc)show_total_count, sess );
}
- sess->count++;
- set_current_count(sess->count, sess);
-
+ sess->wpt_count++;
+ sess->id_count = gdk_threads_add_idle ( (GSourceFunc)show_current_count, sess );
+ }
+ if ( strstr(line, "RTEHDR") || strstr(line, "RTEWPT") ) {
+ sess->progress_type = RTE;
+ if (sess->rte_count == 0) {
+ // 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
+ // Anyway since we're uploading - we should know how many points we're going to put!
+ cnt = (cnt / 2) + 1;
+ sess->id_total_count = gdk_threads_add_idle ( (GSourceFunc)show_total_count, sess);
+ }
+ sess->rte_count++;
+ sess->id_count = gdk_threads_add_idle ( (GSourceFunc)show_current_count, sess);
}
if ( strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) {
- if (sess->count == 0) {
- sess->progress_label = sess->trk_label;
- set_total_count(cnt, sess);
+ sess->progress_type = TRK;
+ if (sess->trk_count == 0) {
+ sess->id_total_count = gdk_threads_add_idle ( (GSourceFunc)show_total_count, sess);
}
- sess->count++;
- set_current_count(sess->count, sess);
+ sess->trk_count++;
+ sess->id_count = gdk_threads_add_idle ( (GSourceFunc)show_current_count, sess);
}
break;
case BABEL_DONE:
default:
break;
}
-
}
-static void gps_comm_thread(GpsSession *sess)
+static gboolean show_gps_status_end ( GpsSession *sess )
{
- gboolean result;
-
- if (sess->direction == GPS_DOWN)
- 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->track, sess->cmd_args, sess->port,
- (BabelStatusFunc) gps_upload_progress_func, sess);
+ g_mutex_lock(sess->mutex);
+ // (Download)Failure could be due to a number of reasons: such as no/wrong device attached or GPSBabel not installed
+ if (!sess->result) {
+ gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Error: No result.") );
}
-
- if (!result) {
- gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Error: couldn't find gpsbabel.") );
- }
else {
- g_mutex_lock(sess->mutex);
if (sess->ok) {
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 );
+ }
+ }
+ sess->id_status_end = 0;
+ g_mutex_unlock(sess->mutex);
+ return FALSE;
+}
+/**
+ *
+ */
+static void gps_comm_thread(GpsSession *sess)
+{
+ if (sess->direction == GPS_DOWN) {
+ ProcessOptions po = { sess->babelargs, sess->port, NULL, NULL, NULL, NULL };
+ sess->result = a_babel_convert_from (sess->vtl, &po, (BabelStatusFunc) gps_download_progress_func, sess, NULL);
+ }
+ else {
+ sess->result = a_babel_convert_to (sess->vtl, sess->track, sess->babelargs, sess->port,
+ (BabelStatusFunc) gps_upload_progress_func, sess);
+ }
+
+ sess->id_status_end = gdk_threads_add_idle ( (GSourceFunc)show_gps_status_end, sess );
+
+ if (sess->result) {
+ if (sess->ok) {
/* 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
- }
+ if ( sess->vvp && sess->direction == GPS_DOWN ) {
+ vik_layer_post_read ( VIK_LAYER(sess->vtl), sess->vvp, TRUE );
+ /* View the data available */
+ vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp ) ;
+ vik_layer_emit_update ( VIK_LAYER(sess->vtl) ); // NB update request from background thread
+ }
}
} else {
- /* canceled */
+ /* cancelled */
}
- g_mutex_unlock(sess->mutex);
}
- g_mutex_lock(sess->mutex);
if (sess->ok) {
+ // Thread has completed successfully, but now set to false to avoid 'tell thread to stop' test after dialog run
sess->ok = FALSE;
- g_mutex_unlock(sess->mutex);
- }
- else {
- g_mutex_unlock(sess->mutex);
- gps_session_delete(sess);
}
+
+ sess->thread_complete = TRUE;
g_thread_exit(NULL);
}
VikViewport *vvp,
VikLayersPanel *vlp,
gboolean do_tracks,
+ gboolean do_routes,
gboolean do_waypoints,
gboolean turn_off )
{
- GpsSession *sess = g_malloc(sizeof(GpsSession));
+ GpsSession *sess = g_malloc0(sizeof(GpsSession));
char *tracks = NULL;
+ char *routes = NULL;
char *waypoints = NULL;
- sess->mutex = g_mutex_new();
+ sess->mutex = vik_mutex_new();
sess->direction = dir;
sess->vtl = vtl;
sess->track = track;
sess->port = g_strdup(port);
sess->ok = TRUE;
- 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
tracks = "-t";
else
tracks = "";
+ if (do_routes)
+ routes = "-r";
+ else
+ routes = "";
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', protocol);
+ sess->babelargs = g_strdup_printf("-D 9 %s %s %s -%c %s",
+ tracks, routes, waypoints, (dir == GPS_DOWN) ? 'i' : 'o', protocol);
tracks = NULL;
waypoints = NULL;
+ GtkWidget *dialog = NULL;
+
// Only create dialog if we're going to do some transferring
- if ( do_tracks || do_waypoints ) {
- 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 );
+ if ( do_tracks || do_waypoints || do_routes ) {
+ 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 );
+ sess->dialog = dialog;
gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog),
GTK_RESPONSE_ACCEPT, FALSE );
- gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title );
+ gtk_window_set_title ( GTK_WINDOW(sess->dialog), (dir == GPS_DOWN) ? _("GPS Download") : _("GPS Upload") );
sess->status_label = gtk_label_new (_("Status: detecting gpsbabel"));
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->status_label, FALSE, FALSE, 5 );
- gtk_widget_show_all(sess->status_label);
+ gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(sess->dialog))), sess->status_label, FALSE, FALSE, 5 );
sess->gps_label = gtk_label_new (_("GPS device: N/A"));
- sess->ver_label = gtk_label_new ("");
- sess->id_label = gtk_label_new ("");
- sess->wp_label = gtk_label_new ("");
+ sess->wpt_label = gtk_label_new ("");
sess->trk_label = gtk_label_new ("");
+ sess->rte_label = gtk_label_new ("");
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->gps_label, FALSE, FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->wp_label, FALSE, FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->trk_label, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(sess->dialog))), sess->gps_label, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(sess->dialog))), sess->wpt_label, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(sess->dialog))), sess->trk_label, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(sess->dialog))), sess->rte_label, FALSE, FALSE, 5 );
gtk_widget_show_all(sess->dialog);
- sess->progress_label = sess->wp_label;
- sess->total_count = -1;
-
- // Starting gps read/write thread
- 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));
+ // Starting gps read/write thread
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_thread_try_new ( "gps_comm_thread", (GThreadFunc)gps_comm_thread, sess, NULL );
+#else
+ g_thread_create ( (GThreadFunc)gps_comm_thread, sess, FALSE, NULL );
+#endif
- gtk_widget_destroy(sess->dialog);
+ gtk_dialog_run(GTK_DIALOG(dialog));
}
else {
if ( !turn_off )
a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_LAYER(vtl), _("No GPS items selected for transfer.") );
}
- g_mutex_lock(sess->mutex);
-
if (sess->ok) {
sess->ok = FALSE; /* tell thread to stop */
- g_mutex_unlock(sess->mutex);
}
else {
if ( turn_off ) {
// No need for thread for powering off device (should be quick operation...) - so use babel command directly:
gchar *device_off = g_strdup_printf("-i %s,%s", protocol, "power_off");
- gboolean result = a_babel_convert_from (NULL, (const char*)device_off, (const char*)port, NULL, NULL);
+ ProcessOptions po = { device_off, port, NULL, NULL, NULL, NULL };
+ gboolean result = a_babel_convert_from (NULL, &po, NULL, NULL, NULL);
if ( !result )
a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vtl), _("Could not turn off device.") );
g_free ( device_off );
}
- g_mutex_unlock(sess->mutex);
- gps_session_delete(sess);
}
+ if ( dialog ) {
+ while ( !sess->thread_complete ) {
+ g_usleep (G_USEC_PER_SEC/10);
+ }
+ gtk_widget_destroy(dialog);
+ }
+ gps_session_delete(sess);
return 0;
}
VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD];
VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl));
VikViewport *vvp = vik_window_viewport(vw);
- vik_gps_comm(vtl, NULL, GPS_UP, vgl->protocol, vgl->serial_port, FALSE, vvp, vlp, vgl->upload_tracks, vgl->upload_waypoints, FALSE);
+ vik_gps_comm(vtl, NULL, GPS_UP, vgl->protocol, vgl->serial_port, FALSE, vvp, vlp, vgl->upload_tracks, vgl->upload_routes, vgl->upload_waypoints, FALSE);
}
static void gps_download_cb( gpointer layer_and_vlp[2] )
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)
- vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, vgl->realtime_tracking, vvp, NULL, vgl->download_tracks, vgl->download_waypoints, FALSE);
+ vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, vgl->realtime_tracking, vvp, NULL, vgl->download_tracks, vgl->download_routes, vgl->download_waypoints, FALSE);
#else
- vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, FALSE, vvp, NULL, vgl->download_tracks, vgl->download_waypoints, FALSE);
+ vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, FALSE, vvp, NULL, vgl->download_tracks, vgl->download_routes, vgl->download_waypoints, FALSE);
#endif
}
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_routes ( vgl-> trw_children[TRW_UPLOAD]);
}
static void gps_empty_download_cb( gpointer layer_and_vlp[2] )
return;
vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_DOWNLOAD]);
vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]);
+ vik_trw_layer_delete_all_routes ( vgl-> trw_children[TRW_DOWNLOAD]);
}
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
return;
vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_REALTIME]);
vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_REALTIME]);
+ vik_trw_layer_delete_all_routes ( vgl-> trw_children[TRW_REALTIME]);
}
#endif
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_routes ( 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]);
+ vik_trw_layer_delete_all_routes ( 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]);
+ vik_trw_layer_delete_all_routes ( vgl-> trw_children[TRW_REALTIME]);
#endif
}
if ( vgl->realtime_fix.fix.latitude > lse.lat &&
vgl->realtime_fix.fix.latitude < lnw.lat &&
vgl->realtime_fix.fix.longitude > lnw.lon &&
- vgl->realtime_fix.fix.longitude < lse.lon ) {
+ vgl->realtime_fix.fix.longitude < lse.lon &&
+ !isnan (vgl->realtime_fix.fix.track) ) {
VikCoord gps;
gint x, y;
gint half_back_x, half_back_y;
vik_coord_load_from_latlon ( &gps, vik_viewport_get_coord_mode(vp), &ll);
vik_viewport_coord_to_screen ( vp, &gps, &x, &y );
- gdouble heading_cos = cos(M_PI/180*vgl->realtime_fix.fix.track);
- gdouble heading_sin = sin(M_PI/180*vgl->realtime_fix.fix.track);
+ gdouble heading_cos = cos(DEG2RAD(vgl->realtime_fix.fix.track));
+ gdouble heading_sin = sin(DEG2RAD(vgl->realtime_fix.fix.track));
half_back_y = y+8*heading_cos;
half_back_x = x-8*heading_sin;
}
}
-static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced)
+static VikTrackpoint* create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced)
{
struct LatLon ll;
GList *last_tp;
time_t last_timestamp = vgl->last_fix.fix.time;
if (cur_timestamp < last_timestamp) {
- return;
+ return NULL;
}
if (vgl->realtime_record && vgl->realtime_fix.dirty) {
gboolean replace = FALSE;
- int heading = (int)floor(vgl->realtime_fix.fix.track);
- int last_heading = (int)floor(vgl->last_fix.fix.track);
+ int heading = isnan(vgl->realtime_fix.fix.track) ? 0 : (int)floor(vgl->realtime_fix.fix.track);
+ int last_heading = isnan(vgl->last_fix.fix.track) ? 0 : (int)floor(vgl->last_fix.fix.track);
int alt = isnan(vgl->realtime_fix.fix.altitude) ? VIK_DEFAULT_ALTITUDE : floor(vgl->realtime_fix.fix.altitude);
int last_alt = isnan(vgl->last_fix.fix.altitude) ? VIK_DEFAULT_ALTITUDE : floor(vgl->last_fix.fix.altitude);
if (((last_tp = g_list_last(vgl->realtime_track->trackpoints)) != NULL) &&
vik_coord_load_from_latlon(&tp->coord,
vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll);
- vgl->realtime_track->trackpoints = g_list_append(vgl->realtime_track->trackpoints, tp);
+ vik_track_add_trackpoint ( vgl->realtime_track, tp, TRUE ); // Ensure bounds is recalculated
vgl->realtime_fix.dirty = FALSE;
vgl->realtime_fix.satellites_used = 0;
vgl->last_fix = vgl->realtime_fix;
+ return tp;
}
}
+ return NULL;
+}
+
+#define VIK_SETTINGS_GPS_STATUSBAR_FORMAT "gps_statusbar_format"
+
+static void update_statusbar ( VikGpsLayer *vgl, VikWindow *vw )
+{
+ gchar *statusbar_format_code = NULL;
+ gboolean need2free = FALSE;
+ if ( !a_settings_get_string ( VIK_SETTINGS_GPS_STATUSBAR_FORMAT, &statusbar_format_code ) ) {
+ // Otherwise use default
+ statusbar_format_code = g_strdup ( "GSA" );
+ need2free = TRUE;
+ }
+
+ gchar *msg = vu_trackpoint_formatted_message ( statusbar_format_code, vgl->trkpt, vgl->trkpt_prev, vgl->realtime_track, vgl->last_fix.fix.climb );
+ vik_statusbar_set_message ( vik_window_get_statusbar (vw), VIK_STATUSBAR_INFO, msg );
+ g_free ( msg );
+
+ if ( need2free )
+ g_free ( statusbar_format_code );
}
if ((vgpsd->gpsd.fix.mode >= MODE_2D) &&
!isnan(vgpsd->gpsd.fix.latitude) &&
- !isnan(vgpsd->gpsd.fix.longitude) &&
- !isnan(vgpsd->gpsd.fix.track)) {
+ !isnan(vgpsd->gpsd.fix.longitude)) {
VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl));
VikViewport *vvp = vik_window_viewport(vw);
if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) ||
(vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) {
- vik_viewport_set_center_coord(vvp, &vehicle_coord);
+ vik_viewport_set_center_coord(vvp, &vehicle_coord, FALSE);
update_all = TRUE;
}
else if (vgl->vehicle_position == VEHICLE_POSITION_ON_SCREEN) {
}
vgl->first_realtime_trackpoint = FALSE;
- create_realtime_trackpoint(vgl, FALSE);
- vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]), TRUE); // Yes update from background thread
+ vgl->trkpt = create_realtime_trackpoint ( vgl, FALSE );
+
+ if ( vgl->trkpt ) {
+ if ( vgl->realtime_update_statusbar )
+ update_statusbar ( vgl, vw );
+ vgl->trkpt_prev = vgl->trkpt;
+ }
+
+ vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]) ); // NB update from background thread
}
}
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
+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
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 {
g_warning("Disconnected from gpsd. Trying to reconnect");
rt_gpsd_disconnect(vgl);
- rt_gpsd_connect(vgl, FALSE);
+ (void)rt_gpsd_connect(vgl, FALSE);
}
}
return FALSE; /* no further calling */
}
+/**
+ * make_track_name:
+ *
+ * returns allocated string for a new realtime track name
+ * NB no i18n ATM
+ * free string after use
+ */
static gchar *make_track_name(VikTrwLayer *vtl)
{
const gchar basename[] = "REALTIME";
i++;
}
return(name);
-
}
static gboolean rt_gpsd_try_connect(gpointer *data)
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
+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
vgl->vgpsd = g_malloc(sizeof(VglGpsd));
- if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) {
+ vgl->vgpsd->gpsd_open = gps_open ( vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd );
+ if ( vgl->vgpsd->gpsd_open != 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);
+ g_debug("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 */
}
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);
+ gchar *name = make_track_name(vtl);
+ vik_trw_layer_add_track(vtl, name, vgl->realtime_track);
+ g_free(name);
}
+ vgl->connected_to_gpsd = TRUE;
+
#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4
gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
#endif
#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);
+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ if ( gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL) == -1 )
+ g_critical ( "gps_stream error" );
#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);
+ gchar *msg = g_strdup_printf ( _("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 );
+ gboolean ans = a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_LAYER(vgl), msg, NULL );
+ g_free ( msg );
+ return ans;
}
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);
+ g_warning("Failed to connect to gpsd but will not retry because retry interval was set to %d (which is 0 or negative)", vgl->gpsd_retry_interval);
return FALSE;
}
else if (ask_if_failed && !rt_ask_retry(vgl))
vgl->realtime_io_channel = NULL;
}
if (vgl->vgpsd) {
-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL);
#endif
- gps_close(&vgl->vgpsd->gpsd);
+ if ( vgl->vgpsd->gpsd_open == 0 )
+ (void)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
+#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
g_free(vgl->vgpsd);
#endif
vgl->vgpsd = NULL;
vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track);
vgl->realtime_track = NULL;
}
+ vgl->connected_to_gpsd = FALSE;
}
static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2])
if (!rt_gpsd_connect(vgl, TRUE)) {
vgl->first_realtime_trackpoint = FALSE;
vgl->realtime_tracking = FALSE;
+ vgl->trkpt = NULL;
}
}
else { /* stop realtime tracking */
vgl->first_realtime_trackpoint = FALSE;
+ vgl->trkpt = NULL;
rt_gpsd_disconnect(vgl);
}
}
projects / andy / viking.git / blobdiff