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

UI updated for bioMetrics

Browse Source
This commit is contained in:
LoudSnorer 2023-09-25 14:34:18 -04:00
parent 6118760182
commit b6305187f8
4 changed files with 101 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
oscar/daily.cpp
View File

@ -502,21 +502,10 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
ZombieMeterMoved=false; ZombieMeterMoved=false;
if (p_profile->general->unitSystem()==US_English) {
ui->weightSpinBox->setSuffix(STR_UNIT_POUND);
ui->weightSpinBox->setDecimals(0);
ui->ouncesSpinBox->setVisible(true);
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
} else {
ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
}
#else // REMOVE_FITNESS #else // REMOVE_FITNESS
// hide the parent widget to make the gridlayout invisible // hide the parent widget to make the gridlayout invisible
QWidget *myparent ; QWidget *myparent ;
myparent = ui->gridLayout->parentWidget(); myparent = ui->bioMetrics->parentWidget();
if(myparent) myparent->hide(); if(myparent) myparent->hide();
#endif #endif
@ -958,17 +947,7 @@ void Daily::on_ReloadDay()
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
ZombieMeterMoved=false; ZombieMeterMoved=false;
if (p_profile->general->unitSystem()==US_English) {
ui->weightSpinBox->setSuffix(STR_UNIT_POUND);
ui->weightSpinBox->setDecimals(0);
ui->ouncesSpinBox->setVisible(true);
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
} else {
ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setDecimals(1); ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
}
#endif #endif
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
other_time=time.restart(); other_time=time.restart();
@ -1875,24 +1854,17 @@ void Daily::Load(QDate date)
ui->bookmarkTable->clearContents(); ui->bookmarkTable->clearContents();
ui->bookmarkTable->setRowCount(0); ui->bookmarkTable->setRowCount(0);
QStringList sl; QStringList sl;
//sl.append(tr("Starts"));
//sl.append(tr("Notes"));
ui->bookmarkTable->setHorizontalHeaderLabels(sl); ui->bookmarkTable->setHorizontalHeaderLabels(sl);
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
ui->ZombieMeter->blockSignals(true); ui->ZombieMeter->blockSignals(true);
ui->weightSpinBox->blockSignals(true);
ui->ouncesSpinBox->blockSignals(true);
ui->weightSpinBox->setValue(0);
ui->ouncesSpinBox->setValue(0);
ui->ZombieMeter->setValue(0); ui->ZombieMeter->setValue(0);
set_ZombieMeterLabel(); set_ZombieMeterLabel();
ui->ouncesSpinBox->blockSignals(false);
ui->weightSpinBox->blockSignals(false);
ui->ZombieMeter->blockSignals(false); ui->ZombieMeter->blockSignals(false);
ui->BMI->display(0);
ui->BMI->setVisible(false); set_WeightUI(0);
ui->BMIlabel->setVisible(false); user_height_cm = p_profile->user->height();
set_BmiUI();
#endif #endif
BookmarksChanged=false; BookmarksChanged=false;
Session *journal=GetJournalSession(date); Session *journal=GetJournalSession(date);
@ -1904,44 +1876,21 @@ void Daily::Load(QDate date)
bool ok; bool ok;
if (journal->settings.contains(Journal_Weight)) { if (journal->settings.contains(Journal_Weight)) {
double kg=journal->settings[Journal_Weight].toDouble(&ok); double kg=journal->settings[Journal_Weight].toDouble(&ok);
set_WeightUI(kg);
if (p_profile->general->unitSystem()==US_Metric) { set_BmiUI(journal);
ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->blockSignals(true);
ui->weightSpinBox->setValue(kg);
ui->weightSpinBox->blockSignals(false);
ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
} else {
float ounces=(kg*1000.0)/ounce_convert;
int pounds=ounces/16.0;
double oz;
double frac=modf(ounces,&oz);
ounces=(int(ounces) % 16)+frac;
ui->weightSpinBox->blockSignals(true);
ui->ouncesSpinBox->blockSignals(true);
ui->weightSpinBox->setValue(pounds);
ui->ouncesSpinBox->setValue(ounces);
ui->ouncesSpinBox->blockSignals(false);
ui->weightSpinBox->blockSignals(false);
ui->weightSpinBox->setSuffix(STR_UNIT_POUND);
ui->weightSpinBox->setDecimals(0);
ui->ouncesSpinBox->setVisible(true);
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
}
double height=p_profile->user->height()/100.0;
if (height>0 && kg>0) {
double bmi=kg/(height*height);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
ui->BMI->display(bmi);
}
} }
if (journal->settings.contains(Journal_ZombieMeter)) { if (journal->settings.contains(Journal_ZombieMeter)) {
ui->ZombieMeter->blockSignals(true); ui->ZombieMeter->blockSignals(true);
ui->ZombieMeter->setValue(journal->settings[Journal_ZombieMeter].toDouble(&ok)); int value = journal->settings[Journal_ZombieMeter].toInt(&ok);
// value of 0 means there is not an entry for feelings.
if (value==0) {
// set minimum to 1 zero means empty value. Should upgrade older systems.
value=1;
journal->settings[Journal_ZombieMeter] = value;
journal->SetChanged(true);
} ;
ui->ZombieMeter->setValue(value);
set_ZombieMeterLabel(); set_ZombieMeterLabel();
ui->ZombieMeter->blockSignals(false); ui->ZombieMeter->blockSignals(false);
} }
@ -1984,27 +1933,9 @@ void Daily::Load(QDate date)
void Daily::UnitsChanged() void Daily::UnitsChanged()
{ {
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
double kg; user_height_cm = p_profile->user->height();
if (p_profile->general->unitSystem()==US_English) { set_WeightUI(user_weight_kg);
kg=ui->weightSpinBox->value(); set_BmiUI();
float ounces=(kg*1000.0)/ounce_convert;
int pounds=ounces/16;
float oz=fmodf(ounces,16);
ui->weightSpinBox->setValue(pounds);
ui->ouncesSpinBox->setValue(oz);
ui->weightSpinBox->setDecimals(0);
ui->weightSpinBox->setSuffix(STR_UNIT_POUND);
ui->ouncesSpinBox->setVisible(true);
ui->ouncesSpinBox->setSuffix(STR_UNIT_OUNCE);
} else {
kg=(ui->weightSpinBox->value()*(ounce_convert*16.0))+(ui->ouncesSpinBox->value()*ounce_convert);
kg/=1000.0;
ui->weightSpinBox->setDecimals(1);
ui->weightSpinBox->setValue(kg);
ui->ouncesSpinBox->setVisible(false);
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
}
#endif #endif
} }
@ -2500,6 +2431,48 @@ void Daily::on_removeBookmarkButton_clicked()
mainwin->updateFavourites(); mainwin->updateFavourites();
} }
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
void Daily::set_BmiUI(Session* journal) {
if ((user_height_cm>0) && (user_weight_kg>0)) {
double height = user_height_cm/100.0;
double bmi=user_weight_kg/(height * height);
ui->BMI->display(bmi);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
if (journal) {
journal->settings[Journal_BMI]=bmi;
journal->SetChanged(true);
}
} else {
// BMI now zero - remove it
if (journal) {
auto jit = journal->settings.find(Journal_BMI);
if (jit != journal->settings.end()) {
journal->settings.erase(jit);
}
journal->SetChanged(true);
}
// And make it invisible
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
}
mainwin->updateOverview();
};
void Daily::set_WeightUI(double kg) {
ui->weightSpinBox->blockSignals(true);
ui->weightSpinBox->setDecimals(1);
user_weight_kg = kg;
if (p_profile->general->unitSystem()==US_Metric) {
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
} else {
kg *= pounds_per_kg;
ui->weightSpinBox->setSuffix(STR_UNIT_POUND);
}
ui->weightSpinBox->setValue(kg);
ui->weightSpinBox->blockSignals(false);
};
void Daily::set_ZombieMeterLabel() void Daily::set_ZombieMeterLabel()
{ {
if (ui->ZombieMeter->value()==0 ) { if (ui->ZombieMeter->value()==0 ) {
@ -2508,16 +2481,24 @@ void Daily::set_ZombieMeterLabel()
ui->ZombieValue->setText(QString("%1:%2").arg(tr("Value")).arg(ui->ZombieMeter->value())); ui->ZombieValue->setText(QString("%1:%2").arg(tr("Value")).arg(ui->ZombieMeter->value()));
} }
} }
void Daily::on_ZombieMeter_valueChanged(int action)
void Daily::on_ZombieMeter_valueChanged(int value)
{ {
Q_UNUSED(action);
set_ZombieMeterLabel(); set_ZombieMeterLabel();
ZombieMeterMoved=true; ZombieMeterMoved=true;
Session *journal=GetJournalSession(previous_date); Session *journal=GetJournalSession(previous_date);
if (!journal) { if (!journal) {
journal=CreateJournalSession(previous_date); journal=CreateJournalSession(previous_date);
} }
journal->settings[Journal_ZombieMeter]=ui->ZombieMeter->value(); if (value==0) {
// should delete zombie entry here. if null.
auto jit = journal->settings.find(Journal_ZombieMeter);
if (jit != journal->settings.end()) {
journal->settings.erase(jit);
}
} else {
journal->settings[Journal_ZombieMeter]=value;
}
journal->SetChanged(true); journal->SetChanged(true);
mainwin->updateOverview(); mainwin->updateOverview();
} }
@ -2530,41 +2511,38 @@ void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item)
} }
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
void Daily::on_weightSpinBox_valueChanged(double arg1) void Daily::on_weightSpinBox_valueChanged(double )
{ {
// This is called if up/down arrows are used, in which case editingFinished is
// never called. So always call editingFinished instead
Q_UNUSED(arg1);
this->on_weightSpinBox_editingFinished(); this->on_weightSpinBox_editingFinished();
} }
const double zeroKg=0.011; //
void Daily::on_weightSpinBox_editingFinished() void Daily::on_weightSpinBox_editingFinished()
{ {
double arg1=ui->weightSpinBox->value(); user_height_cm = p_profile->user->height();
double kg = ui->weightSpinBox->value();
if (p_profile->general->unitSystem()==US_English) {
kg *= kgs_per_pound; // convert pounds to kg.
}
if (kg < zeroKg) kg = 0.0;
user_weight_kg = kg;
double height=p_profile->user->height()/100.0;
Session *journal=GetJournalSession(previous_date); Session *journal=GetJournalSession(previous_date);
if (!journal) { if (!journal) {
journal=CreateJournalSession(previous_date); journal=CreateJournalSession(previous_date);
} }
double kg;
if (p_profile->general->unitSystem()==US_English) {
kg=((arg1*pound_convert) + (ui->ouncesSpinBox->value()*ounce_convert)) / 1000.0;
} else {
kg=arg1;
}
if (journal->settings.contains(Journal_Weight)) { if (journal->settings.contains(Journal_Weight)) {
QVariant old = journal->settings[Journal_Weight]; QVariant old = journal->settings[Journal_Weight];
if (old == kg && kg > 0) { if (abs(old.toDouble() - kg) < zeroKg && kg > zeroKg) {
// No change to weight - skip // No change to weight - skip
return; return;
} }
} else if (kg == 0) { } else if (kg < zeroKg) {
// Still zero - skip // Still zero - skip
return; return;
} }
if (kg > 0) { if (kg > zeroKg) {
journal->settings[Journal_Weight]=kg; journal->settings[Journal_Weight]=kg;
} else { } else {
// Weight now zero - remove from journal // Weight now zero - remove from journal
@ -2573,28 +2551,14 @@ void Daily::on_weightSpinBox_editingFinished()
journal->settings.erase(jit); journal->settings.erase(jit);
} }
} }
user_weight_kg=kg;
gGraphView *gv=mainwin->getOverview()->graphView(); gGraphView *gv=mainwin->getOverview()->graphView();
gGraph *g; gGraph *g;
if (gv) { if (gv) {
g=gv->findGraph(STR_GRAPH_Weight); g=gv->findGraph(STR_GRAPH_Weight);
if (g) g->setDay(nullptr); if (g) g->setDay(nullptr);
} }
if ((height>0) && (kg>0)) { set_BmiUI(journal);
double bmi=kg/(height * height);
ui->BMI->display(bmi);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
journal->settings[Journal_BMI]=bmi;
} else {
// BMI now zero - remove it
auto jit = journal->settings.find(Journal_BMI);
if (jit != journal->settings.end()) {
journal->settings.erase(jit);
}
// And make it invisible
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
}
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);
@ -2602,20 +2566,6 @@ void Daily::on_weightSpinBox_editingFinished()
journal->SetChanged(true); journal->SetChanged(true);
mainwin->updateOverview(); mainwin->updateOverview();
} }
void Daily::on_ouncesSpinBox_valueChanged(int arg1)
{
// This is called if up/down arrows are used, in which case editingFinished is
// never called. So always call editingFinished instead
Q_UNUSED(arg1);
this->on_weightSpinBox_editingFinished();
}
void Daily::on_ouncesSpinBox_editingFinished()
{
// This is functionally identical to the weightSpinBox_editingFinished, so just call that
this->on_weightSpinBox_editingFinished();
}
#endif #endif
QString Daily::GetDetailsText() QString Daily::GetDetailsText()

