chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shay Martin 2022-08-21 07:26:21 -05:00
parent 7ca4f42ccb
commit f96ef0f15e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/common.cpp
View File

@ -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);

1
oscar/SleepLib/common.h
View File

@ -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);