mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Added auto-import preference, fixed large leak reflagging
This commit is contained in:
Mark Watkins
parent
f229eefd22
commit
9d967002c5
@ -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);
|
||||
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -889,6 +889,8 @@ void MainWindow::on_action_Import_Data_triggered()
|
||||
} else {
|
||||
infostr = tr("A %1 file structure was located at:").arg(datacards[0].loader->loaderName());
|
||||
}
|
||||
|
||||
if (!p_profile->cpap->autoImport()) {
|
||||
QMessageBox mbox(QMessageBox::NoIcon,
|
||||
tr("CPAP Data Located"),
|
||||
infostr+"\n\n"+QDir::toNativeSeparators(datacards[0].path)+"\n\n"+
|
||||
@ -911,7 +913,7 @@ void MainWindow::on_action_Import_Data_triggered()
|
||||
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) {
|
||||
|
||||
@ -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());
|
||||
|
||||
|
||||
@ -1361,8 +1361,14 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
<property name="spacing">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_20">
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_4">
|
||||
<property name="title">
|
||||
<string>Flag rapid changes in oximetry stats</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_24">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -1370,7 +1376,97 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
<string>SPO2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QDoubleSpinBox" name="spo2DropTime">
|
||||
<property name="toolTip">
|
||||
<string>Minimum duration of drop in oxygen saturation</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QDoubleSpinBox" name="pulseChange">
|
||||
<property name="toolTip">
|
||||
<string>Sudden change in Pulse Rate of at least this amount</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> bpm</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QDoubleSpinBox" name="pulseChangeTime">
|
||||
<property name="toolTip">
|
||||
<string>Minimum duration of pulse change event.</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_25">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Pulse</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="spo2Drop">
|
||||
<property name="toolTip">
|
||||
<string>Percentage drop in oxygen saturation</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="oximetrySync">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Tries to forces the oximetry data to link with CPAP when possible.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Link Oximetry and CPAP graphs</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1392,25 +1488,19 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
<string>Contec CMS50F v3.7+</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="oximetrySync">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Tries to forces the oximetry data to link with CPAP when possible.</string>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Link Oximetry and CPAP graphs</string>
|
||||
<string>ChoiceMMed MD300W1</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>ResMed S9 Oximeter Module</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<item row="5" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
@ -1423,14 +1513,8 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_4">
|
||||
<property name="title">
|
||||
<string>Flag changes in oximetry stats</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_24">
|
||||
<widget class="QLabel" name="label_20">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -1438,92 +1522,44 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>SPO2</string>
|
||||
<string>Type</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QDoubleSpinBox" name="spo2Drop">
|
||||
<property name="toolTip">
|
||||
<string>Percentage drop in oxygen saturation</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>1.000000000000000</double>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="Line" name="line_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_25">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_3">
|
||||
<property name="title">
|
||||
<string>Other oximetry options</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_13">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_52">
|
||||
<property name="text">
|
||||
<string>Pulse</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="pulseChange">
|
||||
<property name="toolTip">
|
||||
<string>Sudden change in Pulse Rate of at least this amount</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> bpm</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QDoubleSpinBox" name="spo2DropTime">
|
||||
<property name="toolTip">
|
||||
<string>Minimum duration of drop in oxygen saturation</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QDoubleSpinBox" name="pulseChangeTime">
|
||||
<property name="toolTip">
|
||||
<string>Minimum duration of pulse change event.</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QLabel" name="label_33">
|
||||
<property name="text">
|
||||
<string>Discard chunks under</string>
|
||||
<string>Flag SPO2 Desaturations Below</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_33">
|
||||
<property name="text">
|
||||
<string>Discard segments under</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QSpinBox" name="oxiDiscardThreshold">
|
||||
<property name="toolTip">
|
||||
<string>Small chunks of oximetry data under this amount will be discarded.</string>
|
||||
@ -1536,14 +1572,48 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<item row="0" column="1">
|
||||
<widget class="QSpinBox" name="oxiDesaturationThreshold">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="Line" name="line_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_53">
|
||||
<property name="text">
|
||||
<string>Flag Pulse Rate Above</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_54">
|
||||
<property name="text">
|
||||
<string>Flag Pulse Rate Below</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="spinBox">
|
||||
<property name="suffix">
|
||||
<string> bpm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QSpinBox" name="spinBox_2">
|
||||
<property name="suffix">
|
||||
<string> bpm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@ -1745,6 +1815,16 @@ as this is the only value available on summary-only days.</string>
|
||||
<property name="spacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item row="5" column="1">
|
||||
<widget class="QCheckBox" name="showUnknownFlags">
|
||||
<property name="toolTip">
|
||||
<string>Show flags for machine detected events that haven't been identified yet.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show Unknown Flags</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="skipLoginScreen">
|
||||
<property name="toolTip">
|
||||
@ -1755,16 +1835,6 @@ as this is the only value available on summary-only days.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QCheckBox" name="skipEmptyDays">
|
||||
<property name="toolTip">
|
||||
<string>Daily view navigation buttons will skip over days without data records</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Skip over Empty Days</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QCheckBox" name="enableMultithreading">
|
||||
<property name="toolTip">
|
||||
@ -1776,13 +1846,20 @@ Mainly affects the importer.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QCheckBox" name="showUnknownFlags">
|
||||
<item row="5" column="0">
|
||||
<widget class="QCheckBox" name="skipEmptyDays">
|
||||
<property name="toolTip">
|
||||
<string>Show flags for machine detected events that haven't been identified yet.</string>
|
||||
<string>Daily view navigation buttons will skip over days without data records</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show Unknown Flags</string>
|
||||
<string>Skip over Empty Days</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QCheckBox" name="automaticImport">
|
||||
<property name="text">
|
||||
<string>Import without nagging</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user