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

F&P import flags code rearange

Browse Source
This commit is contained in:
Mark Watkins 2014-05-15 16:20:54 +10:00
parent 87bdf725a7
commit ae3fe507b1
5 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -845,44 +845,33 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
idx = stidx * 15;
quint8 bitmask;
for (int i = 0; i < rec; i++) {
for (int j = 0; j < 3; j++) {
pressure = data[idx];
leak = data[idx + 1];
a1 = data[idx + 2];
a2 = data[idx + 3];
a3 = data[idx + 4];
sa1 = (a3 >> 6) & 1; // Sense awake bit for first minutes
sa2 = (a3 >> 7) & 1; // Sense awake bit for second minutes
PR->AddEvent(ti, pressure);
leak = data[idx + 1];
LK->AddEvent(ti, leak);
a1 = data[idx + 2]; // [0..5] Obstructive flag, [6..7] Unknown
a2 = data[idx + 3]; // [0..5] Hypopnea, [6..7] Unknown
a3 = data[idx + 4]; // [0..5] Flow Limitation, [6..7] SensAwake bitflags, 1 per minute
sa1 = (a3 >> 6) & 1; // Sense awake bit for first minutes
sa2 = (a3 >> 7) & 1; // Sense awake bit for second minute
if (sa1) { SA->AddEvent(ti, 1); }
if (sa2) { SA->AddEvent(ti + 60000L, 1); }
bitmask = 1;
for (int k = 0; k < 6; k++) { // There are 6 flag sets per 2 minutes
//if (a1 > 0) { OA->AddEvent(ti, a1); }
if ((a1 & 1) == 1) { OA->AddEvent(ti, 1); }
//if (a2 > 0) { H->AddEvent(ti, a2); }
if ((a2 & 1) == 1) { H->AddEvent(ti, 1); }
//if (a3 > 0) { FL->AddEvent(ti, a3); }
if ((a3 & 1) == 1) { FL->AddEvent(ti, 1); }
// These should be flags as above, but for now I re-used the redundant FLG graph
if (k == 0) {
if (sa1 == 1) {SA->AddEvent(ti, sa1); }
}
else if (k == 3) {
if (sa2 == 1) { SA->AddEvent(ti, sa2); }
}
// else { FLG->AddEvent(ti, 0); }
a1 = a1 >> 1;
a2 = a2 >> 1;
a3 = a3 >> 1;
if (a1 & bitmask) { OA->AddEvent(ti, 1); }
if (a2 & bitmask) { H->AddEvent(ti, 1); }
if (a3 & bitmask) { FL->AddEvent(ti, 1); }
bitmask <<= 1;
ti += 20000L; // Increment 20 seconds
}
//FLG->AddEvent(ti, a3);
//ti += 120000L;
idx += 5;
}

2
sleepyhead/SleepLib/schema.cpp
View File

@ -213,7 +213,7 @@ void init()
schema::channel.add(GRP_CPAP, new Channel(CPAP_SensAwake = 0x100d, DATA, SESSION,
"SensAwake", QObject::tr("SensAwake"),
QObject::tr("SensAwake feature will reduce pressure when waking is detected."),
QObject::tr("SA"), QObject::tr("events/hr"), DEFAULT, QColor("#404040")));
QObject::tr("SA"), QObject::tr("events/hr"), DEFAULT, QColor("gold")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag1 = 0x101e, DATA, SESSION,
"UserFlag1", QObject::tr("User Flag #1"),
QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."),

2
sleepyhead/common_gui.cpp
View File

@ -73,7 +73,7 @@ QColor COLOR_ClearAirway = QColor("#b254cd");
QColor COLOR_RERA = COLOR_Gold;
QColor COLOR_VibratorySnore = QColor("#ff4040");
QColor COLOR_FlowLimit = QColor("#404040");
QColor COLOR_SensAwake = QColor("#40C040");
QColor COLOR_SensAwake = COLOR_Gold;
QColor COLOR_LeakFlag = QColor("#40c0c0"); // Qt::darkBlue;
QColor COLOR_NRI = COLOR_ClearAirway;
QColor COLOR_ExP = Qt::darkCyan;

2
sleepyhead/daily.cpp
View File

@ -1303,7 +1303,7 @@ void Daily::Load(QDate date)
{ CPAP_ClearAirway, COLOR_ClearAirway, Qt::black, cai=cpap->count(CPAP_ClearAirway)/hours },
{ CPAP_NRI, COLOR_NRI, Qt::black, nri=cpap->count(CPAP_NRI)/hours },
{ CPAP_FlowLimit, COLOR_FlowLimit, Qt::white, fli=cpap->count(CPAP_FlowLimit)/hours },
{ CPAP_SensAwake, COLOR_SensAwake, Qt::white, sai=cpap->count(CPAP_SensAwake)/hours },
{ CPAP_SensAwake, COLOR_SensAwake, Qt::black, sai=cpap->count(CPAP_SensAwake)/hours },
{ CPAP_ExP, COLOR_ExP, Qt::black, exp=cpap->count(CPAP_ExP)/hours },
{ CPAP_RERA, COLOR_RERA, Qt::black, rei=cpap->count(CPAP_RERA)/hours },
{ CPAP_VSnore, COLOR_VibratorySnore, Qt::black, vs=cpap->count(CPAP_VSnore)/cpap->hours() },

7
sleepyhead/mainwindow.cpp
View File

@ -759,9 +759,10 @@ QString MainWindow::getWelcomeHTML()
"<h3>" + tr("Currenly supported machines:") + "</h3>"
"<b>" + tr("CPAP") + "</b>"
"<li>" + tr("Philips Respironics System One (CPAP, Auto, BiPAP & ASV models)") + "</li>"
"<li>" + tr("Philips Respironics System One (CPAP Pro, Auto, BiPAP & ASV models)") + "</li>"
"<li>" + tr("ResMed S9 models (CPAP, Auto, VPAP)") + "</li>"
"<li>" + tr("DeVilbiss Intellipap (Auto)") + "</li>"
"<li>" + tr("Fisher & Paykel ICON (CPAP, Auto)") + "</li>"
"<b>" + tr("Oximetry") + "</b>"
"<li>" + tr("Contec CMS50D+, CMS50E and CMS50F (not 50FW) Oximeters") + "</li>"
"<li>" + tr("ResMed S9 Oximeter Attachment") + "</li>"
@ -1020,10 +1021,10 @@ void MainWindow::on_action_About_triggered()
// Credits section
"<hr/><p><b><font size='+1'>" +tr("Kudos & Credits") + "</font></b></p><b>" +
tr("Bugfixes, Patches and Platform Help:") + "</b> " +
tr("James Marshall, Rich Freeman, John Masters, Keary Griffin, Patricia Shanahan, Alec Clews, manders99, and Sean Stangl.")
tr("James Marshall, Rich Freeman, John Masters, Keary Griffin, Patricia Shanahan, Alec Clews, manders99, Sean Stangl and Roy Stone.")
+ "</p>"
"<p><b>" + tr("Translators:") + "</b> " + tr("Arie Klerk (Dutch), Steffen Reitz (German).") +
"<p><b>" + tr("Translators:") + "</b> " + tr("Arie Klerk (Dutch), Steffen Reitz (German), and others I've still to add here.") +
"</p>"
"<p><b>" + tr("3rd Party Libaries:") + "</b> " +