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

Exclude additional invalid samples in PRS1 oximetry.

Browse Source 
Also clean up some function names and remove unnecessary code.
This commit is contained in:
sawinglogz 2020-04-29 10:40:23 -04:00
parent 5f0960aa4d
commit 01c7f7cdc0
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -29,6 +29,7 @@
<li>[fix] Fix the pressure waveform scale for the BiPAP autoSV Advanced 30 (960T)</li> <li>[fix] Fix the pressure waveform scale for the BiPAP autoSV Advanced 30 (960T)</li>
<li>[fix] Add support for rise time mode on DreamStation BiPAP devices (600X-700X).</li> <li>[fix] Add support for rise time mode on DreamStation BiPAP devices (600X-700X).</li>
<li>[fix] Remove the ramp time and pressure settings when the ramp is disabled on pre-DreamStation devices.</li> <li>[fix] Remove the ramp time and pressure settings when the ramp is disabled on pre-DreamStation devices.</li>
<li>[fix] Improve import of Philips Respironics oximetry data.</li>
<li>[fix] Fix occasional failure to save imported Viatom data.</li> <li>[fix] Fix occasional failure to save imported Viatom data.</li>
</ul> </ul>
<p> <p>

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

@ -8149,7 +8149,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
} }
void PRS1Import::ParseOximetry() void PRS1Import::ImportOximetry()
{ {
int size = oximetry.size(); int size = oximetry.size();
@ -8205,10 +8205,10 @@ void PRS1Import::ImportOximetryChannel(ChannelID channel, QByteArray & data, qui
quint64 start_ti; quint64 start_ti;
int start_i; int start_i;
// Split eventlist on invalid values (255) // Split eventlist on invalid values (254-255)
for (int i=0; i < data.size(); i++) { for (int i=0; i < data.size(); i++) {
unsigned char value = raw[i]; unsigned char value = raw[i];
bool valid = (value != 255); bool valid = (value < 254);
if (valid) { if (valid) {
if (pending_samples == false) { if (pending_samples == false) {
@ -8218,7 +8218,7 @@ void PRS1Import::ImportOximetryChannel(ChannelID channel, QByteArray & data, qui
} }
if (channel == OXI_Pulse) { if (channel == OXI_Pulse) {
if (value > 200) UNEXPECTED_VALUE(value, "<= 200 bpm"); if (value > 240) UNEXPECTED_VALUE(value, "<= 240 bpm");
} else { } else {
if (value > 100) UNEXPECTED_VALUE(value, "<= 100%"); if (value > 100) UNEXPECTED_VALUE(value, "<= 100%");
} }
@ -8242,7 +8242,7 @@ void PRS1Import::ImportOximetryChannel(ChannelID channel, QByteArray & data, qui
} }
void PRS1Import::ParseWaveforms() void PRS1Import::ImportWaveforms()
{ {
int size = waveforms.size(); int size = waveforms.size();
quint64 s1, s2; quint64 s1, s2;
@ -8429,25 +8429,16 @@ bool PRS1Import::ParseSession(void)
// Parse .005 Waveform files // Parse .005 Waveform files
waveforms = ReadWaveformData(m_wavefiles, "Waveform"); waveforms = ReadWaveformData(m_wavefiles, "Waveform");
if (session->eventlist.contains(CPAP_FlowRate)) { // Extract and import raw data into channels.
if (waveforms.size() > 0) { ImportWaveforms();
// Delete anything called "Flow rate" picked up in the events file if high-resolution data is present
// TODO: Is this still used anywhere?
qWarning() << session->session() << "Deleting flow rate events due to flow rate waveform data";
session->destroyEvent(CPAP_FlowRate);
}
}
// Extract raw data into channels.
ParseWaveforms();
} }
if (!m_oxifiles.isEmpty()) { if (!m_oxifiles.isEmpty()) {
// Parse .006 Waveform files // Parse .006 Waveform files
oximetry = ReadWaveformData(m_oxifiles, "Oximetry"); oximetry = ReadWaveformData(m_oxifiles, "Oximetry");
// Extract raw data into channels. // Extract and import raw data into channels.
ParseOximetry(); ImportOximetry();
} }
save = true; save = true;

4
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -313,10 +313,10 @@ public:
QList<PRS1DataChunk *> CoalesceWaveformChunks(QList<PRS1DataChunk *> & allchunks); QList<PRS1DataChunk *> CoalesceWaveformChunks(QList<PRS1DataChunk *> & allchunks);
//! \brief Takes the parsed list of Flow/MaskPressure waveform chunks and adds them to the database //! \brief Takes the parsed list of Flow/MaskPressure waveform chunks and adds them to the database
void ParseWaveforms(); void ImportWaveforms();
//! \brief Takes the parsed list of oximeter waveform chunks and adds them to the database. //! \brief Takes the parsed list of oximeter waveform chunks and adds them to the database.
void ParseOximetry(); void ImportOximetry();
//! \brief Adds a single channel of continuous oximetry data to the database, splitting on any missing samples. //! \brief Adds a single channel of continuous oximetry data to the database, splitting on any missing samples.
void ImportOximetryChannel(ChannelID channel, QByteArray & data, quint64 ti, qint64 dur); void ImportOximetryChannel(ChannelID channel, QByteArray & data, quint64 ti, qint64 dur);