More oximetry work, plus added MD300W1 oximeter importer

sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp

@@ -48,6 +48,8 @@ CMS50Loader::CMS50Loader()
     m_vendorID = 0x10c4;
     m_productID = 0xea60;
 
+    oxirec = nullptr;
+
     startTimer.setParent(this);
     resetTimer.setParent(this);
 
@@ -84,6 +86,10 @@ int CMS50Loader::Open(QString path, Profile *profile)
 
     m_time.start();
 
+    if (oxirec) {
+        trashRecords();
+    }
+
     // Cheating using path for two serial oximetry modes
 
     if (path.compare("import") == 0) {
@@ -93,7 +99,12 @@ int CMS50Loader::Open(QString path, Profile *profile)
         startImportTimeout();
         return 1;
     } else if (path.compare("live") == 0) {
-        m_startTime = oxitime = QDateTime::currentDateTime();
+
+        m_startTime = QDateTime::currentDateTime();
+
+        oxirec = new QVector<OxiRecord>;
+        oxisessions[m_startTime] = oxirec;
+
         setStatus(LIVE);
         return 1;
     }
@@ -164,10 +175,12 @@ int CMS50Loader::doImportMode()
     while (idx < available) {
         unsigned char c=(unsigned char)buffer.at(idx);
         if (!started_import) {
+            // TODO: Check there might be length data after the 3 headers trios..
             if (c != 0xf2) { // If not started, continue scanning for a valie header.
                 idx++;
                 continue;
             } else {
+
                 received_bytes=0;
 
                 hour=(unsigned char)buffer.at(idx + 1) & 0x7f;
@@ -188,8 +201,8 @@ int CMS50Loader::doImportMode()
                 killTimers();
                 qDebug() << "Getting ready for import";
 
-                oxirec.clear();
+                oxirec = new QVector<OxiRecord>;
-                oxirec.reserve(10000);
+                oxirec->reserve(30000);
 
                 QDate oda=QDate::currentDate();
                 QTime oti=QTime(hour,minute); // Only CMS50E/F's have a realtime clock. CMS50D+ will set this to midnight
@@ -202,12 +215,10 @@ int CMS50Loader::doImportMode()
                     oda = oda.addDays(-1);
                 }
 
-                m_startTime = oxitime = QDateTime(oda,oti);
+                m_startTime = QDateTime(oda,oti);
 
-                // Convert it to UTC
+                oxisessions[m_startTime] = oxirec;
-                oxitime = oxitime.toTimeSpec(Qt::UTC);
+                qDebug() << "Session start (according to CMS50)" << m_startTime << hex << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << dec << hour << minute ;
-
-                qDebug() << "Session start (according to CMS50)" << oxitime<< hex << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << dec << hour << minute ;
 
                 cb_reset = 1;
 
@@ -232,10 +243,10 @@ int CMS50Loader::doImportMode()
                     return idx;
                 }
 
-                quint8 pulse=(unsigned char)buffer.at(idx + 1) & 0x7f | ((c & 1) << 7);
+                quint8 pulse=(unsigned char)((buffer.at(idx + 1) & 0x7f) | ((c & 1) << 7));
                 quint8 spo2=(unsigned char)buffer.at(idx + 2) & 0xff;
 
-                oxirec.append(OxiRecord(pulse,spo2));
+                oxirec->append(OxiRecord(pulse,spo2));
                 received_bytes+=3;
 
                 // TODO: Store the data to the session
@@ -273,6 +284,8 @@ int CMS50Loader::doImportMode()
 
 int CMS50Loader::doLiveMode()
 {
+    Q_ASSERT(oxirec != nullptr);
+
     int available = buffer.size();
     int idx = 0;
 
@@ -287,7 +300,7 @@ int CMS50Loader::doLiveMode()
         int pulse=((unsigned char)buffer.at(idx + 3) & 0x7f) | ((pbeat & 0x40) << 1);
         int spo2=(unsigned char)buffer.at(idx + 4) & 0x7f;
 
-        oxirec.append(OxiRecord(pulse, spo2));
+        oxirec->append(OxiRecord(pulse, spo2));
         plethy.append(pwave);
 
         idx += 5;
@@ -407,11 +420,13 @@ void CMS50Loader::resetImportTimeout()
 bool CMS50Loader::readSpoRFile(QString path)
 {
     QFile file(path);
-    if (!file.exists() || !file.isReadable()) {
+    if (!file.exists()) {
         return false;
     }
 
-    file.open(QFile::ReadOnly);
+    if (!file.open(QFile::ReadOnly)) {
+        return false;
+    }
 
     QByteArray data;
 
@@ -421,6 +436,9 @@ bool CMS50Loader::readSpoRFile(QString path)
     // position data stream starts at
     int pos = ((unsigned char)data.at(1) << 8) | (unsigned char)data.at(0);
 
+    // next is 0x0002
+    // followed by 16bit duration in seconds
+
     // Read date and time (it's a 16bit charset)
     char dchr[20];
     int j = 0;
@@ -430,9 +448,11 @@ bool CMS50Loader::readSpoRFile(QString path)
 
     dchr[j] = 0;
     QString dstr(dchr);
-    oxitime = QDateTime::fromString(dstr, "MM/dd/yy HH:mm:ss");
+    m_startTime = QDateTime::fromString(dstr, "MM/dd/yy HH:mm:ss");
+    if (m_startTime.date().year() < 2000) { m_startTime = m_startTime.addYears(100); }
 
-    if (oxitime.date().year() < 2000) { oxitime = oxitime.addYears(100); }
+    oxirec = new QVector<OxiRecord>;
+    oxisessions[m_startTime] = oxirec;
 
     unsigned char o2, pr;
 
@@ -440,7 +460,7 @@ bool CMS50Loader::readSpoRFile(QString path)
     for (int i = pos; i < size - 2;) {
         o2 = (unsigned char)(data.at(i + 1));
         pr = (unsigned char)(data.at(i + 0));
-        oxirec.append(OxiRecord(pr, o2));
+        oxirec->append(OxiRecord(pr, o2));
         i += 2;
     }
 
@@ -483,21 +503,14 @@ Machine *CMS50Loader::CreateMachine(Profile *profile)
 
 void CMS50Loader::process()
 {
-    int size=oxirec.size();
+    // Just clean up any extra crap before oximeterimport parses the oxirecords..
-    if (size<10)
+    return;
-        return;
+//    if (!oxirec)
+//        return;
+//    int size=oxirec->size();
+//    if (size<10)
+//        return;
 
-
-//    EventList *PULSE=new EventList(EVL_Event);
-//    EventList *SPO2=new EventList(EVL_Event);
-
-
-//    quint64 ti = oxitime.toMSecsSinceEpoch();
-
-//    for (int i=0; i < size; ++i) {
-//        //PULSE->AddWaveform
-//    }
-//    qDebug() << "Processing" << oxirec.size() << "oximetry records";
 }
 
 

sleepyhead/SleepLib/loader_plugins/cms50_loader.h

@@ -77,7 +77,6 @@ protected:
     bool finished_import;
     bool started_reading;
     bool cms50dplus;
-    QDateTime oxitime;
 
     int cb_reset,imp_callbacks;
 

sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp

@@ -0,0 +1,266 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * SleepLib ChoiceMMed MD300W1 Oximeter Loader Implementation
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * 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 Linux
+ * distribution for more details. */
+
+//********************************************************************************************
+/// IMPORTANT!!!
+//********************************************************************************************
+// Please INCREMENT the md300w1_data_version in md300w1_loader.h when making changes to this
+// loader that change loader behaviour or modify channels.
+//********************************************************************************************
+
+#include <QProgressBar>
+#include <QApplication>
+#include <QDir>
+#include <QString>
+#include <QDateTime>
+#include <QFile>
+#include <QDebug>
+#include <QList>
+#include <QMessageBox>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QPushButton>
+
+using namespace std;
+
+#include "md300w1_loader.h"
+#include "SleepLib/machine.h"
+#include "SleepLib/session.h"
+
+extern QProgressBar *qprogress;
+
+MD300W1Loader::MD300W1Loader()
+{
+    m_type = MT_OXIMETER;
+    m_abort = false;
+    m_streaming = false;
+    m_importing = false;
+    imp_callbacks = 0;
+
+    // have no idea.. assuming it's another CP2102 USB UART, which won't help detection :/
+    m_vendorID = 0;
+    m_productID = 0;
+
+    startTimer.setParent(this);
+    resetTimer.setParent(this);
+
+}
+
+MD300W1Loader::~MD300W1Loader()
+{
+}
+
+bool MD300W1Loader::Detect(const QString &path)
+{
+    Q_UNUSED(path);
+    return false;
+}
+
+int MD300W1Loader::Open(QString path, Profile *profile)
+{
+
+    // Only one active Oximeter module at a time, set in preferences
+    Q_UNUSED(profile)
+
+    m_itemCnt = 0;
+    m_itemTotal = 0;
+
+    m_abort = false;
+    m_importing = false;
+
+    started_import = false;
+    started_reading = false;
+    finished_import = false;
+
+    imp_callbacks = 0;
+    cb_reset = 0;
+
+    m_time.start();
+
+    // Cheating using path for two serial oximetry modes
+
+    if (path.compare("import") == 0) {
+        setStatus(IMPORTING);
+
+        startTimer.stop();
+        startImportTimeout();
+        return 1;
+    } else if (path.compare("live") == 0) {
+        m_startTime = oxitime = QDateTime::currentDateTime();
+        setStatus(LIVE);
+        return 1;
+    }
+    QString ext = path.section(".",1);
+    if (ext.compare("dat", Qt::CaseInsensitive)==0) {
+        // try to read and process SpoR file..
+        return readDATFile(path) ? 1 : 0;
+    }
+
+    return 0;
+}
+
+
+void MD300W1Loader::processBytes(QByteArray bytes)
+{
+    return;
+}
+
+int MD300W1Loader::doImportMode()
+{
+    return 0;
+}
+
+int MD300W1Loader::doLiveMode()
+{
+    return 0;
+}
+
+// Switch MD300W1 device to live streaming mode
+void MD300W1Loader::resetDevice()
+{
+}
+
+// Switch MD300W1 device to record transmission mode
+void MD300W1Loader::requestData()
+{
+}
+
+void MD300W1Loader::killTimers()
+{
+    startTimer.stop();
+    resetTimer.stop();
+}
+
+void MD300W1Loader::startImportTimeout()
+{
+    return;
+}
+
+void MD300W1Loader::resetImportTimeout()
+{
+    return;
+}
+
+
+// MedView .dat file (ChoiceMMed MD300B, MD300KI, MD300I, MD300W1, MD300C318, MD2000A)
+// Format:
+// Bytes  0  (1  2)
+//        id    n
+// n*11   0  1  2  3  4  5  6  7  8  9  10
+//        0  0  id yr mm dd hh mm ss o2 pulse
+// report title etc.
+
+bool MD300W1Loader::readDATFile(QString path)
+{
+    QFile file(path);
+    if (!file.exists()) {
+        return false;
+    }
+
+    if (!file.open(QFile::ReadOnly)) {
+        return false;
+    }
+
+    QByteArray data;
+
+    data = file.readAll();
+    long size = data.size();
+
+    // Number of records
+    int n = ((unsigned char)data.at(2) << 8) | (unsigned char)data.at(1);
+
+    unsigned char o2, pr;
+
+    qint32 lasttime=0, ts=0;
+    int gap;
+    for (int pos = 0; pos < n; ++pos) {
+        int i = 3 + (pos * 11);
+        QString datestr = QString().sprintf("%02d/%02d/%02d %02d:%02d:%02d",(unsigned char)data.at(i+4),(unsigned char)data.at(i+5),(unsigned char)data.at(i+3),(unsigned char)data.at(i+6),(unsigned char)data.at(i+7),(unsigned char)data.at(i+8));
+        QDateTime datetime = QDateTime::fromString(datestr,"MM/dd/yy HH:mm:ss");
+        if (datetime.date().year() < 2000) datetime = datetime.addYears(100);
+        ts = datetime.toTime_t();
+        gap = ts - lasttime;
+        if (gap > 1) {
+            if (gap < 360) {
+                // Less than 5 minutes? Merge session
+                gap--;
+                // fill with zeroes
+                for (int j = 0; j < gap; j++) {
+                    oxirec->append(OxiRecord(0,0));
+                }
+            } else {
+                // Create a new session
+                oxirec = new QVector<OxiRecord>;
+                oxisessions[datetime] = oxirec;
+            }
+        }
+
+        pr=(unsigned char)(data.at(i+10));
+        o2=(unsigned char)(data.at(i+9));
+
+        oxirec->append(OxiRecord(pr, o2));
+
+        lasttime = ts;
+    }
+
+    // processing gets done later
+    return true;
+}
+
+Machine *MD300W1Loader::CreateMachine(Profile *profile)
+{
+    if (!profile) {
+        return nullptr;
+    }
+
+    // NOTE: This only allows for one MD300W1 machine per profile..
+    // Upgrading their oximeter will use this same record..
+
+    QList<Machine *> ml = profile->GetMachines(MT_OXIMETER);
+
+    for (QList<Machine *>::iterator i = ml.begin(); i != ml.end(); i++) {
+        if ((*i)->GetClass() == md300w1_class_name)  {
+            return (*i);
+            break;
+        }
+    }
+
+    qDebug() << "Create MD300W1 Machine Record";
+
+    Machine *m = new Oximeter(profile, 0);
+    m->SetClass(md300w1_class_name);
+    m->properties[STR_PROP_Brand] = "ChoiceMMed";
+    m->properties[STR_PROP_Model] = "MD300W1";
+    m->properties[STR_PROP_DataVersion] = QString::number(md300w1_data_version);
+
+    profile->AddMachine(m);
+    QString path = "{" + STR_GEN_DataFolder + "}/" + m->GetClass() + "_" + m->hexid() + "/";
+    m->properties[STR_PROP_Path] = path;
+
+    return m;
+}
+
+void MD300W1Loader::process()
+{
+}
+
+
+static bool MD300W1_initialized = false;
+
+void MD300W1Loader::Register()
+{
+    if (MD300W1_initialized) { return; }
+
+    qDebug() << "Registering MD300W1Loader";
+    RegisterLoader(new MD300W1Loader());
+    MD300W1_initialized = true;
+}
+

sleepyhead/SleepLib/loader_plugins/md300w1_loader.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * SleepLib ChoiceMMed MD300W1 Oximeter Loader Header
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * 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 Linux
+ * distribution for more details. */
+
+#ifndef MD300W1LOADER_H
+#define MD300W1LOADER_H
+
+#include "SleepLib/serialoximeter.h"
+
+const QString md300w1_class_name = "MD300W1";
+const int md300w1_data_version = 1;
+
+
+/*! \class MD300W1Loader
+    \brief Importer for ChoiceMMed MD300W1 data format..
+    */
+class MD300W1Loader : public SerialOximeter
+{
+Q_OBJECT
+  public:
+
+
+    MD300W1Loader();
+    virtual ~MD300W1Loader();
+
+    virtual bool Detect(const QString &path);
+    virtual int Open(QString path, Profile *profile);
+
+    static void Register();
+
+    virtual int Version() { return md300w1_data_version; }
+    virtual const QString &ClassName() { return md300w1_class_name; }
+
+    Machine *CreateMachine(Profile *profile);
+
+    virtual void process();
+
+    virtual bool isStartTimeValid() { return true; }
+
+protected slots:
+    virtual void resetImportTimeout();
+    virtual void startImportTimeout();
+
+protected:
+
+    bool readDATFile(QString path);
+    virtual void processBytes(QByteArray bytes);
+
+    int doImportMode();
+    int doLiveMode();
+
+    virtual void killTimers();
+
+    // Switch MD300W1 device to live streaming mode
+    virtual void resetDevice();
+
+    // Switch MD300W1 device to record transmission mode
+    void requestData();
+
+  private:
+    EventList *PULSE;
+    EventList *SPO2;
+
+    QTime m_time;
+
+    QByteArray buffer;
+
+    bool started_import;
+    bool finished_import;
+    bool started_reading;
+    QDateTime oxitime;
+
+    int cb_reset,imp_callbacks;
+
+    int received_bytes;
+
+    int m_itemCnt;
+    int m_itemTotal;
+
+
+};
+
+
+#endif // MD300W1LOADER_H

sleepyhead/SleepLib/serialoximeter.cpp

@@ -130,3 +130,13 @@ void SerialOximeter::stopRecording()
     m_status = NEUTRAL;
     emit importComplete(this);
 }
+
+void SerialOximeter::trashRecords()
+{
+    QMap<QDateTime, QVector<OxiRecord> *>::iterator it;
+    for (it = oxisessions.begin(); it != oxisessions.end(); ++it) {
+        delete it.value();
+    }
+    oxisessions.clear();
+    oxirec = nullptr;
+}

sleepyhead/SleepLib/serialoximeter.h

@@ -62,11 +62,20 @@ public:
 
     virtual Machine *CreateMachine(Profile *profile)=0;
 
-    QVector<OxiRecord> oxirec;
+    // available sessions
+    QMap<QDateTime, QVector<OxiRecord> *> oxisessions;
+
+    // current session
+    QVector<OxiRecord> * oxirec;
 
     QDateTime startTime() { return m_startTime; }
+    void setStartTime(QDateTime datetime) { m_startTime = datetime; }
     virtual bool isStartTimeValid() { return true; }
 
+    virtual qint64 importResolution() { return 1000; }
+    virtual qint64 liveResolution() { return 20; }
+
+    void trashRecords();
 
 signals:
     void noDeviceFound();

sleepyhead/main.cpp

@@ -35,6 +35,7 @@
 // Gah! I must add the real darn plugin system one day.
 #include "SleepLib/loader_plugins/prs1_loader.h"
 #include "SleepLib/loader_plugins/cms50_loader.h"
+#include "SleepLib/loader_plugins/md300w1_loader.h"
 #include "SleepLib/loader_plugins/zeo_loader.h"
 #include "SleepLib/loader_plugins/somnopose_loader.h"
 #include "SleepLib/loader_plugins/resmed_loader.h"
@@ -249,6 +250,7 @@ retry_directory:
     IntellipapLoader::Register();
     FPIconLoader::Register();
     CMS50Loader::Register();
+    MD300W1Loader::Register();
     //ZEOLoader::Register(); // Use outside of directory importer..
 
     p_pref = new Preferences("Preferences");

sleepyhead/oximeterimport.cpp

@@ -32,7 +32,9 @@ OximeterImport::OximeterImport(QWidget *parent) :
     ui->stopButton->setVisible(false);
     ui->saveButton->setVisible(false);
     ui->syncButton->setVisible(false);
+    ui->chooseSessionButton->setVisible(false);
 
+    importMode = IM_UNDEFINED;
 
     QVBoxLayout * lvlayout = new QVBoxLayout;
     lvlayout->setMargin(0);
@@ -228,7 +230,7 @@ void OximeterImport::on_directImportButton_clicked()
     ui->connectLabel->setText("<h2>"+tr("%1 device is uploading data...").arg(oximodule->ClassName())+"</h2>");
     updateStatus(tr("Please wait until oximeter upload process completes. Do not unplug your oximeter."));
 
-    // Wait for import streaming to finish
+    importMode = IM_RECORDING;
 
     // Can't abort this bit or the oximeter will get confused...
     ui->cancelButton->setVisible(false);
@@ -238,14 +240,18 @@ void OximeterImport::on_directImportButton_clicked()
 
 void OximeterImport::finishedImport(SerialOximeter * oxi)
 {
-    disconnect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedImport()));
+    Q_UNUSED(oxi);
+
+    connect(oximodule, SIGNAL(importComplete(SerialOximeter*)), this, SLOT(finishedImport(SerialOximeter*)));
     ui->cancelButton->setVisible(true);
-    updateStatus(tr("Oximeter import completed.. Processing data"));
-    oximodule->process();
     disconnect(oximodule, SIGNAL(updateProgress(int,int)), this, SLOT(doUpdateProgress(int,int)));
+    updateStatus(tr("Oximeter import completed.."));
 
-
+    if (oximodule->oxisessions.size() > 1) {
-    on_syncButton_clicked();
+        chooseSession();
+    } else {
+        on_syncButton_clicked();
+    }
 }
 
 void OximeterImport::doUpdateProgress(int v, int t)
@@ -260,17 +266,20 @@ void OximeterImport::on_fileImportButton_clicked()
 {
 
 #if QT_VERSION  < QT_VERSION_CHECK(5,0,0)
-        const QString documentsFolder = QDesktopServices::storageLocation(
+        const QString documentsFolder = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
-                                      QDesktopServices::DocumentsLocation);
 #else
         const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
 #endif
 
 
-    QString filename = QFileDialog::getOpenFileName(this, tr("Select a valid oximetry data file"), documentsFolder, "Oximetry Files (*.spo *.spor *.spo2)");
+    QString filename = QFileDialog::getOpenFileName(this, tr("Select a valid oximetry data file"), documentsFolder, "Oximetry Files (*.spo *.spor *.dat)");
 
     if (filename.isEmpty())
         return;
+
+    // Make sure filename dialog had time to close properly..
+    QApplication::processEvents();
+
     QList<SerialOximeter *> loaders = GetOxiLoaders();
 
     bool success = false;
@@ -288,8 +297,14 @@ void OximeterImport::on_fileImportButton_clicked()
         return;
     }
     ui->informationButton->setVisible(false);
+    importMode = IM_FILE;
 
-    on_syncButton_clicked();
+
+    if (oximodule->oxisessions.size() > 1) {
+        chooseSession();
+    } else {
+        on_syncButton_clicked();
+    }
 }
 
 void OximeterImport::on_liveImportButton_clicked()
