From 47b160e90720b3cecfd8b116fb8b15388eaba52b Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 11 Jan 2012 09:28:29 +1000 Subject: [PATCH] userEventDuplicates stub stuff (currently hidden), disabled zlib gzbuffer usage as ubuntu has a outdated zlib. --- Graphs/gGraphView.cpp | 3 --- SleepLib/calcs.cpp | 12 +++++++++--- SleepLib/loader_plugins/resmed_loader.cpp | 2 +- SleepLib/machine_loader.cpp | 2 +- SleepLib/profiles.cpp | 1 + SleepLib/profiles.h | 4 ++++ preferencesdialog.cpp | 4 ++++ preferencesdialog.ui | 9 ++++++++- 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index d81dcc54..6694c802 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1858,9 +1858,6 @@ void gGraph::ToolTip(QString text, int x, int y, int timeout) void gGraph::roundY(EventDataType &miny, EventDataType &maxy) { - if (title()=="Sessions") { - int i=5; - } int m,t; bool ymin_good=false,ymax_good=false; if (rec_miny!=rec_maxy) { diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index 3649149b..9c68eb97 100644 --- a/SleepLib/calcs.cpp +++ b/SleepLib/calcs.cpp @@ -555,6 +555,7 @@ void FlowParser::flagEvents() double st,mt,et, dur; qint64 len; + bool allowDuplicates=PROFILE.cpap->userEventDuplicates(); for (int i=0;iAddEventList(CPAP_UserFlag2,EVL_Event); + EventList * uf3=m_session->AddEventList(CPAP_UserFlag3,EVL_Event); const EventDataType perc=0.6; int idx=float(br.size())*perc; @@ -618,6 +621,11 @@ void FlowParser::flagEvents() bend.push_back(be1); } // } + st=start + bs1 * m_rate; + et=start + be1 * m_rate; + uf2->AddEvent(st,0); + uf3->AddEvent(et,0); + } @@ -626,8 +634,6 @@ void FlowParser::flagEvents() //EventDataType v; int bsize=bstart.size(); EventList * uf1=NULL; - // EventList * uf2=m_session->AddEventList(CPAP_UserFlag2,EVL_Event); - // EventList * uf3=m_session->AddEventList(CPAP_UserFlag3,EVL_Event); for (int i=0;i=duration) { - if (!SearchApnea(m_session,et-len/2,15000)) { + if (allowDuplicates || !SearchApnea(m_session,et-len/2,15000)) { if (!uf1) { uf1=m_session->AddEventList(CPAP_UserFlag1,EVL_Event); } diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 287f715b..ae2f91ad 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -223,7 +223,7 @@ bool EDFParser::Open(QString name) } gzread(f,(char *)&header,EDFHeaderSize); buffer=new char [datasize]; - gzbuffer(f,65536*2); + //gzbuffer(f,65536*2); gzread(f,buffer,datasize); gzclose(f); } else { diff --git a/SleepLib/machine_loader.cpp b/SleepLib/machine_loader.cpp index ca9b4fca..4c9a533b 100644 --- a/SleepLib/machine_loader.cpp +++ b/SleepLib/machine_loader.cpp @@ -71,7 +71,7 @@ bool MachineLoader::compressFile(QString inpath, QString outpath) } f.close(); gzFile gz=gzopen(outpath.toAscii(),"wb"); - gzbuffer(gz,65536*2); + //gzbuffer(gz,65536*2); if (!gz) { qDebug() << "compressFile() Couldn't open" << outpath <<"for writing"; delete buf; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index 36634458..82ef8951 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -919,6 +919,7 @@ const char * STR_CS_DateDiagnosed="DateDiagnosed"; const char * STR_CS_UserEventFlagging="UserEventFlagging"; const char * STR_CS_UserFlowRestriction="UserFlowRestriction"; const char * STR_CS_UserEventDuration="UserEventDuration"; +const char * STR_CS_UserEventDuplicates="UserEventDuplicates"; const char * STR_CS_AHIWindow="AHIWindow"; const char * STR_CS_AHIReset="AHIReset"; diff --git a/SleepLib/profiles.h b/SleepLib/profiles.h index d293a8aa..46695cf7 100644 --- a/SleepLib/profiles.h +++ b/SleepLib/profiles.h @@ -345,6 +345,7 @@ extern const char * STR_CS_DateDiagnosed; extern const char * STR_CS_UserEventFlagging; extern const char * STR_CS_UserFlowRestriction; extern const char * STR_CS_UserEventDuration; +extern const char * STR_CS_UserEventDuplicates; extern const char * STR_CS_AHIWindow; extern const char * STR_CS_AHIReset; @@ -372,6 +373,7 @@ public: if (!m_profile->contains(STR_CS_DateDiagnosed)) (*m_profile)[STR_CS_DateDiagnosed]=QDate(); if (!m_profile->contains(STR_CS_UserFlowRestriction)) (*m_profile)[STR_CS_UserFlowRestriction]=20.0; if (!m_profile->contains(STR_CS_UserEventDuration)) (*m_profile)[STR_CS_UserEventDuration]=10.0; + if (!m_profile->contains(STR_CS_UserEventDuplicates)) (*m_profile)[STR_CS_UserEventDuplicates]=false; if (!m_profile->contains(STR_CS_UserEventFlagging)) (*m_profile)[STR_CS_UserEventFlagging]=false; if (!m_profile->contains(STR_CS_AHIWindow)) (*m_profile)[STR_CS_AHIWindow]=60.0; if (!m_profile->contains(STR_CS_AHIReset)) (*m_profile)[STR_CS_AHIReset]=false; @@ -396,6 +398,7 @@ public: QDate dateDiagnosed() { return (*m_profile)[STR_CS_DateDiagnosed].toDate(); } double userFlowRestriction() { return (*m_profile)[STR_CS_UserFlowRestriction].toDouble(); } double userEventDuration() { return (*m_profile)[STR_CS_UserEventDuration].toDouble(); } + bool userEventDuplicates() { return (*m_profile)[STR_CS_UserEventDuplicates].toBool(); } double AHIWindow() { return (*m_profile)[STR_CS_AHIWindow].toDouble(); } bool AHIReset() { return (*m_profile)[STR_CS_AHIReset].toBool(); } bool userEventFlagging() { return (*m_profile)[STR_CS_UserEventFlagging].toBool(); } @@ -418,6 +421,7 @@ public: void setAHIWindow(double window) { (*m_profile)[STR_CS_AHIWindow]=window; } void setAHIReset(bool reset) { (*m_profile)[STR_CS_AHIReset]=reset; } void setUserEventFlagging(bool flagging) { (*m_profile)[STR_CS_UserEventFlagging]=flagging; } + void setUserEventDuplicates(bool dup) { (*m_profile)[STR_CS_UserEventDuplicates]=dup; } Profile *m_profile; }; diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 0bf21a0a..c93fa5ba 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -200,6 +200,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->customEventGroupbox->setChecked(profile->cpap->userEventFlagging()); ui->apneaDuration->setValue(profile->cpap->userEventDuration()); ui->apneaFlowRestriction->setValue(profile->cpap->userFlowRestriction()); + ui->userEventDuplicates->setChecked(profile->cpap->userEventDuplicates()); + ui->userEventDuplicates->setVisible(false); ui->eventTable->setColumnWidth(0,40); ui->eventTable->setColumnWidth(1,55); @@ -297,6 +299,7 @@ bool PreferencesDialog::Save() } if (profile->cpap->userEventFlagging() && (profile->cpap->userEventDuration()!=ui->apneaDuration->value() || + profile->cpap->userEventDuplicates()!=ui->userEventDuplicates->isChecked() || profile->cpap->userFlowRestriction()!=ui->apneaFlowRestriction->value())) recalc_events=true; @@ -383,6 +386,7 @@ bool PreferencesDialog::Save() profile->cpap->setUserEventDuration(ui->apneaDuration->value()); profile->cpap->setUserFlowRestriction(ui->apneaFlowRestriction->value()); + profile->cpap->setUserEventDuplicates(ui->userEventDuplicates->isChecked()); PREF[STR_GEN_SkipLogin]=ui->skipLoginScreen->isChecked(); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index bd821049..2b0d4d03 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -42,7 +42,7 @@ - 0 + 1 @@ -820,6 +820,13 @@ p, li { white-space: pre-wrap; } + + + + Allow duplicates near machine events. + + +