From 98b3a326bd952c616843694821a48e0c029db699 Mon Sep 17 00:00:00 2001 From: Doug Junkins Date: Sat, 4 May 2019 20:46:42 -0700 Subject: Add "Import dive sites" menu to mainwindow Adds "Import->Import dive sites" menu to mainwindow.cpp and adds the on_actionImportDiveSites_triggered() method to prompt for the filename to import from. The files are parsed and then any dive and trip data is cleared before opening a dialog box to select which sites are to be imported. Signed-off-by: Doug Junkins --- core/divelist.c | 2 +- core/divelist.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/divelist.c b/core/divelist.c index 010ef244a..fb9ee5c13 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -1292,7 +1292,7 @@ void clear_table(struct dive_table *table) table->nr = 0; } -static void clear_trip_table(struct trip_table *table) +void clear_trip_table(struct trip_table *table) { for (int i = 0; i < table->nr; i++) free_trip(table->trips[i]); diff --git a/core/divelist.h b/core/divelist.h index ae71040c4..86f40941f 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -69,6 +69,7 @@ void report_datafile_version(int version); int get_dive_id_closest_to(timestamp_t when); void clear_dive_file_data(); void clear_table(struct dive_table *table); +void clear_trip_table(struct trip_table *table); typedef enum {PO2VAL, SINGLE_EXP, SINGLE_SLOPE, DAILY_EXP, DAILY_SLOPE, NO_COLUMNS} cns_table_headers; -- cgit v1.2.3-70-g09d2