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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Arie Klerk 2021-03-29 20:56:30 +02:00
commit c16fce1d6a
24 changed files with 1910 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -32,6 +32,7 @@
<li>[fix] Newly entered notes no longer lost when importing new day or purging oximetry data.</li>
<li>[fix] Purge currently selected day no longer deletes bookmarks for that day.</li>
<li>[fix] Remove warning from Chromebook when importing from previously used local folder.</li>
<li>[fix] Update link to Contec drivers.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.2.0</b>

16
oscar/Graphs/gFlagsLine.cpp
View File

@ -366,23 +366,25 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
x1 = double(X - minx) * xmult + left;
x2 = double(X2 - minx) * xmult + left;
int width = x1-x2;
width = qMax(2,width); // Insure Rectangle will be visable. Flag events are 2 pixels wide.
brush = QBrush(color);
painter.fillRect(x2, bartop, x1-x2, bottom-bartop, brush);
if (!w.selectingArea() && !hover && QRect(x2, bartop, x1-x2, bottom-bartop).contains(w.graphView()->currentMousePos())) {
painter.fillRect(x2, bartop, width, bottom-bartop, brush);
if (!w.selectingArea() && !hover && QRect(x2, bartop, width , bottom-bartop).contains(w.graphView()->currentMousePos())) {
hover = true;
painter.setPen(QPen(Qt::red,1));
painter.drawRect(x2, bartop, x1-x2, bottom-bartop);
painter.drawRect(x2, bartop, width, bottom-bartop);
int x,y;
int s = *dptr;
int m = s / 60;
s %= 60;
double s = *dptr;
double m;
s=60*modf(s/60,&m);
QString lab = QString("%1").arg(schema::channel[m_code].fullname());
if (m>0) {
lab += QObject::tr(" (%2 min, %3 sec)").arg(m).arg(s);
} else {
lab += QObject::tr(" (%3 sec)").arg(m).arg(s);
lab += QObject::tr(" (%3 sec)").arg(s);
}
GetTextExtent(lab, x, y);
w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);

4
oscar/Graphs/gGraph.cpp
View File

@ -275,7 +275,9 @@ void gGraph::setDay(Day *day)
}
rmin_y = rmax_y = 0;
ResetBounds();
// This resets weight and bmi overview graphs to full date range when they are changed.
// is it required ever?
// ResetBounds();
}
void gGraph::setZoomY(short zoom)

19
oscar/Graphs/gLineOverlay.cpp
View File

@ -28,7 +28,6 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (!schema::channel[m_code].enabled())
return;
int left = region.boundingRect().left();
int topp = region.boundingRect().top(); // FIXME: Misspelling intentional.
double width = region.boundingRect().width();
@ -42,10 +41,12 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
double xx = w.max_x - w.min_x;
//double yy = w.max_y - w.min_y;
if (xx <= 0) { return; }
double jj = width / xx;
if (xx <= 0) { return; }
double x1, x2;
@ -138,12 +139,20 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
x1 = jj * double(X - w.min_x);
x2 = jj * double(Y - w.min_x);
x2 += (int(x1)==int(x2)) ? 1 : 0;
x2 = qMax(0.0, x2)+left;
x1 = qMin(width, x1)+left;
painter.fillRect(QRect(x2, start_py, x1-x2, height), brush);
// x2 represents the begining of a span in pixels
// x1 represent the end of the span in pixels
// BUG HERE
//x2 += (int(x1)==int(x2)) ? 1 : 0;
// Fixed BY
int duration = x1-x2;
if (duration<2) duration=2; // display minial span with 2 pixels.
x2 =x1-duration;
painter.fillRect(QRect(x2, start_py, duration, height), brush);
}
}/* else if (m_flt == FT_Dot) {
////////////////////////////////////////////////////////////////////////////

23
oscar/SleepLib/common.cpp
View File

@ -332,8 +332,8 @@ void validateFont (QString which, int size, bool bold, bool italic) {
QFontDatabase fontdatabase;
if (installedFontFamilies.isEmpty()) {
installedFontFamilies = fontdatabase.families();
qDebug() << "validateFont found" << installedFontFamilies.count() << "installed font families";
}
qDebug() << "validateFont found" << installedFontFamilies.count() << "installed font families";
QString prefPrefix = "Fonts_" + which + "_";
@ -345,11 +345,19 @@ void validateFont (QString which, int size, bool bold, bool italic) {
if (p_pref->contains(prefPrefix + "Name")) {
// We already have a font, so it becomes desired font (if valid)
QString testFont = (*p_pref)[prefPrefix + "Name"].toString();
int prefSize = (*p_pref)[prefPrefix+"Size"].toInt();
// Is this a good font?
if (testFont.length() > 0 && installedFontFamilies.indexOf(testFont) >= 0) {
desiredFont = testFont;
forceFont = false;
}
if (testFont.length() > 0 ) {
qDebug() << which << "Preferences font is" << testFont;
if ( installedFontFamilies.indexOf(testFont) >= 0) {
desiredFont = testFont;
forceFont = false;
} else {
qDebug() << testFont << prefSize << "not found, substituting" << desiredFont << size;
for (int i = 0; i< installedFontFamilies.size(); i++)
qDebug() << installedFontFamilies.at(i);
}
}
}
#ifdef Q_OS_MAC
@ -367,15 +375,20 @@ void validateFont (QString which, int size, bool bold, bool italic) {
(*p_pref)[prefPrefix + "Bold"] = bold;
(*p_pref)[prefPrefix + "Italic"] = italic;
}
qDebug() << which << "font set to" << desiredFont << "at size" << (*p_pref)[prefPrefix + "Size"];
}
void setApplicationFont () {
qDebug() << "Application font starts out as" << QApplication::font();
QFont font = QFont(((*p_pref)["Fonts_Application_Name"]).toString());
font.setPointSize(((*p_pref)["Fonts_Application_Size"]).toInt());
font.setWeight(((*p_pref)["Fonts_Application_Bold"]).toBool() ? QFont::Bold : QFont::Normal);
font.setItalic(((*p_pref)["Fonts_Application_Italic"]).toBool());
QApplication::setFont(font);
mainwin->menuBar()->setFont(font);
qDebug() << "Application font set to" << font;
qDebug() << "Application font reads back as" << QApplication::font();
qDebug() << "system font is" << QFontDatabase::systemFont(QFontDatabase::GeneralFont).family();
}
bool removeDir(const QString &path)

7
oscar/SleepLib/day.cpp
View File

@ -202,11 +202,14 @@ EventDataType Day::countInsideSpan(ChannelID span, ChannelID code)
EventDataType Day::lookupValue(ChannelID code, qint64 time, bool square)
{
// Remove drift from CPAP graphs so we get the right value...
qint64 clockdrift = qint64(p_profile->cpap->clockDrift()) * 1000L;
for (auto & sess : sessions) {
if (sess->enabled()) {
if ((time > sess->first()) && (time < sess->last())) {
qint64 drift = (sess->type() == MT_CPAP?clockdrift:0);
if ((time-drift > sess->first()) && (time-drift < sess->last())) {
if (sess->channelExists(code)) {
return sess->SearchValue(code,time,square);
return sess->SearchValue(code,time-drift,square);
}
}
}

3
oscar/SleepLib/journal.cpp
View File

@ -214,6 +214,7 @@ void BackupJournal(QString filename)
stream.setAutoFormattingIndent(2);
stream.writeStartDocument();
// stream.writeProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"");
stream.writeStartElement("OSCAR");
stream.writeStartElement("Journal");
stream.writeAttribute("username", p_profile->user->userName());
@ -301,6 +302,8 @@ void BackupJournal(QString filename)
}
QTextStream ts(&file);
ts.setCodec("UTF-8");
ts.setGenerateByteOrderMark(true);
ts << outBuf;
file.close();
}

9
oscar/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -7,10 +7,11 @@
* for more details. */
//********************************************************************************************
/// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the cms50_data_version in cms50_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the cms50_data_version in cms50_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
#include <QApplication>

