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

XAxis improvements to Usage Graph

Browse Source
This commit is contained in:
Mark Watkins 2011-07-12 18:53:16 +10:00
parent dad2dedbe9
commit e92eaf98a3
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Graphs/gSessionTime.cpp
View File

@ -63,14 +63,22 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
double px1,px2,py1,py2; double px1,px2,py1,py2;
QColor & col1=color[0]; QColor & col1=color[0];
QColor col2("light grey"); QColor col2("light grey");
QString str;
bool draw_xticks_instead=false;
bool antialias=pref["UseAntiAliasing"].toBool();
QDateTime d; QDateTime d;
QTime t; QTime t;
double start,end,total; double start,end,total;
float textX,textY;
map<int,bool> datedrawn;
int idx=-1;
for (int i=0;i<data->np[0];i++) { for (int i=0;i<data->np[0];i++) {
QPointD & rp=data->point[0][i]; QPointD & rp=data->point[0][i];
if (int(rp.x()) < int(minx)) continue; if (int(rp.x()) < int(minx)) continue;
if (int(rp.x()) > int(maxx+.5)) break; if (int(rp.x()) > int(maxx+.5)) break;
if (idx<0) idx=i;
d=QDateTime::fromTime_t(rp.x()*86400.0); d=QDateTime::fromTime_t(rp.x()*86400.0);
t=d.time(); t=d.time();
start=t.hour()+(t.minute()/60.0)+(t.second()/3600.0); start=t.hour()+(t.minute()/60.0)+(t.second()/3600.0);
@ -119,7 +127,29 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
glVertex2f(rect.x()+rect.width(),rect.y()); glVertex2f(rect.x()+rect.width(),rect.y());
glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()); glVertex2f(rect.x()+rect.width(), rect.y()+rect.height());
glEnd(); glEnd();
if (!draw_xticks_instead) {
if (datedrawn.find(dy)==datedrawn.end()) {
datedrawn[dy]=true;
str=FormatX(rp.y());
GetTextExtent(str, textX, textY);
if (!draw_xticks_instead && (textY+6<barwidth)) {
glBegin(GL_LINE);
glVertex2f(start_px+px1+barwidth/2+textY/2,start_py);
glVertex2f(start_px+px1+barwidth/2+textY/2,start_py-6);
glEnd();
DrawText(str,start_px+px1+barwidth/2+textY/2+textY,scry-(start_py-8-textX/2),90);
} else draw_xticks_instead=true;
}
}
} }
if (draw_xticks_instead) {
// turn off the minor ticks..
Xaxis->SetShowMinorTicks(false);
Xaxis->Plot(w,scrx,scry);
}
glColor3f (0.0F, 0.0F, 0.0F); glColor3f (0.0F, 0.0F, 0.0F);
glLineWidth(1); glLineWidth(1);
glBegin (GL_LINES); glBegin (GL_LINES);
@ -128,6 +158,4 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
glVertex2f (start_px,start_py); glVertex2f (start_px,start_py);
glVertex2f (start_px+width, start_py); glVertex2f (start_px+width, start_py);
glEnd (); glEnd ();
Xaxis->Plot(w,scrx,scry);
} }