From 0dfc59f38cf3d75d9c86af51d17bb578b8655f7b Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Dec 2018 16:30:19 +0100 Subject: Import: add merge_all_trips parameter to process_imported_dives() When importing log-files we generally want to merge trips. But when downloading and the user chose "generate new trip", that new trip should not be merged into existing trips. Therefore, add a "merge_all_trips" parameter to process_imported_dives(). If false only autogenerated trips [via autogroup] will be merged. In the future we might want to let the user choose if trips should be merged when importing log-files. Signed-off-by: Berthold Stoeger --- tests/testrenumber.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/testrenumber.cpp') diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index e69a276ca..e6e802676 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -16,7 +16,7 @@ void TestRenumber::testMerge() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table, &trip_table), 0); - process_imported_dives(&table, &trips, false, false); + process_imported_dives(&table, &trips, false, false, true); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); mark_divelist_changed(false); @@ -27,7 +27,7 @@ void TestRenumber::testMergeAndAppend() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table, &trip_table), 0); - process_imported_dives(&table, &trips, false, false); + process_imported_dives(&table, &trips, false, false, true); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); struct dive *d = get_dive(1); -- cgit v1.2.3-70-g09d2