diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-26 13:28:18 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-26 13:28:18 -0700 |
| commit | 9cc8e39d425b7f64c4c5c2a4226ba581550076f6 (patch) | |
| tree | c759a26f54e50d46de25f3fa8a6e57c593dede8d /qt-ui/models.cpp | |
| parent | a61c04bb584311fd7ebe397f5e5f5bd159b18b27 (diff) | |
| parent | cf3701bbac2f593c6efe046ba15be55bc1360f5b (diff) | |
| download | subsurface-9cc8e39d425b7f64c4c5c2a4226ba581550076f6.tar.gz | |
Merge branch 'Planner'
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 2bc690eb9..4d9e19190 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -67,9 +67,7 @@ CylindersModel::CylindersModel(QObject *parent) : current(0), rows(0) { // enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH}; setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%") -#ifdef ENABLE_PLANNER << tr("Switch at") -#endif ); } @@ -145,11 +143,9 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const case HE: ret = percent_string(cyl->gasmix.he); break; -#ifdef ENABLE_PLANNER case DEPTH: ret = get_depth_string(cyl->depth, true); break; -#endif } break; case Qt::DecorationRole: @@ -265,13 +261,11 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in changed = true; } break; -#ifdef ENABLE_PLANNER case DEPTH: if (CHANGED()) { cyl->depth = string_to_depth(vString.toUtf8().data()); changed = true; } -#endif } dataChanged(index, index); if (addDiveMode) |