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

Windows needed renderPixmap. Typical. Mac & Linux still don't need it

Browse Source
This commit is contained in:
Mark Watkins 2013-01-19 08:10:42 +10:00
parent ec8809f308
commit 1bca04c756
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Graphs/gGraphView.cpp
View File

@ -2073,21 +2073,24 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
sg->setScaleY(1.0); sg->setScaleY(1.0);
// pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h));
sg->makeCurrent(); // has to be current for fbo creation sg->makeCurrent(); // has to be current for fbo creation
#ifdef Q_OS_WIN
#ifndef Q_OS_MAC if (pm.isNull()){
// This doesn't work on Rich's Radeon boxen either pm=sg->renderPixmap(w,h,false);
// I'm suspiscious of this function on Radeon hardware. }
// pm=sg->renderPixmap(w,h,false); if (pm.isNull()) { // Works, but gives shader warnings
#endif pm=QPixmap::fromImage(sg->pbRenderPixmap(w,h));
}
if (pm.isNull()){ // crashes on mine, not sure what to do about it
pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h));
}
#else
pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h)); pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h));
if (pm.isNull()) { // not sure if this will work with printing if (pm.isNull()) { // not sure if this will work with printing
qDebug() << "Had to use PixelBuffer for snapshots\n"; qDebug() << "Had to use PixelBuffer for snapshots\n";
pm=QPixmap::fromImage(sg->pbRenderPixmap(w,h)); pm=QPixmap::fromImage(sg->pbRenderPixmap(w,h));
} }
#endif
//sg->doneCurrent(); //sg->doneCurrent();
sg->trashGraphs(); sg->trashGraphs();
m_graphview=tgv; m_graphview=tgv;