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

More CPAP/VPAP Fixes, (so much for the database being 'ready' :)

Browse Source
This commit is contained in:
Mark Watkins 2011-12-31 21:36:19 +10:00
parent c01ed2c5c0
commit 44d0256bbc
8 changed files with 170 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -252,8 +252,8 @@ int IntellipapLoader::Open(QString & path,Profile *profile)
int rr=m_buffer[pos+0xa]; int rr=m_buffer[pos+0xa];
sess->eventlist[CPAP_RespRate][0]->AddEvent(time,rr); // Respiratory Rate sess->eventlist[CPAP_RespRate][0]->AddEvent(time,rr); // Respiratory Rate
sess->eventlist[CPAP_Te][0]->AddEvent(time,m_buffer[pos+0xf]); // sess->eventlist[INTELLIPAP_Unknown1][0]->AddEvent(time,m_buffer[pos+0xf]); //
sess->eventlist[CPAP_Ti][0]->AddEvent(time,m_buffer[pos+0xc]); sess->eventlist[INTELLIPAP_Unknown1][0]->AddEvent(time,m_buffer[pos+0xc]);
sess->eventlist[CPAP_Snore][0]->AddEvent(time,m_buffer[pos+0x4]); //4/5?? sess->eventlist[CPAP_Snore][0]->AddEvent(time,m_buffer[pos+0x4]); //4/5??
@ -321,7 +321,8 @@ int IntellipapLoader::Open(QString & path,Profile *profile)
quint64 last=qint64(SessionEnd[i])*1000L; quint64 last=qint64(SessionEnd[i])*1000L;
sess->settings[CPAP_PresReliefType]=(PRTypes)PR_SMARTFLEX; sess->settings[CPAP_PresReliefType]=(PRTypes)PR_SMARTFLEX;
sess->settings[CPAP_PresReliefSet]=set1["SmartFlex"].toInt(); int i=set1["SmartFlex"].toInt();
sess->settings[CPAP_PresReliefSet]=i;
int sfm=set1["SmartFlexMode"].toInt(); int sfm=set1["SmartFlexMode"].toInt();
if (sfm==0) { if (sfm==0) {
sess->settings[CPAP_PresReliefMode]=PM_FullTime; sess->settings[CPAP_PresReliefMode]=PM_FullTime;
@ -334,8 +335,7 @@ int IntellipapLoader::Open(QString & path,Profile *profile)
EventDataType pres=sess->Min(CPAP_Pressure); EventDataType pres=sess->Min(CPAP_Pressure);
if (max==min) { if (max==min) {
sess->settings[CPAP_Mode]=(int)MODE_CPAP; sess->settings[CPAP_Mode]=(int)MODE_CPAP;
sess->settings[CPAP_PressureMin]=min; sess->settings[CPAP_Pressure]=min;
sess->settings[CPAP_PressureMax]=min;
} else { } else {
sess->settings[CPAP_Mode]=(int)MODE_APAP; sess->settings[CPAP_Mode]=(int)MODE_APAP;
sess->settings[CPAP_PressureMin]=min; sess->settings[CPAP_PressureMin]=min;

10
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -457,10 +457,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
EventDataType max,min; EventDataType max,min;
min=float(data[0x03])/10.0; min=float(data[0x03])/10.0;
session->settings[CPAP_PressureMin]=(double)min;
//min=session->settings[CPAP_PressureMin].toDouble();
max=float(data[0x04])/10.0; max=float(data[0x04])/10.0;
session->settings[CPAP_PressureMax]=(double)max;
int offset=0; int offset=0;
if (version==5) { //data[0x05]!=0) { // This is a time value for ASV stuff if (version==5) { //data[0x05]!=0) { // This is a time value for ASV stuff
offset=4; // non zero adds 4 extra fields.. offset=4; // non zero adds 4 extra fields..
@ -471,7 +468,12 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
if (max>0) { // Ignoring bipap until I see some more data. if (max>0) { // Ignoring bipap until I see some more data.
session->settings[CPAP_Mode]=(int)MODE_APAP; session->settings[CPAP_Mode]=(int)MODE_APAP;
} else session->settings[CPAP_Mode]=(int)MODE_CPAP; session->settings[CPAP_PressureMin]=(double)min;
session->settings[CPAP_PressureMax]=(double)max;
} else {
session->settings[CPAP_Mode]=(int)MODE_CPAP;
session->settings[CPAP_Pressure]=(double)min;
}
// This is incorrect.. // This is incorrect..
if (data[offset+0x08] & 0x80) { // Flex Setting if (data[offset+0x08] & 0x80) { // Flex Setting

10
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -621,7 +621,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
sig=stredf.lookupSignal(RMS9_SetPressure); // ?? What's meant by Set Pressure? sig=stredf.lookupSignal(RMS9_SetPressure); // ?? What's meant by Set Pressure?
if (sig) { if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain; EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMin]=pressure; sess->settings[CPAP_Pressure]=pressure;
} }
} else { // VPAP or Auto } else { // VPAP or Auto
if (mode>5) { if (mode>5) {
@ -685,13 +685,13 @@ int ResmedLoader::Open(QString & path,Profile *profile)
if (sig) { if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain; EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMin]=pressure; sess->settings[CPAP_PressureMin]=pressure;
sess->setMin(CPAP_Pressure,pressure); //sess->setMin(CPAP_Pressure,pressure);
} }
sig=stredf.lookupSignal(CPAP_PressureMax); sig=stredf.lookupSignal(CPAP_PressureMax);
if (sig) { if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain; EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMax]=pressure; sess->settings[CPAP_PressureMax]=pressure;
sess->setMax(CPAP_Pressure,pressure); //sess->setMax(CPAP_Pressure,pressure);
} }
} }
@ -1058,13 +1058,13 @@ int ResmedLoader::Open(QString & path,Profile *profile)
if (sig) { if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain; EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMin]=pressure; sess->settings[CPAP_PressureMin]=pressure;
sess->setMin(CPAP_Pressure,pressure); //sess->setMin(CPAP_Pressure,pressure);
} }
sig=stredf.lookupSignal(CPAP_PressureMax); sig=stredf.lookupSignal(CPAP_PressureMax);
if (sig) { if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain; EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMax]=pressure; sess->settings[CPAP_PressureMax]=pressure;
sess->setMax(CPAP_Pressure,pressure); //sess->setMax(CPAP_Pressure,pressure);
} }
} }

