From 4dab8e5c6352012de7dbfcc245bed859e9ba8ac0 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 3 Sep 2011 10:06:08 +1000 Subject: [PATCH] AHI Chart improvement --- Graphs/gBarChart.cpp | 108 +++++++++++++++++++++++++------------------ Graphs/gXAxis.cpp | 14 +++--- 2 files changed, 71 insertions(+), 51 deletions(-) diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index 4eb91e7f..8aaa5554 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -45,15 +45,26 @@ void gBarChart::SetDay(Day * day) m_values.clear(); m_miny=9999999; m_maxy=-9999999; + m_minx=0; + m_maxx=0; int dn; EventDataType tmp,total; ChannelID code; + m_fday=0; + qint64 tt; + for (QMap >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) { - dn=QDateTime(d.key(),QTime(0,0,0)).toTime_t()/86400; + tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t(); + dn=tt/86400; + tt*=1000L; + if (!m_minx || ttm_maxx) m_maxx=tt; + total=0; + bool fnd=false; for (int j=0;jchannelExists(code)) { // too many lookups happening here.. stop the crap.. tmp=day->count(code)/day->hours(); if (tmp>0) { + fnd=true; total+=tmp; m_values[dn][code]=tmp; break; @@ -68,13 +80,18 @@ void gBarChart::SetDay(Day * day) } } } - m_values[dn][EmptyChannel]=total; - if (totalm_maxy) m_maxy=total; + if (fnd) { + if (!m_fday) m_fday=dn; + m_values[dn][EmptyChannel]=total; + if (totalm_maxy) m_maxy=total; + } } - m_fday=QDateTime(m_profile->FirstDay(),QTime(0,0,0)).toTime_t()/86400; - m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0)).toTime_t())*1000L; - m_maxx=qint64(QDateTime(m_profile->LastDay(),QTime(23,59,59)).toTime_t())*1000L; + m_maxy=ceil(m_maxy); + //m_minx-=86400000L; + + // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; + //m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; int i=0; //set miny & maxy here.. how? @@ -95,16 +112,7 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height) qint64 minx=w.min_x, maxx=w.max_x; //qint64 minx=m_minx, maxx=m_maxx; qint64 xx=maxx - minx; - int days=xx/86400000L; - - /*int days=0; - for (QMap >::iterator d=m_values.begin();d!=m_values.end();d++) { - qint64 ts=qint64(d.key())*86400000L; - if (tsmaxx) continue; // break; // out of order if I end up using a hash instead.?? - days++; - }*/ - //int days=m_values.size(); + float days=double(xx)/86400000.0; EventDataType yy=m_maxy-m_miny; EventDataType ymult=float(height)/yy; @@ -120,39 +128,51 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height) int daynum=0; float h,tmp; - for (qint64 Q=minx;Q >::iterator d=m_values.find(zd); + if (Qmaxx+86400000) continue; // break; // out of order if I end up using a hash instead.?? if (d!=m_values.end()) { - ts=qint64(d.key())*86400000L; - if (tsmaxx) continue; // break; // out of order if I end up using a hash instead.?? - ChannelID code; - total=d.value()[EmptyChannel]; - py=top+height; - for (int j=0;j::iterator g=d.value().find(code); - if (g!=d.value().end()) { - if (code==EmptyChannel) continue; - //look up it's color key - QColor col=m_colors[j]; - QColor col2=Qt::white; + ChannelID code; + total=d.value()[EmptyChannel]; + py=top+height; + for (int j=0;j::iterator g=d.value().find(code); + if (g!=d.value().end()) { + if (code==EmptyChannel) continue; + //look up it's color key + QColor col=m_colors[j]; + QColor col2=Qt::white; - tmp=(g.value()/total); - h=tmp*(total*ymult); // height of chunk - quads->add(px,py,col); - quads->add(px,py-h,col); - quads->add(px+barw,py-h,col2); - quads->add(px+barw,py,col2); - lines->add(px,py,px,py-h,blk); - lines->add(px,py-h,px+barw,py-h,blk); - lines->add(px,py,px+barw,py,blk); - lines->add(px+barw,py,px+barw,py-h,blk); - py-=h; + tmp=(g.value()/float(total)); + h=tmp*(float(total)*ymult); // height of chunk + int x1=px,x2=px+barw; + + if (x1left+width) x2=left+width; + if (x2>x1) { + quads->add(x1,py,col); + quads->add(x1,py-h,col); + quads->add(x2,py-h,col2); + quads->add(x2,py,col2); + lines->add(x1,py,x1,py-h,blk); + lines->add(x1,py-h,x2,py-h,blk); + lines->add(x1,py,x2,py,blk); + lines->add(x2,py,x2,py-h,blk); + } + py-=h; + } } } - } px+=barw; daynum++; } diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 38c72ee5..1e22f956 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -8,7 +8,7 @@ #include #include "gXAxis.h" -const int divisors[]={604800000,259200000, 172800000, 86400000,2880000,14400000,7200000,3600000,2700000,1800000,1200000,900000,600000,300000,120000,60000,45000,30000,20000,15000,10000,5000,2000,1000,100,50,10}; +const qint64 divisors[]={2419200000,1814400000,1209600000,604800000,259200000, 172800000, 86400000,2880000,14400000,7200000,3600000,2700000,1800000,1200000,900000,600000,300000,120000,60000,45000,30000,20000,15000,10000,5000,2000,1000,100,50,10}; const int divcnt=sizeof(divisors)/sizeof(int); gXAxis::gXAxis(QColor col,bool fadeout) @@ -69,21 +69,21 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height) if (xx>86400000L) { // Day fd="MMM 00"; dividx=0; - divmax=12; + divmax=15; fitmode=0; } else if (xx>600000) { // Minutes fd="00:00"; - dividx=3; - divmax=21; + dividx=6; + divmax=24; fitmode=1; } else if (xx>5000) { // Seconds fd="00:00:00"; - dividx=10; - divmax=21; + dividx=13; + divmax=24; fitmode=2; } else { // Microseconds fd="00:00:00:000"; - dividx=22; + dividx=25; divmax=divcnt; fitmode=3; }