X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7888d76fea463b19ae3bbf1005921e900e59839f..a129aa51e2160d7bda45e8b57ee7a8f28e83a84b:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index ceeacd6c..207f487f 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -43,9 +43,9 @@ #include #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING #include +#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 ); @@ -61,7 +61,6 @@ 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_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] ); @@ -215,6 +214,7 @@ static VikLayerParam gps_layer_params[] = { { 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 }, @@ -226,7 +226,13 @@ enum { 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}; @@ -272,6 +278,7 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncSetParam) gps_layer_set_param, (VikLayerFuncGetParam) gps_layer_get_param, + (VikLayerFuncChangeParam) NULL, (VikLayerFuncReadFileData) NULL, (VikLayerFuncWriteFileData) NULL, @@ -281,7 +288,7 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, - (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request, + (VikLayerFuncDragDropRequest) NULL, (VikLayerFuncSelectClick) NULL, (VikLayerFuncSelectMove) NULL, @@ -344,6 +351,9 @@ struct _VikGpsLayer { 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; @@ -408,7 +418,7 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp) 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; @@ -472,7 +482,8 @@ static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *v 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; } @@ -551,8 +562,8 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara 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; @@ -568,6 +579,9 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara 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"); @@ -626,6 +640,9 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gbo 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__); @@ -647,6 +664,8 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) #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; @@ -777,14 +796,9 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer 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); } } @@ -809,23 +823,6 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) #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; @@ -876,22 +873,6 @@ gboolean vik_gps_layer_is_empty ( 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 */ @@ -1536,7 +1517,7 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) } } -static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) +static VikTrackpoint* create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) { struct LatLon ll; GList *last_tp; @@ -1547,7 +1528,7 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) 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) { @@ -1591,8 +1572,30 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) 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 ); } @@ -1626,7 +1629,7 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) 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) { @@ -1652,7 +1655,14 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) } 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 } @@ -1836,10 +1846,12 @@ 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); } }