From 4ebc7d3681b20452c8faf0838164b566fcb968db Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 26 Jan 2020 19:50:18 -0500 Subject: [PATCH] Rename POS_Motion channel to POS_Movement to match Viatom report terminology. Also move database updates to Open() rather than at each file imported. --- oscar/SleepLib/loader_plugins/viatom_loader.cpp | 15 +++++++++------ oscar/SleepLib/machine_common.cpp | 2 +- oscar/SleepLib/machine_common.h | 2 +- oscar/SleepLib/schema.cpp | 4 ++-- oscar/daily.cpp | 6 +++--- oscar/tests/sessiontests.cpp | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp index 06d3e78a..7771e65e 100644 --- a/oscar/SleepLib/loader_plugins/viatom_loader.cpp +++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp @@ -62,6 +62,12 @@ ViatomLoader::Open(const QString & dirpath) if (!found) { return -1; } + if (mach) { + qDebug() << "Imported" << imported << "sessions"; + mach->Save(); + mach->SaveSummaryCache(); + p_profile->StoreMachines(); + } if (mach && s_unexpectedMessages.count() > 0 && p_profile->session->warnOnUnexpectedData()) { // Compare this to the list of messages previously seen for this machine // and only alert if there are new ones. @@ -116,7 +122,7 @@ Session* ViatomLoader::ParseFile(const QString & filename) if (mach->SessionExists(v.sessionid())) { // Skip already imported session - qDebug() << filename << "session already exists, skipping" << v.sessionid(); + //qDebug() << filename << "session already exists, skipping" << v.sessionid(); return nullptr; } @@ -135,12 +141,12 @@ Session* ViatomLoader::ParseFile(const QString & filename) AddEvent(OXI_Pulse, time_ms, rec.hr); AddEvent(OXI_SPO2, time_ms, rec.spo2); } - AddEvent(POS_Motion, time_ms, rec.motion); + AddEvent(POS_Movement, time_ms, rec.motion); time_ms += m_step; } EndEventList(OXI_Pulse, time_ms); EndEventList(OXI_SPO2, time_ms); - EndEventList(POS_Motion, time_ms); + EndEventList(POS_Movement, time_ms); m_session->set_last(time_ms); return m_session; @@ -152,9 +158,6 @@ void ViatomLoader::SaveSessionToDatabase(Session* sess) sess->SetChanged(true); mach->AddSession(sess); - mach->Save(); - mach->SaveSummaryCache(); - p_profile->StoreMachines(); } void ViatomLoader::AddEvent(ChannelID channel, qint64 t, EventDataType value) diff --git a/oscar/SleepLib/machine_common.cpp b/oscar/SleepLib/machine_common.cpp index 67dc46b2..b11e6dd5 100644 --- a/oscar/SleepLib/machine_common.cpp +++ b/oscar/SleepLib/machine_common.cpp @@ -48,4 +48,4 @@ ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake, ZEO_T ZEO_FirstAlarmRing, ZEO_LastAlarmRing, ZEO_FirstSnoozeTime, ZEO_LastSnoozeTime, ZEO_SetAlarmTime, ZEO_RiseTime; -ChannelID POS_Orientation, POS_Inclination, POS_Motion; +ChannelID POS_Orientation, POS_Inclination, POS_Movement; diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h index 11189dcb..b532a425 100644 --- a/oscar/SleepLib/machine_common.h +++ b/oscar/SleepLib/machine_common.h @@ -176,7 +176,7 @@ extern ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake ZEO_FirstAlarmRing, ZEO_LastAlarmRing, ZEO_FirstSnoozeTime, ZEO_LastSnoozeTime, ZEO_SetAlarmTime, ZEO_RiseTime; -extern ChannelID POS_Orientation, POS_Inclination, POS_Motion; +extern ChannelID POS_Orientation, POS_Inclination, POS_Movement; const QString GRP_CPAP = "CPAP"; const QString GRP_POS = "POS"; diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index 95f7dfa9..17012815 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -276,8 +276,8 @@ void init() schema::channel.add(GRP_POS, new Channel(POS_Inclination = 0x2991, WAVEFORM, MT_POSITION, SESSION, STR_GRAPH_Inclination, QObject::tr("Inclination"), QObject::tr("Upright angle in degrees"), QObject::tr("Inclination"), STR_UNIT_Degrees, DEFAULT, QColor("dark magenta"))); - schema::channel.add(GRP_POS, new Channel(POS_Motion = 0x2992, WAVEFORM, MT_POSITION, SESSION, STR_GRAPH_Motion, - QObject::tr("Motion"), QObject::tr("Movement detector"), QObject::tr("Movement"), STR_UNIT_Unknown, DEFAULT, QColor("dark green"))); + schema::channel.add(GRP_POS, new Channel(POS_Movement = 0x2992, WAVEFORM, MT_POSITION, SESSION, STR_GRAPH_Motion, + QObject::tr("Movement"), QObject::tr("Movement detector"), QObject::tr("Movement"), STR_UNIT_Unknown, DEFAULT, QColor("dark green"))); schema::channel.add(GRP_CPAP, new Channel(RMS9_MaskOnTime = 0x1025, DATA, MT_CPAP, SESSION, "MaskOnTime", QObject::tr("Mask On Time"), QObject::tr("Time started according to str.edf"), QObject::tr("Mask On Time"), STR_UNIT_Unknown, DEFAULT, Qt::black)); diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 0fb1446b..76724715 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -239,7 +239,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) const ChannelID cpapcodes[] = { CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume, CPAP_MaskPressure, CPAP_RespRate, CPAP_MinuteVent, CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te, - /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, POS_Motion, CPAP_Test1 + /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, POS_Movement, CPAP_Test1 }; // Create graphs from the cpap code list @@ -400,7 +400,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) graphlist[schema::channel[POS_Inclination].code()]->AddLayer(new gLineChart(POS_Inclination)); graphlist[schema::channel[POS_Orientation].code()]->AddLayer(new gLineChart(POS_Orientation)); - graphlist[schema::channel[POS_Motion].code()]->AddLayer(new gLineChart(POS_Motion)); + graphlist[schema::channel[POS_Movement].code()]->AddLayer(new gLineChart(POS_Movement)); graphlist[schema::channel[CPAP_MinuteVent].code()]->AddLayer(lc=new gLineChart(CPAP_MinuteVent, square)); lc->addPlot(CPAP_TgMV, square); @@ -1282,7 +1282,7 @@ QString Daily::getStatisticsInfo(Day * day) CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB, CPAP_MinuteVent, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG, CPAP_Leak, CPAP_LeakTotal, CPAP_Snore, /* CPAP_IE, */ CPAP_Ti,CPAP_Te, CPAP_TgMV, - CPAP_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Motion + CPAP_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Movement }; int numchans=sizeof(chans)/sizeof(ChannelID); int ccnt=0; diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp index a74ef170..05da7d68 100644 --- a/oscar/tests/sessiontests.cpp +++ b/oscar/tests/sessiontests.cpp @@ -136,7 +136,7 @@ static QString eventChannel(ChannelID i) CHANNELNAME(CPAP_PressureSet); CHANNELNAME(CPAP_IPAPSet); CHANNELNAME(CPAP_EPAPSet); - CHANNELNAME(POS_Motion); + CHANNELNAME(POS_Movement); s = hex(i); qDebug() << "event channel" << qPrintable(s); } while(false);