From b02cd3a307f3412077e853026e164e99d34c8476 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sun, 7 Apr 2013 12:38:02 +0100 Subject: [PATCH] Add 'Creation' sort option for saving GPX tracks. This will then save tracks in the order they were read in or created. --- src/globals.c | 2 +- src/globals.h | 1 + src/gpx.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/globals.c b/src/globals.c index e7dc2f6d..fee59907 100644 --- a/src/globals.c +++ b/src/globals.c @@ -71,7 +71,7 @@ static VikLayerParam prefs7[] = { /* External/Export Options */ static gchar * params_kml_export_units[] = {"Metric", "Statute", "Nautical", NULL}; -static gchar * params_gpx_export_trk_sort[] = {N_("Alphabetical"), N_("Time"), NULL}; +static gchar * params_gpx_export_trk_sort[] = {N_("Alphabetical"), N_("Time"), N_("Creation"), NULL }; static gchar * params_gpx_export_wpt_symbols[] = {N_("Title Case"), N_("Lowercase"), NULL}; static VikLayerParam io_prefs[] = { diff --git a/src/globals.h b/src/globals.h index ea094e3d..a8b0fa6a 100644 --- a/src/globals.h +++ b/src/globals.h @@ -136,6 +136,7 @@ vik_kml_export_units_t a_vik_get_kml_export_units ( ); typedef enum { VIK_GPX_EXPORT_TRK_SORT_ALPHA, VIK_GPX_EXPORT_TRK_SORT_TIME, + VIK_GPX_EXPORT_TRK_SORT_CREATION, } vik_gpx_export_trk_sort_t; vik_gpx_export_trk_sort_t a_vik_get_gpx_export_trk_sort ( ); diff --git a/src/gpx.c b/src/gpx.c index 60f33182..ddae97b6 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -954,11 +954,20 @@ void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options ) g_list_free ( gl ); - gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) ); + //gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) ); + // Forming the list manually seems to produce one that is more likely to be nearer to the creation order + gpointer key, value; + GHashTableIter ght_iter; + g_hash_table_iter_init ( &ght_iter, vik_trw_layer_get_tracks ( vtl ) ); + while ( g_hash_table_iter_next (&ght_iter, &key, &value) ) { + gl = g_list_prepend ( gl ,value ); + } + gl = g_list_reverse ( gl ); + // Sort method determined by preference if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_TIME ) gl = g_list_sort ( gl, gpx_track_compare_timestamp ); - else + else if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_ALPHA ) gl = g_list_sort ( gl, gpx_track_compare_name ); // Routes sorted by name -- 2.39.5