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

Roy Stones FPIcon Sensawake patch

Browse Source
This commit is contained in:
Mark Watkins 2014-05-15 13:51:32 +10:00
parent 973393f710
commit a86449803f
14 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/SleepLib/common.cpp
View File

@ -157,6 +157,7 @@ QString STR_TR_OA; // Short form of Obstructive Apnea
QString STR_TR_UA; // Short form of Unspecified Apnea
QString STR_TR_CA; // Short form of Clear Airway Apnea
QString STR_TR_FL; // Short form of Flow Limitation
QString STR_TR_SA; // Short form of SensAwake
QString STR_TR_LE; // Short form of Leak Event
QString STR_TR_EP; // Short form of Expiratory Puff
QString STR_TR_VS; // Short form of Vibratory Snore
@ -183,6 +184,7 @@ QString STR_TR_HI; // Short form of Hypopnea Index
QString STR_TR_UAI; // Short form of Uncatagorized Apnea Index
QString STR_TR_CAI; // Short form of Clear Airway Index
QString STR_TR_FLI; // Short form of Flow Limitation Index
//QString STR_TR_SAI; // Short form of SensAwake Index
QString STR_TR_REI; // Short form of RERA Index
QString STR_TR_EPI; // Short form of Expiratory Puff Index
QString STR_TR_CSR; // Short form of Cheyne Stokes Respiration
@ -196,6 +198,8 @@ QString STR_TR_ExpTime; // Expiratory Time
QString STR_TR_RespEvent; // Respiratory Event
QString STR_TR_FlowLimitation;
QString STR_TR_FlowLimit;
//QString STR_TR_FlowLimitation;
QString STR_TR_SensAwake;
QString STR_TR_PatTrigBreath; // Patient Triggered Breath
QString STR_TR_TgtMinVent; // Target Minute Ventilation
QString STR_TR_TargetVent; // Target Ventilation
@ -313,6 +317,7 @@ void initializeStrings()
STR_TR_UA = QObject::tr("A"); // Short form of Unspecified Apnea
STR_TR_CA = QObject::tr("CA"); // Short form of Clear Airway Apnea
STR_TR_FL = QObject::tr("FL"); // Short form of Flow Limitation
STR_TR_SA = QObject::tr("SA"); // Short form of Flow Limitation
STR_TR_LE = QObject::tr("LE"); // Short form of Leak Event
STR_TR_EP = QObject::tr("EP"); // Short form of Expiratory Puff
STR_TR_VS = QObject::tr("VS"); // Short form of Vibratory Snore
@ -340,6 +345,7 @@ void initializeStrings()
STR_TR_UAI = QObject::tr("UAI"); // Short form of Uncatagorized Apnea Index
STR_TR_CAI = QObject::tr("CAI"); // Short form of Clear Airway Index
STR_TR_FLI = QObject::tr("FLI"); // Short form of Flow Limitation Index
// STR_TR_SAI = QObject::tr("SAI"); // Short form of SleepAwake Index
STR_TR_REI = QObject::tr("REI"); // Short form of RERA Index
STR_TR_EPI = QObject::tr("EPI"); // Short form of Expiratory Puff Index
STR_TR_CSR = QObject::tr("ÇSR"); // Short form of Cheyne Stokes Respiration
@ -353,6 +359,7 @@ void initializeStrings()
STR_TR_RespEvent = QObject::tr("Resp. Event"); // Respiratory Event
STR_TR_FlowLimitation = QObject::tr("Flow Limitation");
STR_TR_FlowLimit = QObject::tr("Flow Limit");
STR_TR_SensAwake = QObject::tr("SensAwake");
STR_TR_PatTrigBreath = QObject::tr("Pat. Trig. Breath"); // Patient Triggered Breath
STR_TR_TgtMinVent = QObject::tr("Tgt. Min. Vent"); // Target Minute Ventilation
STR_TR_TargetVent = QObject::tr("Target Vent."); // Target Ventilation

2
sleepyhead/SleepLib/common.h
View File

