diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-06-28 15:24:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-29 16:13:03 -0700 |
| commit | f9721fce4b12faee87398d23fd2f8b4d1b9a0309 (patch) | |
| tree | 0ca37231d70028eb2fdaf615a812af8c9983b1cf /qt-models | |
| parent | 631be569fe5b277c4c1729019305e06b02cec611 (diff) | |
| download | subsurface-f9721fce4b12faee87398d23fd2f8b4d1b9a0309.tar.gz | |
filter: implement importing of filter presets
When importing a divelog, import filter presets. If there are
equal names, import only if the presets differ. In that case,
disambiguate the name. This made things a bit more complicated,
as comparison of filter presets had to be implemented.
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 902d2099a..3413e03a5 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -194,7 +194,7 @@ void DiveImportedModel::recordDives(int flags) std::pair<struct dive_table, struct dive_site_table> tables = consumeTables(); if (tables.first.nr > 0) { auto data = thread.data(); - Command::importDives(&tables.first, nullptr, &tables.second, flags, data->devName()); + Command::importDives(&tables.first, nullptr, &tables.second, nullptr, flags, data->devName()); } else { clear_dive_site_table(&tables.second); } |