/************************ FILTER LIST *******************/
// extern VikDataSourceInterface vik_datasource_gps_interface;
-// extern VikDataSourceInterface vik_datasource_google_interface;
/*** Input is TRWLayer ***/
extern VikDataSourceInterface vik_datasource_bfilter_simplify_interface;
const guint N_FILTERS = sizeof(filters) / sizeof(filters[0]);
VikTrack *filter_track = NULL;
-gchar *filter_track_name = NULL;
/********************************************************/
gdk_threads_leave ();
if ( w->source_interface->progress_func )
- w->source_interface->progress_func ( (gpointer) c, data, w );
+ w->source_interface->progress_func ( c, data, w );
}
gchar *cmd = wi->cmd;
gchar *extra = wi->extra;
gboolean result = TRUE;
- VikTrwLayer *vtl;
+ VikTrwLayer *vtl = NULL;
gboolean creating_new_layer = TRUE;
}
gdk_threads_leave();
- switch ( source_interface->type ) {
- case VIK_DATASOURCE_GPSBABEL_DIRECT:
- result = a_babel_convert_from (vtl, cmd, (BabelStatusFunc) progress_func, extra, w);
- break;
- case VIK_DATASOURCE_URL:
- result = a_babel_convert_from_url (vtl, cmd, extra, (BabelStatusFunc) progress_func, w);
- break;
- case VIK_DATASOURCE_SHELL_CMD:
- result = a_babel_convert_from_shellcommand ( vtl, cmd, extra, (BabelStatusFunc) progress_func, w);
- break;
- default:
- g_critical("Houston, we've had a problem.");
- }
+ if ( source_interface->process_func )
+ result = source_interface->process_func ( vtl, cmd, extra, (BabelStatusFunc) progress_func, w );
g_free ( cmd );
g_free ( extra );
gtk_label_set_text ( GTK_LABEL(w->status), _("Done.") );
if ( creating_new_layer ) {
/* Only create the layer if it actually contains anything useful */
+ // TODO: create function for this operation to hide detail:
if ( g_hash_table_size (vik_trw_layer_get_tracks(vtl)) ||
- g_hash_table_size (vik_trw_layer_get_waypoints(vtl)) )
+ g_hash_table_size (vik_trw_layer_get_waypoints(vtl)) ||
+ g_hash_table_size (vik_trw_layer_get_routes(vtl)) ) {
+ vik_layer_post_read ( VIK_LAYER(vtl), w->vvp, TRUE );
vik_aggregate_layer_add_layer( vik_layers_panel_get_top_layer(w->vlp), VIK_LAYER(vtl));
+ }
else
gtk_label_set_text ( GTK_LABEL(w->status), _("No data.") );
}
+ /* View this data if available and is desired */
+ if ( vtl && source_interface->autoview ) {
+ vik_trw_layer_auto_set_view ( vtl, vik_layers_panel_get_viewport(w->vlp) );
+ vik_layers_panel_emit_update (w->vlp);
+ }
if ( source_interface->keep_dialog_open ) {
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_ACCEPT, TRUE );
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_REJECT, FALSE );
gchar *name_src;
FILE *f;
g_assert ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0);
+ g_debug ("%s: temporary file: %s", __FUNCTION__, name_src);
f = fdopen(fd_src, "w");
- a_gpx_write_file(vtl, f);
+ a_gpx_write_file(vtl, f, NULL);
fclose(f);
f = NULL;
return name_src;
gchar *name_src;
FILE *f;
g_assert ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0);
+ g_debug ("%s: temporary file: %s", __FUNCTION__, name_src);
f = fdopen(fd_src, "w");
- a_gpx_write_track_file("track", track, f); /* Thank you Guilhem! Just when I needed this function... -- Evan */
+ a_gpx_write_track_file(track, f, NULL); /* Thank you Guilhem! Just when I needed this function... -- Evan */
fclose(f);
f = NULL;
return name_src;
/* for manual dialogs */
GtkWidget *dialog = NULL;
GtkWidget *status;
- gchar *cmd, *extra;
- gchar *cmd_off, *extra_off;
+ gchar *cmd = NULL;
+ gchar *extra = NULL;
+ gchar *cmd_off = NULL;
+ gchar *extra_off = NULL;
acq_dialog_widgets_t *w;
gpointer user_data;
if ( source_interface->add_setup_widgets_func ) {
dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+ GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+ response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+#endif
+
source_interface->add_setup_widgets_func(dialog, vvp, user_data);
gtk_window_set_title ( GTK_WINDOW(dialog), _(source_interface->window_title) );
+ if ( response_w )
+ gtk_widget_grab_focus ( response_w );
+
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) {
source_interface->cleanup_func(user_data);
gtk_widget_destroy(dialog);
( pass_along_data, &cmd, &extra, name_src_track );
g_free ( name_src_track );
- } else
- source_interface->get_cmd_string_func ( pass_along_data, &cmd, &extra );
+ } else if ( source_interface->get_cmd_string_func )
+ source_interface->get_cmd_string_func ( pass_along_data, &cmd, &extra );
/* Get data for Off command */
if ( source_interface->off_func ) {
w->ok = TRUE;
status = gtk_label_new (_("Status: detecting gpsbabel"));
gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), status, FALSE, FALSE, 5 );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
gtk_widget_show_all(status);
w->status = status;
else {
if ( cmd_off ) {
/* Turn off */
- a_babel_convert_from (NULL, cmd_off, NULL, extra_off, NULL);
+ a_babel_convert_from (NULL, cmd_off, extra_off, NULL, NULL);
}
g_free ( w ); /* thread has finished; free w */
}
gtk_widget_destroy ( dialog );
}
+/**
+ * a_acquire:
+ *
+ * Process the given VikDataSourceInterface for sources with no input data.
+ */
void a_acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *source_interface ) {
acquire ( vw, vlp, vvp, source_interface, NULL, NULL );
}
return menu_item;
}
+/**
+ * a_acquire_trwlayer_menu:
+ *
+ * Create a sub menu intended for rightclicking on a TRWLayer's menu called "Filter".
+ *
+ * Returns: %NULL if no filters.
+ */
GtkWidget *a_acquire_trwlayer_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
{
- return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, "_Filter", VIK_DATASOURCE_INPUTTYPE_TRWLAYER );
+ return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, _("_Filter"), VIK_DATASOURCE_INPUTTYPE_TRWLAYER );
}
+/**
+ * a_acquire_trwlayer_track_menu:
+ *
+ * Create a sub menu intended for rightclicking on a TRWLayer's menu called "Filter with Track "TRACKNAME"...".
+ *
+ * Returns: %NULL if no filters or no filter track has been set.
+ */
GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
{
if ( filter_track == NULL )
return NULL;
else {
- gchar *menu_title = g_strdup_printf ( "Filter with %s", filter_track_name );
+ gchar *menu_title = g_strdup_printf ( _("Filter with %s"), filter_track->name );
GtkWidget *rv = acquire_build_menu ( vw, vlp, vvp, vtl, filter_track,
menu_title, VIK_DATASOURCE_INPUTTYPE_TRWLAYER_TRACK );
g_free ( menu_title );
}
}
+/**
+ * a_acquire_track_menu:
+ *
+ * Create a sub menu intended for rightclicking on a track's menu called "Filter".
+ *
+ * Returns: %NULL if no applicable filters
+ */
GtkWidget *a_acquire_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrack *tr)
{
- return acquire_build_menu ( vw, vlp, vvp, NULL, tr, "Filter", VIK_DATASOURCE_INPUTTYPE_TRACK );
+ return acquire_build_menu ( vw, vlp, vvp, NULL, tr, _("Filter"), VIK_DATASOURCE_INPUTTYPE_TRACK );
}
-void a_acquire_set_filter_track ( VikTrack *tr, const gchar *name )
+/**
+ * a_acquire_set_filter_track:
+ *
+ * Sets application-wide track to use with filter. references the track.
+ */
+void a_acquire_set_filter_track ( VikTrack *tr )
{
if ( filter_track )
vik_track_free ( filter_track );
- if ( filter_track_name )
- g_free ( filter_track_name );
filter_track = tr;
vik_track_ref ( tr );
-
- filter_track_name = g_strdup(name);
}
projects / andy / viking.git / blobdiff