1
SleepLib/schema.cpp
View File

@ -73,6 +73,7 @@ void init()
CPAP_PSMax=schema::channel["PSMax"].id(); CPAP_PSMax=schema::channel["PSMax"].id();
CPAP_Mode=schema::channel["PAPMode"].id(); CPAP_Mode=schema::channel["PAPMode"].id();
CPAP_BrokenSummary=schema::channel["BrokenSummary"].id(); CPAP_BrokenSummary=schema::channel["BrokenSummary"].id();
CPAP_BrokenWaveform=schema::channel["BrokenWaveform"].id();
CPAP_PressureMin=schema::channel["PressureMin"].id(); CPAP_PressureMin=schema::channel["PressureMin"].id();
CPAP_PressureMax=schema::channel["PressureMax"].id(); CPAP_PressureMax=schema::channel["PressureMax"].id();
CPAP_RampTime=schema::channel["RampTime"].id(); CPAP_RampTime=schema::channel["RampTime"].id();

5
SleepLib/session.cpp
View File

@ -615,7 +615,10 @@ void Session::UpdateSummaries()
EventDataType gain=el->gain(); EventDataType gain=el->gain();
m_gain[id]=gain; m_gain[id]=gain;
} else m_gain[id]=0; } else m_gain[id]=0;
updateCountSummary(id);
if ((id!=CPAP_FlowRate) && (id!=CPAP_MaskPressure))
updateCountSummary(id);
Min(id); Min(id);
Max(id); Max(id);
count(id); count(id);

40
daily.cpp
View File

