Move oximeter select combo to Oximetery wizard, add a panel with some CMS50I/F device related stuff

sleepyhead/Graphs/gSessionTimesChart.cpp

@@ -406,7 +406,6 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
     int days = ceil(double(m_maxx - m_minx) / 86400000.0);
 
     float lasty1 = rect.bottom();
-    float lastx1 = rect.left();
 
     QMap<QDate, int>::iterator it = dayindex.find(date);
     idx_start=0;
@@ -457,15 +456,23 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
     // Virtual call to setup any custom graph stuff
     preCalc();
 
+    float lastx1 = rect.left();
+    float right_edge = (rect.left()+rect.width()+1);
+
+
     /////////////////////////////////////////////////////////////////////
     /// Calculate Graph Peaks
     /////////////////////////////////////////////////////////////////////
     peak_value = 0;
-    for (int i=idx; i <= idx_end; ++i) {
+    for (int i=idx; i <= idx_end; ++i, lastx1 += barw) {
         Day * day = daylist.at(i);
 
-        if (!day) // || !day->hasMachine(m_machtype))
+        if ((lastx1 + barw) > right_edge)
+            break;
+
+        if (!day) {
             continue;
+        }
 
         day->OpenSummary();
 
@@ -487,7 +494,6 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
             }
             peak_value = qMax(peak_value, base);
         }
-
     }
     m_miny = 0;
     m_maxy = ceil(peak_value);
@@ -502,19 +508,21 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
     graph.roundY(miny, maxy);
     float ymult = float(rect.height()) / (maxy-miny);
 
+    lastx1 = rect.left();
+
     /////////////////////////////////////////////////////////////////////
     /// Main drawing loop
     /////////////////////////////////////////////////////////////////////
     do {
         Day * day = daylist.at(idx);
 
-        if ((lastx1 + barw) > (rect.left() + rect.width() + 1))
+        if ((lastx1 + barw) > right_edge)
             break;
 
         totaldays++;
 
         if (!day) {//  || !day->hasMachine(m_machtype)) {
-            lasty1 = rect.bottom();
+           // lasty1 = rect.bottom();
             lastx1 += barw;
             it++;
             nousedays++;
@@ -816,7 +824,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
     QDateTime splittime;
 
-    float lasty1 = rect.bottom();
+//    float lasty1 = rect.bottom();
     float lastx1 = rect.left();
 
     QMap<QDate, int>::iterator it = dayindex.find(date);
@@ -847,12 +855,17 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
     peak_value = 0;
     min_value = 999;
     QMap<QDate, int>::iterator it_end = dayindex.end();
-    for (int i=idx; (i <= idx_end) && (it2 != it_end); ++i, ++it2) {
+
+    float right_edge = (rect.left()+rect.width()+1);
+    for (int i=idx; (i <= idx_end) && (it2 != it_end); ++i, ++it2, lastx1 += barw) {
         Day * day = daylist.at(i);
 
+        if ((lastx1 + barw) > right_edge)
+            break;
 
-        if (!day) // || !day->hasMachine(m_machtype))
+        if (!day) {
             continue;
+        }
 
         QHash<int, QList<SummaryChartSlice> >::iterator cit = cache.find(i);
 
@@ -893,7 +906,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
                     float s2 = sess->hours();
 
-                    QString txt = QObject::tr("%1\nStart:%2\nLength:%3").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
+                    QString txt = QObject::tr("%1\nLength:%3\nStart:%2").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
 
                     slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, goodcolor));
                 }
@@ -920,7 +933,6 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
             min_value = qMin(min_value, base);
 
         }
-
     }
     m_miny = (min_value < 999) ? floor(min_value) : 0;
     m_maxy = ceil(peak_value);
@@ -940,20 +952,22 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
     totaldays = 0;
     nousedays = 0;
 