9
oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -7,10 +7,11 @@
* for more details. */
//********************************************************************************************
/// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the cms50_data_version in cms50_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the cms50f37_data_version in cms50f37_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
// #include <QProgressBar>

9
oscar/SleepLib/loader_plugins/dreem_loader.cpp
View File

@ -7,10 +7,11 @@
* for more details. */
//********************************************************************************************
// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the dreem_data_version in dreem_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the dreem_data_version in dreem_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
#include <QDir>

6
oscar/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -355,7 +355,9 @@ quint32 convertFLWDate(quint32 timestamp) // Bit format: hhhhhmmmmmmssssssYYYYYY
QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
if(!dt.isValid()){
dt = QDateTime(QDate(2015,1,1), QTime(0,0,1));
// make this date too early, then change test later
// dt = QDateTime(QDate(2015,1,1), QTime(0,0,1));
dt = QDateTime(QDate(2010,1,1), QTime(0,0,0));
}
// Q NO!!! _ASSERT(dt.isValid());
// if ((year == 2013) && (month == 9) && (day == 18)) {
@ -483,7 +485,7 @@ bool FPIconLoader::OpenFLW(Machine *mach, const QString & filename)
ts = convertFLWDate(t2);
if (ts > QDateTime(QDate(2015,1,1), QTime(0,0,0)).toTime_t()) {
if (ts < QDateTime(QDate(2010,1,1), QTime(0,1,0)).toTime_t()) {
return false;
}

2269
oscar/SleepLib/loader_plugins/intellipap_loader.cpp
View File

File diff suppressed because it is too large Load Diff

18
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -314,6 +314,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "1030X150", 3, 6, "DreamStation BiPAP S/T 30 with AAM" },
{ "1130X110", 3, 6, "DreamStation BiPAP AVAPS 30" },
{ "1131X150", 3, 6, "DreamStation BiPAP AVAPS 30 AE" },
{ "1130X200", 3, 6, "DreamStation BiPAP AVAPS 30" },
{ "", 0, 0, "" },
};
@ -6213,7 +6214,7 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
case 2: // Breath Rate (fixed BPM)
breath_rate = data[pos+1];
timed_inspiration = data[pos+2];
if (breath_rate < 9 || breath_rate > 13) UNEXPECTED_VALUE(breath_rate, "9-13");
if (breath_rate < 9 || breath_rate > 15) UNEXPECTED_VALUE(breath_rate, "9-15");
if (timed_inspiration < 8 || timed_inspiration > 20) UNEXPECTED_VALUE(timed_inspiration, "8-20");
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_MODE, PRS1Backup_Fixed));
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_RATE, breath_rate));
@ -6248,17 +6249,22 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
// Rise time
if (data[pos] < 1 || data[pos] > 6) UNEXPECTED_VALUE(data[pos], "1-6"); // 1-6 have been seen
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RISE_TIME, data[pos]));
} else {
UNEXPECTED_VALUE(flexmode, "BiFlex or RiseTime");
}
// Timed inspiration specified in the backup breath rate.
break;
case 0x2f: // Rise Time lock? (was flex lock on F0V6, 0x80 for locked)
case 0x2f: // Flex / Rise Time lock
CHECK_VALUE(len, 1);
if (cpapmode == PRS1_MODE_S) {
if (flexmode == FLEX_BiFlex) {
CHECK_VALUE(cpapmode, PRS1_MODE_S);
CHECK_VALUES(data[pos], 0, 0x80); // Bi-Flex Lock
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_LOCK, data[pos] != 0));
} else if (flexmode == FLEX_RiseTime) {
CHECK_VALUES(data[pos], 0, 0x80); // Rise Time Lock
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RISE_TIME_LOCK, data[pos] != 0));
} else {
CHECK_VALUE(data[pos], 0); // Rise Time Lock? not yet observed on F3V6
//this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RISE_TIME_LOCK, data[pos] != 0));
UNEXPECTED_VALUE(flexmode, "BiFlex or RiseTime");
}
break;
case 0x35: // Humidifier setting
@ -7147,7 +7153,7 @@ void PRS1DataChunk::ParseHumidifierSettingV3(unsigned char byte1, unsigned char
} else if (humidadaptive) {
// All humidity levels seen.
} else if (humidfixed) {
if (humidlevel == 0) UNEXPECTED_VALUE(humidlevel, "1-5");
// All humidity levels seen.
}
}
}

