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 --- qt-models/diveimportedmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-models/diveimportedmodel.cpp') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index d2dca2c9d..3b792ee80 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -157,7 +157,7 @@ void DiveImportedModel::recordDives() delete_dive_from_table(diveTable, j); } - process_imported_dives(diveTable, tripTable, true, true); + process_imported_dives(diveTable, tripTable, true, true, false); } QHash DiveImportedModel::roleNames() const { -- cgit v1.2.3-70-g09d2