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

Show BMI label and calculated value only when both weight and height are non-zero

Browse Source
This commit is contained in:
Seeker4 2019-07-24 01:48:18 -07:00
parent 376d04803a
commit 166ffa4970
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oscar/daily.cpp
View File

@ -588,6 +588,11 @@ void Daily::ReloadGraphs()
// sleep(3); // sleep(3);
} }
void Daily::updateLeftSidebar() {
if (webView && !htmlLeftHeader.isEmpty())
webView->setHtml(getLeftSidebar(true));
}
void Daily::hideSpaceHogs() void Daily::hideSpaceHogs()
{ {
if (AppSetting->calendarVisible()) { if (AppSetting->calendarVisible()) {
@ -2276,6 +2281,10 @@ void Daily::on_weightSpinBox_valueChanged(double arg1)
double bmi=kg/(height * height); double bmi=kg/(height * height);
ui->BMI->display(bmi); ui->BMI->display(bmi);
ui->BMI->setVisible(true); ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
} }
} }
@ -2306,11 +2315,15 @@ void Daily::on_weightSpinBox_editingFinished()
double bmi=kg/(height * height); double bmi=kg/(height * height);
ui->BMI->display(bmi); ui->BMI->display(bmi);
ui->BMI->setVisible(true); ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
journal->settings[Journal_BMI]=bmi; journal->settings[Journal_BMI]=bmi;
if (gv) { if (gv) {
g=gv->findGraph(STR_GRAPH_BMI); g=gv->findGraph(STR_GRAPH_BMI);
if (g) g->setDay(nullptr); if (g) g->setDay(nullptr);
} }
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
} }
journal->SetChanged(true); journal->SetChanged(true);
} }
@ -2324,6 +2337,10 @@ void Daily::on_ouncesSpinBox_valueChanged(int arg1)
double bmi=kg/(height * height); double bmi=kg/(height * height);
ui->BMI->display(bmi); ui->BMI->display(bmi);
ui->BMI->setVisible(true); ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
} }
} }
@ -2348,12 +2365,16 @@ void Daily::on_ouncesSpinBox_editingFinished()
double bmi=kg/(height * height); double bmi=kg/(height * height);
ui->BMI->display(bmi); ui->BMI->display(bmi);
ui->BMI->setVisible(true); ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
journal->settings[Journal_BMI]=bmi; journal->settings[Journal_BMI]=bmi;
if (mainwin->getOverview()) { if (mainwin->getOverview()) {
g=mainwin->getOverview()->graphView()->findGraph(STR_GRAPH_BMI); g=mainwin->getOverview()->graphView()->findGraph(STR_GRAPH_BMI);
if (g) g->setDay(nullptr); if (g) g->setDay(nullptr);
} }
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
} }
journal->SetChanged(true); journal->SetChanged(true);
} }

5
oscar/daily.h
View File

@ -66,6 +66,11 @@ public:
*/ */
void ResetGraphLayout(); void ResetGraphLayout();
/*! \fn updateLeftSidebar()
/brief Updtes left sidebar to reflect changes in pie chart visibility
*/
void updateLeftSidebar();
/*! \fn graphView() /*! \fn graphView()
\returns the main graphView area for the Daily View \returns the main graphView area for the Daily View
*/ */