#include <glib/gi18n.h>
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
#include <gps.h>
+#include "vikutils.h"
#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 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_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] );
{ 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, "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 },
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_HOST,
+ PARAM_GPSD_PORT,
+ PARAM_GPSD_RETRY_INTERVAL,
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
NUM_PARAMS};
(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,
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;
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;
}
break;
case PARAM_GPSD_PORT:
if (data.s) {
- if (vgl->gpsd_port);
- g_free(vgl->gpsd_port);
+ if (vgl->gpsd_port)
+ g_free(vgl->gpsd_port);
vgl->gpsd_port = g_strdup(data.s);
}
break;
case PARAM_VEHICLE_POSITION:
vgl->vehicle_position = data.u;
break;
+ case PARAM_REALTIME_UPDATE_STATUSBAR:
+ vgl->realtime_update_statusbar = data.b;
+ break;
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
default:
g_warning("gps_layer_set_param(): unknown parameter");
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__);
#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
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;
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;
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 */
}
}
-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) {
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 );
+ vik_statusbar_set_message ( vik_window_get_statusbar (vw), VIK_STATUSBAR_INFO, msg );
+ g_free ( msg );
+
+ if ( need2free )
+ g_free ( statusbar_format_code );
}
}
vgl->first_realtime_trackpoint = FALSE;
- create_realtime_trackpoint(vgl, FALSE);
+
+ 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 (!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