From 1093d6235b5657746f2cb4524ed08cf13c80c3bb Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Sun, 18 May 2014 22:18:46 +0200 Subject: Reenabled copying the diveplan to dive notes. Gas consumption calculation fixed. Pressure difference still needs cylinder size to be set. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'qt-ui/diveplanner.cpp') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 24aa7f697..6d2ec195c 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -1069,7 +1069,8 @@ bool DivePlannerPointsModel::recalcQ() void DivePlannerPointsModel::emitCylinderModelEdited() { - cylinderModelEdited(); + if (isPlanner()) + cylinderModelEdited(); } int DivePlannerPointsModel::columnCount(const QModelIndex &parent) const @@ -1199,13 +1200,13 @@ DivePlannerPointsModel *DivePlannerPointsModel::instance() void DivePlannerPointsModel::setBottomSac(int sac) { - diveplan.bottomsac = sac; + diveplan.bottomsac = sac * 1000; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDecoSac(int sac) { - diveplan.decosac = sac; + diveplan.decosac = sac * 1000; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } -- cgit v1.2.3-70-g09d2