From 8e4b4c788a12b428f22f346254ceebfba5f36c8c Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sun, 14 Feb 2016 17:33:18 +0200 Subject: Grab pressures from samples if required If cylinder does not have start and end pressures assigned, attempt to grab them from the samples instead. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index 9a6f31818..b05138980 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp @@ -38,9 +38,15 @@ static QString getPressures(struct dive *dive, enum returnPressureSelector ret) cylinder_t *cyl = &dive->cylinder[0]; QString fmt; if (ret == START_PRESSURE) - fmt = get_pressure_string(cyl->start, true); + if (cyl->start.mbar) + fmt = get_pressure_string(cyl->start, true); + else if (cyl->sample_start.mbar) + fmt = get_pressure_string(cyl->sample_start, true); if (ret == END_PRESSURE) - fmt = get_pressure_string(cyl->end, true); + if (cyl->end.mbar) + fmt = get_pressure_string(cyl->end, true); + else if(cyl->sample_end.mbar) + fmt = get_pressure_string(cyl->sample_end, true); return fmt; } -- cgit v1.2.3-70-g09d2