@ -169,6 +169,7 @@ extern QString STR_TR_OA; // Short form of Obstructive Apnea
extern QString STR_TR_UA; // Short form of Unspecified Apnea
extern QString STR_TR_CA; // Short form of Clear Airway Apnea
extern QString STR_TR_FL; // Short form of Flow Limitation
extern QString STR_TR_SA; // Short form of SensAwake
extern QString STR_TR_LE; // Short form of Leak Event
extern QString STR_TR_EP; // Short form of Expiratory Puff
extern QString STR_TR_VS; // Short form of Vibratory Snore
@ -228,6 +229,7 @@ extern QString STR_TR_SleepStage;
extern QString STR_TR_Usage;
extern QString STR_TR_Sessions;
extern QString STR_TR_PrRelief; // Pressure Relief
extern QString STR_TR_SensAwake;
extern QString STR_TR_NoData;
extern QString STR_TR_Bookmarks;

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

@ -834,10 +834,11 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
sess->really_set_first(ti);
EventList *LK = sess->AddEventList(CPAP_LeakTotal, EVL_Event, 1);
EventList *PR = sess->AddEventList(CPAP_Pressure, EVL_Event, 0.1F);
EventList *FLG = sess->AddEventList(CPAP_FLG, EVL_Event);
// EventList *FLG = sess->AddEventList(CPAP_FLG, EVL_Event);
EventList *OA = sess->AddEventList(CPAP_Obstructive, EVL_Event);
EventList *H = sess->AddEventList(CPAP_Hypopnea, EVL_Event);
EventList *FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event);
EventList *SA = sess->AddEventList(CPAP_SensAwake, EVL_Event);
unsigned stidx = start[r];
int rec = records[r];
@ -867,9 +868,13 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
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) { FLG->AddEvent(ti, sa1); }
else if (k == 3) { FLG->AddEvent(ti, sa2); }
else { FLG->AddEvent(ti, 0); }
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;

2
sleepyhead/SleepLib/machine.cpp
View File

@ -535,7 +535,7 @@ ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAP
CPAP_Hypopnea,
CPAP_ClearAirway, CPAP_Apnea, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore,
CPAP_VSnore2,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_FlowRate, CPAP_MaskPressure,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_SensAwake, CPAP_FlowRate, CPAP_MaskPressure,
CPAP_MaskPressureHi,
CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,

2
sleepyhead/SleepLib/machine_common.h
View File

@ -93,7 +93,7 @@ extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CP
CPAP_Hypopnea,
CPAP_ClearAirway, CPAP_Apnea, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore,
CPAP_VSnore2,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_FlowRate, CPAP_MaskPressure,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_SensAwake, CPAP_FlowRate, CPAP_MaskPressure,
CPAP_MaskPressureHi,
CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,

4
sleepyhead/SleepLib/schema.cpp
View File

@ -210,6 +210,10 @@ void init()
QObject::tr("Expiratory Puff"),
QObject::tr("Intellipap event where you breathe out your mouth."),
QObject::tr("EP"), QObject::tr("events/hr"), DEFAULT, QColor("dark magenta")));
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")));
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."),

1
sleepyhead/common_gui.cpp
View File

@ -73,6 +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_LeakFlag = QColor("#40c0c0"); // Qt::darkBlue;
QColor COLOR_NRI = COLOR_ClearAirway;
QColor COLOR_ExP = Qt::darkCyan;

1
sleepyhead/common_gui.h
View File

@ -28,6 +28,7 @@ extern QColor COLOR_ClearAirway;
extern QColor COLOR_RERA;
extern QColor COLOR_VibratorySnore;
extern QColor COLOR_FlowLimit;
extern QColor COLOR_SensAwake;
extern QColor COLOR_LeakFlag;
extern QColor COLOR_NRI;
extern QColor COLOR_ExP;

9
sleepyhead/daily.cpp
View File

