From 41b4e4a19a48dbb97321006cdcbf075fde7d81df Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 28 Nov 2017 21:14:05 +0100 Subject: Add imperial units to variations computation Signed-off-by: Robert C. Helling --- qt-models/diveplannermodel.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index f549a0378..191e04917 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -1085,8 +1085,14 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, s restore_deco_state(save, &ds, false); char buf[200]; - sprintf(buf, "+ %d:%02d /m + %d:%02d /min", FRACTION(analyzeVariations(shallower, original, deeper, "m"),60), - FRACTION(analyzeVariations(shorter, original, longer, "min"), 60)); + if (prefs.units.length == units::METERS) + sprintf(buf, "+ %d:%02d /m + %d:%02d /min", FRACTION(analyzeVariations(shallower, original, deeper, "m"),60), + FRACTION(analyzeVariations(shorter, original, longer, "min"), 60)); + else + sprintf(buf, "+ %d:%02d /ft + %d:%02d /min", + FRACTION(analyzeVariations(shallower, original, deeper, "ft") * feet_to_mm(1.0) / 1000,60), + FRACTION(analyzeVariations(shorter, original, longer, "min"), 60)); + emit variationsComputed(QString(buf)); #ifdef SHOWSTOPVARIATIONS printf("\n\n"); -- cgit v1.2.3-70-g09d2