From 9f8d663ad9bd840a53f3147efa38b3ee49363751 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 12 Sep 2011 15:09:53 +1000 Subject: [PATCH] Report HTML cleanup --- Graphs/gBarChart.cpp | 31 +++++++++---------------- Graphs/gBarChart.h | 2 ++ SleepLib/day.cpp | 10 ++++---- SleepLib/loader_plugins/prs1_loader.cpp | 2 -- SleepLib/session.cpp | 5 ++++ report.cpp | 6 ++--- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index f1ff9242..065dfaac 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -37,6 +37,7 @@ void SummaryChart::SetDay(Day * nullday) Layer::SetDay(day); m_values.clear(); + m_days.clear(); m_miny=9999999; m_maxy=-9999999; m_minx=0; @@ -68,6 +69,7 @@ void SummaryChart::SetDay(Day * nullday) for (int i=0;ichannelExists(code)) { // too many lookups happening here.. stop the crap.. + m_days[dn]=day; switch(m_type[j]) { case ST_AVG: tmp=day->avg(code); break; case ST_SUM: tmp=day->sum(code); break; @@ -223,12 +225,16 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) lastY[i]=top+height-1-h; } + Day * day; for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) { zd=Q/86400000L; d=m_values.find(zd); + qint64 extra=86400000; if (Q >::iterator d=m_values.find(hl_day); if (d!=m_values.end()) { - //int yy=y; - //int x=event->x()+graph->left+gGraphView::titleWidth; - ; - //int x=event->x()+gYAxis::Margin-gGraphView::titleWidth; - //if (x>l_width-45) x=l_width-45; x+=gYAxis::Margin+gGraphView::titleWidth; //graph->m_marginleft+ int y=event->y()+rtop-10; - /*int w=90; - int h=32; - if (x<41+w/2) x=41+w/2; - if (y<1) y=1; - if (y>l_height-h+1) y=l_height-h+1; */ - - - //y+=rtop; - //TODO: Convert this to a ToolTip class - QDateTime dt=QDateTime::fromTime_t(hl_day*86400); + // Day * day=m_days[hl_day]; EventDataType val; if (m_graphtype==GT_BAR) { val=d.value()[0]; } else { val=d.value()[1]; } - QString z=dt.date().toString(Qt::SystemLocaleShortDate)+"\n"+m_label+"="+QString::number(val,'f',2);; + QString z=dt.date().toString(Qt::SystemLocaleShortDate)+"\n"+m_label+"="+QString::number(val,'f',2);//+"\nAHI="+QString::number(day->cph(CPAP_AHI)); graph->ToolTip(z,x,y,1500); return true; } - //graph->redraw(); } - //qDebug() << l_left << x << hl_day << y << offset << barw; return false; } diff --git a/Graphs/gBarChart.h b/Graphs/gBarChart.h index 1705d788..deca68de 100644 --- a/Graphs/gBarChart.h +++ b/Graphs/gBarChart.h @@ -32,6 +32,8 @@ class SummaryChart:public Layer QVector m_codes; QVector m_type; QHash > m_values; + QHash m_days; + Profile * m_profile; GLBuffer *quads,*lines; bool m_empty; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index d045f091..a845122e 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -302,11 +302,11 @@ EventDataType Day::cph(ChannelID code) EventDataType sum=0; EventDataType h=0; for (int i=0;im_sum.contains(code)) continue; - sum+=sessions[i]->count(code); + if (!sessions[i]->m_cph.contains(code)) continue; + sum+=sessions[i]->cph(code)*sessions[i]->hours(); //h+=sessions[i]->hours(); } - sum/=hours();; + sum/=hours(); return sum; } @@ -315,8 +315,8 @@ EventDataType Day::sph(ChannelID code) EventDataType sum=0; EventDataType h=0; for (int i=0;im_sum.contains(code)) continue; - sum+=sessions[i]->sum(code)/3600.0; + if (!sessions[i]->m_sph.contains(code)) continue; + sum+=sessions[i]->sph(code)*sessions[i]->hours(); //h+=sessions[i]->hours(); } h=hours(); diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 9f052f23..d0e1171c 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -327,8 +327,6 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) sess->cph(e[i]); sess->sph(e[i]); }*/ - sess->setCph(CPAP_AHI,sess->cph(CPAP_Obstructive)+sess->cph(CPAP_Hypopnea)+sess->cph(CPAP_ClearAirway)); - sess->setSph(CPAP_AHI,sess->sph(CPAP_Obstructive)+sess->sph(CPAP_Hypopnea)+sess->sph(CPAP_ClearAirway)); ChannelID a[]={ CPAP_FlowRate, CPAP_MaskPressure, CPAP_Leak, CPAP_Snore, CPAP_EPAP, diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index dc43e172..f47960b0 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -427,6 +427,11 @@ void Session::UpdateSummaries() first(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)); + } + } EventDataType Session::min(ChannelID id) diff --git a/report.cpp b/report.cpp index a62bcea8..7830c419 100644 --- a/report.cpp +++ b/report.cpp @@ -117,7 +117,7 @@ void Report::GenerateReport(QDate start, QDate end) "
" "
"; html+="

CPAP Overview

"; - html+="" + html+="" "
"; + html+="
"; //html+="This is a temporary scratch pad tab so I can see what's going on while designing printing code. These graphs are images, and not controllable."; if (!((*profile).Exists("FirstName") && (*profile).Exists("LastName"))) html+="

Please edit your profile

"; else { @@ -133,7 +133,7 @@ void Report::GenerateReport(QDate start, QDate end) if ((*profile).Exists("EmailAddress") && !(*profile)["EmailAddress"].toString().isEmpty()) { html+=""; } - html+="
Email:"+(*profile)["EmailAddress"].toString()+"
"; + html+="
"; if ((*profile).Exists("Gender")) { QString gender=(*profile)["Gender"].toBool() ? "Male" : "Female"; html+=""; @@ -157,7 +157,7 @@ void Report::GenerateReport(QDate start, QDate end) } html+="
Gender:"+gender+"
"; - html+="
SleepyHead v"+pref["VersionString"].toString()+"

SleepyHead v"+pref["VersionString"].toString()+"
" "Reporting from "+startDate.toString()+" to "+endDate.toString()+"" "
"