chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Oximeter welcome page skippable and reaccessable.

Browse Source
This commit is contained in:
Mark Watkins 2014-05-26 20:22:38 +10:00
parent 83d8f1ea40
commit 66ed64be35
4 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/SleepLib/profiles.h
View File

@ -207,6 +207,8 @@ 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";
// CPAPSettings Strings
const QString STR_CS_ComplianceHours = "ComplianceHours";
@ -413,6 +415,7 @@ class OxiSettings : public ProfileSettings
initPref(STR_OS_SPO2DropPercentage, 3.0);
initPref(STR_OS_PulseChangeDuration, 8.0);
initPref(STR_OS_PulseChangeBPM, 5.0);
initPref(STR_OS_SkipOxiIntroScreen, false);
}
bool oximetryEnabled() const { return getPref(STR_OS_EnableOximetry).toBool(); }
@ -423,6 +426,8 @@ class OxiSettings : public ProfileSettings
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(); }
void setOximetryEnabled(bool enabled) { setPref(STR_OS_EnableOximetry, enabled); }
void setSyncOximetry(bool synced) { setPref(STR_OS_SyncOximetry, synced); }
@ -430,6 +435,7 @@ class OxiSettings : public ProfileSettings
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); }
void setSkipOxiIntroScreen(bool skip) { setPref(STR_OS_SkipOxiIntroScreen, skip); }
void setSpO2DropPercentage(double percentage) {
setPref(STR_OS_SPO2DropPercentage, percentage);
}

34
sleepyhead/oximeterimport.cpp
View File

@ -68,6 +68,18 @@ OximeterImport::OximeterImport(QWidget *parent) :
ELplethy = nullptr;
pulse = spo2 = -1;
ui->skipWelcomeCheckbox->setChecked(p_profile->oxi->skipOxiIntroScreen());
if (p_profile->oxi->skipOxiIntroScreen()) {
ui->stackedWidget->setCurrentWidget(ui->importSelectionPage);
ui->nextButton->setVisible(false);
ui->informationButton->setVisible(true);
} else {
ui->stackedWidget->setCurrentWidget(ui->welcomePage);
ui->nextButton->setVisible(true);
ui->informationButton->setVisible(false);
}
}
OximeterImport::~OximeterImport()
@ -96,8 +108,12 @@ void OximeterImport::on_nextButton_clicked()
break;
case 1:
ui->nextButton->setVisible(false);
ui->informationButton->setVisible(true);
break;
default:
ui->informationButton->setVisible(true);
ui->nextButton->setVisible(true);
@ -167,6 +183,7 @@ SerialOximeter * OximeterImport::detectOximeter()
void OximeterImport::on_directImportButton_clicked()
{
ui->informationButton->setVisible(false);
ui->stackedWidget->setCurrentWidget(ui->directImportPage);
oximodule = detectOximeter();
@ -238,6 +255,7 @@ void OximeterImport::doUpdateProgress(int v, int t)
void OximeterImport::on_fileImportButton_clicked()
{
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
const QString documentsFolder = QDesktopServices::storageLocation(
QDesktopServices::DocumentsLocation);
@ -266,6 +284,7 @@ void OximeterImport::on_fileImportButton_clicked()
QMessageBox::warning(this, STR_MessageBox_Warning, tr("No Oximetery module could parse the given file:")+QString("\n\n%1").arg(filename), QMessageBox::Ok);
return;
}
ui->informationButton->setVisible(false);
ui->stackedWidget->setCurrentWidget(ui->syncPage);
ui->syncSaveButton->setVisible(true);
@ -278,6 +297,8 @@ void OximeterImport::on_fileImportButton_clicked()
void OximeterImport::on_liveImportButton_clicked()
{
ui->informationButton->setVisible(false);
ui->stackedWidget->setCurrentWidget(ui->liveImportPage);
ui->liveImportPage->layout()->addWidget(ui->progressBar);
QApplication::processEvents();
@ -586,3 +607,16 @@ void OximeterImport::on_showLiveGraphs_clicked(bool checked)
plethyGraph->setVisible(checked);
liveView->redraw();
}
void OximeterImport::on_skipWelcomeCheckbox_clicked(bool checked)
{
p_profile->oxi->setSkipOxiIntroScreen(checked);
}
void OximeterImport::on_informationButton_clicked()
{
ui->stackedWidget->setCurrentWidget(ui->welcomePage);
ui->nextButton->setVisible(true);
ui->informationButton->setVisible(false);
}

4
sleepyhead/oximeterimport.h
View File

@ -55,6 +55,10 @@ private slots:
void on_showLiveGraphs_clicked(bool checked);
void on_skipWelcomeCheckbox_clicked(bool checked);
void on_informationButton_clicked();
protected slots:
void on_updatePlethy(QByteArray plethy);
void finishedRecording();

24
sleepyhead/oximeterimport.ui
View File

@ -620,7 +620,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>3</number>
<number>1</number>
</property>
<widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout">
@ -691,7 +691,7 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBox">
<widget class="QCheckBox" name="skipWelcomeCheckbox">
<property name="text">
<string>Skip this page next time.</string>
</property>
@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<layout class="QHBoxLayout" name="buttonLayout">
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
@ -1484,6 +1484,13 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="informationButton">
<property name="text">
<string>&amp;Information Page</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -1512,19 +1519,16 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QPushButton" name="nextButton">
<widget class="QPushButton" name="syncSaveButton">
<property name="text">
<string>&amp;Start</string>
</property>
<property name="default">
<bool>true</bool>
<string>&amp;Save and Finish</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="syncSaveButton">
<widget class="QPushButton" name="nextButton">
<property name="text">
<string>&amp;Save and Finish</string>
<string>&amp;Start</string>
</property>
</widget>
</item>