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

Change height and weight decimals displayed, BMI digits displayed

Browse Source
This commit is contained in:
Seeker4 2019-07-25 06:23:24 -07:00
parent acd078cc82
commit 7785d7fc9c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/daily.cpp
View File

@ -432,7 +432,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE); ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
} else { } else {
ui->ouncesSpinBox->setVisible(false); ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setSuffix(STR_UNIT_KG); ui->weightSpinBox->setSuffix(STR_UNIT_KG);
} }
@ -835,7 +835,7 @@ void Daily::on_ReloadDay()
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE); ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
} else { } else {
ui->ouncesSpinBox->setVisible(false); ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setSuffix(STR_UNIT_KG); ui->weightSpinBox->setSuffix(STR_UNIT_KG);
} }
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
@ -1693,7 +1693,7 @@ void Daily::Load(QDate date)
double kg=journal->settings[Journal_Weight].toDouble(&ok); double kg=journal->settings[Journal_Weight].toDouble(&ok);
if (p_profile->general->unitSystem()==US_Metric) { if (p_profile->general->unitSystem()==US_Metric) {
ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->blockSignals(true); ui->weightSpinBox->blockSignals(true);
ui->weightSpinBox->setValue(kg); ui->weightSpinBox->setValue(kg);
ui->weightSpinBox->blockSignals(false); ui->weightSpinBox->blockSignals(false);
@ -1783,7 +1783,7 @@ void Daily::UnitsChanged()
} else { } else {
kg=(ui->weightSpinBox->value()*(ounce_convert*16.0))+(ui->ouncesSpinBox->value()*ounce_convert); kg=(ui->weightSpinBox->value()*(ounce_convert*16.0))+(ui->ouncesSpinBox->value()*ounce_convert);
kg/=1000.0; kg/=1000.0;
ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setValue(kg); ui->weightSpinBox->setValue(kg);
ui->ouncesSpinBox->setVisible(false); ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setSuffix(STR_UNIT_KG); ui->weightSpinBox->setSuffix(STR_UNIT_KG);

2
oscar/daily.ui
View File

@ -1320,7 +1320,7 @@ QSlider::handle:horizontal {
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="digitCount"> <property name="digitCount">
<number>5</number> <number>4</number>
</property> </property>
<property name="segmentStyle"> <property name="segmentStyle">
<enum>QLCDNumber::Flat</enum> <enum>QLCDNumber::Flat</enum>

6
oscar/newprofile.cpp
View File

@ -48,7 +48,7 @@ NewProfile::NewProfile(QWidget *parent, const QString *user) :
on_cpapModeCombo_activated(0); on_cpapModeCombo_activated(0);
m_passwordHashed = false; m_passwordHashed = false;
ui->heightEdit2->setVisible(false); ui->heightEdit2->setVisible(false);
ui->heightEdit->setDecimals(2); ui->heightEdit->setDecimals(0);
ui->heightEdit->setSuffix(STR_UNIT_CM); ui->heightEdit->setSuffix(STR_UNIT_CM);
{ {
@ -397,7 +397,7 @@ void NewProfile::edit(const QString name)
} else { // good wholesome metric } else { // good wholesome metric
ui->heightEdit->setValue(v); ui->heightEdit->setValue(v);
ui->heightEdit2->setVisible(false); ui->heightEdit2->setVisible(false);
ui->heightEdit->setDecimals(2); ui->heightEdit->setDecimals(0);
ui->heightEdit->setSuffix(STR_UNIT_CM); ui->heightEdit->setSuffix(STR_UNIT_CM);
} }
} }
@ -417,7 +417,7 @@ void NewProfile::on_heightCombo_currentIndexChanged(int index)
if (index == 0) { if (index == 0) {
//metric //metric
ui->heightEdit2->setVisible(false); ui->heightEdit2->setVisible(false);
ui->heightEdit->setDecimals(2); ui->heightEdit->setDecimals(0);
ui->heightEdit->setSuffix(STR_UNIT_CM); ui->heightEdit->setSuffix(STR_UNIT_CM);
double v = ui->heightEdit->value() * 30.48; double v = ui->heightEdit->value() * 30.48;
v += ui->heightEdit2->value() * 2.54; v += ui->heightEdit2->value() * 2.54;