* viking -- GPS Data and Topo Analyzer, Explorer, and Manager
*
* Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2006-2008, Quy Tonthat <qtonthat@gmail.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 "icons/icons.h"
#include "babel.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#include <glib.h>
+#include <glib/gstdio.h>
#include <glib/gprintf.h>
#include <glib/gi18n.h>
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
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 );
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
+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);
#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};
#endif
-#define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1)
+/* 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 {
GtkWidget *wp_label;
GtkWidget *progress_label;
GtkWidget *trk_label;
+ VikViewport *vvp;
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+ gboolean realtime_tracking;
+#endif
} GpsSession;
static void gps_session_delete(GpsSession *sess);
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},
-
+ { "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},
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
{ "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},
};
enum {
PARAM_PROTOCOL=0, PARAM_PORT,
+ PARAM_DOWNLOAD_TRACKS, PARAM_UPLOAD_TRACKS,
+ PARAM_DOWNLOAD_WAYPOINTS, PARAM_UPLOAD_WAYPOINTS,
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
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 */
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,
(VikLayerFuncSublayerRenameRequest) NULL,
(VikLayerFuncSublayerToggleVisible) NULL,
+ (VikLayerFuncSublayerTooltip) NULL,
+ (VikLayerFuncLayerTooltip) gps_layer_tooltip,
+ (VikLayerFuncLayerSelected) NULL,
(VikLayerFuncMarshall) gps_layer_marshall,
(VikLayerFuncUnmarshall) gps_layer_unmarshall,
(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,
GpsFix realtime_fix;
GpsFix last_fix;
- enum unit realtime_gpsd_unit;
-
VikTrack *realtime_track;
gchar *realtime_track_name;
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 ()
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 )
{
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;
#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 )
{
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;
+ 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;
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
case PARAM_GPSD_HOST:
if (vgl->gpsd_host)
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 )
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;
+ 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;
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
case PARAM_GPSD_HOST:
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 */
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;
}
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" );
+ 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 );
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 );
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 )
{
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. */
}
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;
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 */
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+ if (!sess->realtime_tracking)
+#endif
+ {
+ if (sess->vvp) {
+ /* View the data available */
+ vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp) ;
+ vik_layer_emit_update ( VIK_LAYER(sess->vtl) );
+ }
+ }
} else {
/* canceled */
}
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, 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;
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+ 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),
/* 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);
{
VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0];
VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD];
- gps_comm(vtl, GPS_UP, vgl->protocol_id, params_ports[vgl->serial_port_id]);
+ gps_comm(vtl, GPS_UP, vgl->protocol_id, vgl->serial_port, FALSE, NULL, 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);
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+ gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, vgl->realtime_tracking, vvp, vgl->download_tracks, vgl->download_waypoints);
+#else
+ gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, FALSE, vvp, 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]);
}
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]);
}
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+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]);
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+ 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
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;
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;
vik_viewport_set_center_coord(vvp, &vehicle_coord);
update_all = TRUE;
}
- else {
+ 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 */
vgl->first_realtime_trackpoint = FALSE;
create_realtime_trackpoint(vgl, FALSE);
+ gdk_threads_enter();
vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]));
+ gdk_threads_leave();
}
}
static gboolean rt_gpsd_try_connect(gpointer *data)
{
VikGpsLayer *vgl = (VikGpsLayer *)data;
+#ifndef HAVE_GPS_OPEN_R
struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port);
if (gpsd == NULL) {
+#else
+ vgl->vgpsd = g_malloc(sizeof(VglGpsd));
+
+ if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
+#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 */
}
- vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd));
+#ifndef HAVE_GPS_OPEN_R
+ vgl->vgpsd = realloc(gpsd, sizeof(VglGpsd));
+#endif
vgl->vgpsd->vgl = vgl;
vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE;
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 HAVE_GPS_STREAM
+ gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL);
+#else
gps_query(&vgl->vgpsd->gpsd, "w+x");
+#endif
return FALSE; /* no longer called by timeout */
}
}
if (vgl->vgpsd) {
gps_close(&vgl->vgpsd->gpsd);
+#ifdef HAVE_GPS_OPEN_R
+ g_free(vgl->vgpsd);
+#else
+ free(vgl->vgpsd);
+#endif
vgl->vgpsd = NULL;
}
projects / andy / viking.git / blobdiff