X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5f95559592dfdbf92b2fc0d39906329facf1729e..754b2771ce0de9b290e798f12def2b13245c03fd:/src/vikgpslayer.c?ds=sidebyside diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index e17a5dd5..0d81e70c 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -45,12 +45,6 @@ #include #endif -#if ! GLIB_CHECK_VERSION(2,14,0) -inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data) { - return g_timeout_add(interval*1000, function, data); -} -#endif - #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) static VikGpsLayer *vik_gps_layer_create (VikViewport *vp); static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter ); @@ -100,26 +94,28 @@ static gchar * old_params_ports[] = {"com1", "usb:", NULL}; 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 { GMutex *mutex; - gps_dir direction; + vik_gps_dir direction; gchar *port; gboolean ok; gint total_count; gint count; VikTrwLayer *vtl; + VikTrack *track; gchar *cmd_args; - gchar * window_title; + gchar *window_title; GtkWidget *dialog; GtkWidget *status_label; GtkWidget *gps_label; GtkWidget *ver_label; GtkWidget *id_label; GtkWidget *wp_label; - GtkWidget *progress_label; GtkWidget *trk_label; + GtkWidget *rte_label; + GtkWidget *progress_label; + vik_gps_xfer_type progress_type; VikViewport *vvp; #if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) gboolean realtime_tracking; @@ -128,9 +124,9 @@ typedef struct { 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 }; @@ -138,9 +134,9 @@ enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE}; #if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) static gchar *params_vehicle_position[] = { - "Keep vehicle at center", - "Keep vehicle on screen", - "Disable", + N_("Keep vehicle at center"), + N_("Keep vehicle on screen"), + N_("Disable"), NULL }; enum { @@ -151,24 +147,27 @@ enum { #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}, + { "gps_protocol", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, 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, NULL }, + { "gps_download_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "gps_upload_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "gps_download_routes", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Routes:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "gps_upload_routes", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Routes:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "gps_download_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "gps_upload_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, 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}, + { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Jump to current position on start"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL }, + { "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL, NULL }, + { "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Host:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL }, + { "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Port:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL }, + { "gpsd_retry_interval", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Retry Interval (seconds):"), VIK_LAYER_WIDGET_ENTRY, NULL, 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, @@ -176,6 +175,7 @@ enum { NUM_PARAMS}; VikLayerInterface vik_gps_layer_interface = { + "GPS", N_("GPS"), NULL, &vikgpslayer_pixbuf, @@ -292,8 +292,10 @@ struct _VikGpsLayer { gchar *protocol; gchar *serial_port; gboolean download_tracks; + gboolean download_routes; gboolean download_waypoints; gboolean upload_tracks; + gboolean upload_routes; gboolean upload_waypoints; }; @@ -472,6 +474,12 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara case PARAM_UPLOAD_TRACKS: vgl->upload_tracks = data.b; break; + case PARAM_DOWNLOAD_ROUTES: + vgl->download_routes = data.b; + break; + case PARAM_UPLOAD_ROUTES: + vgl->upload_routes = data.b; + break; case PARAM_DOWNLOAD_WAYPOINTS: vgl->download_waypoints = data.b; break; @@ -528,6 +536,12 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gbo 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; @@ -565,7 +579,7 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) { 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; } @@ -579,11 +593,13 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) 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; /* Setting params here */ @@ -598,6 +614,8 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->serial_port = NULL; vgl->download_tracks = TRUE; vgl->download_waypoints = TRUE; + vgl->download_routes = TRUE; + vgl->upload_routes = TRUE; vgl->upload_tracks = TRUE; vgl->upload_waypoints = TRUE; @@ -864,17 +882,25 @@ static void set_total_count(gint cnt, GpsSession *sess) const gchar *tmp_str; 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...", cnt); sess->total_count = cnt; break; + case TRK: tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt); sess->total_count = cnt; break; + default: + { + // 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); break; + sess->total_count = mycnt; + } + } } - 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...", cnt); break; + case TRK: tmp_str = ngettext("Uploading %d trackpoint...", "Uploading %d trackpoints...", cnt); break; + default: tmp_str = ngettext("Uploading %d routepoint...", "Uploading %d routepoints...", cnt); break; + } } g_snprintf(s, 128, tmp_str, cnt); @@ -897,31 +923,35 @@ static void set_current_count(gint cnt, GpsSession *sess) 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); + switch (sess->progress_type) { + case WPT: tmp_str = ngettext("Downloaded %d out of %d waypoint...", "Downloaded %d out of %d waypoints...", sess->total_count); break; + case TRK: tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->total_count); break; + default: tmp_str = ngettext("Downloaded %d out of %d routepoint...", "Downloaded %d out of %d routepoints...", sess->total_count); 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->total_count); break; + case TRK: tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->total_count); break; + default: tmp_str = ngettext("Uploaded %d out of %d routepoint...", "Uploaded %d out of %d routepoints...", sess->total_count); 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); + switch (sess->progress_type) { + case WPT: tmp_str = ngettext("Downloaded %d waypoint", "Downloaded %d waypoints", cnt); break; + case TRK: tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", cnt); break; + default: tmp_str = ngettext("Downloaded %d routepoint", "Downloaded %d routepoints", cnt); 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", cnt); break; + case TRK: tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", cnt); break; + default: tmp_str = ngettext("Uploaded %d routepoint", "Uploaded %d routepoints", cnt); break; + } } g_snprintf(s, 128, tmp_str, cnt); } @@ -944,6 +974,51 @@ static void set_gps_info(const gchar *info, GpsSession *sess) gdk_threads_leave(); } +/* + * 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; + set_gps_info(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) { + set_gps_info(tokens[1], sess); + } + g_strfreev(tokens); + } +} + static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSession * sess ) { gchar *line; @@ -963,47 +1038,31 @@ static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSe case BABEL_DIAG_OUTPUT: line = (gchar *)data; - /* tells us how many items there will be */ - if (strstr(line, "Xfer Wpt")) { + 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(); + + /* tells us the type of items that will follow */ + if (strstr(line, "Xfer Wpt")) { sess->progress_label = sess->wp_label; + sess->progress_type = WPT; } - if (strstr(line, "Xfer Trk")) { + if (strstr(line, "Xfer Trk")) { sess->progress_label = sess->trk_label; + 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); - } - /* 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, "Xfer Rte")) { + sess->progress_label = sess->rte_label; + sess->progress_type = RTE; } - if (strstr(line, "RECORD")) { + + process_line_for_gps_info ( line, sess ); + + if (strstr(line, "RECORD")) { int lsb, msb, cnt; if (strlen(line) > 20) { @@ -1014,7 +1073,7 @@ static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSe sess->count = 0; } } - if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) { + if ( strstr(line, "WPTDAT") || strstr(line, "TRKHDR") || strstr(line, "TRKDAT") || strstr(line, "RTEHDR") || strstr(line, "RTEWPT") ) { sess->count++; set_current_count(sess->count, sess); } @@ -1047,27 +1106,16 @@ static void gps_upload_progress_func(BabelProgressCode c, gpointer data, GpsSess case BABEL_DIAG_OUTPUT: line = (gchar *)data; - 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); + 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(); + + process_line_for_gps_info ( line, sess ); + if (strstr(line, "RECORD")) { int lsb, msb; @@ -1082,15 +1130,28 @@ static void gps_upload_progress_func(BabelProgressCode c, gpointer data, GpsSess if ( strstr(line, "WPTDAT")) { if (sess->count == 0) { sess->progress_label = sess->wp_label; + sess->progress_type = WPT; set_total_count(cnt, sess); } sess->count++; set_current_count(sess->count, sess); - + } + if ( strstr(line, "RTEHDR") || strstr(line, "RTEWPT") ) { + if (sess->count == 0) { + sess->progress_label = sess->rte_label; + 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 + // Anyway since we're uploading - we should know how many points we're going to put! + cnt = (cnt / 2) + 1; + set_total_count(cnt, sess); + } + sess->count++; + set_current_count(sess->count, sess); } if ( strstr(line, "TRKHDR") || strstr(line, "TRKDAT") ) { if (sess->count == 0) { sess->progress_label = sess->trk_label; + sess->progress_type = TRK; set_total_count(cnt, sess); } sess->count++; @@ -1111,9 +1172,9 @@ static void gps_comm_thread(GpsSession *sess) if (sess->direction == GPS_DOWN) result = a_babel_convert_from (sess->vtl, sess->cmd_args, sess->port, - (BabelStatusFunc) gps_download_progress_func, sess); + (BabelStatusFunc) gps_download_progress_func, sess, NULL); else { - result = a_babel_convert_to (sess->vtl, NULL, sess->cmd_args, sess->port, + result = a_babel_convert_to (sess->vtl, sess->track, sess->cmd_args, sess->port, (BabelStatusFunc) gps_upload_progress_func, sess); } @@ -1135,7 +1196,7 @@ static void gps_comm_thread(GpsSession *sess) 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 + vik_layer_emit_update ( VIK_LAYER(sess->vtl) ); // NB update from background thread } } } else { @@ -1156,14 +1217,44 @@ static void gps_comm_thread(GpsSession *sess) g_thread_exit(NULL); } -static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port, gboolean tracking, VikViewport *vvp, VikLayersPanel *vlp, gboolean do_tracks, gboolean do_waypoints) { +/** + * vik_gps_comm: + * @vtl: The TrackWaypoint layer to operate on + * @track: Operate on a particular track when specified + * @dir: The direction of the transfer + * @protocol: The GPS device communication protocol + * @port: The GPS serial port + * @tracking: If tracking then viewport display update will be skipped + * @vvp: A viewport is required as the display may get updated + * @vlp: A layers panel is needed for uploading as the items maybe modified + * @do_tracks: Whether tracks shoud be processed + * @do_waypoints: Whether waypoints shoud be processed + * @turn_off: Whether we should attempt to turn off the GPS device after the transfer (only some devices support this) + * + * Talk to a GPS Device using a thread which updates a dialog with the progress + */ +gint vik_gps_comm ( VikTrwLayer *vtl, + VikTrack *track, + vik_gps_dir dir, + gchar *protocol, + gchar *port, + gboolean tracking, + VikViewport *vvp, + VikLayersPanel *vlp, + gboolean do_tracks, + gboolean do_routes, + gboolean do_waypoints, + gboolean turn_off ) +{ GpsSession *sess = g_malloc(sizeof(GpsSession)); char *tracks = NULL; + char *routes = NULL; char *waypoints = NULL; sess->mutex = g_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"); @@ -1188,55 +1279,76 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * 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->cmd_args = g_strdup_printf("-D 9 %s %s %s -%c %s", + tracks, routes, waypoints, (dir == GPS_DOWN) ? 'i' : 'o', protocol); 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), - GTK_RESPONSE_ACCEPT, FALSE ); - gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title ); + // Only create dialog if we're going to do some transferring + if ( do_tracks || do_waypoints || do_routes ) { + 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), + GTK_RESPONSE_ACCEPT, FALSE ); + gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title ); - 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); + 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); - 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->trk_label = gtk_label_new (""); + 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->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(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(sess->dialog)->vbox), sess->rte_label, FALSE, FALSE, 5 ); - gtk_widget_show_all(sess->dialog); + gtk_widget_show_all(sess->dialog); - sess->progress_label = sess->wp_label; - sess->total_count = -1; + sess->progress_label = sess->wp_label; + sess->total_count = -1; - /* TODO: starting gps read/write thread here */ - g_thread_create((GThreadFunc)gps_comm_thread, sess, FALSE, NULL ); + // 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)); + gtk_dialog_set_default_response ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT ); + gtk_dialog_run(GTK_DIALOG(sess->dialog)); - gtk_widget_destroy(sess->dialog); + gtk_widget_destroy(sess->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, 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); } @@ -1251,7 +1363,7 @@ static void gps_upload_cb( gpointer layer_and_vlp[2] ) VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD]; VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); VikViewport *vvp = vik_window_viewport(vw); - gps_comm(vtl, GPS_UP, vgl->protocol_id, vgl->serial_port, FALSE, vvp, vlp, vgl->upload_tracks, vgl->upload_waypoints); + 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] ) @@ -1261,9 +1373,9 @@ 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) - gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, vgl->realtime_tracking, vvp, NULL, vgl->download_tracks, vgl->download_waypoints); + 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 - gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, FALSE, vvp, NULL, vgl->download_tracks, vgl->download_waypoints); + 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 } @@ -1277,6 +1389,7 @@ static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) 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] ) @@ -1289,6 +1402,7 @@ 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) @@ -1315,8 +1429,10 @@ static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) 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]); @@ -1351,8 +1467,8 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) 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; @@ -1505,7 +1621,7 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) 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 + vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]) ); // NB update from background thread } } @@ -1695,4 +1811,3 @@ static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) } } #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ -