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

Retina display support for Qt5.2 beta, build 3rdparty libs in on mac

Browse Source
This commit is contained in:
Mark Watkins 2013-11-03 22:14:17 +10:00
parent c58bfbbf8e
commit 1ba1511118
5 changed files with 64 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sleepyhead/Graphs/gGraphView.cpp
View File

@ -2086,7 +2086,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
painter.setRenderHint(QPainter::TextAntialiasing,q.antialias);
if (q.angle==0) { // normal text
painter.drawText(q.x,q.y,q.text);
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
painter.drawText(q.x*devicePixelRatio(),q.y*devicePixelRatio(),q.text);
#else
painter.drawText(q.x,q.y,q.text);
#endif
} else { // rotated text
w=painter.fontMetrics().width(q.text);
h=painter.fontMetrics().xHeight()+2;
@ -2136,6 +2140,10 @@ QImage gGraphView::fboRenderPixmap(int w,int h)
if (fbo_unsupported)
return pm;
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
w*=devicePixelRatio();
h*=devicePixelRatio();
#endif
if ((w > max_fbo_width) || (h > max_fbo_height)) {
qWarning() << "gGraphView::fboRenderPixmap called with dimensiopns exceeding maximum frame buffer object size";
@ -2578,35 +2586,47 @@ void gGraphView::DrawTextQue()
painter.drawText(2,h,q.text);
painter.end();
pc->image=QGLWidget::convertToGLFormat(pm);
pc->image=pm;// QGLWidget::convertToGLFormat(pm);
pixmap_cache_size+=pm.width()*pm.height()*(pm.depth()/8);
pc->textureID=bindTexture(pc->image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption);
pixmap_cache[hstr]=pc;
}
if (pc) {
painter.begin(this);
pc->last_used=ti;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//glEnable(GL_BLEND);
//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//glEnable(GL_TEXTURE_2D);
if (q.angle!=0) {
glPushMatrix();
glTranslatef(q.x-pc->image.height()-(pc->image.height()/2),q.y+pc->image.width()/2 + pc->image.height()/2, 0);
glRotatef(-q.angle,0,0,1);
drawTexture(QPoint(0,pc->image.height()/2),pc->textureID);
glPopMatrix();
// glPushMatrix();
// glTranslatef(q.x-pc->image.height()-(pc->image.height()/2),q.y+pc->image.width()/2 + pc->image.height()/2, 0);
// glRotatef(-q.angle,0,0,1);
// drawTexture(QPoint(0,pc->image.height()/2),pc->textureID);
// glPopMatrix();
float xxx=q.x-pc->image.height()-(pc->image.height()/2);
float yyy=q.y+pc->image.width()/2 + pc->image.height()/2;
painter.translate(xxx,yyy);
painter.rotate(-q.angle);
painter.drawImage(QPoint(0,pc->image.height()/2),pc->image);
painter.rotate(+q.angle);
painter.translate(-xxx, -yyy);
//glTranslatef(marginLeft()+4,originY+height/2+x/2, 0);
//glRotatef(-90,0,0,1);
//m_graphview->drawTexture(QPoint(0,y/2),titleImageTex);
} else {
painter.drawImage(q.x,q.y-pc->image.height()+4,pc->image);
// TODO: setup for rotation if angle specified.
drawTexture(QPoint(q.x,q.y-pc->image.height()+4),pc->textureID);
//drawTexture(QPoint(q.x,q.y-pc->image.height()+4),pc->textureID);
}
// glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
// glDisable(GL_BLEND);
}
} else {
@ -2937,7 +2957,11 @@ void gGraphView::resizeGL(int w, int h)
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
glOrtho(0, w/devicePixelRatio(), h/devicePixelRatio(), 0, -1, 1);
#else
glOrtho(0, w, h, 0, -1, 1);
#endif
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
}
@ -2948,6 +2972,11 @@ void gGraphView::renderSomethingFun(float alpha)
// glPushMatrix();
float w=width();
float h=height();
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
w*=devicePixelRatio();
h*=devicePixelRatio();
#endif
glViewport(0, 0, w, h);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();

11
sleepyhead/Graphs/gLineChart.cpp
View File

@ -657,8 +657,12 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
//DrawText(w,msg,left+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
}
} else {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
float dpr=w.graphView()->devicePixelRatio();
lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
#else
lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
//lines->draw();
#endif
}
}
@ -745,7 +749,12 @@ void AHIChart::paint(gGraph & w,int left, int top, int width, int height)
lastpy=py;
if (done) break;
}
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
float dpr=w.graphView()->devicePixelRatio();
lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
#else
lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
#endif
}
void AHIChart::SetDay(Day *d)

7
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -580,9 +580,12 @@ jumpnext:
daynum++;
//lastQ=Q;
}
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
float dpr=w.graphView()->devicePixelRatio();
lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
#else
lines->scissor(left,w.flipY(top+height+2),width+1,height+2);
#endif
// Draw Ledgend
px=left+width-3;
py=top-5;

6
sleepyhead/daily.cpp
View File

@ -1246,13 +1246,15 @@ void Daily::Load(QDate date)
html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));
GAHI->setShowTitle(false);
QPixmap pixmap=GAHI->renderPixmap(155,155,false);
int w=155;
int h=155;
QPixmap pixmap=GAHI->renderPixmap(w,h,false);
if (!pixmap.isNull()) {
QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG");
html += "<tr><td align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
html += "<tr><td align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + QString("\" width='%1' height='%2px'></td></tr>\n").arg(w).arg(h);
} else {
html += "<tr><td align=center>Unable to display Pie Chart on this system</td></tr>\n";
}

8
sleepyhead/sleepyhead.pro
View File

@ -15,7 +15,6 @@ greaterThan(QT_MAJOR_VERSION,4) {
CONFIG += rtti
win32:CONFIG += use_bundled_libs
else:!use_bundled_libs:CONFIG += extserialport
use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
@ -231,7 +230,9 @@ mac {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
else:unix {
else:mac {
include(../3rdparty/quazip/quazip/quazip.pri)
} else:unix {
use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/quazip/
else:QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
@ -262,5 +263,6 @@ use_bundled_libs: {
INCLUDEPATH += $$PWD/../3rdparty/qextserialport
DEPENDPATH += $$PWD/../3rdparty/qextserialport
} else {
CONFIG += extserialport
mac:include(../3rdparty/qextserialport/src/qextserialport.pri)
else:CONFIG += extserialport
}