sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make the non-preview layout 3D maps renders work again

Browse Source
This commit is contained in:
Martin Dobias 2018-08-24 18:18:17 +02:00
parent 832d27c29e
commit 7bdcab67bf
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/3d/qgslayoutitem3dmap.cpp
View File

@ -69,8 +69,11 @@ void QgsLayoutItem3DMap::draw( QgsLayoutItemRenderContext &context )
// we do not have a cached image of the rendered scene - let's request one from the engine
painter->drawText( r, Qt::AlignCenter, tr( "Loading" ) );
painter->restore();
if ( mLayout->renderContext().isPreviewRender() )
{
painter->drawText( r, Qt::AlignCenter, tr( "Loading" ) );
painter->restore();
}
QSizeF sizePixels = mLayout->renderContext().measurementConverter().convert( sizeWithUnits(), QgsUnitTypes::LayoutPixels ).toQSizeF();
QSize sizePixelsInt = QSize( static_cast<int>( std::ceil( sizePixels.width() ) ),
@ -94,7 +97,23 @@ void QgsLayoutItem3DMap::draw( QgsLayoutItemRenderContext &context )
mScene->cameraController()->setCameraPose( mCameraPose );
onSceneStateChanged();
if ( mLayout->renderContext().isPreviewRender() )
{
onSceneStateChanged();
}
else
{
// we can't just request a capture and hope it will arrive at some point later.
// this is not a preview, we need the rendered scene now!
if ( mDrawing )
return;
mDrawing = true;
Qgs3DUtils::captureSceneImage( *mEngine.get(), mScene );
QImage img = Qgs3DUtils::captureSceneImage( *mEngine.get(), mScene );
painter->drawImage( r, img );
painter->restore();
mDrawing = false;
}
}
void QgsLayoutItem3DMap::onImageCaptured( const QImage &img )