13
oscar/daily.h
View File

@ -252,6 +252,8 @@ private slots:
void on_ZombieMeter_valueChanged(int value); void on_ZombieMeter_valueChanged(int value);
void set_ZombieMeterLabel(); void set_ZombieMeterLabel();
void set_WeightUI(double weight_kg);
void set_BmiUI(Session *journal = nullptr);
/*! \fn on_weightSpinBox_editingFinished(); /*! \fn on_weightSpinBox_editingFinished();
\brief Called when weight has changed.. Updates the BMI dislpay and journal objects. \brief Called when weight has changed.. Updates the BMI dislpay and journal objects.
@ -261,15 +263,6 @@ private slots:
void on_weightSpinBox_editingFinished(); void on_weightSpinBox_editingFinished();
/*! \fn on_ouncesSpinBox_editingFinished();
\brief Called when weights ounces component has changed.. Updates the BMI dislpay and journal objects.
Also Refreshes the Overview charts
*/
void on_ouncesSpinBox_editingFinished();
void on_ouncesSpinBox_valueChanged(int arg1);
void on_weightSpinBox_valueChanged(double arg1); void on_weightSpinBox_valueChanged(double arg1);
#endif #endif
@ -376,6 +369,8 @@ private:
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS
bool ZombieMeterMoved; bool ZombieMeterMoved;
double user_weight_kg;
double user_height_cm;
#endif #endif
bool BookmarksChanged; bool BookmarksChanged;

