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

Remove unused code from PRS1 event parsers.

Browse Source 
Also temporarily disable the time-consuming chunk unit test, since
the current work is on conversion from chunk to sessions.
This commit is contained in:
sawinglogz 2019-05-23 12:17:21 -04:00
parent 795e9414be
commit a5b4851583
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1308,6 +1308,7 @@ bool PRS1Import::ParseF5EventsFV3()
} }
// 900X series
bool PRS1DataChunk::ParseEventsF5V3(void) bool PRS1DataChunk::ParseEventsF5V3(void)
{ {
if (this->family != 5 || this->familyVersion != 3) { if (this->family != 5 || this->familyVersion != 3) {
@ -1682,14 +1683,6 @@ bool PRS1Import::ParseF5Events()
pos += 1; pos += 1;
//tt-=delta; //tt-=delta;
tt -= qint64(data1) * 1000L; tt -= qint64(data1) * 1000L;
if (!PB) {
if (!(PB = session->AddEventList(cpapcode, EVL_Event))) {
qDebug() << "!PB addeventlist exit";
return false;
}
}
PB->AddEvent(tt, data0); PB->AddEvent(tt, data0);
break; break;
@ -1701,14 +1694,6 @@ bool PRS1Import::ParseF5Events()
pos += 2; pos += 2;
data1 = buffer[pos++]; data1 = buffer[pos++];
tt = t - qint64(data1) * 1000L; tt = t - qint64(data1) * 1000L;
if (!PB) {
if (!(PB = session->AddEventList(cpapcode, EVL_Event))) {
qDebug() << "!PB addeventlist exit";
return false;
}
}
PB->AddEvent(tt, data0); PB->AddEvent(tt, data0);
} else { } else {
@ -1758,13 +1743,6 @@ bool PRS1Import::ParseF5Events()
SNORE->AddEvent(t, data2 = buffer[pos++]); // 08=Snore SNORE->AddEvent(t, data2 = buffer[pos++]); // 08=Snore
if (data2 > 0) { if (data2 > 0) {
if (!VS) {
if (!(VS = session->AddEventList(CPAP_VSnore, EVL_Event))) {
qDebug() << "!VS eventlist exit";
return false;
}
}
VS->AddEvent(t, 0); //data2); // VSnore VS->AddEvent(t, 0); //data2); // VSnore
} }
@ -1792,13 +1770,6 @@ bool PRS1Import::ParseF5Events()
SNORE->AddEvent(t, data2 = buffer[pos+8]); //?? SNORE->AddEvent(t, data2 = buffer[pos+8]); //??
if (data2 > 0) { if (data2 > 0) {
if (!VS) {
if (!(VS = session->AddEventList(CPAP_VSnore, EVL_Event))) {
qDebug() << "!VS eventlist exit";
return false;
}
}
VS->AddEvent(t, 0); //data2); // VSnore VS->AddEvent(t, 0); //data2); // VSnore
} }
data2 = data1 - data0; data2 = data1 - data0;
@ -1869,16 +1840,6 @@ bool PRS1Import::ParseF5Events()
session->m_cnt.clear(); session->m_cnt.clear();
session->m_cph.clear(); session->m_cph.clear();
// EventDataType minEpap = session->Min(CPAP_EPAP);
// EventDataType minIpapLo = session->Min(CPAP_IPAPLo);
// EventDataType maxIpapHi = session->Max(CPAP_IPAPHi);
// session->settings[CPAP_IPAPLo] = minIpapLo;
// session->settings[CPAP_IPAPHi] = maxIpapHi;
// session->settings[CPAP_PSMax] = maxIpapHi - minEpap;
// session->settings[CPAP_PSMin] = minIpapLo - minEpap;
session->m_valuesummary[CPAP_Pressure].clear(); session->m_valuesummary[CPAP_Pressure].clear();
session->m_valuesummary.erase(session->m_valuesummary.find(CPAP_Pressure)); session->m_valuesummary.erase(session->m_valuesummary.find(CPAP_Pressure));

2
oscar/tests/prs1tests.cpp
View File

@ -224,7 +224,7 @@ void parseAndEmitChunkYaml(const QString & path)
void PRS1Tests::testChunksToYaml() void PRS1Tests::testChunksToYaml()
{ {
iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitChunkYaml); //iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitChunkYaml);
} }