@ -189,6 +189,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
evseg->AddSlice(CPAP_RERA,QColor(0xff,0xff,0x80,0xff),STR_TR_RE);
evseg->AddSlice(CPAP_NRI,QColor(0x00,0x80,0x40,0xff),STR_TR_NR);
evseg->AddSlice(CPAP_FlowLimit,QColor(0x40,0x40,0x40,0xff),STR_TR_FL);
evseg->AddSlice(CPAP_SensAwake,QColor(0x40,0xC0,0x40,0xff),STR_TR_SA);
//evseg->AddSlice(CPAP_UserFlag1,QColor(0x40,0x40,0x40,0xff),tr("UF"));
GAHI->AddLayer(AddCPAP(evseg));
@ -208,6 +209,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
fg->AddLayer((new gFlagsLine(CPAP_LeakFlag, COLOR_LeakFlag, STR_TR_LE,false)));
fg->AddLayer((new gFlagsLine(CPAP_NRI, COLOR_NRI, STR_TR_NRI,false)));
fg->AddLayer((new gFlagsLine(CPAP_FlowLimit, COLOR_FlowLimit, STR_TR_FL)));
fg->AddLayer((new gFlagsLine(CPAP_SensAwake, COLOR_SensAwake, STR_TR_SA)));
fg->AddLayer((new gFlagsLine(CPAP_RERA, COLOR_RERA, STR_TR_RE)));
fg->AddLayer((new gFlagsLine(CPAP_VSnore, COLOR_VibratorySnore, STR_TR_VS)));
fg->AddLayer((new gFlagsLine(CPAP_VSnore2, COLOR_VibratorySnore, STR_TR_VS2)));
@ -268,6 +270,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Apnea, COLOR_Apnea, STR_TR_UA))));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore, COLOR_VibratorySnore, STR_TR_VS)));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_FlowLimit, COLOR_FlowLimit, STR_TR_FL)));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_SensAwake, COLOR_SensAwake, STR_TR_SA)));
FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Obstructive, COLOR_Obstructive, STR_TR_OA))));
FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_ClearAirway, COLOR_ClearAirway, STR_TR_CA))));
if (PROFILE.cpap->userEventFlagging()) {
@ -572,6 +575,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
&& (code!=PRS1_10)
&& (code!=CPAP_ExP)
&& (code!=CPAP_FlowLimit)
&& (code!=CPAP_SensAwake)
&& (code!=CPAP_PressurePulse)
&& (code!=CPAP_VSnore2)
&& (code!=CPAP_VSnore)) continue;
@ -1268,7 +1272,7 @@ void Daily::Load(QDate date)
EventDataType ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway)+cpap->count(CPAP_Apnea));
if (PROFILE.general->calculateRDI()) ahi+=cpap->count(CPAP_RERA);
ahi/=hours;
EventDataType csr,uai,oai,hi,cai,rei,fli,nri,lki,vs,vs2,exp,lk2;
EventDataType csr,uai,oai,hi,cai,rei,fli,sai,nri,lki,vs,vs2,exp,lk2;
if (!isBrick && hours>0) {
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
@ -1299,6 +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_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() },
@ -1327,7 +1332,7 @@ void Daily::Load(QDate date)
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
// Show Event Breakdown pie chart
if ((hours > 0) && PROFILE.appearance->graphSnapshots()) { // AHI Pie Chart
if ((oai+hi+cai+uai+rei+fli)>0) {
if ((oai+hi+cai+uai+rei+fli+sai)>0) {
html+="<tr><td align=center>&nbsp;</td></tr>";
html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));
eventBreakdownPie()->setShowTitle(false);

1
sleepyhead/exportcsv.cpp
View File

@ -175,6 +175,7 @@ void ExportCSV::on_exportButton_clicked()
countlist.append(CPAP_VSnore2);
countlist.append(CPAP_RERA);
countlist.append(CPAP_FlowLimit);
countlist.append(CPAP_SensAwake);
countlist.append(CPAP_NRI);
countlist.append(CPAP_ExP);
countlist.append(CPAP_LeakFlag);

5
sleepyhead/overview.cpp
View File

@ -146,6 +146,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
SES = createGraph(STR_TR_Sessions, STR_TR_Sessions + tr("\n(count)"));
PULSE = createGraph(STR_TR_PulseRate, STR_TR_PulseRate + "\n(" + STR_UNIT_BPM + ")");
SPO2 = createGraph(STR_TR_SpO2, tr("Oxygen Saturation\n(%)"));
SA = createGraph(STR_TR_SensAwake, tr("SensAwake\n(count)"));
WEIGHT = createGraph(STR_TR_Weight, STR_TR_Weight, YT_Weight);
BMI = createGraph(STR_TR_BMI, tr("Body\nMass\nIndex"));
@ -193,6 +194,10 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
fl->addSlice(CPAP_FlowLimit, COLOR_Brown, ST_CPH);
FL->AddLayer(fl);
sa = new SummaryChart(STR_TR_SA, GT_POINTS);
sa->addSlice(CPAP_SensAwake, COLOR_Brown, ST_CNT);
SA->AddLayer(sa);
us = new SummaryChart(STR_UNIT_Hours, GT_SESSIONS);
us->addSlice(NoChannel, COLOR_DarkBlue, ST_HOURS);
us->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS);

