diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index 29964e7d..0fe56dc2 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -465,6 +465,7 @@ QString STR_TR_EventFlags; QString STR_TR_Inclination; QString STR_TR_Orientation; +QString STR_TR_Motion; // Machine type names. @@ -772,6 +773,7 @@ void initializeStrings() STR_TR_Inclination = QObject::tr("Inclination"); STR_TR_Orientation = QObject::tr("Orientation"); + STR_TR_Motion = QObject::tr("Motion"); STR_TR_Name = QObject::tr("Name"); STR_TR_DOB = QObject::tr("DOB"); // Date of Birth diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index bb111ade..5c61e273 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -249,6 +249,7 @@ extern QString STR_TR_EventFlags; extern QString STR_TR_Inclination; extern QString STR_TR_Orientation; +extern QString STR_TR_Motion; // Machine type names. extern QString STR_TR_CPAP; // Constant Positive Airway Pressure diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp new file mode 100644 index 00000000..45226a66 --- /dev/null +++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp @@ -0,0 +1,159 @@ +/* SleepLib Viatom Loader Implementation + * + * Copyright (c) 2019 The OSCAR Team (written by dave madden ) + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +//******************************************************************************************** +// IMPORTANT!!! +//******************************************************************************************** +// Please INCREMENT the viatom_data_version in viatom_loader.h when making changes to this loader +// that change loader behaviour or modify channels. +//******************************************************************************************** + +#include +#include +#include "viatom_loader.h" +#include "SleepLib/machine.h" + +bool +ViatomLoader::Detect(const QString & path) +{ + // I don't know under what circumstances this is called... + qDebug() << "ViatomLoader::Detect(" << path << ")"; + return true; +} + +int +ViatomLoader::Open( const QString & dirpath ) +{ + // I don't know under what circumstances this is called... + qDebug() << "ViatomLoader::Open(" << dirpath << ")"; + return 0; +} + +int +ViatomLoader::OpenFile( const QString & filename ) +{ + qDebug() << "ViatomLoader::OpenFile(" << filename << ")"; + + QFile file(filename); + + if (!file.open( QFile::ReadOnly )) { + qDebug() << "Couldn't open Viatom data file" << filename; + return 0; + } + + QByteArray data; + qint64 filesize = file.size(); + + data = file.readAll(); + + QDataStream in(data); + in.setByteOrder(QDataStream::LittleEndian); + + quint16 sig; + quint16 Y; + quint8 m,d,H,M,S; + + in >> sig >> Y >> m >> d >> H >> M >> S; + + if (sig != 0x0003 || + (Y < 2015 || Y > 2040) || + (m < 1 || m > 12) || + (d < 1 || d > 31) || + ( H > 23) || + ( M > 60) || + ( S > 61)) { + qDebug( ) << filename << "does not appear to be a Viatom data file"; + return false; + } + + char dchr[32]; + sprintf( dchr, "%02u/%02u/%04u %02u:%02u:%02u", m, d, Y, H, M, S ); + + QDateTime data_timestamp = QDateTime::fromString( QString( dchr ), "MM/dd/yyyy HH:mm:ss" ); + quint64 time_s = data_timestamp.toTime_t( ); + quint64 time_ms = time_s * 1000L; + SessionID sid = time_s; + + qDebug( ) << filename << "looks like a Viatom file, size" << filesize << "bytes signature" << sig + << "start date/time" << data_timestamp << "(" << time_ms << ")"; + + in.skipRawData( 41 ); // total 50 byte header, not sure what the rest is. + + MachineInfo info = newInfo( ); + Machine *mach = p_profile->CreateMachine( info ); + Session *sess = mach->SessionExists( sid ); + + if (!sess) { + qDebug( ) << "Session at" << data_timestamp << "not found...create new session" << sid; + sess = new Session( mach, sid ); + sess->really_set_first( time_ms ); + } else { + qDebug( ) << "Session" << sid << "found...add data to it"; + } + + EventList *ev_hr = sess->AddEventList( OXI_Pulse, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, 2000.0 ); + EventList *ev_o2 = sess->AddEventList( OXI_SPO2, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, 2000.0 ); + EventList *ev_mv = sess->AddEventList( POS_Motion, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, 2000.0 ); + + unsigned char o2, hr, x, motion; + unsigned char o2_ = 99, hr_ = 60, motion_ = 0; + unsigned n_rec = 0; + quint64 step = 2000; // records @ 2000ms (2 sec) + + // Read all Pulse, SPO2 and Motion data + do { + in >> o2 >> hr >> x >> motion >> x; + + if (o2 < 50 || o2 > 100) o2 = o2_; + if (hr < 20 || hr > 200) hr = hr_; + if (motion > 200) motion = motion_; + + sess->set_last( time_ms ); + ev_hr->AddEvent( time_ms, hr ); + ev_o2->AddEvent( time_ms, o2 ); + ev_mv->AddEvent( time_ms, motion ); + + o2_ = o2; + hr_ = hr; + motion_ = motion; + time_ms += step; + n_rec += 1; + } while (!in.atEnd()); + + qDebug( ) << "Read Viatom data from" << data_timestamp << "to" << (QDateTime::fromSecsSinceEpoch( time_ms / 1000L )) + << n_rec << "records" + << ev_mv->Min( ) << "<=Motion<=" << ev_mv->Max( ); + + sess->setMin( OXI_Pulse, ev_hr->Min( ) ); + sess->setMax( OXI_Pulse, ev_hr->Max( ) ); + sess->setMin( OXI_SPO2, ev_o2->Min( ) ); + sess->setMax( OXI_SPO2, ev_o2->Max( ) ); + sess->setMin( POS_Motion, ev_mv->Min( ) ); + sess->setMax( POS_Motion, ev_mv->Max( ) ); + + sess->really_set_last( time_ms ); + sess->SetChanged( true ); + mach->AddSession( sess ); + mach->Save( ); + + return true; +} + +static bool viatom_initialized = false; + +void +ViatomLoader::Register( ) +{ + if (!viatom_initialized) { + qDebug( "Registering ViatomLoader" ); + RegisterLoader( new ViatomLoader( ) ); + //InitModelMap(); + viatom_initialized = true; + } +} + diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.h b/oscar/SleepLib/loader_plugins/viatom_loader.h new file mode 100644 index 00000000..ef2a814a --- /dev/null +++ b/oscar/SleepLib/loader_plugins/viatom_loader.h @@ -0,0 +1,47 @@ +/* SleepLib Viatom Loader Header + * + * Copyright (c) 2019 The OSCAR Team (written by dave madden ) + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +#ifndef VIATOMLOADER_H +#define VIATOMLOADER_H + +#include "SleepLib/machine_loader.h" + +const QString viatom_class_name = "Viatom"; +const int viatom_data_version = 1; + + +/*! \class ViatomLoader + \brief Unfinished stub for loading Viatom Sleep Ring / Wrist Pulse Oximeter data +*/ +class ViatomLoader : public MachineLoader +{ + public: + ViatomLoader() { m_type = MT_MULTI; } + virtual ~ViatomLoader() { } + + virtual bool Detect(const QString & path); + + virtual int Open(const QString & path); + virtual int OpenFile(const QString & filename); + + static void Register(); + + virtual int Version() { return viatom_data_version; } + virtual const QString &loaderName() { return viatom_class_name; } + + virtual MachineInfo newInfo() { + return MachineInfo(MT_POSITION, 0, viatom_class_name, QObject::tr("Viatom"), QString(), QString(), QString(), QObject::tr("Viatom Software"), QDateTime::currentDateTime(), viatom_data_version); + } + + //Machine *CreateMachine(); + + protected: + private: +}; + +#endif // VIATOMLOADER_H diff --git a/oscar/SleepLib/machine_common.cpp b/oscar/SleepLib/machine_common.cpp index b8861b36..67dc46b2 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; +ChannelID POS_Orientation, POS_Inclination, POS_Motion; diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h index 995a76aa..f7dceae8 100644 --- a/oscar/SleepLib/machine_common.h +++ b/oscar/SleepLib/machine_common.h @@ -50,7 +50,7 @@ enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_ \brief Generalized type of a machine. MT_CPAP is any type of xPAP machine, MT_OXIMETER any type of Oximeter \brief MT_SLEEPSTAGE stage of sleep detector (ZEO importer), MT_JOURNAL for optional notes, MT_POSITION for sleep position detector (Somnopose) */ -enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99}; +enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_MULTI, MT_UNCATEGORIZED = 99}; //void InitMapsWithoutAwesomeInitializerLists(); /***** NEVER USED --- 8/2019 @@ -161,7 +161,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; +extern ChannelID POS_Orientation, POS_Inclination, POS_Motion; const QString GRP_CPAP = "CPAP"; const QString GRP_POS = "POS"; diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index dcb0840d..95f7dfa9 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -276,6 +276,9 @@ 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_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/common_gui.h b/oscar/common_gui.h index 21c849eb..69e7c7ac 100644 --- a/oscar/common_gui.h +++ b/oscar/common_gui.h @@ -31,6 +31,7 @@ const QString STR_GRAPH_Te = "Te"; const QString STR_GRAPH_SleepStage = "SleepStage"; const QString STR_GRAPH_Inclination = "Inclination"; const QString STR_GRAPH_Orientation = "Orientation"; +const QString STR_GRAPH_Motion = "Motion"; const QString STR_GRAPH_TestChan1 = "TestChan1"; const QString STR_GRAPH_TestChan2 = "TestChan2"; const QString STR_GRAPH_AHI = "AHI"; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 5bcde5e9..0fb1446b 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -79,7 +79,7 @@ inline QString channelInfo(ChannelID code) { const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_FlowLimitation, STR_GRAPH_Snore, STR_GRAPH_TidalVolume, STR_GRAPH_MaskPressure, STR_GRAPH_RespRate, STR_GRAPH_MinuteVent, STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_Ti, STR_GRAPH_Te, - STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, + STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, STR_GRAPH_AHI, STR_GRAPH_TAP }; @@ -88,7 +88,7 @@ const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR const QList advancedGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_MaskPressure, STR_GRAPH_TidalVolume, STR_GRAPH_MinuteVent, STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_FlowLimitation, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_Snore, STR_GRAPH_RespRate, STR_GRAPH_PTB, STR_GRAPH_RespEvent, - STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, + STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, STR_GRAPH_AHI, STR_GRAPH_TAP }; @@ -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, CPAP_Test1 + /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, POS_Motion, CPAP_Test1 }; // Create graphs from the cpap code list @@ -400,6 +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[CPAP_MinuteVent].code()]->AddLayer(lc=new gLineChart(CPAP_MinuteVent, square)); lc->addPlot(CPAP_TgMV, square); @@ -1281,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 + CPAP_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Motion }; int numchans=sizeof(chans)/sizeof(ChannelID); int ccnt=0; diff --git a/oscar/main.cpp b/oscar/main.cpp index 53ec0756..6418d33a 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -43,6 +43,7 @@ #include "SleepLib/loader_plugins/intellipap_loader.h" #include "SleepLib/loader_plugins/icon_loader.h" #include "SleepLib/loader_plugins/weinmann_loader.h" +#include "SleepLib/loader_plugins/viatom_loader.h" MainWindow *mainwin = nullptr; @@ -583,6 +584,7 @@ int main(int argc, char *argv[]) { CMS50Loader::Register(); CMS50F37Loader::Register(); MD300W1Loader::Register(); + ViatomLoader::Register(); schema::setOrders(); // could be called in init... diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 3d1f9a88..74791082 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -40,6 +40,7 @@ // Custom loaders that don't autoscan.. #include #include +#include #ifdef REMSTAR_M_SUPPORT #include @@ -2396,6 +2397,30 @@ void MainWindow::on_actionImport_Somnopose_Data_triggered() } +void MainWindow::on_actionImport_Viatom_Data_triggered() +{ + QFileDialog w; + w.setFileMode(QFileDialog::ExistingFiles); + w.setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + w.setOption(QFileDialog::ShowDirsOnly, false); + w.setOption(QFileDialog::DontUseNativeDialog, true); + w.setNameFilters(QStringList("Viatom Data File (20[0-5][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9][0-5][0-9])")); + + ViatomLoader viatom; + + if (w.exec() == QFileDialog::Accepted) { + QString filename = w.selectedFiles()[0]; + + if (!viatom.OpenFile(filename)) { + Notify(tr("There was a problem opening Viatom data file: ") + filename); + return; + } + + Notify(tr("Viatom Data Import complete")); + daily->LoadDate(daily->getDate()); + } +} + void MainWindow::GenerateStatistics() { QDate first = p_profile->FirstDay(); diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index df663f6d..730f14f9 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -295,6 +295,8 @@ class MainWindow : public QMainWindow void on_actionImport_Somnopose_Data_triggered(); + void on_actionImport_Viatom_Data_triggered(); + //! \brief Populates the statistics with information. void on_statisticsButton_clicked(); diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index 1027c7dd..b0084312 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -2905,6 +2905,7 @@ p, li { white-space: pre-wrap; } + @@ -3136,6 +3137,11 @@ p, li { white-space: pre-wrap; } Import &Somnopose Data + + + Import &Viatom Data + + Current Days diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 79fa49c2..f5bf1d76 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -292,6 +292,7 @@ SOURCES += \ SleepLib/loader_plugins/prs1_loader.cpp \ SleepLib/loader_plugins/resmed_loader.cpp \ SleepLib/loader_plugins/somnopose_loader.cpp \ + SleepLib/loader_plugins/viatom_loader.cpp \ SleepLib/loader_plugins/zeo_loader.cpp \ zip.cpp \ miniz.c \ @@ -366,6 +367,7 @@ HEADERS += \ SleepLib/loader_plugins/prs1_loader.h \ SleepLib/loader_plugins/resmed_loader.h \ SleepLib/loader_plugins/somnopose_loader.h \ + SleepLib/loader_plugins/viatom_loader.h \ SleepLib/loader_plugins/zeo_loader.h \ zip.h \ miniz.h \ diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index c263eb33..f72ef3e0 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -41,8 +41,9 @@ void Welcome::refreshPage() QList oximachines = p_profile->GetMachines(MT_OXIMETER); QList posmachines = p_profile->GetMachines(MT_POSITION); QList stgmachines = p_profile->GetMachines(MT_SLEEPSTAGE); + QList mltmachines = p_profile->GetMachines(MT_MULTI); - bool noMachines = mlist.isEmpty() && posmachines.isEmpty() && oximachines.isEmpty() && stgmachines.isEmpty(); + bool noMachines = mlist.isEmpty() && posmachines.isEmpty() && oximachines.isEmpty() && stgmachines.isEmpty() && mltmachines.isEmpty(); bool showCardWarning = noMachines;