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

Temporary Day marker stub for XTicker

Browse Source
This commit is contained in:
Mark Watkins 2011-08-07 12:21:26 +10:00
parent f8182fed8b
commit 18730218c7
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Graphs/gXAxis.cpp
View File

@ -61,7 +61,7 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
int divmax,dividx; int divmax,dividx;
int fitmode; int fitmode;
if (xx>86400000L) { // Day if (xx>86400000L) { // Day
fd="00 MMM"; fd="000 00:00";
dividx=0; dividx=0;
divmax=1; divmax=1;
fitmode=0; fitmode=0;
@ -106,7 +106,7 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
} }
} }
if (fit_ticks==0) { if (fit_ticks==0) {
qDebug() << "gXAxis::Plot() What exactly do you expect to find at this zoom level?"; qDebug() << "gXAxis::Plot() Short days and zooming in too much screws this up.";
return; return;
} }
if ((div<0) || (div>divcnt)) { if ((div<0) || (div>divcnt)) {
@ -149,21 +149,20 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=start_py; vertarray[vertcnt++]=start_py;
vertarray[vertcnt++]=px; vertarray[vertcnt++]=px;
vertarray[vertcnt++]=start_py-6; vertarray[vertcnt++]=start_py-6;
if (fitmode==0) {
} else {
qint64 j=i+tz_offset; qint64 j=i+tz_offset;
int ms=j % 1000; int ms=j % 1000;
int m=(j/60000L) % 60L; int m=(j/60000L) % 60L;
int h=(j/3600000L) % 24L; int h=(j/3600000L) % 24L;
int s=(j/1000L) % 60L; int s=(j/1000L) % 60L;
if (fitmode==1) { // minute if (fitmode==0) {
tmpstr=QString("XX %1:%2").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
} else if (fitmode==1) { // minute
tmpstr=QString("%1:%2").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')); tmpstr=QString("%1:%2").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
} else if (fitmode==2) { // second } else if (fitmode==2) { // second
tmpstr=QString("%1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')); tmpstr=QString("%1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0'));
} else if (fitmode==3) { // milli } else if (fitmode==3) { // milli
tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0')); tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0'));
} }
}
//w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr); //w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr);
DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0); DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0);