diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp index 0df96030..d704e7a4 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp @@ -202,10 +202,10 @@ int CMS50Loader::doImportMode() oda = oda.addDays(-1); } - oxitime = QDateTime(oda,oti); + m_startTime = oxitime = QDateTime(oda,oti); // Convert it to UTC - oxitime=oxitime.toTimeSpec(Qt::UTC); + oxitime = oxitime.toTimeSpec(Qt::UTC); qDebug() << "Session start (according to CMS50)" << oxitime<< hex << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << dec << hour << minute ; @@ -232,7 +232,7 @@ int CMS50Loader::doImportMode() return idx; } - quint8 pulse=(unsigned char)buffer.at(idx + 1) & 0xff; + 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)); diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index f1d4a6fc..e913b8a2 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -950,9 +950,9 @@ QString Daily::getOximeterInformation(Day * oxi) html+=" "; html+=""+oxi->machine->properties[STR_PROP_Brand]+" "+oxi->machine->properties[STR_PROP_Model]+"\n"; html+=" "; - html+=QString("%1: %2 (%3)%%").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0),0,'f',2); - html+=QString("%1: %2 (%3)%%").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0),0,'f',2); - html+=QString("%1: %2%%").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop),0,'f',2); // CHECKME: Should this value be wavg OXI_SPO2 isntead? + html+=QString("%1: %2 (%3%)").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0),0,'f',2); + html+=QString("%1: %2 (%3%)").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0),0,'f',2); + html+=QString("%1: %2%").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop),0,'f',2); // CHECKME: Should this value be wavg OXI_SPO2 isntead? html+="\n"; html+="
\n"; } diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index c5ac13b9..ec3bd53f 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -8,6 +8,10 @@ #include "oximeterimport.h" #include "ui_oximeterimport.h" +#include "SleepLib/calcs.h" +#include "mainwindow.h" + +extern MainWindow * mainwin; #include "SleepLib/loader_plugins/cms50_loader.h" @@ -629,3 +633,149 @@ void OximeterImport::on_syncButton_clicked() } + +void OximeterImport::on_saveButton_clicked() +{ + 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; + + 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); + } else { + // Live recording... + if (dummyday) { + dummyday->removeSession(session); + delete dummyday; + dummyday = nullptr; + } + session->SetSessionID(sid); + session->really_set_first(start); + ELplethy->setFirst(start); + session->setFirst(OXI_Plethy, start); + quint64 duration = start + (ELplethy->count() * ELplethy->rate()); + quint64 end = start + duration; + session->setLast(OXI_Plethy, end); + + session->count(OXI_Plethy); + session->Min(OXI_Plethy); + session->Max(OXI_Plethy); + } + EventList * ELpulse = nullptr; + EventList * ELspo2 = nullptr; + + quint16 lastpulse = 0; + quint16 lastspo2 = 0; + quint16 lastgoodpulse = 0; + quint16 lastgoodspo2 = 0; + + quint64 ti = start; + for (int i=1; i < size; ++i) { + OxiRecord * rec = &oximodule->oxirec[i]; + + if (rec->pulse > 0) { + if (lastpulse == 0) { + ELpulse = session->AddEventList(OXI_Pulse, EVL_Event); + } + if (lastpulse != rec->pulse) { + if (lastpulse > 0) { + ELpulse->AddEvent(ti, lastpulse); + } + ELpulse->AddEvent(ti, rec->pulse); + } + lastgoodpulse = rec->pulse; + } else { + // end section properly + if (lastgoodpulse > 0) { + ELpulse->AddEvent(ti, lastpulse); + session->setLast(OXI_Pulse, ti); + lastgoodpulse = 0; + } + } + + lastpulse = rec->pulse; + + if (rec->spo2 > 0) { + if (lastspo2 == 0) { + ELspo2 = session->AddEventList(OXI_SPO2, EVL_Event); + } + if (lastspo2 != rec->spo2) { + if (lastspo2 > 0) { + ELspo2->AddEvent(ti, lastspo2); + } + ELspo2->AddEvent(ti, rec->spo2); + } + lastgoodspo2 = rec->spo2; + } else { + // end section properly + if (lastgoodspo2 > 0) { + ELspo2->AddEvent(ti, lastspo2); + session->setLast(OXI_SPO2, ti); + lastgoodspo2 = 0; + } + } + lastspo2 = rec->spo2; + + ti += 20; + } + ti -= 20; + if (lastpulse > 0) { + ELpulse->AddEvent(ti, lastpulse); + session->setLast(OXI_Pulse, ti); + } + + if (lastspo2 > 0) { + ELspo2->AddEvent(ti, lastspo2); + session->setLast(OXI_SPO2, ti); + } + + + calcSPO2Drop(session); + calcPulseChange(session); + + session->first(OXI_Pulse); + session->first(OXI_SPO2); + session->last(OXI_Pulse); + session->last(OXI_SPO2); + + session->first(OXI_PulseChange); + session->first(OXI_SPO2Drop); + session->last(OXI_PulseChange); + session->last(OXI_SPO2Drop); + + session->cph(OXI_PulseChange); + session->sph(OXI_PulseChange); + + session->cph(OXI_SPO2Drop); + session->sph(OXI_SPO2Drop); + + session->count(OXI_Pulse); + session->count(OXI_SPO2); + session->count(OXI_PulseChange); + session->count(OXI_SPO2Drop); + session->Min(OXI_Pulse); + session->Max(OXI_Pulse); + session->Min(OXI_SPO2); + session->Max(OXI_SPO2); + + session->really_set_last(ti); + session->SetChanged(true); + + mach->AddSession(session, p_profile); + mach->Save(); + + mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate()); + mainwin->getOverview()->ReloadGraphs(); + + ELplethy = nullptr; + session = nullptr; + + accept(); +} diff --git a/sleepyhead/oximeterimport.h b/sleepyhead/oximeterimport.h index a33676d3..984868f9 100644 --- a/sleepyhead/oximeterimport.h +++ b/sleepyhead/oximeterimport.h @@ -58,6 +58,8 @@ private slots: void on_syncButton_clicked(); + void on_saveButton_clicked(); + protected slots: void on_updatePlethy(QByteArray plethy); void finishedRecording(); diff --git a/sleepyhead/oximeterimport.ui b/sleepyhead/oximeterimport.ui index a8fc5fdb..af9f016c 100644 --- a/sleepyhead/oximeterimport.ui +++ b/sleepyhead/oximeterimport.ui @@ -7,7 +7,7 @@ 0 0 905 - 625 + 595 @@ -768,19 +768,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) } - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -805,19 +792,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -914,19 +888,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1056,35 +1017,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) 6 - - - - - 75 - true - - - - Show Live Graphs - - - true - - - - - - - Qt::Horizontal - - - - 139 - 20 - - - - @@ -1121,6 +1053,35 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) + + + + + 75 + true + + + + Show Live Graphs + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -1312,7 +1273,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - + 0 0 @@ -1320,7 +1281,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) 0 - 200 + 180 @@ -1342,7 +1303,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - + 0 0 @@ -1363,7 +1324,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) 0 - 200 + 180 @@ -1434,19 +1395,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1460,6 +1408,22 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) + + + + + 0 + 0 + + + + <html><head/><body><p>Note: Syncing to CPAP session starting time will always be more accurate.</p></body></html> + + + true + + + @@ -1568,7 +1532,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - + Qt::Horizontal @@ -1588,24 +1552,16 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) 0 + + + 14 + + You can manually adjust the time here if required: - - - - Qt::Horizontal - - - - 40 - 20 - - - -