From 0b3d47a7f0dcce1cf2a0df5eec2b340dd227ec87 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 6 Jan 2012 13:15:52 +1000 Subject: [PATCH] SummaryChart highlight improvement, Details tab tooltip position, SearchEvent optimisation. --- Graphs/gSummaryChart.cpp | 7 +++++++ SleepLib/calcs.cpp | 2 ++ SleepLib/session.cpp | 45 ++++++++-------------------------------- daily.cpp | 14 ++++++------- 4 files changed, 25 insertions(+), 43 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index fe7281bd..c0e1d1fa 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -391,6 +391,13 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) if (x2add(x1-1,top,x1-1,top+height,x2,top+height,x2,top,col.rgba()); + } + if (m_graphtype==GT_SESSIONS) { int j; QHash >::iterator times=m_times.find(zd); diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index e1723ad0..e6f4161f 100644 --- a/SleepLib/calcs.cpp +++ b/SleepLib/calcs.cpp @@ -21,6 +21,8 @@ bool SearchApnea(Session *session, qint64 time, qint64 dist=15000) return false; } + + // Support function for calcRespRate() int filterFlow(Session *session, EventList *in, EventList *out, EventList *tv, EventList *mv, double rate) { diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 3ab12054..187ca96b 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -153,12 +153,6 @@ bool Session::StoreSummary(QString filename) out << m_timesummary; out << m_gain; - // First output the Machine Code and type for each summary record -/* for (QHash::iterator i=settings.begin(); i!=settings.end(); i++) { - ChannelID mc=i.key(); - out << (qint16)mc; - out << i.value(); - } */ file.close(); return true; } @@ -218,7 +212,6 @@ bool Session::LoadSummary(QString filename) in >> s_first; // Start time in >> s_last; // Duration // (16bit==Limited to 18 hours) - QHash cruft; if (version<7) { @@ -256,11 +249,6 @@ bool Session::LoadSummary(QString filename) } ztmp.clear(); in >> ztmp; // 90p - // Ignore this -// for (QHash::iterator i=ztmp.begin();i!=ztmp.end();i++) { -// code=schema::channel[i.key()].id(); -// m_90p[code]=i.value(); -// } ztmp.clear(); in >> ztmp; // min for (QHash::iterator i=ztmp.begin();i!=ztmp.end();i++) { @@ -673,23 +661,12 @@ void Session::updateCountSummary(ChannelID code) time=start + *tptr++; raw=*dptr++; - //raw=e.raw(j); valsum[raw]++; -// vsi=valsum.find(raw); -// if (vsi==valsum.end()) { -// valsum[raw]=1; -// } -// else vsi.value()++; - - //time=e.time(j); // elapsed time in seconds since last event len=(time-lasttime) / 1000L; timesum[lastraw]+=len; -// tsi=timesum.find(lastraw); -// if (tsi==timesum.end()) timesum[raw]=len; -// else tsi.value()+=len; lastraw=raw; lasttime=time; @@ -735,30 +712,26 @@ void Session::UpdateSummaries() sph(id); avg(id); wavg(id); -// p90(id); -// p95(id); -// median(id); } } - - /*if (channelExists(CPAP_Obstructive)) { - setCph(CPAP_AHI,cph(CPAP_Obstructive)+cph(CPAP_Hypopnea)+cph(CPAP_ClearAirway)); - setSph(CPAP_AHI,sph(CPAP_Obstructive)+sph(CPAP_Hypopnea)+sph(CPAP_ClearAirway)); - }*/ - } bool Session::SearchEvent(ChannelID code, qint64 time, qint64 dist) { - qint64 t; + qint64 t,start; QHash >::iterator it; it=eventlist.find(code); + quint32 * tptr; + int cnt; if (it!=eventlist.end()) { for (int i=0;icount();j++) { - t=el->time(j); - if (qAbs(time-t)first(); + tptr=el->rawTime(); + cnt=el->count(); + for (unsigned j=0;jmachine->GetClass()==STR_MACH_ResMed) { - cs="4 width='100%' align=center>"; + cs="4 width='70%' align=center>"; } else cs="2 width='50%'>"; html+=""; if (PROFILE.general->calculateRDI()) { - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#F88017").arg("black").arg(tr("RDI")).arg(schema::channel[CPAP_RDI].description()).arg(ahi,0,'f',2); } else { - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#F88017").arg("black").arg(tr("AHI")).arg(schema::channel[CPAP_AHI].description()).arg(ahi,0,'f',2); //html+=""+tr("AHI")+""+schema::channel[CPAP_AHI].description()+""+QString().sprintf("%.2f",ahi)+"\n"; } - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#4040ff").arg("white").arg(tr("Hypopnea")).arg(schema::channel[CPAP_Hypopnea].description()).arg(hi,0,'f',2).arg(CPAP_Hypopnea); if (cpap->machine->GetClass()==STR_MACH_ResMed) { - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#208020").arg("black") .arg(tr("Apnea")).arg(schema::channel[CPAP_Apnea].description()).arg(uai,0,'f',2).arg(CPAP_Apnea); } - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#40afbf").arg("black").arg(tr("Obstructive")).arg(schema::channel[CPAP_Obstructive].description()).arg(oai,0,'f',2).arg(CPAP_Obstructive); - html+=QString("%3%4%5\n") + html+=QString("%3%4%5\n") .arg("#b254cd").arg("black").arg(tr("Clear Airway")).arg(schema::channel[CPAP_ClearAirway].description()).arg(cai,0,'f',2).arg(CPAP_ClearAirway); html+="";