12
oscar/daily.ui
View File

@ -1166,7 +1166,7 @@ QToolButton:pressed {
<number>2</number> <number>2</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="bioMetrics">
<item row="0" column="3" colspan="5"> <item row="0" column="3" colspan="5">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1253,6 +1253,9 @@ QToolButton:pressed {
<property name="text"> <property name="text">
<string>Weight</string> <string>Weight</string>
</property> </property>
<property name="toolTip">
<string>If height is greater than zero in Preferences Dialog, setting weight here will show Body Mass Index (BMI) value</string>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2"> <item row="3" column="1" colspan="2">
@ -1309,13 +1312,6 @@ QSlider::handle:horizontal {
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3">
<widget class="QSpinBox" name="ouncesSpinBox">
<property name="suffix">
<string/>
</property>
</widget>
</item>
<item row="3" column="7"> <item row="3" column="7">
<widget class="QLCDNumber" name="BMI"> <widget class="QLCDNumber" name="BMI">
<property name="sizePolicy"> <property name="sizePolicy">

4
oscar/newprofile.cpp
View File

@ -7,7 +7,7 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLED #define TEST_MACROS_ENABLEDoff
#include <test_macros.h> #include <test_macros.h>
#include <QMessageBox> #include <QMessageBox>
@ -261,6 +261,8 @@ void NewProfile::on_nextButton_clicked()
if (m_height_modified) { if (m_height_modified) {
profile->user->setHeight(m_tmp_height_cm); profile->user->setHeight(m_tmp_height_cm);
// also call unitsChanged if height also changed. Need for update BMI.
if (mainwin && mainwin->getDaily()) { mainwin->getDaily()->UnitsChanged(); }
} }
AppSetting->setProfileName(username); AppSetting->setProfileName(username);