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

Add code to parse family 3 event file header so it chunks properly

Browse Source
This commit is contained in:
Mark Watkins 2016-02-28 11:27:43 +10:00
parent 4dd142ed60
commit 3bc9ce4b07
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -568,7 +568,7 @@ int PRS1Loader::OpenMachine(QString path)
} }
// A bit of protection against future annoyances.. // A bit of protection against future annoyances..
if (((series != 5) && (series != 6) && (series != 0)) || (type >= 10)) { if (((series != 5) && (series != 6) && (series != 0))) { // || (type >= 10)) {
QMessageBox::information(QApplication::activeWindow(), QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Machine Unsupported"), QObject::tr("Machine Unsupported"),
QObject::tr("Sorry, your Philips Respironics CPAP machine (Model %1) is not supported yet.").arg(info.modelnumber) +"\n\n"+ QObject::tr("Sorry, your Philips Respironics CPAP machine (Model %1) is not supported yet.").arg(info.modelnumber) +"\n\n"+
@ -2523,6 +2523,20 @@ QList<PRS1DataChunk *> PRS1Loader::ParseFile(QString path)
int diff = 0; int diff = 0;
//////////////////////////////////////////////////////////
// Family 3 (1060P)
//////////////////////////////////////////////////////////
if ((chunk->family == 3) && (chunk->ext == 2)) {
QByteArray extra = f.read(47);
if (extra.size() != 47) {
delete chunk;
break;
}
headerBA.append(extra);
header = (unsigned char *)headerBA.data();
}
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// Waveform Header // Waveform Header
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
@ -2562,7 +2576,7 @@ QList<PRS1DataChunk *> PRS1Loader::ParseFile(QString path)
chunk->waveformInfo.push_back(PRS1Waveform(interleave, sample_format)); chunk->waveformInfo.push_back(PRS1Waveform(interleave, sample_format));
pos -= 3; pos -= 3;
} else if (chunk->fileVersion == 3) { } else if (chunk->fileVersion == 3) {
quint16 sample_size = header[pos + 2] | header[pos + 3] << 8; // size in bits?? (08 00) //quint16 sample_size = header[pos + 2] | header[pos + 3] << 8; // size in bits?? (08 00)
// Possibly this is size in bits, and sign bit for the other byte? // Possibly this is size in bits, and sign bit for the other byte?
chunk->waveformInfo.push_back(PRS1Waveform(interleave, 0)); chunk->waveformInfo.push_back(PRS1Waveform(interleave, 0));
pos -= 4; pos -= 4;
@ -2626,6 +2640,8 @@ QList<PRS1DataChunk *> PRS1Loader::ParseFile(QString path)
delete chunk; delete chunk;
return CHUNKS; return CHUNKS;
} }
// Read data block // Read data block
chunk->m_data = f.read(blocksize); chunk->m_data = f.read(blocksize);