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

Re=Enabled biometrics Zombie,Weight,BMI like 1.4.0. except zombie. zombie renamed to Feelings with range 1-10

Browse Source
This commit is contained in:
LoudSnorer 2023-09-19 22:35:24 -04:00
parent 9866f49138
commit a21fb20716
10 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/Graphs/gOverviewGraph.cpp
View File

@ -861,11 +861,14 @@ jumpnext:
QString a, b; QString a, b;
int x, y; int x, y;
QFontMetrics fm(*defaultfont); QSize size = QFontMetrics(*defaultfont).size(Qt::TextSingleLine ,"X");
int bw = fm.width('X'); int bw = size.width();
int bh = fm.height() / 1.8; 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; int good = 0;
for (int j = 0; j < m_codes.size(); j++) { for (int j = 0; j < m_codes.size(); j++) {
@ -954,7 +957,7 @@ jumpnext:
int h = f; int h = f;
int m = int(f * 60) % 60; int m = int(f * 60) % 60;
val = QString::asprintf("%02i:%02i", h, m); val = QString::asprintf("%02i:%02i", h, m);
ishours = true; // ishours = true;
} else { } else {
val = QString::number(f, 'f', 2); val = QString::number(f, 'f', 2);
} }
@ -1230,7 +1233,6 @@ bool gOverviewGraph::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
} else { } else {
val = QString::number(v, 'f', 2); val = QString::number(v, 'f', 2);
} }
strTooltip += "\r\n" + chan.label() + " " + strDataType + ": " + val; strTooltip += "\r\n" + chan.label() + " " + strDataType + ": " + val;
//} //}
} }

4
oscar/Graphs/gOverviewGraph.h
View File

@ -18,7 +18,7 @@
#ifndef REMOVE_FITNESS #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. These graph require special handling in class gOverviewGraph.
Currently there are 4 graphs types, one of which is not used. 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_POINT ? Used to display points instead of lines ?
GT_SESSION ?? NOT USED. 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. The Overview Linecharts preference allows points to be displayed instead of lines.
*/ */

2
oscar/SleepLib/appsettings.h
View File

@ -18,7 +18,7 @@
class Preferences; class Preferences;
#define REMOVE_FITNESS #define REMOVE_FITNESS_OFF
/* valid values are REMOVE_FITNESS or REMOVE_FITNESS_OFF */ /* valid values are REMOVE_FITNESS or REMOVE_FITNESS_OFF */
#ifndef REMOVE_FITNESS #ifndef REMOVE_FITNESS

2
oscar/SleepLib/common.cpp
View File

@ -737,7 +737,7 @@ void initializeStrings()
STR_TR_BMI = QObject::tr("BMI"); // Short form of Body Mass Index STR_TR_BMI = QObject::tr("BMI"); // Short form of Body Mass Index
STR_TR_Weight = QObject::tr("Weight"); 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_PulseRate = QObject::tr("Pulse Rate"); // Pulse / Heart rate
STR_TR_SpO2 = QString("SpO2"); STR_TR_SpO2 = QString("SpO2");
STR_TR_Plethy = QObject::tr("Plethy"); // Plethysomogram STR_TR_Plethy = QObject::tr("Plethy"); // Plethysomogram

2
oscar/SleepLib/schema.cpp
View File

@ -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)); 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 // 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_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_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(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)); 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));

2
oscar/common_gui.h
View File

@ -39,7 +39,7 @@ const QString STR_GRAPH_TestChan2 = "TestChan2";
const QString STR_GRAPH_AHI = "AHI"; const QString STR_GRAPH_AHI = "AHI";
const QString STR_GRAPH_Weight = "Weight"; const QString STR_GRAPH_Weight = "Weight";
const QString STR_GRAPH_BMI = "BMI"; 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_Sessions = "Sessions";
const QString STR_GRAPH_SessionTimes = "SessionTimes"; const QString STR_GRAPH_SessionTimes = "SessionTimes";
const QString STR_GRAPH_Usage = "Usage"; const QString STR_GRAPH_Usage = "Usage";

13
oscar/daily.cpp
View File

