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

Fix PRS1 typo, resolve use of multiple event lists and refine warning.

Browse Source
This commit is contained in:
sawinglogz 2019-06-05 10:00:11 -04:00
parent 44d134dee5
commit 8fa5df5f89
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4319,7 +4319,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
} }
bool PRS1Import::ParseOximetery() bool PRS1Import::ParseOximetry()
{ {
int size = oximetry.size(); int size = oximetry.size();
@ -4506,7 +4506,7 @@ bool PRS1Import::ParseSession(void)
// Parse .006 Waveform file // Parse .006 Waveform file
oximetry = loader->ParseFile(oxifile); oximetry = loader->ParseFile(oxifile);
oximetry = CoalesceWaveformChunks(oximetry); oximetry = CoalesceWaveformChunks(oximetry);
ParseOximetery(); ParseOximetry();
if (session->first() > 0) { if (session->first() > 0) {
if (session->last() < session->first()) { if (session->last() < session->first()) {

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

@ -249,7 +249,7 @@ public:
bool ParseWaveforms(); bool ParseWaveforms();
//! \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.
bool ParseOximetery(); bool ParseOximetry();
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine //! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine

18
oscar/tests/sessiontests.cpp
View File

@ -230,13 +230,23 @@ void SessionToYaml(QString filepath, Session* session)
// Note that this is a vector of lists // Note that this is a vector of lists
QVector<EventList *> &ev = session->eventlist[*key]; QVector<EventList *> &ev = session->eventlist[*key];
int ev_size = ev.size(); int ev_size = ev.size();
if (ev_size == 0) {
continue;
}
EventList &e = *ev[0];
// TODO: See what this actually signifies. Some waveform data seems to have to multiple event lists, // Multiple eventlists in a channel are used to account for discontiguous data.
// which might reflect blocks within the original files, or something else. // See CoalesceWaveformChunks for the coalescing of multiple contiguous waveform
if (ev_size > 2) qDebug() << session->session() << eventChannel(*key) << "ev_size =" << ev_size; // chunks and ParseWaveforms/ParseOximetry for the creation of eventlists per
// coalesced chunk.
//
// TODO: Is this only for waveform data?
if (ev_size > 1 && e.type() != EVL_Waveform) {
qWarning() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
}
for (int j = 0; j < ev_size; j++) { for (int j = 0; j < ev_size; j++) {
EventList &e = *ev[j]; e = *ev[j];
out << " - count: " << (qint32)e.count() << endl; out << " - count: " << (qint32)e.count() << endl;
if (e.count() == 0) if (e.count() == 0)
continue; continue;