From f96ef0f15eea7d4c661b0dbd8a84ac4128fef804 Mon Sep 17 00:00:00 2001 From: Shay Martin Date: Sun, 21 Aug 2022 07:26:21 -0500 Subject: [PATCH] Mantis#0000339 - calculate ounces in a gram to be used when calculating kg to lbs and ounces when printing daily report to account for loss of precision/rounding occurring when kilograms value being saved in journal object --- oscar/SleepLib/common.cpp | 2 +- oscar/SleepLib/common.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index c574b664..73d9cc48 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -283,7 +283,7 @@ QString weightString(float kg, UnitSystem us) if (us == US_Metric) { return QString("%1kg").arg(kg, 0, 'f', 2); } else if (us == US_English) { - int oz = (kg * 1000.0) / (float)ounce_convert; + int oz = (kg * 1000.0) * (float)gram_ounce_convert; int lb = oz / 16.0; oz = oz % 16; return QString("%1lb %2oz").arg(lb, 0, 10).arg(oz); diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index 12d6df1f..ce2433fc 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -83,6 +83,7 @@ bool operator <(const ValueCount &a, const ValueCount &b); const float ounce_convert = 28.3495231F; // grams const float pound_convert = ounce_convert * 16; +const float gram_ounce_convert = 0.0352754; // ounces in a gram QString weightString(float kg, UnitSystem us = US_Undefined);