7
sleepyhead/overview.h
View File

@ -63,10 +63,11 @@ class Overview : public QWidget
\param QString name The title of the graph
\param QString units The units of measurements to show in the popup */
gGraph *createGraph(QString name, QString units = "", YTickerType yttype = YT_Number);
gGraph *AHI, *AHIHR, *UC, *FL, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2,
gGraph *AHI, *AHIHR, *UC, *FL, *SA, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2,
// gGraph *AHI, *AHIHR, *UC, *FL, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2,
*WEIGHT, *ZOMBIE, *BMI, *TGMV, *TOTLK;
SummaryChart *bc, *uc, *fl, *us, *pr, *lk, *npb, *set, *ses, *rr, *mv, *tv, *ptb, *pulse, *spo2,
SummaryChart *bc, *uc, *fl, *sa, *us, *pr, *lk, *npb, *set, *ses, *rr, *mv, *tv, *ptb, *pulse, *spo2,
// SummaryChart *bc, *uc, *fl, *us, *pr, *lk, *npb, *set, *ses, *rr, *mv, *tv, *ptb, *pulse, *spo2,
*weight, *zombie, *bmi, *ahihr, *tgmv, *totlk;
//! \breif List of SummaryCharts shown on the overview page

1
sleepyhead/reports.cpp
View File

@ -238,6 +238,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
float rei = cpap->count(CPAP_RERA) / cpap->hours();
float vsi = cpap->count(CPAP_VSnore) / cpap->hours();
float fli = cpap->count(CPAP_FlowLimit) / cpap->hours();
// float sai = cpap->count(CPAP_SensAwake) / cpap->hours();
float nri = cpap->count(CPAP_NRI) / cpap->hours();
float lki = cpap->count(CPAP_LeakFlag) / cpap->hours();
float exp = cpap->count(CPAP_ExP) / cpap->hours();

19
sleepyhead/statistics.cpp
View File

@ -201,6 +201,20 @@ EventDataType calcFL(QDate start, QDate end)
return val;
}
EventDataType calcSA(QDate start, QDate end)
{
EventDataType val = (p_profile->calcCount(CPAP_SensAwake, MT_CPAP, start, end));
EventDataType hours = p_profile->calcHours(MT_CPAP, start, end);
if (hours > 0) {
val /= hours;
} else {
val = 0;
}
return val;
}
struct RXChange {
RXChange() { highlight = 0; machine = nullptr; }
@ -210,6 +224,7 @@ struct RXChange {
days = copy.days;
ahi = copy.ahi;
fl = copy.fl;
sa = copy.sa;
mode = copy.mode;
min = copy.min;
max = copy.max;
@ -229,6 +244,7 @@ struct RXChange {
int days;
EventDataType ahi;
EventDataType fl;
EventDataType sa;
CPAPMode mode;
EventDataType min;
EventDataType max;
@ -737,6 +753,7 @@ QString Statistics::GenerateHTML()
rx.days = days;
rx.ahi = calcAHI(first, last);
rx.fl = calcFL(first, last);
rx.sa = calcSA(first, last);
rx.mode = cmode;
rx.min = cmin;
rx.max = cmax;
@ -795,6 +812,7 @@ QString Statistics::GenerateHTML()
rx.days = days;
rx.ahi = calcAHI(first, last);
rx.fl = calcFL(first, last);
rx.sa = calcSA(first, last);
rx.mode = mode;
rx.min = min;
rx.max = max;
@ -1128,6 +1146,7 @@ QString Statistics::GenerateHTML()
.arg(rx.days)
.arg(rx.ahi, 0, 'f', decimals)
.arg(rx.fl, 0, 'f', decimals) // Not the best way to do this.. Todo: Add an extra field for data..
.arg(rx.sa, 0, 'f', decimals) // Not the best way to do this.. Todo: Add an extra field for data..
.arg(rx.machine->GetClass())
.arg(presrel)
.arg(schema::channel[CPAP_Mode].option(int(rx.mode) - 1))