+    lastx1 = rect.left();
+
     /////////////////////////////////////////////////////////////////////
     /// Main Loop scaling
     /////////////////////////////////////////////////////////////////////
     do {
         Day * day = daylist.at(idx);
 
-        if ((lastx1 + barw) > (rect.left()+rect.width()+1))
+        if ((lastx1 + barw) > right_edge)
             break;
 
         totaldays++;
 
 
         if (!day) { // || !day->hasMachine(m_machtype)) {
-            lasty1 = rect.bottom();
+           // lasty1 = rect.bottom();
             lastx1 += barw;
             nousedays++;
          //   it++;

sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp

@@ -57,7 +57,7 @@ CMS50Loader::~CMS50Loader()
 
 bool CMS50Loader::Detect(const QString &path)
 {
-    if (p_profile->oxi->oximeterType() == QString("Contec CMS50D+/E/F")) {
+    if (p_profile->oxi->oximeterType() == 1) {
         return true;
     }
 

sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp

@@ -100,7 +100,7 @@ bool CMS50F37Loader::openDevice()
 
 bool CMS50F37Loader::Detect(const QString &path)
 {
-    if (p_profile->oxi->oximeterType() == QString("Contec CMS50F v3.7+")) {
+    if (p_profile->oxi->oximeterType() == 0) {
         return true;
     }
     Q_UNUSED(path);
@@ -160,16 +160,18 @@ unsigned char cms50_sequence[] = { 0xa7, 0xa2, 0xa0, 0xb0, 0xac, 0xb3, 0xad, 0xa
 const int TIMEOUT = 2000;
 
 
-const quint8 COMMAND_CMS50_HELLO1 = 0x27;          // 0xa7
-const quint8 COMMAND_CMS50_HELLO2 = 0x22;          // 0xa2
-const quint8 COMMAND_GET_SESSION_COUNT = 0x23;     // 0xA3
-const quint8 COMMAND_GET_SESSION_TIME = 0x25;      // 0xA5
-const quint8 COMMAND_GET_SESSION_DURATION = 0x24;  // 0xA4
-const quint8 COMMAND_GET_USER_INFO = 0x2B;         // 0xAB
-const quint8 COMMAND_GET_SESSION_DATA = 0x26;      // 0xA6
-const quint8 COMMAND_GET_OXIMETER_INFO = 0x30;     // 0xb0
-const quint8 COMMAND_GET_OXIMETER_MODEL = 0x28;    // 0xA8
-const quint8 COMMAND_GET_OXIMETER_VENDOR = 0x29;    // 0xA9
+const quint8 COMMAND_CMS50_HELLO1 = 0xa7;
+const quint8 COMMAND_CMS50_HELLO2 = 0xa2;
+const quint8 COMMAND_GET_SESSION_COUNT = 0xA3;
+const quint8 COMMAND_GET_SESSION_TIME = 0xA5;
+const quint8 COMMAND_GET_SESSION_DURATION = 0xA4;
+const quint8 COMMAND_GET_USER_INFO = 0xAB;
+const quint8 COMMAND_GET_SESSION_DATA = 0xA6;
+const quint8 COMMAND_GET_OXIMETER_DEVICEID = 0xAA;
+const quint8 COMMAND_GET_OXIMETER_INFO = 0xb0;
+const quint8 COMMAND_GET_OXIMETER_MODEL = 0xA8;
+const quint8 COMMAND_GET_OXIMETER_VENDOR = 0xA9;
+const quint8 COMMAND_SESSION_ERASE = 0xAE;
 
 
 int cms50_seqlength = sizeof(cms50_sequence);
@@ -232,6 +234,20 @@ QString CMS50F37Loader::getDeviceString()
     return QString("%1 %2").arg(getVendor()).arg(getModel());
 }
 
+QString CMS50F37Loader::getDeviceID()
+{
+    if (!devid.isEmpty()) return devid;
+
+    sendCommand(COMMAND_GET_OXIMETER_DEVICEID);
+
+    QTime time;
+    time.start();
+    do {
+        QApplication::processEvents();
+    } while (devid.isEmpty() && (time.elapsed() < TIMEOUT));
+    return devid;
+}
+
 int CMS50F37Loader::getSessionCount()
 {
     session_count = -1;
@@ -301,7 +317,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
 
     QString tmpstr;
 
-    int lengths[32] = { 0, 0, 9, 9, 0, 9, 4, 8, 8, 6, 4, 4, 2, 0, 3, 8, 3, 9, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    int lengths[32] = { 0, 0, 9, 9, 9, 9, 4, 8, 8, 6, 4, 4, 2, 0, 3, 8, 3, 9, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
     buffer.append(bytes);
     int size = buffer.size();
@@ -343,14 +359,16 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
         }
 
         if (!started_reading) switch(res) {
-        case 0x02:
+        case 0x02: // Model name string (there are two in sequnce.. second might be the next chunk!)
             data = buffer.at(idx+1);
             if (data == 0) {
                 model = QString(buffer.mid(idx+3, 6));
                 qDebug() << "Model:" << model;
+            } else {
+                qDebug() << "Extra Model:" << data;
             }
             break;
-        case 0x03:
+        case 0x03: // Vendor string
             data = buffer.at(idx+1);
             if (data == 0) {
                 vendor = QString(buffer.mid(idx+2, 6));
@@ -358,6 +376,15 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
             }
             break;
 
+        case 0x04: // Device Identifiers
+            for (int i = 2, msb = buffer.at(idx+1); i < len; i++, msb>>= 1) {
+                buffer[idx+i] = (buffer[idx+i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
+            }
+
+            devid = QString(buffer.mid(idx+2, 7));
+            qDebug() << "Device ID:" << devid;
+            break;
+
             // COMMAND_GET_USER_INFO
         case 0x05: // 5,80,80,f5,f3,e5,f2,80,80
             // User
@@ -579,6 +606,67 @@ void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)
     }
 }
 
+void CMS50F37Loader::eraseSession(int user, int session)
+{
+    quint8 cmd[] = { 0x7d, 0x81, COMMAND_SESSION_ERASE, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
+
+    cmd[3] = (user & 0x7f) | 0x80;
+    cmd[4] = (session & 0x7f) | 0x80;
+
+    QString out;
+    for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);
+    qDebug() << "Write:" << out;
+
+    if (serial.write((char *)cmd, 9) == -1) {
+        qDebug() << "Couldn't write data reset bytes to CMS50";
+    }
+
+    int z = timectr;
+    QTime time;
+    time.start();
+    do {
+        QApplication::processEvents();
+    } while ((timectr == z) && (time.elapsed() < TIMEOUT));
+}
+
+
+void CMS50F37Loader::setDeviceID(QString str)
+{
+    str.truncate(7);
+    if (str.length() < 7) {
+        str = QString(" ").repeated(7-str.length()) + str;
+    }
+    quint8 cmd[] = { 0x04, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
+
+    quint8 msb = 0;
+
+    QByteArray ba = str.toLocal8Bit();
+    for (int i=6; i > 0; i--) {
+        msb <<= 1;
+        msb |= (ba.at(i) >> 7) & 1;
+        cmd[i+2] = ba.at(i) | 0x80;
+    }
+
+    cmd[1] = msb & 0x80;
+
+    QString out;
+    for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);
+    qDebug() << "Write:" << out;
+
+    if (serial.write((char *)cmd, 9) == -1) {
+        qDebug() << "Couldn't write data reset bytes to CMS50";
+    }
+
+    // Supposed to return 0x04 command, so reset devid..
+    devid = QString();
+
+    QTime time;
+    time.start();
+    do {
+        QApplication::processEvents();
+    } while (devid.isEmpty() && (time.elapsed() < TIMEOUT));
+}
+
 void CMS50F37Loader::syncClock()
 {
     QDate date = QDate::currentDate();

sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h

@@ -57,8 +57,12 @@ Q_OBJECT
     virtual int getDuration(int session);
     virtual int getSessionCount();
     virtual int getOximeterInfo();
+    virtual void eraseSession(int user, int session);
 
     virtual void syncClock();
+    virtual QString getDeviceID();
+    virtual void setDeviceID(QString);
+
 
     virtual void setDuration(int d) { duration=d; }
 
@@ -135,6 +139,7 @@ protected:
     int device_info;
     QString model;
     QString vendor;
+    QString devid;
 
     int duration_divisor;
     int selected_session;

sleepyhead/SleepLib/profiles.h

@@ -262,7 +262,7 @@ const QString STR_UI_DST = "DST";
 
 // OxiSettings Strings
 const QString STR_OS_EnableOximetry = "EnableOximetry";
-const QString STR_OS_SyncOximetry = "SyncOximetry";
+const QString STR_OS_DefaultDevice = "DefaultOxiDevice";
 const QString STR_OS_SyncOximeterClock = "SyncOximeterClock";
 const QString STR_OS_OximeterType = "OximeterType";
 const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold";
@@ -487,9 +487,9 @@ class OxiSettings : public ProfileSettings
       : ProfileSettings(profile)
     {
         initPref(STR_OS_EnableOximetry, false);
-        initPref(STR_OS_SyncOximetry, true);
+        initPref(STR_OS_DefaultDevice, QString());
         initPref(STR_OS_SyncOximeterClock, true);
-        initPref(STR_OS_OximeterType, "CMS50");
+        initPref(STR_OS_OximeterType, 0);
         initPref(STR_OS_OxiDiscardThreshold, 0.0);
         initPref(STR_OS_SPO2DropDuration, 8.0);
         initPref(STR_OS_SPO2DropPercentage, 3.0);
@@ -499,9 +499,9 @@ class OxiSettings : public ProfileSettings
     }
 
     bool oximetryEnabled() const { return getPref(STR_OS_EnableOximetry).toBool(); }
-    bool syncOximetry() const { return getPref(STR_OS_SyncOximetry).toBool(); }
+    QString defaultDevice() const { return getPref(STR_OS_DefaultDevice).toString(); }
     bool syncOximeterClock() const { return getPref(STR_OS_SyncOximeterClock).toBool(); }
-    QString oximeterType() const { return getPref(STR_OS_OximeterType).toString(); }
+    int oximeterType() const { return getPref(STR_OS_OximeterType).toInt(); }
     double oxiDiscardThreshold() const { return getPref(STR_OS_OxiDiscardThreshold).toDouble(); }
     double spO2DropDuration() const { return getPref(STR_OS_SPO2DropDuration).toDouble(); }
     double spO2DropPercentage() const { return getPref(STR_OS_SPO2DropPercentage).toDouble(); }
@@ -511,9 +511,9 @@ class OxiSettings : public ProfileSettings
 
 
     void setOximetryEnabled(bool enabled) { setPref(STR_OS_EnableOximetry, enabled); }
-    void setSyncOximetry(bool synced) { setPref(STR_OS_SyncOximetry, synced); }
+    void setDefaultDevice(QString name) { setPref(STR_OS_DefaultDevice, name); }
     void setSyncOximeterClock(bool synced) { setPref(STR_OS_SyncOximeterClock, synced); }
-    void setOximeterType(QString oxitype) { setPref(STR_OS_OximeterType, oxitype); }
+    void setOximeterType(int oxitype) { setPref(STR_OS_OximeterType, oxitype); }
     void setOxiDiscardThreshold(double thresh) { setPref(STR_OS_OxiDiscardThreshold, thresh); }
     void setSpO2DropDuration(double duration) { setPref(STR_OS_SPO2DropDuration, duration); }
     void setPulseChangeBPM(double bpm) { setPref(STR_OS_PulseChangeBPM, bpm); }

sleepyhead/SleepLib/serialoximeter.h

@@ -55,9 +55,16 @@ public:
     virtual QString getModel() { return QString(); }
     virtual QString getVendor()  { return QString(); }
     virtual QString getDeviceString()  { return QString(); }
+
     virtual void getSessionData(int session) { Q_UNUSED(session); }
     virtual void syncClock() {}
 
+    virtual QString getDeviceID() { return QString(); }
+    virtual void setDeviceID(QString) {}
+
+    virtual void eraseSession(int /*user*/, int /*session*/) {}
+
+
 
     virtual bool commandDriven() { return false; }
 

sleepyhead/oximeterimport.cpp

@@ -23,6 +23,7 @@ extern MainWindow * mainwin;
 
 #include "SleepLib/loader_plugins/cms50_loader.h"
 #include "SleepLib/loader_plugins/cms50f37_loader.h"
+#include "SleepLib/loader_plugins/md300w1_loader.h"
 
 Qt::DayOfWeek firstDayOfWeekFromLocale();
 QList<SerialOximeter *> GetOxiLoaders();
@@ -101,6 +102,15 @@ OximeterImport::OximeterImport(QWidget *parent) :
 
     ui->dateTimeEdit->setMinimumHeight(ui->dateTimeEdit->height()+10);
     setInformation();
+
+    ui->cms50DeviceName->setText(p_profile->oxi->defaultDevice());
+    int oxitype = p_profile->oxi->oximeterType();
+    ui->oximeterType->setCurrentIndex(oxitype);
+    on_oximeterType_currentIndexChanged(oxitype);
+    ui->cms50DeviceName->setEnabled(false);
+    ui->cms50SyncTime->setChecked(p_profile->oxi->syncOximeterClock());
+
+
 }
 
 OximeterImport::~OximeterImport()
@@ -160,11 +170,14 @@ SerialOximeter * OximeterImport::detectOximeter()
 
     QList<SerialOximeter *> loaders; //= GetOxiLoaders();
 
-    if (p_profile->oxi->oximeterType() == "Contec CMS50D+/E/F") {
+    if (ui->oximeterType->currentIndex() == 0) { // CMS50F3.7
+        SerialOximeter * oxi = qobject_cast<SerialOximeter *>(lookupLoader(cms50f37_class_name));
+        loaders.push_back(oxi);
+    } else if (ui->oximeterType->currentIndex() == 1) { // CMS50D+/E/F
         SerialOximeter * oxi = qobject_cast<SerialOximeter *>(lookupLoader(cms50_class_name));
         loaders.push_back(oxi);
-    } else if (p_profile->oxi->oximeterType() == "Contec CMS50F v3.7+") {
-        SerialOximeter * oxi = qobject_cast<SerialOximeter *>(lookupLoader(cms50f37_class_name));
+    } else if (ui->oximeterType->currentIndex() == 2) { // ChoiceMed
+        SerialOximeter * oxi = qobject_cast<SerialOximeter *>(lookupLoader(md300w1_class_name));
         loaders.push_back(oxi);
     } else return nullptr;
 
@@ -202,6 +215,7 @@ SerialOximeter * OximeterImport::detectOximeter()
 
     if (!oximodule) {
         updateStatus(tr("Could not detect any connected oximeter devices."));
+        ui->retryButton->setVisible(true);
         return nullptr;
     }
 
@@ -230,8 +244,18 @@ void OximeterImport::on_directImportButton_clicked()
 
     QString model = oximodule->getModel();
     QString user = oximodule->getUser();
+    QString devid = oximodule->getDeviceID();
 
-
+    if (oximodule->commandDriven()) {
+        if (devid != ui->cms50DeviceName->text()) {
+            if (ui->cms50CheckName->isChecked()) {
+                mainwin->Notify(STR_MessageBox_Information, tr("Renaming this oximeter from '%1' to '%2'").arg(devid).arg(ui->cms50DeviceName->text()));
+                oximodule->setDeviceID(ui->cms50DeviceName->text());
+            } else {
+                QMessageBox::information(this, STR_MessageBox_Information, tr("Oximeter name is different.. If you only have one and are sharing it between profiles, set the name to the same on both profiles."), QMessageBox::Ok);
+            }
+        }
+    }
 
     oximodule->resetDevice();
     int session_count = oximodule->getSessionCount();
@@ -288,10 +312,10 @@ void OximeterImport::doImport()
 {
     if (oximodule->commandDriven()) {
         if (chosen_sessions.size() == 0) {
-            ui->connectLabel->setText("<h2>"+tr("Nothing to import for %1").arg(oximodule->getModel())+"</h2>");
-            ui->logBox->appendPlainText(tr("Could not find any valid sessions on your oximeter."));
+            ui->connectLabel->setText("<h2>"+tr("Nothing to import")+"</h2>");
 
-            updateStatus(tr("Your oximeter did not have any valid sessions"));
+            updateStatus(tr("Your oximeter did not have any valid sessions."));
+            ui->cancelButton->setText(tr("Close"));
             return;
         }
         ui->connectLabel->setText("<h2>"+tr("Waiting for %1 to start").arg(oximodule->getModel())+"</h2>");
@@ -308,7 +332,7 @@ void OximeterImport::doImport()
     oximodule->Open("import");
 
     if (oximodule->commandDriven()) {
-        int chosen = chosen_sessions.takeFirst();
+        int chosen = chosen_sessions.at(0);
         oximodule->getSessionData(chosen);
     }
 
@@ -1072,3 +1096,50 @@ void OximeterImport::setInformation()
     ui->textBrowser->setHtml(html);
     ui->textBrowser->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 }
+
+void OximeterImport::on_oximeterType_currentIndexChanged(int index)
+{
+    switch (index) {
+    case 0: //New CMS50's
+        ui->directImportButton->setEnabled(true);
+        ui->liveImportButton->setEnabled(false);
+        ui->fileImportButton->setEnabled(true);
+        ui->oldCMS50specific->setVisible(false);
+        ui->newCMS50settingsPanel->setVisible(true);
+        break;
+    case 1:
+        ui->directImportButton->setEnabled(true);
+        ui->liveImportButton->setEnabled(true);
+        ui->fileImportButton->setEnabled(true);
+        ui->oldCMS50specific->setVisible(true);
+        ui->newCMS50settingsPanel->setVisible(false);
+        break;
+    default:
+        ui->directImportButton->setEnabled(false);
+        ui->liveImportButton->setEnabled(false);
+        ui->fileImportButton->setEnabled(true);
+        ui->oldCMS50specific->setVisible(false);
+        ui->newCMS50settingsPanel->setVisible(false);
+    }
+    p_profile->oxi->setOximeterType(index);
+
+}
+
+void OximeterImport::on_cms50CheckName_clicked(bool checked)
+{
+    ui->cms50DeviceName->setEnabled(checked);
+    if (checked) {
+        ui->cms50DeviceName->setFocus();
+        ui->cms50DeviceName->setCursorPosition(0);
+    }
+}
+
+void OximeterImport::on_cms50SyncTime_clicked(bool checked)
+{
+    p_profile->oxi->setSyncOximeterClock(checked);
+}
+
+void OximeterImport::on_cms50DeviceName_textEdited(const QString &arg1)
+{
+    p_profile->oxi->setDefaultDevice(arg1);
+}

sleepyhead/oximeterimport.h

@@ -77,6 +77,14 @@ private slots:
 
     void on_chooseSessionButton_clicked();
 
+    void on_oximeterType_currentIndexChanged(int index);
+
+    void on_cms50CheckName_clicked(bool checked);
+
+    void on_cms50SyncTime_clicked(bool checked);
+
+    void on_cms50DeviceName_textEdited(const QString &arg1);
+
 protected slots:
     void on_updatePlethy(QByteArray plethy);
     void finishedRecording();
@@ -103,7 +111,6 @@ private:
     QTimer updateTimer;
     OximeterImportMode importMode;
 
-
     int pulse;
     int spo2;
 

sleepyhead/oximeterimport.ui

@@ -28,6 +28,28 @@
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer_8">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>200</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QLabel" name="label_2">
        <property name="font">
@@ -647,7 +669,7 @@ border-radius: 0px;</string>
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>2</number>
+        <number>1</number>
        </property>
        <widget class="QWidget" name="welcomePage">
         <layout class="QVBoxLayout" name="verticalLayout">
@@ -783,7 +805,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
             </font>
            </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SleepyHead fully supports Contec CMS50D+/E/F serial oximeters, &lt;br/&gt;as well as data files made by ChoiceMMed MD300W1 oximeters' software.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Please note: &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Make sure your correct oximeter type is selected otherwise import will fail.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignHCenter|Qt::AlignTop</set>
@@ -824,6 +846,192 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            </property>
           </widget>
          </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <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>
+            <widget class="QLabel" name="label_13">
+             <property name="text">
+              <string>Select Oximeter Type:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="oximeterType">
+             <property name="sizeAdjustPolicy">
+              <enum>QComboBox::AdjustToContents</enum>
+             </property>
+             <item>
+              <property name="text">
+               <string>CMS50Fv3.7+/H/I, Pulox PO-400/500</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>CMS50D+/E/F, Pulox PO-200/300</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>ChoiceMMed MD300W1</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QLabel" name="oldCMS50specific">
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <italic>true</italic>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>CMS50E/F users, when importing directly, please don't select upload on your device until SleepyHead prompts you to.</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="newCMS50settingsPanel">
+           <property name="mouseTracking">
+            <bool>true</bool>
+           </property>
+           <property name="title">
+            <string>Contec CMS50F/H/I Import Options</string>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <property name="leftMargin">
+             <number>4</number>
+            </property>
+            <property name="topMargin">
+             <number>4</number>
+            </property>
+            <property name="rightMargin">
+             <number>4</number>
+            </property>
+            <property name="bottomMargin">
+             <number>4</number>
+            </property>
+            <item>
+             <widget class="QCheckBox" name="cms50SyncTime">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, SleepyHead will automatically reset your CMS50's internal clock using your computers current time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="text">
+               <string>Set device date/time</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="cms50CheckName">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check to enable updating the device identifier next import, which is useful for those who have multiple oximeters lying around.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="text">
+               <string>Set device identifier</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="cms50DeviceName">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>100</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Here you can enter a 7 character pet name for this oximeter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="inputMask">
+               <string notr="true">nnnnnnn</string>
+              </property>
+              <property name="text">
+               <string notr="true"/>
+              </property>
+              <property name="frame">
+               <bool>true</bool>
+              </property>
+              <property name="cursorPosition">
+               <number>0</number>
+              </property>
+              <property name="placeholderText">
+               <string notr="true"/>
+              </property>
+              <property name="cursorMoveStyle">
+               <enum>Qt::LogicalMoveStyle</enum>
+              </property>
+              <property name="clearButtonEnabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_11">
+              <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>
+             <widget class="QCheckBox" name="cms50EraseAfterwards">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option will erase the imported session from your oximeter after import has completed. &lt;/p&gt;&lt;p&gt;Use with caution,  becauseif something goes wrong before SleepyHead saves your session, you won't get it back.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="text">
+               <string>Erase session after successful upload</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
          <item>
           <spacer name="verticalSpacer_4">
            <property name="orientation">
@@ -846,7 +1054,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
             <string notr="true"/>
            </property>
            <property name="text">
-            <string>Directly from a recording on a device</string>
+            <string>Import directly from a recording on a device</string>
            </property>
            <property name="icon">
             <iconset resource="Resources.qrc">

sleepyhead/preferencesdialog.cpp

@@ -203,15 +203,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->overlayFlagsCombo->setCurrentIndex(profile->appearance->overlayType());
     ui->overviewLinecharts->setCurrentIndex(profile->appearance->overviewLinechartMode());
 
-    ui->syncOximeterClock->setChecked(profile->oxi->syncOximeterClock());
-    ui->oximetrySync->setChecked(profile->oxi->syncOximetry());
-    ui->oximetrySync->setVisible(false);
-    int ot = ui->oximetryType->findText(profile->oxi->oximeterType(), Qt::MatchExactly);
-
-    if (ot < 0) { ot = 0; }
-
-    ui->oximetryType->setCurrentIndex(ot);
-
     ui->ahiGraphWindowSize->setEnabled(false);
     ui->ahiGraphWindowSize->setValue(profile->cpap->AHIWindow());
     ui->ahiGraphZeroReset->setChecked(profile->cpap->AHIReset());
@@ -758,32 +749,7 @@ bool PreferencesDialog::Save()
     profile->cpap->setClockDrift(s);
 
     profile->appearance->setOverlayType((OverlayDisplayType)ui->overlayFlagsCombo->currentIndex());
-    profile->appearance->setOverviewLinechartMode((OverviewLinechartModes)
-            ui->overviewLinecharts->currentIndex());
-
-    profile->oxi->setSyncOximetry(ui->oximetrySync->isChecked());
-    int oxigrp = ui->oximetrySync->isChecked() ? 0 : 1;
-    gGraphView *gv = mainwin->getDaily()->graphView();
-    gGraph *g = gv->findGraph(schema::channel[OXI_Pulse].code());
-
-    if (g) {
-        g->setGroup(oxigrp);
-    }
-
-    g = gv->findGraph(schema::channel[OXI_SPO2].code());
-
-    if (g) {
-        g->setGroup(oxigrp);
-    }
-
-    g = gv->findGraph(schema::channel[OXI_Plethy].code());
-
-    if (g) {
-        g->setGroup(oxigrp);
-    }
-
-    profile->oxi->setOximeterType(ui->oximetryType->currentText());
-    profile->oxi->setSyncOximeterClock(ui->syncOximeterClock->isChecked());
+    profile->appearance->setOverviewLinechartMode((OverviewLinechartModes)ui->overviewLinecharts->currentIndex());
 
     profile->oxi->setSpO2DropPercentage(ui->spo2Drop->value());
     profile->oxi->setSpO2DropDuration(ui->spo2DropTime->value());

sleepyhead/preferencesdialog.ui

@@ -51,7 +51,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -1258,7 +1258,90 @@ A value of 20% works well for detecting apneas. </string>
           <property name="spacing">
            <number>5</number>
           </property>
-          <item row="4" column="0" colspan="2">
+          <item row="2" column="0" colspan="2">
+           <widget class="QGroupBox" name="groupBox_3">
+            <property name="title">
+             <string>Other oximetry options</string>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_13">
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="oxiDesaturationThreshold">
+               <property name="suffix">
+                <string>%</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QSpinBox" name="flagPulseBelow">
+               <property name="suffix">
+                <string> bpm</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QSpinBox" name="oxiDiscardThreshold">
+               <property name="toolTip">
+                <string>Small chunks of oximetry data under this amount will be discarded.</string>
+               </property>
+               <property name="suffix">
+                <string>s</string>
+               </property>
+               <property name="maximum">
+                <number>300</number>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_33">
+               <property name="text">
+                <string>Discard segments under</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QSpinBox" name="flagPulseAbove">
+               <property name="suffix">
+                <string> bpm</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_52">
+               <property name="text">
+                <string>Flag SPO2 Desaturations Below</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_54">
+               <property name="text">
+                <string>Flag Pulse Rate Below</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_53">
+               <property name="text">
+                <string>Flag Pulse Rate Above</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
            <widget class="QGroupBox" name="groupBox_4">
             <property name="title">
              <string>Flag rapid changes in oximetry stats</string>
@@ -1351,166 +1434,7 @@ A value of 20% works well for detecting apneas. </string>
             </layout>
            </widget>
           </item>
-          <item row="5" column="0" colspan="2">
-           <widget class="QGroupBox" name="groupBox_3">
-            <property name="title">
-             <string>Other oximetry options</string>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_13">
-             <item row="1" column="1">
-              <widget class="QSpinBox" name="oxiDesaturationThreshold">
-               <property name="suffix">
-                <string>%</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QSpinBox" name="flagPulseAbove">
-               <property name="suffix">
-                <string> bpm</string>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QSpinBox" name="flagPulseBelow">
-               <property name="suffix">
-                <string> bpm</string>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QSpinBox" name="oxiDiscardThreshold">
-               <property name="toolTip">
-                <string>Small chunks of oximetry data under this amount will be discarded.</string>
-               </property>
-               <property name="suffix">
-                <string>s</string>
-               </property>
-               <property name="maximum">
-                <number>300</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_52">
-               <property name="text">
-                <string>Flag SPO2 Desaturations Below</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QLabel" name="label_33">
-               <property name="text">
-                <string>Discard segments under</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_53">
-               <property name="text">
-                <string>Flag Pulse Rate Above</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="label_54">
-               <property name="text">
-                <string>Flag Pulse Rate Below</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0" colspan="2">
-              <widget class="QCheckBox" name="syncOximeterClock">
-               <property name="toolTip">
-                <string>If your oximeter supports it, SleepyHead will attempt to set your Oximeters clock from your computers time.</string>
-               </property>
-               <property name="text">
-                <string>Update Oximeter Clock during import</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_20">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Type</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="2">
-           <widget class="QCheckBox" name="oximetrySync">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>Tries to forces the oximetry data to link with CPAP when possible.</string>
-            </property>
-            <property name="text">
-             <string>Link Oximetry and CPAP graphs</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="0" colspan="2">
-           <widget class="Line" name="line_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="oximetryType">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <item>
-             <property name="text">
-              <string>Contec CMS50D+/E/F</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Contec CMS50F v3.7+</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ChoiceMMed MD300W1</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ResMed S9 Oximeter Module</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="6" column="0" colspan="2">
            <spacer name="verticalSpacer_6">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -2844,8 +2768,8 @@ this application to be unstable with this feature enabled.</string>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>541</x>
-     <y>387</y>
+     <x>757</x>
+     <y>605</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>