chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

AHI Chart improvement

Browse Source
This commit is contained in:
Mark Watkins 2011-09-03 10:06:08 +10:00
parent 32a7a67878
commit 4dab8e5c63
2 changed files with 71 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Graphs/gBarChart.cpp
View File

@ -45,15 +45,26 @@ void gBarChart::SetDay(Day * day)
m_values.clear(); m_values.clear();
m_miny=9999999; m_miny=9999999;
m_maxy=-9999999; m_maxy=-9999999;
m_minx=0;
m_maxx=0;
int dn; int dn;
EventDataType tmp,total; EventDataType tmp,total;
ChannelID code; ChannelID code;
m_fday=0;
qint64 tt;
for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) { for (QMap<QDate,QVector<Day *> >::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 || tt<m_minx) m_minx=tt;
if (!m_maxx || tt>m_maxx) m_maxx=tt;
total=0; total=0;
bool fnd=false;
for (int j=0;j<m_codes.size();j++) { for (int j=0;j<m_codes.size();j++) {
code=m_codes[j]; code=m_codes[j];
for (int i=0;i<d.value().size();i++) { for (int i=0;i<d.value().size();i++) {
@ -61,6 +72,7 @@ void gBarChart::SetDay(Day * day)
if (day->channelExists(code)) { // too many lookups happening here.. stop the crap.. if (day->channelExists(code)) { // too many lookups happening here.. stop the crap..
tmp=day->count(code)/day->hours(); tmp=day->count(code)/day->hours();
if (tmp>0) { if (tmp>0) {
fnd=true;
total+=tmp; total+=tmp;
m_values[dn][code]=tmp; m_values[dn][code]=tmp;
break; break;
@ -68,13 +80,18 @@ void gBarChart::SetDay(Day * day)
} }
} }
} }
m_values[dn][EmptyChannel]=total; if (fnd) {
if (total<m_miny) m_miny=total; if (!m_fday) m_fday=dn;
if (total>m_maxy) m_maxy=total; m_values[dn][EmptyChannel]=total;
if (total<m_miny) m_miny=total;
if (total>m_maxy) m_maxy=total;
}
} }
m_fday=QDateTime(m_profile->FirstDay(),QTime(0,0,0)).toTime_t()/86400; m_maxy=ceil(m_maxy);
m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0)).toTime_t())*1000L; //m_minx-=86400000L;
m_maxx=qint64(QDateTime(m_profile->LastDay(),QTime(23,59,59)).toTime_t())*1000L;
// 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; int i=0;
//set miny & maxy here.. how? //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=w.min_x, maxx=w.max_x;
//qint64 minx=m_minx, maxx=m_maxx; //qint64 minx=m_minx, maxx=m_maxx;
qint64 xx=maxx - minx; qint64 xx=maxx - minx;
int days=xx/86400000L; float days=double(xx)/86400000.0;
/*int days=0;
for (QMap<int,QMap<ChannelID,EventDataType> >::iterator d=m_values.begin();d!=m_values.end();d++) {
qint64 ts=qint64(d.key())*86400000L;
if (ts<minx) continue;
if (ts>maxx) continue; // break; // out of order if I end up using a hash instead.??
days++;
}*/
//int days=m_values.size();
EventDataType yy=m_maxy-m_miny; EventDataType yy=m_maxy-m_miny;
EventDataType ymult=float(height)/yy; 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; int daynum=0;
float h,tmp; float h,tmp;
for (qint64 Q=minx;Q<maxx;Q+=86400000L) { qint64 offs=minx% 86400000L;
//zz*=86400000L;
float offset=offs/86400000.0;
offset*=barw;
px=left-offset;
for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) {
int zd=Q/86400000L; int zd=Q/86400000L;
QHash<int,QMap<ChannelID,EventDataType> >::iterator d=m_values.find(zd); QHash<int,QMap<ChannelID,EventDataType> >::iterator d=m_values.find(zd);
if (Q<minx) continue;
if (Q>maxx+86400000) continue; // break; // out of order if I end up using a hash instead.??
if (d!=m_values.end()) { if (d!=m_values.end()) {
ts=qint64(d.key())*86400000L; ChannelID code;
if (ts<minx) continue; total=d.value()[EmptyChannel];
if (ts>maxx) continue; // break; // out of order if I end up using a hash instead.?? py=top+height;
ChannelID code; for (int j=0;j<m_codes.size();j++) {
total=d.value()[EmptyChannel]; code=m_codes[j];
py=top+height; QMap<ChannelID,EventDataType>::iterator g=d.value().find(code);
for (int j=0;j<m_codes.size();j++) { if (g!=d.value().end()) {
code=m_codes[j]; if (code==EmptyChannel) continue;
QMap<ChannelID,EventDataType>::iterator g=d.value().find(code); //look up it's color key
if (g!=d.value().end()) { QColor col=m_colors[j];
if (code==EmptyChannel) continue; QColor col2=Qt::white;
//look up it's color key
QColor col=m_colors[j];
QColor col2=Qt::white;
tmp=(g.value()/total); tmp=(g.value()/float(total));
h=tmp*(total*ymult); // height of chunk h=tmp*(float(total)*ymult); // height of chunk
quads->add(px,py,col); int x1=px,x2=px+barw;
quads->add(px,py-h,col);
quads->add(px+barw,py-h,col2); if (x1<left) x1=left;
quads->add(px+barw,py,col2); if (x2>left+width) x2=left+width;
lines->add(px,py,px,py-h,blk); if (x2>x1) {
lines->add(px,py-h,px+barw,py-h,blk); quads->add(x1,py,col);
lines->add(px,py,px+barw,py,blk); quads->add(x1,py-h,col);
lines->add(px+barw,py,px+barw,py-h,blk); quads->add(x2,py-h,col2);
py-=h; 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; px+=barw;
daynum++; daynum++;
} }

14
Graphs/gXAxis.cpp
View File

@ -8,7 +8,7 @@
#include <QDebug> #include <QDebug>
#include "gXAxis.h" #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); const int divcnt=sizeof(divisors)/sizeof(int);
gXAxis::gXAxis(QColor col,bool fadeout) 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 if (xx>86400000L) { // Day
fd="MMM 00"; fd="MMM 00";
dividx=0; dividx=0;
divmax=12; divmax=15;
fitmode=0; fitmode=0;
} else if (xx>600000) { // Minutes } else if (xx>600000) { // Minutes
fd="00:00"; fd="00:00";
dividx=3; dividx=6;
divmax=21; divmax=24;
fitmode=1; fitmode=1;
} else if (xx>5000) { // Seconds } else if (xx>5000) { // Seconds
fd="00:00:00"; fd="00:00:00";
dividx=10; dividx=13;
divmax=21; divmax=24;
fitmode=2; fitmode=2;
} else { // Microseconds } else { // Microseconds
fd="00:00:00:000"; fd="00:00:00:000";
dividx=22; dividx=25;
divmax=divcnt; divmax=divcnt;
fitmode=3; fitmode=3;
} }