@ -1885,7 +1885,8 @@ void Daily::Load(QDate date)
ui->weightSpinBox->setValue(0); ui->weightSpinBox->setValue(0);
ui->ouncesSpinBox->setValue(0); ui->ouncesSpinBox->setValue(0);
ui->ZombieMeter->setValue(5); ui->ZombieMeter->setValue(0);
set_ZombieMeterLabel();
ui->ouncesSpinBox->blockSignals(false); ui->ouncesSpinBox->blockSignals(false);
ui->weightSpinBox->blockSignals(false); ui->weightSpinBox->blockSignals(false);
ui->ZombieMeter->blockSignals(false); ui->ZombieMeter->blockSignals(false);
@ -1941,6 +1942,7 @@ void Daily::Load(QDate date)
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)); ui->ZombieMeter->setValue(journal->settings[Journal_ZombieMeter].toDouble(&ok));
set_ZombieMeterLabel();
ui->ZombieMeter->blockSignals(false); ui->ZombieMeter->blockSignals(false);
} }
#endif #endif
@ -2498,9 +2500,18 @@ void Daily::on_removeBookmarkButton_clicked()
mainwin->updateFavourites(); mainwin->updateFavourites();
} }
#ifndef REMOVE_FITNESS #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) void Daily::on_ZombieMeter_valueChanged(int action)
{ {
Q_UNUSED(action); Q_UNUSED(action);
set_ZombieMeterLabel();
ZombieMeterMoved=true; ZombieMeterMoved=true;
Session *journal=GetJournalSession(previous_date); Session *journal=GetJournalSession(previous_date);
if (!journal) { if (!journal) {

2
oscar/daily.h
View File

@ -251,6 +251,8 @@ private slots:
*/ */
void on_ZombieMeter_valueChanged(int value); void on_ZombieMeter_valueChanged(int value);
void set_ZombieMeterLabel();
/*! \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.

88
oscar/daily.ui
View File

@ -1167,7 +1167,7 @@ QToolButton:pressed {
</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="gridLayout">
<item row="0" column="0"> <item row="0" column="3" colspan="5">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -1181,12 +1181,33 @@ QToolButton:pressed {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Zombie</string> <string>Feelings</string>
</property>
<property name="toolTip">
<string>Feelings have a range 1 - 10. 1 is the worst feeling and 10 is the Best.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="6"> <item row="1" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Poor</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="6">
<widget class="QLabel" name="ZombieValue">
<property name="font"> <property name="font">
<font> <font>
<bold>false</bold> <bold>false</bold>
@ -1200,7 +1221,28 @@ QToolButton:pressed {
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="7">
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Awesome</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -1213,7 +1255,7 @@ QToolButton:pressed {
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="weightSpinBox"> <widget class="QDoubleSpinBox" name="weightSpinBox">
<property name="toolTip"> <property name="toolTip">
<string>If height is greater than zero in Preferences Dialog, setting weight here will show Body Mass Index (BMI) value</string> <string>If height is greater than zero in Preferences Dialog, setting weight here will show Body Mass Index (BMI) value</string>
@ -1223,8 +1265,11 @@ QToolButton:pressed {
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="8"> <item row="2" column="0" colspan="8">
<widget class="QSlider" name="ZombieMeter"> <widget class="QSlider" name="ZombieMeter">
<property name="toolTip">
<string>Feelings have a range 1 - 10. 1 is the worst feeling and 10 is the Best.</string>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QSlider::groove:horizontal { <string notr="true">QSlider::groove:horizontal {
border: 1px solid #999999; border: 1px solid #999999;
@ -1248,7 +1293,7 @@ QSlider::handle:horizontal {
<number>10</number> <number>10</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>5</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>5</number> <number>5</number>
@ -1264,35 +1309,14 @@ QSlider::handle:horizontal {
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="3" column="3">
<widget class="QSpinBox" name="ouncesSpinBox"> <widget class="QSpinBox" name="ouncesSpinBox">
<property name="suffix"> <property name="suffix">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7"> <item row="3" column="7">
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Awesome</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="7">
<widget class="QLCDNumber" name="BMI"> <widget class="QLCDNumber" name="BMI">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@ -1314,7 +1338,7 @@ QSlider::handle:horizontal {
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="4" colspan="3"> <item row="3" column="4" colspan="3">
<widget class="QLabel" name="BMIlabel"> <widget class="QLabel" name="BMIlabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

4
oscar/overview.cpp
View File

@ -350,8 +350,8 @@ void Overview::CreateAllGraphs() {
bmi->addSlice(Journal_BMI, QColor("black"), ST_SETAVG); bmi->addSlice(Journal_BMI, QColor("black"), ST_SETAVG);
BMI->AddLayer(bmi); BMI->AddLayer(bmi);
ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(0-10)")); ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(1-10)"));
zombie = new gOverviewGraph("Zombie", GT_LINE); zombie = new gOverviewGraph("Feeling", GT_LINE);
zombie->setMachineType(MT_JOURNAL); zombie->setMachineType(MT_JOURNAL);
zombie->addSlice(Journal_ZombieMeter, QColor("black"), ST_SETAVG); zombie->addSlice(Journal_ZombieMeter, QColor("black"), ST_SETAVG);
ZOMBIE->AddLayer(zombie); ZOMBIE->AddLayer(zombie);