diff --git a/oscar/Graphs/gOverviewGraph.cpp b/oscar/Graphs/gOverviewGraph.cpp index 4a17e628..2d57a3c6 100644 --- a/oscar/Graphs/gOverviewGraph.cpp +++ b/oscar/Graphs/gOverviewGraph.cpp @@ -861,11 +861,14 @@ jumpnext: QString a, b; int x, y; - QFontMetrics fm(*defaultfont); - int bw = fm.width('X'); - int bh = fm.height() / 1.8; + QSize size = QFontMetrics(*defaultfont).size(Qt::TextSingleLine ,"X"); + int bw = size.width(); + int bh = size.height() / 1.8; + //QFontMetrics fm(*defaultfont); + //int bw = fm.width('X'); + //int bh = fm.height() / 1.8; - bool ishours = false; + // bool ishours = false; int good = 0; for (int j = 0; j < m_codes.size(); j++) { @@ -954,7 +957,7 @@ jumpnext: int h = f; int m = int(f * 60) % 60; val = QString::asprintf("%02i:%02i", h, m); - ishours = true; + // ishours = true; } else { val = QString::number(f, 'f', 2); } @@ -1230,7 +1233,6 @@ bool gOverviewGraph::mouseMoveEvent(QMouseEvent *event, gGraph *graph) } else { val = QString::number(v, 'f', 2); } - strTooltip += "\r\n" + chan.label() + " " + strDataType + ": " + val; //} } diff --git a/oscar/Graphs/gOverviewGraph.h b/oscar/Graphs/gOverviewGraph.h index c6b36669..420b4f08 100644 --- a/oscar/Graphs/gOverviewGraph.h +++ b/oscar/Graphs/gOverviewGraph.h @@ -18,7 +18,7 @@ #ifndef REMOVE_FITNESS /* -BMI, Weight and Zombie graphs are are hard coded in Overview.cpp +BMI, Weight and Feeling graphs are are hard coded in Overview.cpp These graph require special handling in class gOverviewGraph. Currently there are 4 graphs types, one of which is not used. @@ -27,7 +27,7 @@ GT_LINE ? Used for making a line ? GT_POINT ? Used to display points instead of lines ? GT_SESSION ?? NOT USED. -BMI, Weight and Zombie graphs current use GT_LINE and not GT_BAR +BMI, Weight and Feeling graphs current use GT_LINE and not GT_BAR The Overview Linecharts preference allows points to be displayed instead of lines. */ diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h index 578c20b3..c62a7cba 100644 --- a/oscar/SleepLib/appsettings.h +++ b/oscar/SleepLib/appsettings.h @@ -18,7 +18,7 @@ class Preferences; -#define REMOVE_FITNESS +#define REMOVE_FITNESS_OFF /* valid values are REMOVE_FITNESS or REMOVE_FITNESS_OFF */ #ifndef REMOVE_FITNESS diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index abbe1067..fe13866e 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -737,7 +737,7 @@ void initializeStrings() STR_TR_BMI = QObject::tr("BMI"); // Short form of Body Mass Index STR_TR_Weight = QObject::tr("Weight"); - STR_TR_Zombie = QObject::tr("Zombie"); + STR_TR_Zombie = QObject::tr("Feeling"); STR_TR_PulseRate = QObject::tr("Pulse Rate"); // Pulse / Heart rate STR_TR_SpO2 = QString("SpO2"); STR_TR_Plethy = QObject::tr("Plethy"); // Plethysomogram diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index 93852407..9c2db008 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -323,7 +323,7 @@ void init() schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Notes=0x0805, DATA, MT_JOURNAL, DAY, "BookmarkNotes", QObject::tr("Notes"), QObject::tr("Bookmark Notes"), QObject::tr("Notes"), QString(), STRING, Qt::black)); // This may as well be calculated schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_BMI = 0x0806, DATA, MT_JOURNAL, DAY, "BMI", QObject::tr("BMI"), QObject::tr("Body Mass Index"), QObject::tr("BMI"), QString(), DOUBLE, Qt::black)); - schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_ZombieMeter = 0x0807, DATA, MT_JOURNAL, DAY, "ZombieMeter", QObject::tr("Zombie"), QObject::tr("How you feel (0 = like crap, 10 = unstoppable)"), QObject::tr("Zombie"), QString(), DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_ZombieMeter = 0x0807, DATA, MT_JOURNAL, DAY, "FeelingMeter", QObject::tr("Feeling"), QObject::tr("How you feel (1 = like crap, 10 = unstoppable)"), QObject::tr("Feeling"), QString(), DOUBLE, Qt::black)); schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Start=0x0808, DATA, MT_JOURNAL, DAY, "BookmarkStart", QObject::tr("Start"), QObject::tr("Bookmark Start"), QObject::tr("Start"), QString(), INTEGER, Qt::black)); schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_End=0x0809, DATA, MT_JOURNAL, DAY, "BookmarkEnd", QObject::tr("End"), QObject::tr("Bookmark End"), QObject::tr("End"), QString(), DOUBLE, Qt::black)); schema::channel.add(GRP_JOURNAL, ch = new Channel(LastUpdated=0x080a, DATA, MT_JOURNAL, DAY, "LastUpdated", QObject::tr("Last Updated"), QObject::tr("Last Updated"), QObject::tr("Last Updated"), QString(), DATETIME, Qt::black)); diff --git a/oscar/common_gui.h b/oscar/common_gui.h index da88b0fa..7e8593ef 100644 --- a/oscar/common_gui.h +++ b/oscar/common_gui.h @@ -39,7 +39,7 @@ const QString STR_GRAPH_TestChan2 = "TestChan2"; const QString STR_GRAPH_AHI = "AHI"; const QString STR_GRAPH_Weight = "Weight"; const QString STR_GRAPH_BMI = "BMI"; -const QString STR_GRAPH_Zombie = "Zombie"; +const QString STR_GRAPH_Zombie = "Feeling"; const QString STR_GRAPH_Sessions = "Sessions"; const QString STR_GRAPH_SessionTimes = "SessionTimes"; const QString STR_GRAPH_Usage = "Usage"; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index ba33efa5..dd0d247f 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -1885,7 +1885,8 @@ void Daily::Load(QDate date) ui->weightSpinBox->setValue(0); ui->ouncesSpinBox->setValue(0); - ui->ZombieMeter->setValue(5); + ui->ZombieMeter->setValue(0); + set_ZombieMeterLabel(); ui->ouncesSpinBox->blockSignals(false); ui->weightSpinBox->blockSignals(false); ui->ZombieMeter->blockSignals(false); @@ -1941,6 +1942,7 @@ void Daily::Load(QDate date) if (journal->settings.contains(Journal_ZombieMeter)) { ui->ZombieMeter->blockSignals(true); ui->ZombieMeter->setValue(journal->settings[Journal_ZombieMeter].toDouble(&ok)); + set_ZombieMeterLabel(); ui->ZombieMeter->blockSignals(false); } #endif @@ -2498,9 +2500,18 @@ void Daily::on_removeBookmarkButton_clicked() mainwin->updateFavourites(); } #ifndef REMOVE_FITNESS +void Daily::set_ZombieMeterLabel() +{ + if (ui->ZombieMeter->value()==0 ) { + ui->ZombieValue->setText(tr("No Value Selected")); + } else { + ui->ZombieValue->setText(QString("%1:%2").arg(tr("Value")).arg(ui->ZombieMeter->value())); + } +} void Daily::on_ZombieMeter_valueChanged(int action) { Q_UNUSED(action); + set_ZombieMeterLabel(); ZombieMeterMoved=true; Session *journal=GetJournalSession(previous_date); if (!journal) { diff --git a/oscar/daily.h b/oscar/daily.h index faa7a904..51ae7fa1 100644 --- a/oscar/daily.h +++ b/oscar/daily.h @@ -251,6 +251,8 @@ private slots: */ void on_ZombieMeter_valueChanged(int value); + void set_ZombieMeterLabel(); + /*! \fn on_weightSpinBox_editingFinished(); \brief Called when weight has changed.. Updates the BMI dislpay and journal objects. diff --git a/oscar/daily.ui b/oscar/daily.ui index cdec6521..7afcba3d 100644 --- a/oscar/daily.ui +++ b/oscar/daily.ui @@ -1167,7 +1167,7 @@ QToolButton:pressed { - + @@ -1181,12 +1181,33 @@ QToolButton:pressed { - Zombie + Feelings + + + Feelings have a range 1 - 10. 1 is the worst feeling and 10 is the Best. - - + + + + + 0 + 0 + + + + + true + + + + Poor + + + + + false @@ -1200,7 +1221,28 @@ QToolButton:pressed { - + + + + + 0 + 0 + + + + + true + + + + Awesome + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -1213,7 +1255,7 @@ QToolButton:pressed { - + If height is greater than zero in Preferences Dialog, setting weight here will show Body Mass Index (BMI) value @@ -1223,8 +1265,11 @@ QToolButton:pressed { - + + + Feelings have a range 1 - 10. 1 is the worst feeling and 10 is the Best. + QSlider::groove:horizontal { border: 1px solid #999999; @@ -1248,7 +1293,7 @@ QSlider::handle:horizontal { 10 - 5 + 1 5 @@ -1264,35 +1309,14 @@ QSlider::handle:horizontal { - + - - - - - 0 - 0 - - - - - true - - - - Awesome - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -1314,7 +1338,7 @@ QSlider::handle:horizontal { - + diff --git a/oscar/overview.cpp b/oscar/overview.cpp index 54648b14..d2f73c97 100644 --- a/oscar/overview.cpp +++ b/oscar/overview.cpp @@ -350,8 +350,8 @@ void Overview::CreateAllGraphs() { bmi->addSlice(Journal_BMI, QColor("black"), ST_SETAVG); BMI->AddLayer(bmi); - ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(0-10)")); - zombie = new gOverviewGraph("Zombie", GT_LINE); + ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(1-10)")); + zombie = new gOverviewGraph("Feeling", GT_LINE); zombie->setMachineType(MT_JOURNAL); zombie->addSlice(Journal_ZombieMeter, QColor("black"), ST_SETAVG); ZOMBIE->AddLayer(zombie);