diff --git a/sleepyhead/SleepLib/calcs.cpp b/sleepyhead/SleepLib/calcs.cpp index 950bde3c..8c20d5bd 100644 --- a/sleepyhead/SleepLib/calcs.cpp +++ b/sleepyhead/SleepLib/calcs.cpp @@ -22,7 +22,7 @@ extern double round(double number); -bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType dur, qint64 dist) +bool SearchEvent(Session * session, ChannelID code, qint64 time, int dur, bool update=true) { qint64 t, start; QHash >::iterator it; @@ -34,9 +34,10 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType int cnt; //qint64 rate; - bool fixdurations = (session->machine()->GetClass() != STR_MACH_ResMed); - if (!fixdurations) { - dur=0; +// bool fixdurations = (session->machine()->GetClass() != STR_MACH_ResMed); + + if (!p_profile->cpap->resyncFromUserFlagging()) { + update=false; } QHash >::iterator evend = session->eventlist.end(); @@ -59,12 +60,22 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType for (int j = 0; j < cnt; j++) { t = start + *tptr; - if (qAbs(time - t) < dist) { + // Move the position and set the duration + qint64 end1 = time + 5000L; + qint64 start1 = end1 - quint64(dur+10)*1000L; - // Move the position and set the duration - if (dur>0) { - *tptr = time - start; - *dptr = (EventStoreType)dur; + qint64 end2 = t + 5000L; + qint64 start2 = end2 - quint64(*dptr+10)*1000L; + + bool overlap = (start1 <= end2) && (start2 <= end1); + + if (overlap) { + if (update) { + qint32 delta = time-start; + if (delta >= 0) { + *tptr = delta; + *dptr = (EventStoreType)dur; + } } return true; } @@ -78,27 +89,26 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType return false; } -bool SearchApnea(Session *session, qint64 time, double dur, qint64 dist) +bool SearchApnea(Session *session, qint64 time, double dur) { - if (session->SearchEvent(CPAP_UserFlag1, time, dist)) + if (SearchEvent(session, CPAP_Obstructive, time, dur)) return true; - if (session->SearchEvent(CPAP_UserFlag2, time, dist)) + if (SearchEvent(session, CPAP_Apnea, time, dur)) return true; - if (SearchEvent(session, CPAP_Obstructive, time, dur, dist)) + if (SearchEvent(session, CPAP_ClearAirway, time, dur)) return true; - if (SearchEvent(session, CPAP_Apnea, time, dur, dist)) + if (SearchEvent(session, CPAP_Hypopnea, time, dur, false)) return true; - if (SearchEvent(session, CPAP_ClearAirway, time, dur, dist)) + if (SearchEvent(session, CPAP_UserFlag1, time, dur, false)) return true; - if (SearchEvent(session, CPAP_Hypopnea, time, dur, dist)) + if (SearchEvent(session, CPAP_UserFlag2, time, dur, false)) return true; - return false; } @@ -776,13 +786,13 @@ void FlowParser::flagUserEvents(ChannelID code, EventDataType restriction, Event bs = bend[i]; be = bstart[i + 1]; st = start + bs * m_rate; - et = start + be * m_rate; + et = start + be * m_rate; len = et - st; dur = len / 1000.0; if (dur >= duration) { - if (allowDuplicates || !SearchApnea(m_session, et, dur, 15000)) { + if (allowDuplicates || !SearchApnea(m_session, et, dur)) { if (!uf) { uf = m_session->AddEventList(code, EVL_Event); } diff --git a/sleepyhead/SleepLib/calcs.h b/sleepyhead/SleepLib/calcs.h index a7c7505c..8d71167d 100644 --- a/sleepyhead/SleepLib/calcs.h +++ b/sleepyhead/SleepLib/calcs.h @@ -140,7 +140,7 @@ class FlowParser EventDataType *m_buffers[num_filter_buffers]; }; -bool SearchApnea(Session *session, qint64 time, double dur, qint64 dist = 15000); +bool SearchApnea(Session *session, qint64 time, double dur); //! \brief Calculate Respiratory Rate, Tidal Volume & Minute Ventilation for PRS1 data void calcRespRate(Session *session, FlowParser *flowparser = nullptr); diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index 714d5a4f..7e01fc32 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -278,6 +278,8 @@ const QString STR_CS_UserEventDuration = "UserEventDuration"; const QString STR_CS_UserFlowRestriction2 = "UserFlowRestriction2"; const QString STR_CS_UserEventDuration2 = "UserEventDuration2"; const QString STR_CS_UserEventDuplicates = "UserEventDuplicates"; +const QString STR_CS_ResyncFromUserFlagging = "ResyncFromUserFlagging"; + const QString STR_CS_AHIWindow = "AHIWindow"; const QString STR_CS_AHIReset = "AHIReset"; const QString STR_CS_ClockDrift = "ClockDrift"; @@ -528,6 +530,7 @@ class CPAPSettings : public ProfileSettings initPref(STR_CS_LeakRedline, 24.0); initPref(STR_CS_ShowLeakRedline, true); initPref(STR_CS_UserEventPieChart, false); + initPref(STR_CS_ResyncFromUserFlagging, false); initPref(STR_CS_ClockDrift, (int)0); m_clock_drift = getPref(STR_CS_ClockDrift).toInt(); @@ -558,6 +561,8 @@ class CPAPSettings : public ProfileSettings EventDataType leakRedline() const { return getPref(STR_CS_LeakRedline).toFloat(); } 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(); } + //Setters void setMode(CPAPMode mode) { setPref(STR_CS_PrescribedMode, (int)mode); } @@ -588,6 +593,7 @@ class CPAPSettings : public ProfileSettings void setLeakRedline(EventDataType value) { setPref(STR_CS_LeakRedline, value); } 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); } public: int m_clock_drift; diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index b96e9ec6..f67e4ce5 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -171,6 +171,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->maskTypeCombo->setCurrentIndex(mt); on_maskTypeCombo_activated(mt); + ui->resyncMachineDetectedEvents->setChecked(profile->cpap->resyncFromUserFlagging()); ui->maskDescription->setText(profile->cpap->maskDescription()); ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); @@ -491,6 +492,7 @@ bool PreferencesDialog::Save() profile->cpap->setUserEventFlagging(ui->customEventGroupbox->isChecked()); + profile->cpap->setResyncFromUserFlagging(ui->resyncMachineDetectedEvents->isChecked()); profile->cpap->setUserEventDuration(ui->apneaDuration->value()); profile->cpap->setUserFlowRestriction(ui->apneaFlowRestriction->value()); profile->cpap->setUserEventDuration2(ui->apneaDuration2->value()); diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 8caa8395..f6106583 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -878,6 +878,83 @@ This option must be enabled before import, otherwise a purge is required. 4 + + + + % + + + 10.000000000000000 + + + + + + + Show in Event Breakdown Piechart + + + + + + + #1 + + + + + + + #2 + + + + + + + + 0 + 0 + + + + Flow Restriction + + + + + + + s + + + 10.000000000000000 + + + + + + + Event Duration + + + + + + + Duration of airflow restriction + + + s + + + 1.000000000000000 + + + 10.000000000000000 + + + @@ -898,33 +975,14 @@ A value of 20% works well for detecting apneas. - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - + + - Flow Restriction + Allow duplicates near machine events. - + @@ -952,74 +1010,26 @@ p, li { white-space: pre-wrap; } - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + - Duration of airflow restriction + This experimental option attempts to use SleepyHead's event flagging system to improve machine detected event positioning. - - s - - - 1.000000000000000 - - - 10.000000000000000 - - - - - - Event Duration - - - - - - - % - - - 10.000000000000000 - - - - - - - #2 - - - - - - - Allow duplicates near machine events. - - - - - - - s - - - 10.000000000000000 - - - - - - - #1 - - - - - - - Show in Event Breakdown Piechart + Resync Machine Detected Events (Experimental)