@@ -351,6 +366,9 @@ void OximeterImport::on_liveImportButton_clicked()
     updateTimer.start();
     connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateLiveDisplay()));
     connect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedRecording()));
+
+    importMode = IM_LIVE;
+
 }
 
 void OximeterImport::finishedRecording()
@@ -367,17 +385,12 @@ void OximeterImport::finishedRecording()
 
     disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
 
-//    delete dummyday;
-
-    //ui->stackedWidget->setCurrentWidget(ui->syncPage);
     ui->syncButton->setVisible(true);
 
     plethyGraph->SetMinX(start_ti);
     liveView->SetXBounds(start_ti, ti, 0, true);
 
     plethyGraph->setBlockZoom(false);
-
-
 }
 
 void OximeterImport::on_retryButton_clicked()
@@ -526,7 +539,7 @@ void OximeterImport::updateLiveDisplay()
         liveView->redraw();
     }
 
-    int size = oximodule->oxirec.size();
+    int size = oximodule->oxirec->size();
 
     if (size > 0) {
         int i = oximodule->startTime().secsTo(QDateTime::currentDateTime());
@@ -537,7 +550,7 @@ void OximeterImport::updateLiveDisplay()
 
         size--;
 
-        bool datagood = oximodule->oxirec[size].pulse > 0;
+        bool datagood = (*(oximodule->oxirec))[size].pulse > 0;
 
 
         if (datagood & (pulse <= 0)) {
@@ -555,8 +568,8 @@ void OximeterImport::updateLiveDisplay()
                 liveView->redraw();
             }
         }
