aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui/models.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2014-05-25 14:16:43 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-26 13:17:32 -0700
commitfeff22c2228d56cd75594e1a20d9a2181f9f9a6b (patch)
tree97bba5359a9f94ac37ef61d1aed9095ca0411e20 /qt-ui/models.cpp
parentd1366257f081fc28939bd6abe9b67b1dba3fb07a (diff)
downloadsubsurface-feff22c2228d56cd75594e1a20d9a2181f9f9a6b.tar.gz
Planner: Re-enable using the new profile.
This correctly enables the planner on the new profile, but it doesn't triggers the correct paint on the canvas. [Dirk Hohndel: remove other remnants of the disabled planner as well] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/models.cpp')
-rw-r--r--qt-ui/models.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index dc9a7189a..5efcf5a34 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:
@@ -263,13 +259,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)