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

Remove erronous CPAP_Pressure channel from PRS1 BIPAP imports

Browse Source
This commit is contained in:
Mark Watkins 2012-01-14 16:22:24 +10:00
parent f771a26868
commit 19ab96d566
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -389,10 +389,17 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
EventDataType max=sess->settings[CPAP_PressureMax].toDouble(); EventDataType max=sess->settings[CPAP_PressureMax].toDouble();
sess->settings[CPAP_EPAP]=min; sess->settings[CPAP_EPAP]=min;
sess->settings[CPAP_IPAP]=max; sess->settings[CPAP_IPAP]=max;
sess->settings[CPAP_PS]=max-min; sess->settings[CPAP_PS]=max-min;
sess->settings.erase(sess->settings.find(CPAP_PressureMin)); sess->settings.erase(sess->settings.find(CPAP_PressureMin));
sess->settings.erase(sess->settings.find(CPAP_PressureMax)); sess->settings.erase(sess->settings.find(CPAP_PressureMax));
sess->m_valuesummary.erase(sess->m_valuesummary.find(CPAP_Pressure));
sess->m_wavg.erase(sess->m_wavg.find(CPAP_Pressure));
sess->m_min.erase(sess->m_min.find(CPAP_Pressure));
sess->m_max.erase(sess->m_max.find(CPAP_Pressure));
sess->m_gain.erase(sess->m_gain.find(CPAP_Pressure));
} else { } else {
@ -457,6 +464,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
min=float(data[0x03])/10.0; min=float(data[0x03])/10.0;
max=float(data[0x04])/10.0; max=float(data[0x04])/10.0;
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..
} }
@ -465,7 +473,8 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
session->settings[CPAP_RampPressure]=(EventDataType)data[offset+0x07]/10.0; session->settings[CPAP_RampPressure]=(EventDataType)data[offset+0x07]/10.0;
if (max>0) { // Ignoring bipap until we see some more data during import if (max>0) { // Ignoring bipap until we see some more data during import
session->settings[CPAP_Mode]=(int)MODE_APAP; session->settings[CPAP_Mode]=(version==5) ? (int)MODE_ASV : (int)MODE_APAP;
session->settings[CPAP_PressureMin]=(EventDataType)min; session->settings[CPAP_PressureMin]=(EventDataType)min;
session->settings[CPAP_PressureMax]=(EventDataType)max; session->settings[CPAP_PressureMax]=(EventDataType)max;
} else { } else {
@ -476,7 +485,13 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
// This is incorrect.. // This is incorrect..
if (data[offset+0x08] & 0x80) { // Flex Setting if (data[offset+0x08] & 0x80) { // Flex Setting
if (data[offset+0x08] & 0x08) { if (data[offset+0x08] & 0x08) {
if (max>0) session->settings[CPAP_PresReliefType]=(int)PR_AFLEX; if (max>0) {
if (version==5) {
session->settings[CPAP_PresReliefType]=(int)PR_BIFLEX;
} else {
session->settings[CPAP_PresReliefType]=(int)PR_AFLEX;
}
}
else session->settings[CPAP_PresReliefType]=(int)PR_CFLEXPLUS; else session->settings[CPAP_PresReliefType]=(int)PR_CFLEXPLUS;
} else session->settings[CPAP_PresReliefType]=(int)PR_CFLEX; } else session->settings[CPAP_PresReliefType]=(int)PR_CFLEX;
} else session->settings[CPAP_PresReliefType]=(int)PR_NONE; } else session->settings[CPAP_PresReliefType]=(int)PR_NONE;
@ -533,6 +548,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
short medp=data[offset+0x19]; short medp=data[offset+0x19];
short p90p=data[offset+0x18]; short p90p=data[offset+0x18];
if (version<5) {
if (minp>0) session->setMin(CPAP_Pressure,EventDataType(minp)*0.10); if (minp>0) session->setMin(CPAP_Pressure,EventDataType(minp)*0.10);
if (maxp>0) session->setMax(CPAP_Pressure,EventDataType(maxp)*0.10); if (maxp>0) session->setMax(CPAP_Pressure,EventDataType(maxp)*0.10);
if (medp>0) session->setWavg(CPAP_Pressure,EventDataType(medp)*0.10); // ?? if (medp>0) session->setWavg(CPAP_Pressure,EventDataType(medp)*0.10); // ??
@ -542,6 +558,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
session->m_valuesummary[CPAP_Pressure][medp]=46; session->m_valuesummary[CPAP_Pressure][medp]=46;
session->m_valuesummary[CPAP_Pressure][p90p]=44; session->m_valuesummary[CPAP_Pressure][p90p]=44;
session->m_valuesummary[CPAP_Pressure][maxp]=5; session->m_valuesummary[CPAP_Pressure][maxp]=5;
}
// if (p90p>0) { // if (p90p>0) {
// session->set90p(CPAP_Pressure,p90p); // session->set90p(CPAP_Pressure,p90p);