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

Fix Import Journal - issue 108

Browse Source
This commit is contained in:
LoudSnorer 2024-08-23 19:58:36 -04:00
parent d9a75e3930
commit 67b0854b1c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/daily.cpp
View File

@ -66,6 +66,8 @@ QString htmlLeftFooter;
extern ChannelID PRS1_PeakFlow; extern ChannelID PRS1_PeakFlow;
extern ChannelID Prisma_ObstructLevel, Prisma_rMVFluctuation, Prisma_rRMV, Prisma_PressureMeasured, Prisma_FlowFull; extern ChannelID Prisma_ObstructLevel, Prisma_rMVFluctuation, Prisma_rRMV, Prisma_PressureMeasured, Prisma_FlowFull;
#define WEIGHT_SPIN_BOX_DECIMALS 1
// This was Sean Stangl's idea.. but I couldn't apply that patch. // This was Sean Stangl's idea.. but I couldn't apply that patch.
inline QString channelInfo(ChannelID code) { inline QString channelInfo(ChannelID code) {
return schema::channel[code].fullname()+"\n"+schema::channel[code].description()+"\n("+schema::channel[code].units()+")"; return schema::channel[code].fullname()+"\n"+schema::channel[code].description()+"\n("+schema::channel[code].units()+")";
@ -950,7 +952,7 @@ void Daily::on_ReloadDay()
ui->calendar->setFocus(Qt::ActiveWindowFocusReason); ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
ui->weightSpinBox->setDecimals(1); ui->weightSpinBox->setDecimals(WEIGHT_SPIN_BOX_DECIMALS);
#endif #endif
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
other_time=time.restart(); other_time=time.restart();
@ -2579,14 +2581,15 @@ void Daily::set_BmiUI(double user_weight_kg) {
void Daily::set_WeightUI(double kg) { void Daily::set_WeightUI(double kg) {
ui->weightSpinBox->blockSignals(true); ui->weightSpinBox->blockSignals(true);
ui->weightSpinBox->setDecimals(1); ui->weightSpinBox->setDecimals(WEIGHT_SPIN_BOX_DECIMALS);
if (p_profile->general->unitSystem()==US_Metric) { if (p_profile->general->unitSystem()==US_Metric) {
ui->weightSpinBox->setSuffix(STR_UNIT_KG); ui->weightSpinBox->setSuffix(QString(" %1").arg(STR_UNIT_KG));
ui->weightSpinBox->setValue(kg);
} else { } else {
kg *= pounds_per_kg; double lbs = kg * pounds_per_kg;
ui->weightSpinBox->setSuffix(STR_UNIT_POUND); ui->weightSpinBox->setSuffix(QString(" %1").arg(STR_UNIT_POUND));
ui->weightSpinBox->setValue(lbs);
} }
ui->weightSpinBox->setValue(kg);
ui->weightSpinBox->blockSignals(false); ui->weightSpinBox->blockSignals(false);
set_BmiUI(kg); set_BmiUI(kg);
}; };
@ -2652,7 +2655,8 @@ void Daily::on_weightSpinBox_editingFinished()
user_height_cm = p_profile->user->height(); user_height_cm = p_profile->user->height();
double kg = ui->weightSpinBox->value(); double kg = ui->weightSpinBox->value();
if (p_profile->general->unitSystem()==US_English) { if (p_profile->general->unitSystem()==US_English) {
kg *= kgs_per_pound; // convert pounds to kg. double lbs = ui->weightSpinBox->value();
kg = lbs*kgs_per_pound; // convert pounds to kg.
} }
if (kg < zeroD) kg = 0.0; if (kg < zeroD) kg = 0.0;
set_JournalWeightValue(previous_date,kg) ; set_JournalWeightValue(previous_date,kg) ;