@ -762,7 +762,7 @@ void Daily::Load(QDate date)
html+="<tr><td colspan=4 align=center>Mode: "; html+="<tr><td colspan=4 align=center>Mode: ";
if (mode==MODE_CPAP) { if (mode==MODE_CPAP) {
EventDataType min=cpap->settings_min(CPAP_PressureMin); EventDataType min=round(cpap->settings_wavg(CPAP_Pressure)*2)/2.0;
html+=tr("CPAP")+" "+QString::number(min)+STR_UNIT_CMH2O; html+=tr("CPAP")+" "+QString::number(min)+STR_UNIT_CMH2O;
} else if (mode==MODE_APAP) { } else if (mode==MODE_APAP) {
EventDataType min=cpap->settings_min(CPAP_PressureMin); EventDataType min=cpap->settings_min(CPAP_PressureMin);
@ -978,31 +978,32 @@ void Daily::Load(QDate date)
// html+="<table cellpadding=0 cellspacing=0 border=0 width=100%>"; // html+="<table cellpadding=0 cellspacing=0 border=0 width=100%>";
html+=QString("<tr><td colspan=5 align=center><b>%1</b></td></tr>").arg(tr("Machine Settings")); html+=QString("<tr><td colspan=5 align=center><b>%1</b></td></tr>").arg(tr("Machine Settings"));
html+="<tr><td colspan=5><hr height=2></td></tr>"; html+="<tr><td colspan=5><hr height=2></td></tr>";
if (cpap->machine->GetClass()==STR_MACH_PRS1) { int i=cpap->settings_max(CPAP_PresReliefType);
int i=cpap->settings_max(PRS1_FlexMode); int j=cpap->settings_max(CPAP_PresReliefSet);
int j=cpap->settings_max(PRS1_FlexSet); QString flexstr=(i>1) ? schema::channel[CPAP_PresReliefType].option(i)+" x"+QString::number(j) : "None";
QString flexstr=(i>1) ? schema::channel[PRS1_FlexMode].option(i)+" "+schema::channel[PRS1_FlexSet].option(j) : "None";
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Flex")) html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Pr. Relief"))
.arg(flexstr); .arg(flexstr);
int humid=round(cpap->settings_wavg(PRS1_HumidSetting)); if (cpap->machine->GetClass()==STR_MACH_PRS1) {
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Humidifier")) int humid=round(cpap->settings_wavg(PRS1_HumidSetting));
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Humidifier"))
.arg(humid==0 ? STR_GEN_Off : "x"+QString::number(humid)); .arg(humid==0 ? STR_GEN_Off : "x"+QString::number(humid));
} else if (cpap->machine->GetClass()==STR_MACH_ResMed) { }
/*} else if (cpap->machine->GetClass()==STR_MACH_ResMed) {
int epr=cpap->settings_max(RMS9_EPR); int epr=cpap->settings_max(RMS9_EPR);
int epr2=cpap->settings_max(RMS9_EPRSet); int epr2=cpap->settings_max(RMS9_EPRSet);
html+=QString("<tr><td>%1</td><td colspan=4>%2 / %3</td></tr>") html+=QString("<tr><td>%1</td><td colspan=4>%2 / %3</td></tr>")
.arg(tr("EPR")).arg(epr).arg(epr2); .arg(tr("EPR")).arg(epr).arg(epr2);
} }*/
} }
html+="</table>"; html+="</table>";
if (cpap || oxi) { if (cpap || oxi) {
html+="<table cellpadding=0 cellspacing=0 border=0 width=100%>"; html+="<table cellpadding=0 cellspacing=0 border=0 width=100%>";
html+="<tr><td colspan=4 align=center>&nbsp;</td></tr>"; html+="<tr><td colspan=5 align=center>&nbsp;</td></tr>";
html+=QString("<tr><td colspan=4 align=center><b>%1</b></td></tr>").arg(tr("Session Information")); html+=QString("<tr><td colspan=4 align=center><b>%1</b></td></tr>").arg(tr("Session Information"));
html+="<tr><td colspan=4 align=center><hr height=2/></td></tr>"; html+="<tr><td colspan=5><hr/></td></tr>";
QDateTime fd,ld; QDateTime fd,ld;
bool corrupted_waveform=false; bool corrupted_waveform=false;
QString tooltip; QString tooltip;
@ -1013,7 +1014,7 @@ void Daily::Load(QDate date)
.arg(tr("Start")) .arg(tr("Start"))
.arg(tr("End")); .arg(tr("End"));
if (cpap) { if (cpap) {
html+=QString("<tr><td align=left colspan=4><i>%1</i></td></tr>").arg(tr("CPAP Sessions")); html+=QString("<tr><td align=left colspan=5><i>%1</i></td></tr>").arg(tr("CPAP Sessions"));
for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) { for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) {
fd=QDateTime::fromTime_t((*s)->first()/1000L); fd=QDateTime::fromTime_t((*s)->first()/1000L);
ld=QDateTime::fromTime_t((*s)->last()/1000L); ld=QDateTime::fromTime_t((*s)->last()/1000L);
@ -1021,11 +1022,11 @@ void Daily::Load(QDate date)
int h=len/3600; int h=len/3600;
int m=(len/60) % 60; int m=(len/60) % 60;
int s1=len % 60; int s1=len % 60;
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
tooltip=cpap->machine->GetClass()+"&nbsp;"+tr("CPAP")+"&nbsp;"+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1); tooltip=cpap->machine->GetClass()+"&nbsp;"+tr("CPAP")+"&nbsp;"+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1);
// tooltip needs to lookup language.. :-/ // tooltip needs to lookup language.. :-/
if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true; QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
corrupted_waveform=(i!=(*s)->settings.end()) && i.value().toBool();
Session *sess=*s; Session *sess=*s;
if (!sess->settings.contains(SESSION_ENABLED)) { if (!sess->settings.contains(SESSION_ENABLED)) {
sess->settings[SESSION_ENABLED]=true; sess->settings[SESSION_ENABLED]=true;
@ -1041,8 +1042,9 @@ void Daily::Load(QDate date)
.arg(ld.toString("HH:mm")); .arg(ld.toString("HH:mm"));
} }
} }
if (oxi) { if (oxi) {
html+=QString("<tr><td align=left colspan=4><i>%1</i></td></tr>").arg(tr("Oximetry Sessions")); html+=QString("<tr><td align=left colspan=5><i>%1</i></td></tr>").arg(tr("Oximetry Sessions"));
for (QVector<Session *>::iterator s=oxi->begin();s!=oxi->end();s++) { for (QVector<Session *>::iterator s=oxi->begin();s!=oxi->end();s++) {
fd=QDateTime::fromTime_t((*s)->first()/1000L); fd=QDateTime::fromTime_t((*s)->first()/1000L);
ld=QDateTime::fromTime_t((*s)->last()/1000L); ld=QDateTime::fromTime_t((*s)->last()/1000L);
@ -1050,7 +1052,6 @@ void Daily::Load(QDate date)
int h=len/3600; int h=len/3600;
int m=(len/60) % 60; int m=(len/60) % 60;
int s1=len % 60; int s1=len % 60;
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
tooltip=oxi->machine->GetClass()+" "+tr("Oximeter")+" "+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1); tooltip=oxi->machine->GetClass()+" "+tr("Oximeter")+" "+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1);
Session *sess=*s; Session *sess=*s;
@ -1059,7 +1060,8 @@ void Daily::Load(QDate date)
} }
bool b=sess->settings[SESSION_ENABLED].toBool(); bool b=sess->settings[SESSION_ENABLED].toBool();
if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true; QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
corrupted_waveform=(i!=(*s)->settings.end()) && i.value().toBool();
html+=QString("<tr><td align=left><a class=info href='oxi=%1'>%3<span>%2</span></a></td><td width=26><a href='toggleoxisession=%1'><img src='qrc:/icons/session-%4.png' width=24px></a></td><td align=center>%5</td><td align=center>%6</td><td align=center>%7</td></tr>") html+=QString("<tr><td align=left><a class=info href='oxi=%1'>%3<span>%2</span></a></td><td width=26><a href='toggleoxisession=%1'><img src='qrc:/icons/session-%4.png' width=24px></a></td><td align=center>%5</td><td align=center>%6</td><td align=center>%7</td></tr>")
.arg((*s)->session()) .arg((*s)->session())
.arg(tooltip) .arg(tooltip)
@ -1073,7 +1075,7 @@ void Daily::Load(QDate date)
} }
} }
if (corrupted_waveform) { if (corrupted_waveform) {
html+=QString("<tr><td colspan=4 align=center><i>%1</i></td></tr>").arg(tr("One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.")); html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg(tr("One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly."));
} }
html+="</table><br/>"; html+="</table><br/>";
} }

