diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index cedf4c22..1772ab3b 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -95,11 +95,13 @@ void gLineChart::SetDay(Day *d) for (int i = 0; i < d->size(); i++) { Session *sess = d->sessions[i]; + if (!sess->enabled()) continue; if (code == CPAP_MaskPressure) { if (sess->channelExists(CPAP_MaskPressureHi)) { code = m_codes[j] = CPAP_MaskPressureHi; m_enabled[code] = schema::channel[CPAP_MaskPressureHi].enabled(); + goto skipcheck; // why not :P } } @@ -458,6 +460,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) EventDataType miny = m_physminy; EventDataType maxy = m_physmaxy; + w.roundY(miny, maxy); diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index 8b03e6d8..63b759fc 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -270,6 +270,7 @@ const QString STR_CS_Notes = "CPAPNotes"; const QString STR_CS_DateDiagnosed = "DateDiagnosed"; const QString STR_CS_UserEventFlagging = "UserEventFlagging"; const QString STR_CS_UserEventPieChart = "UserEventPieChart"; +const QString STR_CS_AutoImport = "AutoImport"; const QString STR_CS_UserFlowRestriction = "UserFlowRestriction"; const QString STR_CS_UserEventDuration = "UserEventDuration"; @@ -533,6 +534,7 @@ class CPAPSettings : public ProfileSettings initPref(STR_CS_ShowLeakRedline, true); initPref(STR_CS_UserEventPieChart, false); initPref(STR_CS_ResyncFromUserFlagging, false); + initPref(STR_CS_AutoImport, false); initPref(STR_CS_ClockDrift, (int)0); m_clock_drift = getPref(STR_CS_ClockDrift).toInt(); @@ -564,6 +566,7 @@ class CPAPSettings : public ProfileSettings bool showLeakRedline() const { return getPref(STR_CS_ShowLeakRedline).toBool(); } bool userEventPieChart() const { return getPref(STR_CS_UserEventPieChart).toBool(); } bool resyncFromUserFlagging() const { return getPref(STR_CS_ResyncFromUserFlagging).toBool(); } + bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); } //Setters @@ -596,6 +599,7 @@ class CPAPSettings : public ProfileSettings void setShowLeakRedline(bool reset) { setPref(STR_CS_ShowLeakRedline, reset); } void setUserEventPieChart(bool b) { setPref(STR_CS_UserEventPieChart, b); } void setResyncFromUserFlagging(bool b) { setPref(STR_CS_ResyncFromUserFlagging, b); } + void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); } public: int m_clock_drift; diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index eec09ed9..f4629957 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -889,29 +889,31 @@ void MainWindow::on_action_Import_Data_triggered() } else { infostr = tr("A %1 file structure was located at:").arg(datacards[0].loader->loaderName()); } - QMessageBox mbox(QMessageBox::NoIcon, - tr("CPAP Data Located"), - infostr+"\n\n"+QDir::toNativeSeparators(datacards[0].path)+"\n\n"+ - tr("Would you like to import from this location?"), - QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, - this); - mbox.setDefaultButton(QMessageBox::Yes); - mbox.setButtonText(QMessageBox::No, tr("Specify")); - QPixmap pixmap = QPixmap(getCPAPPixmap(datacards[0].loader->loaderName())).scaled(64,64); - mbox.setIconPixmap(pixmap); - int res = mbox.exec(); + if (!p_profile->cpap->autoImport()) { + QMessageBox mbox(QMessageBox::NoIcon, + tr("CPAP Data Located"), + infostr+"\n\n"+QDir::toNativeSeparators(datacards[0].path)+"\n\n"+ + tr("Would you like to import from this location?"), + QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, + this); + mbox.setDefaultButton(QMessageBox::Yes); + mbox.setButtonText(QMessageBox::No, tr("Specify")); - if (res == QMessageBox::Cancel) { - // Give the communal progress bar back - ui->statusbar->insertWidget(2,qprogress,1); - return; - } else if (res == QMessageBox::No) { - waitmsg->setText(tr("Please wait, launching file dialog...")); - datacards.clear(); - asknew = true; + QPixmap pixmap = QPixmap(getCPAPPixmap(datacards[0].loader->loaderName())).scaled(64,64); + mbox.setIconPixmap(pixmap); + int res = mbox.exec(); + + if (res == QMessageBox::Cancel) { + // Give the communal progress bar back + ui->statusbar->insertWidget(2,qprogress,1); + return; + } else if (res == QMessageBox::No) { + waitmsg->setText(tr("Please wait, launching file dialog...")); + datacards.clear(); + asknew = true; + } } - } else { waitmsg->setText(tr("No CPAP data card detected, launching file dialog...")); asknew = true; @@ -2333,6 +2335,10 @@ void MainWindow::doReprocessEvents() sess->destroyEvent(CPAP_AHI); sess->destroyEvent(CPAP_RDI); + if (sess->machine()->loaderName() != STR_MACH_PRS1) { + sess->destroyEvent(CPAP_LargeLeak); + } + sess->SetChanged(true); if (!cache_sessions) { diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 4990c4eb..362b9763 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -118,6 +118,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->pulseChangeTime->setValue(profile->oxi->pulseChangeDuration()); ui->oxiDiscardThreshold->setValue(profile->oxi->oxiDiscardThreshold()); ui->AddRERAtoAHI->setChecked(profile->general->calculateRDI()); + ui->automaticImport->setChecked(profile->cpap->autoImport()); ui->timeEdit->setTime(profile->session->daySplitTime()); int val = profile->session->combineCloseSessions(); @@ -415,6 +416,11 @@ bool PreferencesDialog::Save() needs_restart = true; } + if (profile->cpap->leakRedline() != ui->leakRedlineSpinbox->value()) { + recalc_events = true; + } + + if (profile->cpap->userEventFlagging() && (profile->cpap->userEventDuration() != ui->apneaDuration->value() || profile->cpap->userEventDuration2() != ui->apneaDuration2->value() || @@ -541,6 +547,7 @@ bool PreferencesDialog::Save() profile->cpap->setAHIWindow(ui->ahiGraphWindowSize->value()); profile->cpap->setAHIReset(ui->ahiGraphZeroReset->isChecked()); + profile->cpap->setAutoImport(ui->automaticImport->isChecked()); profile->cpap->setUserEventFlagging(ui->customEventGroupbox->isChecked()); diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 61eb2a0c..77368c3e 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -1361,16 +1361,112 @@ Try to sync it to your PC's clock (which should be synced to a timeserver) 5 - - + + + + Flag rapid changes in oximetry stats + + + + + + + 0 + 0 + + + + SPO2 + + + + + + + Minimum duration of drop in oxygen saturation + + + s + + + 0 + + + + + + + Sudden change in Pulse Rate of at least this amount + + + bpm + + + 0 + + + 1.000000000000000 + + + + + + + Minimum duration of pulse change event. + + + s + + + 0 + + + + + + + + 0 + 0 + + + + Pulse + + + + + + + Percentage drop in oxygen saturation + + + % + + + 0 + + + 1.000000000000000 + + + + + + + + - + 0 0 + + Tries to forces the oximetry data to link with CPAP when possible. + - Type + Link Oximetry and CPAP graphs @@ -1392,25 +1488,19 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)Contec CMS50F v3.7+ + + + ChoiceMMed MD300W1 + + + + + ResMed S9 Oximeter Module + + - - - - - 0 - 0 - - - - Tries to forces the oximetry data to link with CPAP when possible. - - - Link Oximetry and CPAP graphs - - - - + Qt::Vertical @@ -1423,107 +1513,53 @@ Try to sync it to your PC's clock (which should be synced to a timeserver) - - - - Flag changes in oximetry stats + + + + + 0 + 0 + - + + Type + + + + + + + Qt::Horizontal + + + + + + + Other oximetry options + + - - - - 0 - 0 - - + - SPO2 - - - - - - - Percentage drop in oxygen saturation - - - % - - - 0 - - - 1.000000000000000 - - - - - - - - 0 - 0 - - - - Pulse - - - - - - - Sudden change in Pulse Rate of at least this amount - - - bpm - - - 0 - - - 1.000000000000000 - - - - - - - Minimum duration of drop in oxygen saturation - - - s - - - 0 - - - - - - - Minimum duration of pulse change event. - - - s - - - 0 - - - - - - - Discard chunks under + Flag SPO2 Desaturations Below Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + + Discard segments under + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Small chunks of oximetry data under this amount will be discarded. @@ -1536,16 +1572,50 @@ Try to sync it to your PC's clock (which should be synced to a timeserver) + + + + % + + + + + + + Flag Pulse Rate Above + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Flag Pulse Rate Below + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + bpm + + + + + + + bpm + + + - - - - Qt::Horizontal - - - @@ -1745,6 +1815,16 @@ as this is the only value available on summary-only days. 4 + + + + Show flags for machine detected events that haven't been identified yet. + + + Show Unknown Flags + + + @@ -1755,16 +1835,6 @@ as this is the only value available on summary-only days. - - - - Daily view navigation buttons will skip over days without data records - - - Skip over Empty Days - - - @@ -1776,13 +1846,20 @@ Mainly affects the importer. - - + + - Show flags for machine detected events that haven't been identified yet. + Daily view navigation buttons will skip over days without data records - Show Unknown Flags + Skip over Empty Days + + + + + + + Import without nagging