1
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -181,6 +181,7 @@ void ResmedLoader::initChannels()
chan->addOption(0, STR_TR_Off);
chan->addOption(1, STR_TR_On);
chan->addOption(2, QObject::tr("Auto"));
// Setup ResMeds signal name translation map
setupResMedTranslationMap();

98
oscar/SleepLib/loader_plugins/somnopose_loader.cpp
View File

@ -7,10 +7,11 @@
* for more details. */
//********************************************************************************************
// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the somnopose_data_version in somnopose_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the somnopose_data_version in somnopose_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
#include <QDir>
@ -68,12 +69,24 @@ int SomnoposeLoader::OpenFile(const QString & filename)
// Read header line and determine order of fields
QString hdr = ts.readLine();
QStringList headers = hdr.split(",");
QString model = "";
QString serial = "";
int col_inclination = -1, col_orientation = -1, col_timestamp = -1;
int col_inclination = -1, col_orientation = -1, col_timestamp = -1, col_movement = -1;
int hdr_size = headers.size();
for (int i = 0; i < hdr_size; i++) {
// Optional header model=<model>
if (headers.at(i).startsWith("model=", Qt::CaseInsensitive)) {
model=headers.at(i).split("=")[1];
}
// Optional header serial=<serial>
if (headers.at(i).startsWith("serial=", Qt::CaseInsensitive)) {
serial=headers.at(i).split("=")[1];
}
if (headers.at(i).compare("timestamp", Qt::CaseInsensitive) == 0) {
col_timestamp = i;
}
@ -85,11 +98,20 @@ int SomnoposeLoader::OpenFile(const QString & filename)
if (headers.at(i).compare("orientation", Qt::CaseInsensitive) == 0) {
col_orientation = i;
}
if (headers.at(i).compare("movement", Qt::CaseInsensitive) == 0) {
col_movement = i;
}
}
// Check we have all fields available
if ((col_timestamp < 0) || (col_inclination < 0) || (col_orientation < 0)) {
qDebug() << "Header missing one of timestamp, inclination, or orientation";
if (col_timestamp < 0) {
qDebug() << "Header missing timestamp";
return 0;
}
if ((col_inclination < 0) && (col_orientation < 0) && (col_movement < 0)) {
qDebug() << "Header missing all of inclination, orientation, movement (at least one must be present)";
return 0;
}
@ -97,18 +119,20 @@ int SomnoposeLoader::OpenFile(const QString & filename)
qint64 ep = qint64(epoch.toTime_t()+epoch.offsetFromUtc()) * 1000, time;
qDebug() << "Epoch starts at" << epoch.toString();
double timestamp, orientation, inclination;
double timestamp, orientation=0, inclination=0, movement=0;
QString data;
QStringList fields;
bool ok;
bool ok, orientation_ok, inclination_ok, movement_ok;
bool first = true;
MachineInfo info = newInfo();
info.model = model;
info.serial = serial;
Machine *mach = p_profile->CreateMachine(info);
Session *sess = nullptr;
SessionID sid;
EventList *ev_orientation = nullptr, *ev_inclination = nullptr;
EventList *ev_orientation = nullptr, *ev_inclination = nullptr, *ev_movement = nullptr;
while (!(data = ts.readLine()).isEmpty()) {
fields = data.split(",");
@ -121,14 +145,21 @@ int SomnoposeLoader::OpenFile(const QString & filename)
if (!ok) { continue; }
orientation = fields[col_orientation].toDouble(&ok);
if (col_orientation >= 0) {
orientation = fields[col_orientation].toDouble(&orientation_ok);
}
if (!ok) { continue; }
if (col_inclination >= 0) {
inclination = fields[col_inclination].toDouble(&inclination_ok);
}
inclination = fields[col_inclination].toDouble(&ok);
if (!ok) { continue; }
if (col_movement >= 0) {
movement = fields[col_movement].toDouble(&movement_ok);
}
if (!orientation_ok && !inclination_ok && !movement_ok) {
continue;
}
// convert to milliseconds since epoch
time = (timestamp * 1000.0) + ep;
@ -137,35 +168,58 @@ int SomnoposeLoader::OpenFile(const QString & filename)
qDebug() << "First timestamp is" << QDateTime::fromMSecsSinceEpoch(time).toString();
if (mach->SessionExists(sid)) {
return 0; // Already imported
qDebug() << "File " << filename << " already loaded... skipping";
return -1; // Already imported
}
sess = new Session(mach, sid);
sess->really_set_first(time);
ev_orientation = sess->AddEventList(POS_Orientation, EVL_Event, 1, 0, 0, 0);
ev_inclination = sess->AddEventList(POS_Inclination, EVL_Event, 1, 0, 0, 0);
if (col_orientation >= 0) {
ev_orientation = sess->AddEventList(POS_Orientation, EVL_Event, 1, 0, 0, 0);
}
if (col_inclination >= 0) {
ev_inclination = sess->AddEventList(POS_Inclination, EVL_Event, 1, 0, 0, 0);
}
if (col_movement >= 0) {
ev_movement = sess->AddEventList(POS_Movement, EVL_Event, 1, 0, 0, 0);
}
first = false;
}
sess->set_last(time);
ev_orientation->AddEvent(time, orientation);
ev_inclination->AddEvent(time, inclination);
if (ev_orientation && orientation_ok) {
ev_orientation->AddEvent(time, orientation);
}
if (ev_inclination && inclination_ok) {
ev_inclination->AddEvent(time, inclination);
}
if (ev_movement && movement_ok) {
ev_movement->AddEvent(time, movement);
}
}
if (sess) {
if (ev_orientation && ev_inclination) {
if (ev_orientation) {
sess->setMin(POS_Orientation, ev_orientation->Min());
sess->setMax(POS_Orientation, ev_orientation->Max());
}
if (ev_inclination) {
sess->setMin(POS_Inclination, ev_inclination->Min());
sess->setMax(POS_Inclination, ev_inclination->Max());
}
if (ev_movement) {
sess->setMin(POS_Movement, ev_movement->Min());
sess->setMax(POS_Movement, ev_movement->Max());
}
sess->really_set_last(time);
sess->SetChanged(true);
mach->AddSession(sess);
mach->Save();
// Adding these to hopefully make data persistent...
mach->SaveSummaryCache();
p_profile->StoreMachines();
}
return true;

57
oscar/SleepLib/loader_plugins/viatom_loader.cpp
View File

@ -2,16 +2,18 @@
*
* Copyright (c) 2019-2020 The OSCAR Team
* (Initial importer written by dave madden <dhm@mersenne.com>)
* Modified 02/21/2021 to allow for CheckMe device data files by Crimson Nape <CrimsonNape@gmail.com>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code
* for more details. */
//********************************************************************************************
// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the viatom_data_version in viatom_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the viatom_data_version in viatom_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
#include <QDir>
@ -39,7 +41,7 @@ ViatomLoader::Open(const QString & dirpath)
int imported = 0;
int found = 0;
s_unexpectedMessages.clear();
if (QFileInfo(dirpath).isDir()) {
QDir dir(dirpath);
dir.setFilter(QDir::NoDotAndDotDot | QDir::Files | QDir::Hidden);
@ -95,7 +97,7 @@ ViatomLoader::Open(const QString & dirpath)
bool ViatomLoader::OpenFile(const QString & filename)
{
Machine* mach = nullptr;
Session* sess = ParseFile(filename);
if (sess) {
SaveSessionToDatabase(sess);
@ -124,7 +126,7 @@ Session* ViatomLoader::ParseFile(const QString & filename)
QString foldername = QFileInfo(filename).dir().dirName();
if (foldername.length() >= 9) {
bool numeric;
foldername.right(4).toInt(&numeric);
foldername.rightRef(4).toInt(&numeric);
if (numeric) {
info.serial = foldername;
}
@ -167,7 +169,7 @@ Session* ViatomLoader::ParseFile(const QString & filename)
void ViatomLoader::SaveSessionToDatabase(Session* sess)
{
Machine* mach = sess->machine();
sess->SetChanged(true);
mach->AddSession(sess);
}
@ -192,7 +194,7 @@ void ViatomLoader::EndEventList(ChannelID channel, qint64 /*t*/)
// The below would be needed for square charts if the first sample represents
// the 4 seconds following the starting timestamp:
//C->AddEvent(t, m_importLastValue[channel]);
// Mark this channel's event list as ended.
m_importChannels[channel] = nullptr;
}
@ -248,6 +250,7 @@ static QString dur(qint64 msecs)
#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
// for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails
ViatomFile::ViatomFile(QFile & file) : m_file(file)
{
}
@ -270,10 +273,23 @@ bool ViatomFile::ParseHeader()
int min = header[7];
int sec = header[8];
/* CN - Changed the if statement to a switch to accomdate additional Viatom/Wellue signatures in the future
if (sig != 0x0003) {
qDebug() << m_file.fileName() << "invalid signature for Viatom data file" << sig;
return false;
}
CN */
switch (sig){
case 0x0003:
case 0x0005:
break;
default:
qDebug() << m_file.fileName() << "invalid signature for Viatom data file" << sig;
return false;
break;
}
if ((year < 2015 || year > 2059) || (month < 1 || month > 12) || (day < 1 || day > 31) ||
(hour > 23) || (min > 59) || (sec > 59)) {
qDebug() << m_file.fileName() << "invalid timestamp in Viatom data file";
@ -338,8 +354,8 @@ bool ViatomFile::ParseHeader()
CHECK_VALUE(filesize, m_file.size());
}
CHECK_VALUES(m_resolution, 2000, 4000);
CHECK_VALUE(datasize % RECORD_SIZE, 0);
CHECK_VALUE(m_duration % m_record_count, 0);
// CHECK_VALUE(datasize % RECORD_SIZE, 0); CN - Commented out these 2 lines because CheckMe can record odd number of entries
// CHECK_VALUE(m_duration % m_record_count, 0);
//qDebug().noquote() << m_file.fileName() << ts(m_timestamp) << dur(m_duration * 1000L) << ":" << m_record_count << "records @" << m_resolution << "ms";
@ -351,21 +367,22 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
QByteArray data = m_file.readAll();
QDataStream in(data);
in.setByteOrder(QDataStream::LittleEndian);
int iCheckMeAdj; // Allows for an odd number in the CheckMe duration/# of records return
QList<ViatomFile::Record> records;
// Read all Pulse, SPO2 and Motion data
do {
ViatomFile::Record rec;
in >> rec.spo2 >> rec.hr >> rec.oximetry_invalid >> rec.motion >> rec.vibration;
CHECK_VALUES(rec.oximetry_invalid, 0, 0xFF);
CHECK_VALUES(rec.vibration, 0, 0x80); // 0x80 when vibration is triggered
CHECK_VALUES(rec.oximetry_invalid, 0, 0xFF); //If it doesn't have one of these 2 values, it's bad
if (rec.vibration == 0x40) rec.vibration = 0x80; //0x040 (64) or 0x80 (128) when vibration is triggered
CHECK_VALUES(rec.vibration, 0, 0x80); // 0x80 (128) when vibration is triggered
if (rec.oximetry_invalid == 0xFF) {
CHECK_VALUE(rec.spo2, 0xFF);
CHECK_VALUE(rec.hr, 0xFF);
CHECK_VALUE(rec.hr, 0xFF); // if all 3 have 0xFF, then end of data
}
records.append(rec);
} while (!in.atEnd());
} while (records.size() < m_record_count); // CN Changed to allow for an incomlpete record values
// CN } while (!in.atEnd());
// It turns out 2s files are actually just double-reported samples!
if (m_resolution == 2000) {
@ -392,7 +409,11 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
records = dedup;
}
}
CHECK_VALUE(duration() / records.size(), 4); // We've only seen 4s true resolution so far.
iCheckMeAdj = duration() / records.size();
if(iCheckMeAdj == 3) iCheckMeAdj = 4; // CN - Sanity check for CheckMe devices since their files do not always terminate on an even number.
CHECK_VALUE(iCheckMeAdj, 4); // Crimson Nape - Changed to accomadate the CheckMe data files.
// CHECK_VALUE(duration() / records.size(), 4); // We've only seen 4s true resolution so far.
return records;
}

3
oscar/SleepLib/loader_plugins/viatom_loader.h
View File

@ -2,6 +2,7 @@
*
* Copyright (c) 2019-2020 The OSCAR Team
* (Initial importer written by dave madden <dhm@mersenne.com>)
* Modified 02/21/2021 to allow for CheckMe device data files by Crimson Nape <CrimsonNape@gmail.com>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code
@ -38,7 +39,7 @@ class ViatomLoader : public MachineLoader
virtual MachineInfo newInfo() {
return MachineInfo(MT_OXIMETER, 0, viatom_class_name, QObject::tr("Viatom"), QString(), QString(), QString(), QObject::tr("Viatom Software"), QDateTime::currentDateTime(), viatom_data_version);
}
QStringList getNameFilter();
//Machine *CreateMachine();

9
oscar/SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -8,10 +8,11 @@
* for more details. */
//********************************************************************************************
// IMPORTANT!!!
//********************************************************************************************
// Please INCREMENT the zeo_data_version in zel_loader.h when making changes to this loader
// that change loader behaviour or modify channels.
// Please only INCREMENT the zeo_data_version in zeo_loader.h when making changes
// that change loader behaviour or modify channels in a manner that fixes old data imports.
// Note that changing the data version will require a reimport of existing data for which OSCAR
// does not keep a backup - so it should be avoided if possible.
// i.e. there is no need to change the version when adding support for new devices
//********************************************************************************************
#include <QDir>

166
oscar/daily.cpp
View File

@ -509,6 +509,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
connect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
connect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));
connect(GraphView, SIGNAL(GraphsChanged()), this, SLOT(updateGraphCombo()));
// Watch for focusOut events on the JournalNotes widget
ui->JournalNotes->installEventFilter(this);
// qDebug() << "Finished making new Daily object";
// sleep(3);
}
@ -521,9 +524,11 @@ Daily::~Daily()
disconnect(sessionbar, SIGNAL(sessionClicked(Session*)), this, SLOT(doToggleSession(Session*)));
disconnect(webView,SIGNAL(anchorClicked(QUrl)),this,SLOT(Link_clicked(QUrl)));
ui->JournalNotes->removeEventFilter(this);
if (previous_date.isValid())
if (previous_date.isValid()) {
Unload(previous_date);
}
// Save graph orders and pin status, etc...
GraphView->SaveSettings("Daily");
@ -1221,8 +1226,9 @@ QString Daily::getOximeterInformation(Day * day)
html+="<tr><td colspan=5 align=center>&nbsp;</td></tr>";
html+="<tr><td colspan=5 align=center>"+oxi->brand()+" "+oxi->model()+"</td></tr>\n";
html+="<tr><td colspan=5 align=center>&nbsp;</td></tr>";
html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3%)</td></tr>").arg(tr("SpO2 Desaturations")).arg(day->count(OXI_SPO2Drop)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_SPO2Drop)/3600.0),0,'f',2);
html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3%)</td></tr>").arg(tr("Pulse Change events")).arg(day->count(OXI_PulseChange)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_PulseChange)/3600.0),0,'f',2);
// Include SpO2 and PC drops per hour of Oximetry data in case CPAP data is missing
html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3%) %4/h</td></tr>").arg(tr("SpO2 Desaturations")).arg(day->count(OXI_SPO2Drop)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_SPO2Drop)/3600.0),0,'f',2).arg((day->count(OXI_SPO2Drop)/day->hours(MT_OXIMETER)),0,'f',2);
html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3%) %4/h</td></tr>").arg(tr("Pulse Change events")).arg(day->count(OXI_PulseChange)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_PulseChange)/3600.0),0,'f',2).arg((day->count(OXI_PulseChange)/day->hours(MT_OXIMETER)),0,'f',2);
html+=QString("<tr><td colspan=5 align=center>%1: %2%</td></tr>").arg(tr("SpO2 Baseline Used")).arg(day->settings_wavg(OXI_SPO2Drop),0,'f',2); // CHECKME: Should this value be wavg OXI_SPO2 isntead?
html+="</table>\n";
html+="<hr/>\n";
@ -1295,7 +1301,7 @@ QString Daily::getStatisticsInfo(Day * day)
.arg(STR_TR_Min)
.arg(midname)
.arg(tr("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage))
.arg(STR_TR_Max);
.arg(ST_max == ST_MAX?STR_TR_Max:tr("99.5%"));
ChannelID chans[]={
CPAP_Pressure,CPAP_PressureSet,CPAP_EPAP,CPAP_EPAPSet,CPAP_IPAP,CPAP_IPAPSet,CPAP_PS,CPAP_PTB,
@ -1529,6 +1535,11 @@ QVariant MyTextBrowser::loadResource(int type, const QUrl &url)
void Daily::Load(QDate date)
{
qDebug() << "Daily::Load called for" << date.toString() << "using" << QApplication::font().toString();
qDebug() << "Setting App font in Daily::Load";
setApplicationFont();
dateDisplay->setText("<i>"+date.toString(Qt::SystemLocaleLongDate)+"</i>");
previous_date=date;
@ -1643,6 +1654,11 @@ void Daily::Load(QDate date)
if (hours>0) {
htmlLeftAHI="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
// Show application font, for debugging font issues
// QString appFont = QApplication::font().toString();
// htmlLeftAHI+=QString("<tr><td colspan=5 align=center>%1</td></tr>").arg(appFont);
htmlLeftAHI+="<tr>";
if (!isBrick) {
ChannelID ahichan=CPAP_AHI;
@ -1651,10 +1667,10 @@ void Daily::Load(QDate date)
ahichan=CPAP_RDI;
ahiname=STR_TR_RDI;
}
htmlLeftAHI+=QString("<td colspan=4 bgcolor='%1' align=center><p title='%4'><font size=+4 color='%2'><b>%3</b></font></p> &nbsp; <font size=+4 color='%2'><b>%5</b></font></td>\n")
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><p title='%4'><font size=+3 color='%2'><b>%3</b></font></p> &nbsp; <font size=+3 color='%2'><b>%5</b></font></td>\n")
.arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
} else {
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+4 color='yellow'>%2</font></td>\n")
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+3 color='yellow'>%2</font></td>\n")
.arg("#F88017").arg(tr("BRICK! :("));
}
htmlLeftAHI+="</tr>\n";
@ -1680,14 +1696,23 @@ void Daily::Load(QDate date)
schema::Channel & chan = schema::channel[code];
// if (!chan.enabled()) continue;
QString data;
float channelHours = hours;
if (chan.machtype() != MT_CPAP) {
// Use machine type hours (if available) rather than CPAP hours, since
// might have Oximetry (for example) longer or shorter than CPAP
channelHours = day->hours(chan.machtype());
if (channelHours <= 0) {
channelHours = hours;
}
}
if (chan.type() == schema::SPAN) {
val = (100.0 / hours)*(day->sum(code)/3600.0);
val = (100.0 / channelHours)*(day->sum(code)/3600.0);
data = QString("%1%").arg(val,0,'f',2);
} else if (code == CPAP_VSnore2) { // TODO: This should be generalized rather than special-casing a single channel here.
val = day->sum(code) / hours;
val = day->sum(code) / channelHours;
data = QString("%1").arg(val,0,'f',2);
} else {
val = day->count(code) / hours;
val = day->count(code) / channelHours;
data = QString("%1").arg(val,0,'f',2);
}
// TODO: percentage would be another useful option here for things like
@ -2186,6 +2211,9 @@ void Daily::on_JournalNotesUnderline_clicked()
void Daily::on_prevDayButton_clicked()
{
if (previous_date.isValid()) {
Unload(previous_date);
}
if (!p_profile->ExistsAndTrue("SkipEmptyDays")) {
LoadDate(previous_date.addDays(-1));
} else {
@ -2200,8 +2228,23 @@ void Daily::on_prevDayButton_clicked()
}
}
bool Daily::eventFilter(QObject *object, QEvent *event)
{
if (object == ui->JournalNotes && event->type() == QEvent::FocusOut) {
// Trigger immediate save of journal when we focus out from it so we never
// lose any journal entry text...
if (previous_date.isValid()) {
Unload(previous_date);
}
}
return false;
}
void Daily::on_nextDayButton_clicked()
{
if (previous_date.isValid()) {
Unload(previous_date);
}
if (!p_profile->ExistsAndTrue("SkipEmptyDays")) {
LoadDate(previous_date.addDays(1));
} else {
@ -2232,6 +2275,9 @@ void Daily::on_calButton_toggled(bool checked)
void Daily::on_todayButton_clicked()
{
if (previous_date.isValid()) {
Unload(previous_date);
}
// QDate d=QDate::currentDate();
// if (d > p_profile->LastDay()) {
QDate lastcpap = p_profile->LastDay(MT_CPAP);
@ -2404,21 +2450,10 @@ void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item)
void Daily::on_weightSpinBox_valueChanged(double arg1)
{
// Update the BMI display
double kg;
if (p_profile->general->unitSystem()==US_English) {
kg=((arg1*pound_convert) + (ui->ouncesSpinBox->value()*ounce_convert)) / 1000.0;
} else kg=arg1;
double height=p_profile->user->height()/100.0;
if ((height>0) && (kg>0)) {
double bmi=kg/(height * height);
ui->BMI->display(bmi);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
}
// 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_weightSpinBox_editingFinished()
@ -2437,7 +2472,25 @@ void Daily::on_weightSpinBox_editingFinished()
} else {
kg=arg1;
}
journal->settings[Journal_Weight]=kg;
if (journal->settings.contains(Journal_Weight)) {
QVariant old = journal->settings[Journal_Weight];
if (old == kg && kg > 0) {
// No change to weight - skip
return;
}
} else if (kg == 0) {
// Still zero - skip
return;
}
if (kg > 0) {
journal->settings[Journal_Weight]=kg;
} else {
// Weight now zero - remove from journal
auto jit = journal->settings.find(Journal_Weight);
if (jit != journal->settings.end()) {
journal->settings.erase(jit);
}
}
gGraphView *gv=mainwin->getOverview()->graphView();
gGraph *g;
if (gv) {
@ -2450,66 +2503,35 @@ void Daily::on_weightSpinBox_editingFinished()
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
journal->settings[Journal_BMI]=bmi;
if (gv) {
g=gv->findGraph(STR_GRAPH_BMI);
if (g) g->setDay(nullptr);
}
} 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) {
g=gv->findGraph(STR_GRAPH_BMI);
if (g) g->setDay(nullptr);
}
journal->SetChanged(true);
}
void Daily::on_ouncesSpinBox_valueChanged(int arg1)
{
// just update for BMI display
double height=p_profile->user->height()/100.0;
double kg=((ui->weightSpinBox->value()*pound_convert) + (arg1*ounce_convert)) / 1000.0;
if ((height>0) && (kg>0)) {
double bmi=kg/(height * height);
ui->BMI->display(bmi);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
}
// 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()
{
double arg1=ui->ouncesSpinBox->value();
Session *journal=GetJournalSession(previous_date);
if (!journal) {
journal=CreateJournalSession(previous_date);
}
double height=p_profile->user->height()/100.0;
double kg=((ui->weightSpinBox->value()*pound_convert) + (arg1*ounce_convert)) / 1000.0;
journal->settings[Journal_Weight]=kg;
gGraph *g;
if (mainwin->getOverview()) {
g=mainwin->getOverview()->graphView()->findGraph(STR_GRAPH_Weight);
if (g) g->setDay(nullptr);
}
if ((height>0) && (kg>0)) {
double bmi=kg/(height * height);
ui->BMI->display(bmi);
ui->BMI->setVisible(true);
ui->BMIlabel->setVisible(true);
journal->settings[Journal_BMI]=bmi;
if (mainwin->getOverview()) {
g=mainwin->getOverview()->graphView()->findGraph(STR_GRAPH_BMI);
if (g) g->setDay(nullptr);
}
} else {
ui->BMI->setVisible(false);
ui->BMIlabel->setVisible(false);
}
journal->SetChanged(true);
// This is functionally identical to the weightSpinBox_editingFinished, so just call that
this->on_weightSpinBox_editingFinished();
}
QString Daily::GetDetailsText()

2
oscar/daily.h
View File

@ -304,6 +304,8 @@ private:
*/
void UpdateEventsTree(QTreeWidget * tree,Day *day);
virtual bool eventFilter(QObject *object, QEvent *event) override;
void updateCube();

4
oscar/main.cpp
View File

@ -564,8 +564,7 @@ int main(int argc, char *argv[]) {
if (testFile.exists())
testFile.remove();
if (!testFile.open(QFile::ReadWrite)) {
QString errMsg = QObject::tr("Unable to write to OSCAR data directory") + " " + GetAppData() + "\n" +
GetAppData() + "\n" +
QString errMsg = QObject::tr("Unable to write to OSCAR data directory") + " " + GetAppData() + "\n\n" +
QObject::tr("Error code") + ": " + QString::number(testFile.error()) + " - " + testFile.errorString() + "\n\n" +
QObject::tr("OSCAR cannot continue and is exiting.") + "\n";
qCritical() << errMsg;
@ -592,6 +591,7 @@ int main(int argc, char *argv[]) {
AppSetting->setLanguage(language);
// Set fonts from preferences file
qDebug() << "App font before Prefs setting" << QApplication::font();
validateAllFonts();
setApplicationFont();

40
oscar/mainwindow.cpp
View File

@ -2394,16 +2394,46 @@ void MainWindow::on_actionImport_Somnopose_Data_triggered()
w.setNameFilters(QStringList("Somnopause CSV File (*.csv)"));
SomnoposeLoader somno;
// Display progress if we have more than 1 file to load...
ProgressDialog progress(this);
if (w.exec() == QFileDialog::Accepted) {
QString filename = w.selectedFiles()[0];
int i, skipped = 0;
int size = w.selectedFiles().size();
if (size > 1) {
progress.setMessage(QObject::tr("Importing Sessions..."));
progress.setProgressMax(size);
progress.setProgressValue(0);
progress.setWindowModality(Qt::ApplicationModal);
progress.open();
QCoreApplication::processEvents();
}
for (i=0; i < size; i++) {
QString filename = w.selectedFiles()[i];
if (!somno.OpenFile(filename)) {
Notify(tr("There was a problem opening Somnopose Data File: ") + filename);
return;
int res = somno.OpenFile(filename);
if (!res) {
if (i == 0) {
Notify(tr("There was a problem opening Somnopose Data File: ") + filename);
return;
} else {
Notify(tr("Somnopause Data Import of %1 file(s) complete").arg(i) + "\n\n" +
tr("There was a problem opening Somnopose Data File: ") + filename,
tr("Somnopose Import Partial Success"));
break;
}
}
if (res < 0) {
// Should we report on skipped count?
skipped++;
}
progress.setProgressValue(i+1);
QCoreApplication::processEvents();
}
Notify(tr("Somnopause Data Import complete"));
if (i == size) {
Notify(tr("Somnopause Data Import complete"));
}
PopulatePurgeMenu();
if (overview) overview->ReloadGraphs();
if (welcome) welcome->refreshPage();

24
oscar/mainwindow.ui
View File

@ -1211,8 +1211,8 @@ QToolBox::tab:selected {
<rect>
<x>0</x>
<y>0</y>
<width>178</width>
<height>685</height>
<width>175</width>
<height>690</height>
</rect>
</property>
<property name="palette">
@ -1669,8 +1669,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect>
<x>0</x>
<y>0</y>
<width>178</width>
<height>685</height>
<width>175</width>
<height>690</height>
</rect>
</property>
<property name="palette">
@ -2713,8 +2713,8 @@ border-radius: 10px;
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
@ -2728,8 +2728,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>178</width>
<height>685</height>
<width>175</width>
<height>690</height>
</rect>
</property>
<property name="mouseTracking">
@ -2770,8 +2770,8 @@ p, li { white-space: pre-wrap; }
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
@ -2791,7 +2791,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>1023</width>
<height>23</height>
<height>18</height>
</rect>
</property>
<property name="sizePolicy">
@ -3157,7 +3157,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionImport_Viatom_Data">
<property name="text">
<string>Import &amp;Viatom Data</string>
<string>Import &amp;Viatom/Wellue Data</string>
</property>
</action>
<action name="actionPurgeCurrentDaysOximetry">

12
oscar/overview.cpp
View File

@ -236,8 +236,20 @@ void Overview::CreateAllGraphs() {
} // for chit
WEIGHT = createGraph(STR_GRAPH_Weight, STR_TR_Weight, STR_TR_Weight, YT_Weight);
weight = new SummaryChart("Weight", GT_LINE);
weight->setMachineType(MT_JOURNAL);
weight->addSlice(Journal_Weight, QColor("black"), ST_SETAVG);
WEIGHT->AddLayer(weight);
BMI = createGraph(STR_GRAPH_BMI, STR_TR_BMI, tr("Body\nMass\nIndex"));
bmi = new SummaryChart("BMI", GT_LINE);
bmi->setMachineType(MT_JOURNAL);
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 SummaryChart("Zombie", GT_LINE);
zombie->setMachineType(MT_JOURNAL);
zombie->addSlice(Journal_ZombieMeter, QColor("black"), ST_SETAVG);
ZOMBIE->AddLayer(zombie);
}
// Recalculates Overview chart info