185
mainwindow.cpp
View File

@ -419,6 +419,8 @@ struct RXChange
mode=copy.mode; mode=copy.mode;
min=copy.min; min=copy.min;
max=copy.max; max=copy.max;
maxhi=copy.maxhi;
machine=copy.machine;
per1=copy.per1; per1=copy.per1;
per2=copy.per2; per2=copy.per2;
highlight=copy.highlight; highlight=copy.highlight;
@ -433,48 +435,52 @@ struct RXChange
CPAPMode mode; CPAPMode mode;
EventDataType min; EventDataType min;
EventDataType max; EventDataType max;
EventDataType maxhi;
EventDataType per1; EventDataType per1;
EventDataType per2; EventDataType per2;
EventDataType weighted; EventDataType weighted;
PRTypes prelief; PRTypes prelief;
Machine * machine;
short prelset; short prelset;
short highlight; short highlight;
}; };
enum RXSortMode { RX_first, RX_last, RX_days, RX_ahi, RX_mode, RX_min, RX_max, RX_per1, RX_per2, RX_weighted }; enum RXSortMode { RX_first, RX_last, RX_days, RX_ahi, RX_mode, RX_min, RX_max, RX_maxhi, RX_per1, RX_per2, RX_weighted };
RXSortMode RXsort=RX_first; RXSortMode RXsort=RX_first;
bool RXorder=false; bool RXorder=false;
bool operator<(const RXChange & comp1, const RXChange & comp2) { //bool operator<(const RXChange & comp1, const RXChange & comp2) {
if (RXorder) { // if (RXorder) {
switch (RXsort) { // switch (RXsort) {
case RX_ahi: return comp1.ahi < comp2.ahi; // case RX_ahi: return comp1.ahi < comp2.ahi;
case RX_days: return comp1.days < comp2.days; // case RX_days: return comp1.days < comp2.days;
case RX_first: return comp1.first < comp2.first; // case RX_first: return comp1.first < comp2.first;
case RX_last: return comp1.last < comp2.last; // case RX_last: return comp1.last < comp2.last;
case RX_mode: return comp1.mode < comp2.mode; // case RX_mode: return comp1.mode < comp2.mode;
case RX_min: return comp1.min < comp2.min; // case RX_min: return comp1.min < comp2.min;
case RX_max: return comp1.max < comp2.max; // case RX_max: return comp1.max < comp2.max;
case RX_per1: return comp1.per1 < comp2.per1; // case RX_maxhi: return comp1.maxhi < comp2.maxhi;
case RX_per2: return comp1.per2 < comp2.per2; // case RX_per1: return comp1.per1 < comp2.per1;
case RX_weighted: return comp1.weighted < comp2.weighted; // case RX_per2: return comp1.per2 < comp2.per2;
}; // case RX_weighted: return comp1.weighted < comp2.weighted;
} else { // };
switch (RXsort) { // } else {
case RX_ahi: return comp1.ahi > comp2.ahi; // switch (RXsort) {
case RX_days: return comp1.days > comp2.days; // case RX_ahi: return comp1.ahi > comp2.ahi;
case RX_first: return comp1.first > comp2.first; // case RX_days: return comp1.days > comp2.days;
case RX_last: return comp1.last > comp2.last; // case RX_first: return comp1.first > comp2.first;
case RX_mode: return comp1.mode > comp2.mode; // case RX_last: return comp1.last > comp2.last;
case RX_min: return comp1.min > comp2.min; // case RX_mode: return comp1.mode > comp2.mode;
case RX_max: return comp1.max > comp2.max; // case RX_min: return comp1.min > comp2.min;
case RX_per1: return comp1.per1 > comp2.per1; // case RX_max: return comp1.max > comp2.max;
case RX_per2: return comp1.per2 > comp2.per2; // case RX_maxhi: return comp1.maxhi > comp2.maxhi;
case RX_weighted: return comp1.weighted > comp2.weighted; // case RX_per1: return comp1.per1 > comp2.per1;
}; // case RX_per2: return comp1.per2 > comp2.per2;
} // case RX_weighted: return comp1.weighted > comp2.weighted;
return true; // };
} // }
// return true;
//}
bool RXSort(const RXChange * comp1, const RXChange * comp2) { bool RXSort(const RXChange * comp1, const RXChange * comp2) {
if (RXorder) { if (RXorder) {
switch (RXsort) { switch (RXsort) {
@ -485,6 +491,7 @@ bool RXSort(const RXChange * comp1, const RXChange * comp2) {
case RX_mode: return comp1->mode < comp2->mode; case RX_mode: return comp1->mode < comp2->mode;
case RX_min: return comp1->min < comp2->min; case RX_min: return comp1->min < comp2->min;
case RX_max: return comp1->max < comp2->max; case RX_max: return comp1->max < comp2->max;
case RX_maxhi: return comp1->maxhi < comp2->maxhi;
case RX_per1: return comp1->per1 < comp2->per1; case RX_per1: return comp1->per1 < comp2->per1;
case RX_per2: return comp1->per2 < comp2->per2; case RX_per2: return comp1->per2 < comp2->per2;
case RX_weighted: return comp1->weighted < comp2->weighted; case RX_weighted: return comp1->weighted < comp2->weighted;
@ -498,6 +505,7 @@ bool RXSort(const RXChange * comp1, const RXChange * comp2) {
case RX_mode: return comp1->mode > comp2->mode; case RX_mode: return comp1->mode > comp2->mode;
case RX_min: return comp1->min > comp2->min; case RX_min: return comp1->min > comp2->min;
case RX_max: return comp1->max > comp2->max; case RX_max: return comp1->max > comp2->max;
case RX_maxhi: return comp1->maxhi > comp2->maxhi;
case RX_per1: return comp1->per1 > comp2->per1; case RX_per1: return comp1->per1 > comp2->per1;
case RX_per2: return comp1->per2 > comp2->per2; case RX_per2: return comp1->per2 > comp2->per2;
case RX_weighted: return comp1->weighted > comp2->weighted; case RX_weighted: return comp1->weighted > comp2->weighted;
@ -674,11 +682,11 @@ void MainWindow::on_summaryButton_clicked()
} else { } else {
html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>") html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
.arg(tr("Pressure")) .arg(tr("Pressure"))
.arg(p_profile->calcSettingsMin(CPAP_PressureMin,MT_CPAP),0,'f',3) .arg(p_profile->calcSettingsMin(CPAP_Pressure,MT_CPAP),0,'f',3)
.arg(p_profile->calcSettingsMin(CPAP_PressureMin,MT_CPAP,cpapweek,lastcpap),0,'f',3) .arg(p_profile->calcSettingsMin(CPAP_Pressure,MT_CPAP,cpapweek,lastcpap),0,'f',3)
.arg(p_profile->calcSettingsMin(CPAP_PressureMin,MT_CPAP,cpapmonth,lastcpap),0,'f',3) .arg(p_profile->calcSettingsMin(CPAP_Pressure,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
.arg(p_profile->calcSettingsMin(CPAP_PressureMin,MT_CPAP,cpap6month,lastcpap),0,'f',3) .arg(p_profile->calcSettingsMin(CPAP_Pressure,MT_CPAP,cpap6month,lastcpap),0,'f',3)
.arg(p_profile->calcSettingsMin(CPAP_PressureMin,MT_CPAP,cpapyear,lastcpap),0,'f',3); .arg(p_profile->calcSettingsMin(CPAP_Pressure,MT_CPAP,cpapyear,lastcpap),0,'f',3);
} }
//html+="<tr><td colspan=6>TODO: 90% pressure.. Any point showing if this is all CPAP?</td></tr>"; //html+="<tr><td colspan=6>TODO: 90% pressure.. Any point showing if this is all CPAP?</td></tr>";
@ -795,7 +803,8 @@ void MainWindow::on_summaryButton_clicked()
if (cpapdays>0) { if (cpapdays>0) {
QDate first,last=lastcpap; QDate first,last=lastcpap;
CPAPMode mode,cmode=MODE_UNKNOWN; CPAPMode mode,cmode=MODE_UNKNOWN;
EventDataType cmin=0,cmax=0,min,max; EventDataType cmin=0,cmax=0,cmaxhi=0, min,max,maxhi;
Machine *mach,*lastmach=NULL;
PRTypes prelief=PR_UNKNOWN; PRTypes prelief=PR_UNKNOWN;
short prelset=0; short prelset=0;
QDate date=lastcpap; QDate date=lastcpap;
@ -826,12 +835,20 @@ void MainWindow::on_summaryButton_clicked()
} }
mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode)); mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode));
min=day->settings_min(CPAP_PressureMin); if (mode>=MODE_ASV) {
if (mode==MODE_CPAP) { min=day->settings_min(CPAP_EPAP);
max=day->settings_max(CPAP_PressureMin); max=day->settings_max(CPAP_IPAPLo);
} else max=day->settings_max(CPAP_PressureMax); maxhi=day->settings_max(CPAP_IPAPHi);
} else if (mode>=MODE_BIPAP) {
if ((mode!=cmode) || (min!=cmin) || (max!=cmax)) { min=day->settings_min(CPAP_EPAP);
max=day->settings_max(CPAP_IPAP);
} else if (mode>=MODE_APAP) {
min=day->settings_min(CPAP_PressureMin);
max=day->settings_max(CPAP_PressureMax);
} else {
min=day->settings_min(CPAP_Pressure);
}
if ((mode!=cmode) || (min!=cmin) || (max!=cmax) || (maxhi!=cmaxhi) || (day->machine!=lastmach)) {
if (cmode!=MODE_UNKNOWN) { if (cmode!=MODE_UNKNOWN) {
first=date.addDays(1); first=date.addDays(1);
int days=PROFILE.countDays(MT_CPAP,first,last); int days=PROFILE.countDays(MT_CPAP,first,last);
@ -843,14 +860,19 @@ void MainWindow::on_summaryButton_clicked()
rx.mode=cmode; rx.mode=cmode;
rx.min=cmin; rx.min=cmin;
rx.max=cmax; rx.max=cmax;
rx.maxhi=cmaxhi;
rx.prelief=prelief; rx.prelief=prelief;
rx.prelset=prelset; rx.prelset=prelset;
if (mode<MODE_BIPAP) { if (mode<MODE_BIPAP) {
rx.per1=p_profile->calcPercentile(CPAP_Pressure,percentile,MT_CPAP,first,last); rx.per1=p_profile->calcPercentile(CPAP_Pressure,percentile,MT_CPAP,first,last);
rx.per2=0; rx.per2=0;
} else { } else if (mode<MODE_ASV) {
rx.per1=p_profile->calcPercentile(CPAP_EPAP,percentile,MT_CPAP,first,last); rx.per1=p_profile->calcPercentile(CPAP_EPAP,percentile,MT_CPAP,first,last);
rx.per2=p_profile->calcPercentile(CPAP_IPAP,percentile,MT_CPAP,first,last); rx.per2=p_profile->calcPercentile(CPAP_IPAP,percentile,MT_CPAP,first,last);
} else {
rx.per1=p_profile->calcPercentile(CPAP_EPAP,percentile,MT_CPAP,first,last);
rx.per2=p_profile->calcPercentile(CPAP_IPAPHi,percentile,MT_CPAP,first,last);
} }
rx.weighted=float(rx.days)/float(cpapdays)*rx.ahi; rx.weighted=float(rx.days)/float(cpapdays)*rx.ahi;
rxchange.push_back(rx); rxchange.push_back(rx);
@ -858,7 +880,9 @@ void MainWindow::on_summaryButton_clicked()
cmode=mode; cmode=mode;
cmin=min; cmin=min;
cmax=max; cmax=max;
cmaxhi=maxhi;
last=date; last=date;
lastmach=day->machine;
lastchanged=true; lastchanged=true;
} }
@ -878,12 +902,16 @@ void MainWindow::on_summaryButton_clicked()
rx.mode=mode; rx.mode=mode;
rx.min=min; rx.min=min;
rx.max=max; rx.max=max;
rx.maxhi=maxhi;
if (mode<MODE_BIPAP) { if (mode<MODE_BIPAP) {
rx.per1=p_profile->calcPercentile(CPAP_Pressure,0.9,MT_CPAP,first,last); rx.per1=p_profile->calcPercentile(CPAP_Pressure,0.9,MT_CPAP,first,last);
rx.per2=0; rx.per2=0;
} else { } else if (mode<MODE_ASV) {
rx.per1=p_profile->calcPercentile(CPAP_EPAP,0.9,MT_CPAP,first,last); rx.per1=p_profile->calcPercentile(CPAP_EPAP,0.9,MT_CPAP,first,last);
rx.per2=p_profile->calcPercentile(CPAP_IPAP,0.9,MT_CPAP,first,last); rx.per2=p_profile->calcPercentile(CPAP_IPAP,0.9,MT_CPAP,first,last);
} else {
rx.per1=p_profile->calcPercentile(CPAP_EPAP,percentile,MT_CPAP,first,last);
rx.per2=p_profile->calcPercentile(CPAP_IPAPHi,percentile,MT_CPAP,first,last);
} }
rx.weighted=float(rx.days)/float(cpapdays); rx.weighted=float(rx.days)/float(cpapdays);
//rx.weighted=float(days)*rx.ahi; //rx.weighted=float(days)*rx.ahi;
@ -915,7 +943,7 @@ void MainWindow::on_summaryButton_clicked()
if (tmpRX.size()>0) { if (tmpRX.size()>0) {
RXsort=RX_ahi; RXsort=RX_ahi;
QString minstr,maxstr,modestr; QString minstr,maxstr,modestr,maxhistr;
qSort(tmpRX.begin(),tmpRX.end(),RXSort); qSort(tmpRX.begin(),tmpRX.end(),RXSort);
tmpRX[0]->highlight=4; // worst tmpRX[0]->highlight=4; // worst
int ls=tmpRX.size()-1; int ls=tmpRX.size()-1;
@ -930,10 +958,16 @@ void MainWindow::on_summaryButton_clicked()
minstr="Min"; minstr="Min";
maxstr="Max"; maxstr="Max";
modestr=tr("APAP"); modestr=tr("APAP");
} else { // BIPAP or greater } else if (mode<MODE_ASV) { // BIPAP
minstr="EPAP"; minstr="EPAP";
maxstr="IPAP"; maxstr="IPAP";
modestr=tr("Bi-Level/ASV"); modestr=tr("Bi-Level");
} else {
minstr="EPAP";
maxstr="IPAPLo";
maxhistr="IPAPHi";
modestr=tr("ST/ASV");
} }
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>") recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
@ -944,6 +978,7 @@ void MainWindow::on_summaryButton_clicked()
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr); recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[ls]->min,0,'f',1); recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[ls]->min,0,'f',1);
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[ls]->max,0,'f',1); if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[ls]->max,0,'f',1);
if (!maxhistr.isEmpty()) recbox+=QString(" %1: %2").arg(maxhistr).arg(tmpRX[0]->maxhi,0,'f',1);
recbox+="</td></tr>"; recbox+="</td></tr>";
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate)); recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate));
@ -959,10 +994,15 @@ void MainWindow::on_summaryButton_clicked()
minstr="Min"; minstr="Min";
maxstr="Max"; maxstr="Max";
modestr=tr("APAP"); modestr=tr("APAP");
} else { // BIPAP or greater } else if (mode<MODE_ASV) { // BIPAP or greater
minstr="EPAP"; minstr="EPAP";
maxstr="IPAP"; maxstr="IPAP";
modestr=tr("Bi-Level/ASV"); modestr=tr("Bi-Level/ASV");
} else {
minstr="EPAP";
maxstr="IPAPLo";
maxhistr="IPAPHi";
modestr=tr("ST/ASV");
} }
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>") recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
@ -973,6 +1013,7 @@ void MainWindow::on_summaryButton_clicked()
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr); recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[0]->min,0,'f',1); recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[0]->min,0,'f',1);
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[0]->max,0,'f',1); if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[0]->max,0,'f',1);
if (!maxhistr.isEmpty()) recbox+=QString(" %1: %2").arg(maxhistr).arg(tmpRX[0]->maxhi,0,'f',1);
recbox+="</td></tr>"; recbox+="</td></tr>";
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate)); recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate));
@ -986,7 +1027,10 @@ void MainWindow::on_summaryButton_clicked()
html+=QString("<br/><b>Changes to Prescription Settings</b>"); html+=QString("<br/><b>Changes to Prescription Settings</b>");
html+=QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>"); html+=QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>");
QString extratxt; QString extratxt;
if (cpapmode>=MODE_BIPAP) { if (cpapmode>=MODE_ASV) {
extratxt=QString("<td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td>")
.arg(tr("EPAP")).arg(tr("IPAPLo")).arg(tr("IPAPHi")).arg(tr("%1% EPAP").arg(percentile*100.0)).arg(tr("%1% IPAP").arg(percentile*100.0));
} else if (cpapmode>=MODE_BIPAP) {
extratxt=QString("<td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td>") extratxt=QString("<td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td>")
.arg(tr("EPAP")).arg(tr("IPAP")).arg(tr("%1% EPAP").arg(percentile*100.0)).arg(tr("%1% IPAP").arg(percentile*100.0)); .arg(tr("EPAP")).arg(tr("IPAP")).arg(tr("%1% EPAP").arg(percentile*100.0)).arg(tr("%1% IPAP").arg(percentile*100.0));
} else if (cpapmode>MODE_CPAP) { } else if (cpapmode>MODE_CPAP) {
@ -1016,7 +1060,10 @@ void MainWindow::on_summaryButton_clicked()
} else if (rx.highlight==4) { } else if (rx.highlight==4) {
color="#ffc0c0"; color="#ffc0c0";
} else color=""; } else color="";
if (cpapmode>=MODE_BIPAP) { if(cpapmode>=MODE_ASV) {
extratxt=QString("<td>%1</td><td>%2</td><td>%3</td><td>%4</td>")
.arg(rx.max,0,'f',2).arg(rx.maxhi,0,'f',2).arg(rx.per1,0,'f',2).arg(rx.per2,0,'f',2);
} else if (cpapmode>=MODE_BIPAP) {
extratxt=QString("<td>%1</td><td>%2</td><td>%3</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2).arg(rx.per2,0,'f',2); extratxt=QString("<td>%1</td><td>%2</td><td>%3</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2).arg(rx.per2,0,'f',2);
} else if (cpapmode>MODE_CPAP) { } else if (cpapmode>MODE_CPAP) {
extratxt=QString("<td>%1</td><td>%2</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2); extratxt=QString("<td>%1</td><td>%2</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2);
@ -1548,13 +1595,35 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode);
cpapinfo+=tr("\nMode: "); cpapinfo+=tr("\nMode: ");
EventDataType min=cpap->settings_min(CPAP_PressureMin); if (mode==MODE_CPAP) {
EventDataType max=cpap->settings_max(CPAP_PressureMax); EventDataType min=round(cpap->settings_wavg(CPAP_Pressure)*2)/2.0;
cpapinfo+=tr("CPAP")+" "+QString::number(min)+STR_UNIT_CMH2O;
if (mode==MODE_CPAP) cpapinfo+=tr("CPAP %1cmH2O").arg(min); } else if (mode==MODE_APAP) {
else if (mode==MODE_APAP) cpapinfo+=tr("APAP %1-%2cmH2O").arg(min).arg(max); EventDataType min=cpap->settings_min(CPAP_PressureMin);
else if (mode==MODE_BIPAP) cpapinfo+=tr("Bi-Level %1-%2cmH2O").arg(min).arg(max); EventDataType max=cpap->settings_max(CPAP_PressureMax);
else if (mode==MODE_ASV) cpapinfo+=tr("ASV"); cpapinfo+=tr("APAP")+" "+QString::number(min)+"-"+QString::number(max)+STR_UNIT_CMH2O;
} else if (mode==MODE_BIPAP) {
EventDataType epap=cpap->settings_min(CPAP_EPAP);
EventDataType ipap=cpap->settings_max(CPAP_IPAP);
EventDataType ps=cpap->settings_max(CPAP_PS);
cpapinfo+=tr("Bi-Level")+QString("\nEPAP: %1 IPAP: %2 %3\nPS: %4")
.arg(epap,0,'f',1).arg(ipap,0,'f',1).arg(STR_UNIT_CMH2O).arg(ps,0,'f',1);
}
else if (mode==MODE_ASV) {
EventDataType epap=cpap->settings_min(CPAP_EPAP);
EventDataType low=cpap->settings_min(CPAP_IPAPLo);
EventDataType high=cpap->settings_max(CPAP_IPAPHi);
EventDataType psl=cpap->settings_min(CPAP_PSMin);
EventDataType psh=cpap->settings_max(CPAP_PSMax);
cpapinfo+=tr("ASV")+QString("\nEPAP: %1 IPAP: %2 - %3 %4\nPS: %5 / %6")
.arg(epap,0,'f',1)
.arg(low,0,'f',1)
.arg(high,0,'f',1)
.arg(STR_UNIT_CMH2O)
.arg(psl,0,'f',1)
.arg(psh,0,'f',1);
}
else cpapinfo+=tr("Unknown");
float ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway)+cpap->count(CPAP_Apnea)); float 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); if (PROFILE.general->calculateRDI()) ahi+=cpap->count(CPAP_RERA);

2
overview.cpp
View File

@ -231,7 +231,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
pr->addSlice(CPAP_Pressure,QColor("grey"),ST_PERC,true,0.95); pr->addSlice(CPAP_Pressure,QColor("grey"),ST_PERC,true,0.95);
} else { } else {
pr->addSlice(CPAP_PressureMin,QColor("grey"),ST_SETWAVG,true); pr->addSlice(CPAP_Pressure,QColor("grey"),ST_SETWAVG,true);
} }
PR->AddLayer(pr); PR->AddLayer(pr);