diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-14 08:26:50 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 021aa4bd5742c575e56f36fd057e11679aaa35a5 (patch) | |
| tree | d1380c7813cf5856929d14ec4492e57bcddacae1 /qt-models | |
| parent | 4d183e0d75a3ae5b536abb6ea254ba224d713f72 (diff) | |
| download | subsurface-021aa4bd5742c575e56f36fd057e11679aaa35a5.tar.gz | |
Undo: implement undo of dive site country editing
Simply copy the code of notes editing, but use the taxonomy_* functions
to read and set the value. Moreover, replace the three TAXONOMY_n field
ids by a single TAXONOMY id. We will probably never show one column per
taxonomy field, but rather a single column with a string derived from all
taxonomy fields.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 4 | ||||
| -rw-r--r-- | qt-models/divelocationmodel.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index 03b5f20fe..14d06f70f 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -97,9 +97,7 @@ QVariant LocationInformationModel::getDiveSiteData(const struct dive_site *ds, i case COORDS: return "TODO"; case DESCRIPTION: return ds->description; case NOTES: return ds->name; - case TAXONOMY_1: return "TODO"; - case TAXONOMY_2: return "TODO"; - case TAXONOMY_3: return "TODO"; + case TAXONOMY: return "TODO"; } break; case Qt::ToolTipRole: diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h index a7743f9c9..9714054aa 100644 --- a/qt-models/divelocationmodel.h +++ b/qt-models/divelocationmodel.h @@ -17,7 +17,7 @@ class LocationInformationModel : public QAbstractTableModel { public: // Common columns, roles and accessor function for all dive-site models. // Thus, different views can connect to different models. - enum Columns { REMOVE, NAME, DESCRIPTION, NUM_DIVES, COORDS, NOTES, LATITUDE, LONGITUDE, DIVESITE, TAXONOMY_1, TAXONOMY_2, TAXONOMY_3, COLUMNS}; + enum Columns { REMOVE, NAME, DESCRIPTION, NUM_DIVES, COORDS, NOTES, LATITUDE, LONGITUDE, DIVESITE, TAXONOMY, COLUMNS}; enum Roles { DIVESITE_ROLE = Qt::UserRole + 1 }; static QVariant getDiveSiteData(const struct dive_site *ds, int column, int role); |