diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-23 16:30:19 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 0dfc59f38cf3d75d9c86af51d17bb578b8655f7b (patch) | |
| tree | 9a85f8a49856b4f720b7a0bafddd0a00878e1232 /qt-models | |
| parent | 1593f2ebad25244fefabe606b32ee505d4d6087d (diff) | |
| download | subsurface-0dfc59f38cf3d75d9c86af51d17bb578b8655f7b.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/diveimportedmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<int, QByteArray> DiveImportedModel::roleNames() const { |