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

Revert YAxis Ticker image cache, as it doesn't work rendered offscreen

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 08:28:58 +10:00
parent 13fc0a69af
commit 777772b5d4
1 changed files with 85 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Graphs/gYAxis.cpp
View File

@ -137,20 +137,9 @@ gYAxis::~gYAxis()
}
void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
{
// may as well draw a cached texture here, and only update it when screen or graph is resized.
int x,y,yh=0;
if (w.invalidate_yAxisImage) {
if (!w.yAxisImage.isNull()) {
w.graphView()->deleteTexture(w.yAxisImageTex);
w.yAxisImage=QImage();
}
if (height<0) return;
if (height>2000) return;
int x,y;
int labelW=0;
EventDataType miny=w.min_y;
@ -163,15 +152,9 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
w.roundY(miny,maxy);
EventDataType dy=maxy-miny;
static QString fd="0";
GetTextExtent(fd,x,y);
yh=y;
QPixmap pixmap(width,height+y+4);
pixmap.fill(Qt::transparent);
QPainter paint(&pixmap);
double max_yticks=round(height / (y+14.0)); // plus spacing between lines
@ -199,6 +182,13 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
double min_ytick=rxy*yt;
//if (dy>5) {
// min_ytick=round(min_ytick);
//} else {
//}
float ty,h;
if (min_ytick<=0) {
@ -208,9 +198,9 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
if (min_ytick>=1000000) {
min_ytick=100;
}
lines=w.backlines();
//lines=w.backlines();
GLuint line_color=m_line_color.rgba();
for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
ty=(i - miny) * ymult;
if (dy<5) {
@ -219,46 +209,30 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
fd=Format(i*m_yaxis_scale,1);
}
GetTextExtent(fd,x,y);
GetTextExtent(fd,x,y); // performance bottleneck..
if (x>labelW) labelW=x;
h=(height-2)-ty;
h+=yh;
#ifndef Q_OS_MAC
// stupid pixel alignment rubbish, I really should be using floats..
h+=1;
#endif
if (h<0)
continue;
h=top+height-ty;
if (h<top) continue;
w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color);
paint.setBrush(Qt::black);
paint.drawText(width-8-x,h+y/2,fd);
paint.setPen(m_line_color);
paint.drawLine(width-4,h,width,h);
lines->add(left+width-4,h,left+width,h,line_color);
double z=(min_ytick/4)*ymult;
double g=h;
for (int i=0;i<3;i++) {
g+=z;
if (g>height+yh) break;
paint.drawLine(width-3,g,width,g);
if (g>top+height) break;
lines->add(left+width-3,g,left+width,g,line_color);
if (lines->full()) {
qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
break;
}
}
paint.end();
w.yAxisImage=QGLWidget::convertToGLFormat(pixmap.toImage().mirrored(false,true));
w.yAxisImageTex=w.graphView()->bindTexture(w.yAxisImage);
w.invalidate_yAxisImage=false;
if (lines->full()) {
qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
break;
}
if (!w.yAxisImage.isNull()) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D);
w.graphView()->drawTexture(QPoint(left,(top+height)-w.yAxisImage.height()+5),w.yAxisImageTex);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
}
}
const QString gYAxis::Format(EventDataType v, int dp) {