diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 0253b068..2b373dce 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -2128,10 +2128,10 @@ void Profile::loadChannels() if (in.atEnd()) break; } f.close(); - refrehOxiChannelsPref(); + resetOxiChannelPref(); } -void Profile::refrehOxiChannelsPref() { +void Profile::resetOxiChannelPref() { schema::channel[OXI_Pulse].setLowerThreshold(oxi->flagPulseBelow()); schema::channel[OXI_Pulse].setUpperThreshold(oxi->flagPulseAbove()); schema::channel[OXI_SPO2].setLowerThreshold(oxi->oxiDesaturationThreshold()); diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h index 2d0f127a..6729b1b5 100644 --- a/oscar/SleepLib/profiles.h +++ b/oscar/SleepLib/profiles.h @@ -216,7 +216,7 @@ class Profile : public Preferences void loadChannels(); void saveChannels(); - void refrehOxiChannelsPref(); + void resetOxiChannelPref(); bool is_first_day; @@ -295,16 +295,16 @@ const QString STR_OS_EnableOximetry = "EnableOximetry"; const QString STR_OS_DefaultDevice = "DefaultOxiDevice"; const QString STR_OS_SyncOximeterClock = "SyncOximeterClock"; const QString STR_OS_OximeterType = "OximeterType"; -const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold"; +const QString STR_OS_SkipOxiIntroScreen = "SkipOxiIntroScreen"; + const QString STR_OS_SPO2DropDuration = "SPO2DropDuration"; const QString STR_OS_SPO2DropPercentage = "SPO2DropPercentage"; const QString STR_OS_PulseChangeDuration = "PulseChangeDuration"; const QString STR_OS_PulseChangeBPM = "PulseChangeBPM"; - -const QString STR_OS_SkipOxiIntroScreen = "SkipOxiIntroScreen"; const QString STR_OS_oxiDesaturationThreshold = "oxiDesaturationThreshold"; const QString STR_OS_flagPulseAbove = "flagPulseAbove"; const QString STR_OS_flagPulseBelow = "flagPulseBelow"; +const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold"; // CPAPSettings Strings @@ -484,38 +484,53 @@ class OxiSettings : public PrefSettings OxiSettings(Profile *profile) : PrefSettings(profile) { - initPref(STR_OS_EnableOximetry, false); + + // Intialized non-user changable item - set during import of data? + initPref(STR_OS_EnableOximetry, false); initPref(STR_OS_DefaultDevice, QString()); initPref(STR_OS_SyncOximeterClock, true); initPref(STR_OS_OximeterType, 0); - initPref(STR_OS_OxiDiscardThreshold, 0.0); - initPref(STR_OS_SPO2DropDuration, 8.0); - initPref(STR_OS_SPO2DropPercentage, 3.0); - initPref(STR_OS_PulseChangeDuration, 8.0); - initPref(STR_OS_PulseChangeBPM, 5.0); - initPref(STR_OS_SkipOxiIntroScreen, false); + initPref(STR_OS_SkipOxiIntroScreen, false); + + // Initialize Changeable via GUI parameters with default values + initPref(STR_OS_SPO2DropDuration, defaultValue_OS_SPO2DropDuration); + initPref(STR_OS_SPO2DropPercentage, defaultValue_OS_SPO2DropPercentage); + initPref(STR_OS_PulseChangeDuration, defaultValue_OS_PulseChangeDuration); + initPref(STR_OS_PulseChangeBPM, defaultValue_OS_PulseChangeBPM); + + initPref(STR_OS_OxiDiscardThreshold, defaultValue_OS_OxiDiscardThreshold); + initPref(STR_OS_oxiDesaturationThreshold, defaultValue_OS_oxiDesaturationThreshold); + initPref(STR_OS_flagPulseAbove, defaultValue_OS_flagPulseAbove); + initPref(STR_OS_flagPulseBelow, defaultValue_OS_flagPulseBelow); - initPref(STR_OS_oxiDesaturationThreshold, 88); - initPref(STR_OS_flagPulseAbove, 130); - initPref(STR_OS_flagPulseBelow, 40); } + const double defaultValue_OS_SPO2DropDuration = 8.0; + const double defaultValue_OS_SPO2DropPercentage = 3.0; + const double defaultValue_OS_PulseChangeDuration = 8.0; + const double defaultValue_OS_PulseChangeBPM = 5.0; + + const double defaultValue_OS_OxiDiscardThreshold = 0.0; + const double defaultValue_OS_oxiDesaturationThreshold = 88.0; + const double defaultValue_OS_flagPulseAbove = 99.0; + const double defaultValue_OS_flagPulseBelow = 40.0; + bool oximetryEnabled() const { return getPref(STR_OS_EnableOximetry).toBool(); } QString defaultDevice() const { return getPref(STR_OS_DefaultDevice).toString(); } bool syncOximeterClock() const { return getPref(STR_OS_SyncOximeterClock).toBool(); } int oximeterType() const { return getPref(STR_OS_OximeterType).toInt(); } - double oxiDiscardThreshold() const { return getPref(STR_OS_OxiDiscardThreshold).toDouble(); } + bool skipOxiIntroScreen() const { return getPref(STR_OS_SkipOxiIntroScreen).toBool(); } + double spO2DropDuration() const { return getPref(STR_OS_SPO2DropDuration).toDouble(); } double spO2DropPercentage() const { return getPref(STR_OS_SPO2DropPercentage).toDouble(); } double pulseChangeDuration() const { return getPref(STR_OS_PulseChangeDuration).toDouble(); } double pulseChangeBPM() const { return getPref(STR_OS_PulseChangeBPM).toDouble(); } - bool skipOxiIntroScreen() const { return getPref(STR_OS_SkipOxiIntroScreen).toBool(); } + double oxiDiscardThreshold() const { return getPref(STR_OS_OxiDiscardThreshold).toDouble(); } double oxiDesaturationThreshold() const { return getPref(STR_OS_oxiDesaturationThreshold).toDouble(); } double flagPulseAbove() const { return getPref(STR_OS_flagPulseAbove).toDouble(); } double flagPulseBelow() const { return getPref(STR_OS_flagPulseBelow).toDouble(); } - void setOximetryEnabled(bool enabled) { setPref(STR_OS_EnableOximetry, enabled); } void setDefaultDevice(QString name) { setPref(STR_OS_DefaultDevice, name); } void setSyncOximeterClock(bool synced) { setPref(STR_OS_SyncOximeterClock, synced); } diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 827acc8f..8e049887 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -136,9 +136,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->flagPulseBelow->setValue(profile->oxi->flagPulseBelow()); ui->spo2Drop->setValue(profile->oxi->spO2DropPercentage()); - ui->spo2DropTime->setValue(profile->oxi->spO2DropDuration()); + ui->spo2DropDuration->setValue(profile->oxi->spO2DropDuration()); ui->pulseChange->setValue(profile->oxi->pulseChangeBPM()); - ui->pulseChangeTime->setValue(profile->oxi->pulseChangeDuration()); + ui->pulseChangeDuration->setValue(profile->oxi->pulseChangeDuration()); ui->oxiDiscardThreshold->setValue(profile->oxi->oxiDiscardThreshold()); ui->eventIndexCombo->setCurrentIndex(profile->general->calculateRDI() ? 1 : 0); @@ -889,9 +889,9 @@ bool PreferencesDialog::Save() #endif profile->oxi->setSpO2DropPercentage(ui->spo2Drop->value()); - profile->oxi->setSpO2DropDuration(ui->spo2DropTime->value()); + profile->oxi->setSpO2DropDuration(ui->spo2DropDuration->value()); profile->oxi->setPulseChangeBPM(ui->pulseChange->value()); - profile->oxi->setPulseChangeDuration(ui->pulseChangeTime->value()); + profile->oxi->setPulseChangeDuration(ui->pulseChangeDuration->value()); profile->oxi->setOxiDiscardThreshold(ui->oxiDiscardThreshold->value()); profile->oxi->setOxiDesaturationThreshold(ui->oxiDesaturationThreshold->value()); @@ -981,7 +981,7 @@ bool PreferencesDialog::Save() p_pref->Save(); profile->Save(); - profile->refrehOxiChannelsPref(); + profile->resetOxiChannelPref(); if (recompress_events) { mainwin->recompressEvents(); @@ -1213,6 +1213,42 @@ void PreferencesDialog::on_resetChannelDefaults_clicked() } } +void PreferencesDialog::on_resetOxiMetryDefaults_clicked() +{ + + if (QMessageBox::question(this, STR_MessageBox_Warning, QObject::tr("Are you sure you want to reset all your oximetry settings to defaults?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) { + + // reset ui with defaul values + ui->spo2Drop->setValue( profile->oxi->defaultValue_OS_SPO2DropPercentage); + ui->spo2DropDuration->setValue( profile->oxi->defaultValue_OS_SPO2DropDuration); + ui->pulseChange->setValue( profile->oxi->defaultValue_OS_PulseChangeBPM); + ui->pulseChangeDuration->setValue(profile->oxi->defaultValue_OS_PulseChangeDuration); + + ui->oxiDiscardThreshold->setValue(profile->oxi->defaultValue_OS_OxiDiscardThreshold); + ui->oxiDesaturationThreshold->setValue( profile->oxi->defaultValue_OS_oxiDesaturationThreshold); + ui->flagPulseAbove->setValue( profile->oxi->defaultValue_OS_flagPulseAbove ); + ui->flagPulseBelow->setValue( profile->oxi->defaultValue_OS_flagPulseBelow ); + + if (Save() ) { + // comment accept out to return to the preference tab + // other wise the preference tab will close and return + accept(); + } + } else { + // restore values changed + ui->spo2Drop->setValue(profile->oxi->spO2DropPercentage()); + ui->spo2DropDuration->setValue(profile->oxi->spO2DropDuration()); + ui->pulseChange->setValue(profile->oxi->pulseChangeBPM()); + ui->pulseChangeDuration->setValue(profile->oxi->pulseChangeDuration()); + + ui->oxiDiscardThreshold->setValue(profile->oxi->oxiDiscardThreshold()); + ui->oxiDesaturationThreshold->setValue(profile->oxi->defaultValue_OS_oxiDesaturationThreshold); + ui->flagPulseAbove->setValue( profile->oxi->defaultValue_OS_flagPulseAbove ); + ui->flagPulseBelow->setValue( profile->oxi->defaultValue_OS_flagPulseBelow ); + } + +} + void PreferencesDialog::on_createSDBackups_clicked(bool checked) { if (!checked && p_profile->session->backupCardData()) { diff --git a/oscar/preferencesdialog.h b/oscar/preferencesdialog.h index fc11f565..89fdce2e 100644 --- a/oscar/preferencesdialog.h +++ b/oscar/preferencesdialog.h @@ -93,6 +93,8 @@ class PreferencesDialog : public QDialog void on_calculateUnintentionalLeaks_toggled(bool arg1); + void on_resetOxiMetryDefaults_clicked(); + private: void InitChanInfo(); void InitWaveInfo(); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 48f0c49b..57ea9db9 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -1608,6 +1608,9 @@ as this is the only value available on summary-only days. + + 150 + bpm @@ -1672,7 +1675,7 @@ as this is the only value available on summary-only days. - + Minimum duration of drop in oxygen saturation @@ -1701,7 +1704,7 @@ as this is the only value available on summary-only days. - + Minimum duration of pulse change event. @@ -1758,6 +1761,19 @@ as this is the only value available on summary-only days. + + + + + 0 + 0 + + + + Reset &Defaults + + +