From 460aa4c1bdee64f25e1c846ac9a6182e4e8e9820 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 7 Nov 2013 17:25:42 +0900 Subject: Include the cylinder information in a dive added with "Add Dive" We only copied the samples, but not the related cylinder data. Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qt-ui/diveplanner.cpp') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 169158987..39db8f431 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -437,6 +437,7 @@ void DivePlannerPointsModel::loadFromDive(dive* d) } Q_FOREACH(const sample &s, backupSamples){ + // we need to use the correct gas plannerModel->addStop(s.depth.mm, s.time.seconds, tr("Air"), 0); } } @@ -1190,8 +1191,10 @@ void DivePlannerPointsModel::createTemporaryPlan() tempDive = NULL; const char *errorString = NULL; plan(&diveplan, &cache, &tempDive, isPlanner(), &errorString); - if (mode == ADD) + if (mode == ADD) { copy_samples(tempDive, current_dive); + copy_cylinders(tempDive, current_dive); + } #if DEBUG_PLAN dump_plan(&diveplan); #endif -- cgit v1.2.3-70-g09d2