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

Refactor PRS1Import::ImportSlice out from ImportSummary and ImportCompliance.

Browse Source
This commit is contained in:
sawinglogz 2019-11-07 17:35:09 -05:00
parent ff630b07a6
commit 2a2b36cfc7
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2719,7 +2719,7 @@ void PRS1Import::ImportEvent(qint64 t, PRS1ParsedEvent* e)
{ {
qint64 duration; qint64 duration;
QVector<ChannelID*> channels = PRS1ImportChannelMap[e->m_type]; const QVector<ChannelID*> & channels = PRS1ImportChannelMap[e->m_type];
ChannelID channel = NoChannel, PS, VS2, LEAK; ChannelID channel = NoChannel, PS, VS2, LEAK;
if (channels.count() > 0) { if (channels.count() > 0) {
channel = *channels.at(0); channel = *channels.at(0);
@ -3868,13 +3868,7 @@ bool PRS1Import::ImportCompliance()
for (int i=0; i < compliance->m_parsedData.count(); i++) { for (int i=0; i < compliance->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = compliance->m_parsedData.at(i); PRS1ParsedEvent* e = compliance->m_parsedData.at(i);
if (e->m_type == PRS1ParsedSliceEvent::TYPE) { if (e->m_type == PRS1ParsedSliceEvent::TYPE) {
PRS1ParsedSliceEvent* s = (PRS1ParsedSliceEvent*) e; ImportSlice(start, e);
qint64 tt = start + qint64(s->m_start) * 1000L;
if (!session->m_slices.isEmpty()) {
SessionSlice & prevSlice = session->m_slices.last();
prevSlice.end = tt;
}
session->m_slices.append(SessionSlice(tt, tt, (SliceStatus) s->m_value));
continue; continue;
} else if (e->m_type != PRS1ParsedSettingEvent::TYPE) { } else if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
qWarning() << "Compliance had non-setting event:" << (int) e->m_type; qWarning() << "Compliance had non-setting event:" << (int) e->m_type;
@ -6594,6 +6588,19 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size)
} }
void PRS1Import::ImportSlice(qint64 start, PRS1ParsedEvent* e)
{
// TODO: See other comments re. filtering out empty events or anything other than mask-on/off
PRS1ParsedSliceEvent* s = (PRS1ParsedSliceEvent*) e;
qint64 tt = start + qint64(s->m_start) * 1000L;
if (!session->m_slices.isEmpty()) {
SessionSlice & prevSlice = session->m_slices.last();
prevSlice.end = tt;
}
session->m_slices.append(SessionSlice(tt, tt, (SliceStatus) s->m_value));
}
bool PRS1Import::ImportSummary() bool PRS1Import::ImportSummary()
{ {
if (!summary) { if (!summary) {
@ -6622,13 +6629,7 @@ bool PRS1Import::ImportSummary()
for (int i=0; i < summary->m_parsedData.count(); i++) { for (int i=0; i < summary->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = summary->m_parsedData.at(i); PRS1ParsedEvent* e = summary->m_parsedData.at(i);
if (e->m_type == PRS1ParsedSliceEvent::TYPE) { if (e->m_type == PRS1ParsedSliceEvent::TYPE) {
PRS1ParsedSliceEvent* s = (PRS1ParsedSliceEvent*) e; ImportSlice(start, e);
qint64 tt = start + qint64(s->m_start) * 1000L;
if (!session->m_slices.isEmpty()) {
SessionSlice & prevSlice = session->m_slices.last();
prevSlice.end = tt;
}
session->m_slices.append(SessionSlice(tt, tt, (SliceStatus) s->m_value));
continue; continue;
} else if (e->m_type != PRS1ParsedSettingEvent::TYPE) { } else if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
qWarning() << "Summary had non-setting event:" << (int) e->m_type; qWarning() << "Summary had non-setting event:" << (int) e->m_type;
@ -6758,6 +6759,7 @@ bool PRS1Import::ImportSummary()
summary_duration = summary->duration; summary_duration = summary->duration;
if (summary->duration == 0) { if (summary->duration == 0) {
// TODO: Revisit the below.
// This does occasionally happen and merely indicates a brief session with no useful data. // This does occasionally happen and merely indicates a brief session with no useful data.
//qDebug() << summary->sessionid << "duration == 0"; //qDebug() << summary->sessionid << "duration == 0";
return true; // Don't bail for now, since some summary parsers are still very broken, so we want to proceed to events/waveforms. return true; // Don't bail for now, since some summary parsers are still very broken, so we want to proceed to events/waveforms.

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

@ -327,6 +327,9 @@ protected:
//! \brief Save parsed session data to the database //! \brief Save parsed session data to the database
void SaveSessionToDatabase(void); void SaveSessionToDatabase(void);
//! \brief Import a single slice from a summary or compliance chunk.
void ImportSlice(qint64 chunk_start, PRS1ParsedEvent* e);
//! \brief Import a single event from a data chunk. //! \brief Import a single event from a data chunk.
void ImportEvent(qint64 t, PRS1ParsedEvent* event); void ImportEvent(qint64 t, PRS1ParsedEvent* event);
// State that needs to persist between individual events: // State that needs to persist between individual events: