From f203cd5aa013c1afb25598c1dda2d01d64071b8c Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 29 May 2014 03:45:42 +1000 Subject: [PATCH] Added delete days oximetry sessions menu option --- sleepyhead/SleepLib/profiles.cpp | 2 ++ sleepyhead/daily.cpp | 2 +- sleepyhead/mainwindow.cpp | 19 +++++++++++++++++++ sleepyhead/mainwindow.h | 2 ++ sleepyhead/mainwindow.ui | 13 +++++++++++++ sleepyhead/oximeterimport.cpp | 3 ++- sleepyhead/oximeterimport.ui | 13 +++++++------ 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index fe6ab85d..ee1fb379 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -455,6 +455,7 @@ void Profile::RemoveSession(Session *sess) { QMap >::iterator di; QMap >::iterator daylist_end=daylist.end(); + Machine * mach = sess->machine(); for (di = daylist.begin(); di != daylist_end; di++) { for (int d = 0; d < di.value().size(); d++) { @@ -484,6 +485,7 @@ void Profile::RemoveSession(Session *sess) if (day->size() == 0) { di.value().removeAll(day); + mach->day.erase(mach->day.find(di.key())); delete day; } diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index e913b8a2..63942a90 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -556,7 +556,7 @@ void Daily::ReloadGraphs() ui->calendar->blockSignals(false); Load(d); ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate)); - + graphView()->redraw(); } void Daily::on_calendar_currentPageChanged(int year, int month) diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index f839e577..a06e48b2 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -2282,3 +2282,22 @@ void MainWindow::on_reportModeRange_clicked() GenerateStatistics(); } } + +void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered() +{ + QDate date = getDaily()->getDate(); + Day * day = PROFILE.GetDay(date, MT_OXIMETER); + if (day) { + QList sessions; + sessions.append(day->getSessions()); + + for (int i=0; i < sessions.size(); ++i) { + sessions.at(i)->Destroy(); + } + + + daily->clearLastDay(); // otherwise Daily will crash + + getDaily()->ReloadGraphs(); + } +} diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 0e5760ed..96b440ef 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -312,6 +312,8 @@ class MainWindow : public QMainWindow void on_reportModeRange_clicked(); + void on_actionPurgeCurrentDaysOximetry_triggered(); + private: int importCPAP(const QString &path, const QString &message); void importCPAPBackups(); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index d3458f1a..13d2da4e 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -3148,8 +3148,16 @@ border-radius: 10px; + + + Purge Oximetery Data + + + + + @@ -3394,6 +3402,11 @@ border-radius: 10px; Import &Somnopose Data + + + Current Days + + diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 13f5939f..b51aa3bb 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -634,7 +634,8 @@ void OximeterImport::on_syncButton_clicked() ui->calendarWidget->setMinimumDate(PROFILE.FirstDay()); ui->calendarWidget->setMaximumDate(PROFILE.LastDay()); - on_calendarWidget_clicked(PROFILE.LastDay()); + // TODO: think this through better.. do I need to pick the day before? + on_calendarWidget_clicked(oximodule->startTime().date()); ui->radioSyncOximeter->setChecked(true); on_radioSyncOximeter_clicked(); diff --git a/sleepyhead/oximeterimport.ui b/sleepyhead/oximeterimport.ui index ed4288ee..90f7a013 100644 --- a/sleepyhead/oximeterimport.ui +++ b/sleepyhead/oximeterimport.ui @@ -6,8 +6,8 @@ 0 0 - 905 - 595 + 986 + 623 @@ -644,7 +644,7 @@ border-radius: 0px; - 4 + 1 @@ -707,7 +707,8 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt;">Welcome to the Oximeter Import Wizard</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Pulse Oximeters are medical devices used to measure blood oxygen saturation. During extended Apnea events and abnormal breathing patterns, blood oxygen saturation levels can drop significantly, and can indicate issues that need medical attention.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SleepyHead gives you the ability to track Oximetry data alongside CPAP session data, which can give valuable insight into the effectiveness of CPAP treatment. It will also work standalone with your Pulse Oximeter, allowing you to store, track and review your recorded data.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SleepyHead is currently compatible with Contec CMS50D+, CMS50E and CMS50F serial oximeters. (Note: Direct importing from bluetooth models is <span style=" font-weight:600;">not</span> supported yet)</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SleepyHead is currently compatible with Contec CMS50D+, CMS50E and CMS50F serial oximeters.<br />(Note: Direct importing from bluetooth models is <span style=" font-weight:600;">not</span> supported yet)</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It also can read from ChoiceMMed MD300W1 oximeter .dat files.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Please remember: </span><span style=" font-weight:600; font-style:italic;">If you are trying to sync oximetery and CPAP data, please make sure you imported your CPAP sessions first before proceeding!</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Important Notes: </span>For SleepyHead to be able to locate and read directly from your Oximeter device, you need to ensure the correct device drivers (eg. USB to Serial UART) have been installed on your computer. For more information about this, <a href="http://sleepyhead.sf.net/"><span style=" text-decoration: underline; color:#0000ff;">click here</span></a>.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Contec CMS50D+ devices do not have an internal clock, and do not record a starting time. If you do not have a CPAP session to link a recording to, you will have to enter the start time manually after the import process is completed.</p> @@ -782,7 +783,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - <html><head/><body><p>SleepyHead supports importing directly from CMS50D+/E/F serial oximeters, <br/>as well as from SpO2Review softwares .spo/.spoR datafiles. </p><p>Please note that Bluetooth models are currently <span style=" font-weight:600;">not</span> supported.</p></body></html> + <html><head/><body><p>SleepyHead fully supports Contec CMS50D+/E/F serial oximeters, <br/>as well as data files made by ChoiceMMed MD300W1 oximeters' software.</p></body></html> Qt::AlignHCenter|Qt::AlignTop @@ -894,7 +895,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - Import from other softwares datafile + Import from a datafile saved by another program, like SpO2Review