-        pulse = oximodule->oxirec[size].pulse;
+        pulse = (*(oximodule->oxirec))[size].pulse;
-        spo2 = oximodule->oxirec[size].spo2;
+        spo2 = (*(oximodule->oxirec))[size].spo2;
         if (pulse > 0) {
             ui->pulseDisplay->display(QString().sprintf("%3i", pulse));
         } else {
@@ -578,6 +591,7 @@ void OximeterImport::on_cancelButton_clicked()
 {
     if (oximodule && oximodule->isStreaming()) {
         oximodule->closeDevice();
+        oximodule->trashRecords();
     }
     reject();
 }
@@ -604,11 +618,12 @@ void OximeterImport::on_informationButton_clicked()
     ui->stackedWidget->setCurrentWidget(ui->welcomePage);
     ui->nextButton->setVisible(true);
     ui->informationButton->setVisible(false);
-
 }
 
 void OximeterImport::on_syncButton_clicked()
 {
+    Q_ASSERT(oximodule != nullptr);
+
     ui->stackedWidget->setCurrentWidget(ui->syncPage);
 
     ui->syncButton->setVisible(false);
@@ -618,34 +633,45 @@ void OximeterImport::on_syncButton_clicked()
     ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
 
     on_calendarWidget_clicked(PROFILE.LastDay());
-    Q_ASSERT(oximodule != nullptr);
 
     ui->radioSyncOximeter->setChecked(true);
     on_radioSyncOximeter_clicked();
 
-    if (ELplethy != nullptr) {
+    if (importMode == IM_LIVE) {
         // Live Recording
         ui->labelSyncOximeter->setText(tr("I want to use the time my computer recorded for this live oximetry session."));
     } else if (!oximodule->isStartTimeValid()) {
         // Oximeter doesn't provide a clock
         ui->labelSyncOximeter->setText(tr("I need to set the time manually, because my oximeter doesn't have an internal clock."));
     }
-
-
 }
 
 void OximeterImport::on_saveButton_clicked()
 {
-    int size = oximodule->oxirec.size();
+    int size = oximodule->oxirec->size();
     if (size < 2) {
         QMessageBox::warning(this, STR_MessageBox_Warning, tr("Not enough recorded oximetry data."), QMessageBox::Ok);
         return;
     }
     if (!oximodule) return;
 
+
+    QVector<OxiRecord> * oxirec = nullptr;
+
+    if (!oximodule->oxisessions.contains(oximodule->startTime())) {
+        QMessageBox::warning(this, STR_MessageBox_Error, tr("Something went wrong getting session data"), QMessageBox::Ok);
+        reject();
+        return;
+    }
+    oxirec = oximodule->oxisessions[oximodule->startTime()];
+
+
+    // this can move to SerialOximeter class process function...
     Machine * mach = oximodule->CreateMachine(p_profile);
     SessionID sid = ui->dateTimeEdit->dateTime().toUTC().toTime_t();
     quint64 start = quint64(sid) * 1000L;
+
+
     if (!session) {
         session = new Session(mach, sid);
         session->really_set_first(start);
@@ -677,8 +703,12 @@ void OximeterImport::on_saveButton_clicked()
     quint16 lastgoodspo2 = 0;
 
     quint64 ti = start;
+
+
+    qint64 step = (importMode == IM_LIVE) ? oximodule->liveResolution() : oximodule->importResolution();
+
     for (int i=1; i < size; ++i) {
-        OxiRecord * rec = &oximodule->oxirec[i];
+        OxiRecord * rec = &(*oxirec)[i];
 
         if (rec->pulse > 0) {
             if (lastpulse == 0) {
@@ -723,9 +753,9 @@ void OximeterImport::on_saveButton_clicked()
         }
         lastspo2 = rec->spo2;
 
-        ti += 20;
+        ti += step;
     }
-    ti -= 20;
+    ti -= step;
     if (lastpulse > 0) {
         ELpulse->AddEvent(ti, lastpulse);
         session->setLast(OXI_Pulse, ti);
@@ -777,5 +807,54 @@ void OximeterImport::on_saveButton_clicked()
     ELplethy = nullptr;
     session = nullptr;
 
+    oximodule->trashRecords();
     accept();
 }
+
+void OximeterImport::chooseSession()
+{
+    ui->stackedWidget->setCurrentWidget(ui->chooseSessionPage);
+    ui->syncButton->setVisible(false);
+    ui->chooseSessionButton->setVisible(true);
+    QMap<QDateTime, QVector<OxiRecord> *>::iterator it;
+
+    ui->tableOxiSessions->clearContents();
+    int row = 0;
+    QTableWidgetItem * item;
+    QVector<OxiRecord> * oxirec;
+
+    ui->tableOxiSessions->setRowCount(oximodule->oxisessions.size());
+    ui->tableOxiSessions->setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    for (it = oximodule->oxisessions.begin(); it != oximodule->oxisessions.end(); ++it) {
+        const QDateTime & key = it.key();
+        oxirec = it.value();
+        item = new QTableWidgetItem(key.toString(Qt::ISODate));
+        ui->tableOxiSessions->setItem(row, 0, item);
+        item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+
+        item = new QTableWidgetItem(QString(). sprintf("%lli", oxirec->size() * oximodule->importResolution() / 1000L));
+        ui->tableOxiSessions->setItem(row, 1, item);
+        item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+
+        item = new QTableWidgetItem(tr("CMS50 Session %1").arg(row+1, 0));
+        ui->tableOxiSessions->setItem(row, 2, item);
+        item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+
+        row++;
+    }
+
+    ui->tableOxiSessions->selectRow(0);
+}
+
+void OximeterImport::on_chooseSessionButton_clicked()
+{
+    ui->chooseSessionButton->setVisible(false);
+
+    QTableWidgetItem * item = ui->tableOxiSessions->item(ui->tableOxiSessions->currentRow(),0);
+
+    QDateTime datetime = QDateTime::fromString(item->text(), Qt::ISODate);
+    oximodule->setStartTime(datetime);
+
+    on_syncButton_clicked();
+}

sleepyhead/oximeterimport.h

@@ -12,6 +12,10 @@ namespace Ui {
 class OximeterImport;
 }
 
+enum OximeterImportMode {
+    IM_UNDEFINED = 0, IM_LIVE, IM_RECORDING, IM_FILE
+};
+
 class OximeterImport : public QDialog
 {
     Q_OBJECT
@@ -60,6 +64,10 @@ private slots:
 
     void on_saveButton_clicked();
 
+    void chooseSession();
+
+    void on_chooseSessionButton_clicked();
+
 protected slots:
     void on_updatePlethy(QByteArray plethy);
     void finishedRecording();
@@ -82,6 +90,8 @@ private:
     EventList * ELplethy;
     qint64 start_ti, ti;
     QTimer updateTimer;
+    OximeterImportMode importMode;
+
 
     int pulse;
     int spo2;

sleepyhead/oximeterimport.ui

@@ -792,6 +792,19 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QLabel" name="label">
            <property name="font">
@@ -810,6 +823,19 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QPushButton" name="directImportButton">
            <property name="toolTip">
@@ -888,6 +914,19 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QLabel" name="label_6">
            <property name="font">
@@ -1017,6 +1056,35 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
             <property name="bottomMargin">
              <number>6</number>
             </property>
+            <item>
+             <widget class="QCheckBox" name="showLiveGraphs">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Show Live Graphs</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_8">
               <item>
@@ -1053,35 +1121,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
               </item>
              </layout>
             </item>
-            <item>
-             <widget class="QCheckBox" name="showLiveGraphs">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Show Live Graphs</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_7">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_9">
               <item>
@@ -1251,6 +1290,78 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="chooseSessionPage">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <widget class="QLabel" name="liveConnectLabel_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>21</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Multiple Sessions Detected</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_12">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Please choose which one you want to import into SleepyHead</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTableWidget" name="tableOxiSessions">
+           <property name="alternatingRowColors">
+            <bool>true</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Import Time</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Duration</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Details</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
        <widget class="QWidget" name="syncPage">
         <layout class="QVBoxLayout" name="verticalLayout_10">
          <item>
@@ -1663,6 +1774,13 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="chooseSessionButton">
+        <property name="text">
+         <string>&amp;Choose Session</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QPushButton" name="stopButton">
         <property name="text">

sleepyhead/sleepyhead.pro

@@ -144,7 +144,8 @@ SOURCES += \
     translation.cpp \
     statistics.cpp \
     oximeterimport.cpp \
-    SleepLib/serialoximeter.cpp
+    SleepLib/serialoximeter.cpp \
+    SleepLib/loader_plugins/md300w1_loader.cpp
 
 HEADERS  += \
     common_gui.h \
@@ -197,7 +198,8 @@ HEADERS  += \
     translation.h \
     statistics.h \
     oximeterimport.h \
-    SleepLib/serialoximeter.h
+    SleepLib/serialoximeter.h \
+    SleepLib/loader_plugins/md300w1_loader.h
 
 FORMS += \
     daily.ui \

sleepyhead/statistics.cpp

@@ -141,12 +141,18 @@ QString htmlHeader()
     "border-radius:10px;"
     "-moz-border-radius:10px;"
     "-webkit-border-radius:10px;"
-    "width: 95%"
+    "width: 95%;"
+    "page-break-after:auto;"
+    "-fs-table-paginate: paginate;"
 "}"
 "tr.datarow:nth-child(even) {"
     "background-color: #f8f8f8;"
 "}"
-
+  "table { page-break-after:auto; -fs-table-paginate: paginate; }"
+  "tr    { page-break-inside:avoid; page-break-after:auto }"
+  "td    { page-break-inside:avoid; page-break-after:auto }"
+  "thead { display:table-header-group; }"
+  "tfoot { display:table-footer-group; }"
 
 
                    "</style>"
@@ -610,7 +616,7 @@ QString Statistics::GenerateHTML()
             int days = PROFILE.countDays(row.type, first, last);
             skipsection = (days == 0);
             if (days > 0) {
-                html+=QString("<tr bgcolor='%1'><td colspan=%2 align=center><font size=+3>%3</font></td></tr>\n").
+                html+=QString("<tr bgcolor='%1'><th colspan=%2 align=center><font size=+3>%3</font></th></tr>\n").
                         arg(heading_color).arg(periods.size()+1).arg(row.src);
             }
             continue;
@@ -1036,9 +1042,13 @@ QString Statistics::GenerateHTML()
         /*RXsort=RX_min;
         RXorder=true;
         qSort(rxchange.begin(),rxchange.end());*/
+
+        html += "<p style=\"page-break-before:always;\"/>";
         html += "<div align=center><br/>";
         html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=1
-        html += "<tr bgcolor='"+heading_color+"'><td colspan=10 align=center><font size=+3>" + tr("Changes to Prescription Settings") + "</font></td></tr>";
+        html += "<thead>";
+        html += "<tr bgcolor='"+heading_color+"'><th colspan=10 align=center><font size=+3>" + tr("Changes to Prescription Settings") + "</font></th></tr>";
+
         QString extratxt;
 
         QString tooltip;
@@ -1058,9 +1068,19 @@ QString Statistics::GenerateHTML()
 
         html+="<tr>\n";
         for (int i=0; i < hdrlist.size(); ++i) {
-            html+=QString(" <td><b>%1</b></td>\n").arg(hdrlist.at(i));
+            html+=QString(" <th align=left><b>%1</b></th>\n").arg(hdrlist.at(i));
         }
         html+="</tr>\n";
+        html += "</thead>";
+        html += "<tfoot>";
+        html += "<tr><td colspan=10 align=center>";
+        html += QString("<i>") +
+                tr("Efficacy highlighting ignores prescription settings with less than %1 days of recorded data.").
+                arg(rxthresh) + QString("</i><br/>");
+
+        html += "</td></tr>";
+        html += "</tfoot>";
+
 
         for (int i = 0; i < rxchange.size(); i++) {
             RXChange rx = rxchange.at(i);
@@ -1185,9 +1205,6 @@ QString Statistics::GenerateHTML()
         }
 
         html += "</table>";
-        html += QString("<i>") +
-                tr("Efficacy highlighting ignores prescription settings with less than %1 days of recorded data.").arg(
-                    rxthresh) + QString("</i><br/>");
         html += "</div>";
 
     }
@@ -1195,7 +1212,9 @@ QString Statistics::GenerateHTML()
     if (mach.size() > 0) {
         html += "<div align=center><br/>";
 
-        html += QString("<table class=curved>"); // cellpadding=2 cellspacing=0 border=1 width=90%>");
+        html += QString("<table class=curved style=\"page-break-before:auto;\">");
+
+        html += "<thead>";
         html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+3>" + tr("Machine Information") + "</font></td></tr>";
 
         html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
@@ -1204,6 +1223,9 @@ QString Statistics::GenerateHTML()
                 .arg(STR_TR_Serial)
                 .arg(tr("First Use"))
                 .arg(tr("Last Use"));
+
+        html += "</thead>";
+
         Machine *m;
 
         for (int i = 0; i < mach.size(); i++) {