From 58b668c714223bf7ab1164f27353fb49a38ada40 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 11 Oct 2013 16:39:40 -0700 Subject: Fix dive planner sidebar depth units The dive planner always showed the depth in our internal units, ie millimeter, in the sidebar that showed the plan points. That made little sense in metric mode, and none at all in imperial. The _graph_ showed things in meter and feet. So make the DivePlannerPointsModel always convert things to and from the user units. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-ui/diveplanner.cpp') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 7c7957e67..2078ff8a8 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -937,7 +937,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex& index, int role) const divedatapoint p = divepoints.at(index.row()); switch(index.column()) { case CCSETPOINT: return p.po2; - case DEPTH: return p.depth; + case DEPTH: return rint(get_depth_units(p.depth, NULL, NULL)); case DURATION: return p.time / 60; case GAS: return strForAir(p); } @@ -956,7 +956,7 @@ bool DivePlannerPointsModel::setData(const QModelIndex& index, const QVariant& v if(role == Qt::EditRole) { divedatapoint& p = divepoints[index.row()]; switch(index.column()) { - case DEPTH: p.depth = value.toInt(); break; + case DEPTH: p.depth = units_to_depth(value.toInt()); break; case DURATION: p.time = value.toInt() * 60; break; case CCSETPOINT:{ int po2 = 0; -- cgit v1.2.3-70-g09d2