sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

[3d] Fix main annotation layer is not rendered on terrain

Browse Source
This commit is contained in:
Nyall Dawson 2025-08-15 09:04:59 +10:00 committed by github-actions[bot]
parent 4da0d470bd
commit 22b00e1f50
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/3d/qgs3dmapcanvaswidget.cpp
View File

@ -63,6 +63,8 @@
#include "qgspointcloudlayer3drenderer.h" #include "qgspointcloudlayer3drenderer.h"
#include "qgspointcloudquerybuilder.h" #include "qgspointcloudquerybuilder.h"
#include "qgsannotationlayer.h"
Qgs3DMapCanvasWidget::Qgs3DMapCanvasWidget( const QString &name, bool isDocked ) Qgs3DMapCanvasWidget::Qgs3DMapCanvasWidget( const QString &name, bool isDocked )
: QWidget( nullptr ) : QWidget( nullptr )
, mCanvasName( name ) , mCanvasName( name )
@ -860,7 +862,10 @@ void Qgs3DMapCanvasWidget::exportScene()
void Qgs3DMapCanvasWidget::onMainCanvasLayersChanged() void Qgs3DMapCanvasWidget::onMainCanvasLayersChanged()
{ {
mCanvas->mapSettings()->setLayers( mMainCanvas->layers( true ) ); QList<QgsMapLayer *> layers = mMainCanvas->layers( true );
layers.insert( 0, QgsProject::instance()->mainAnnotationLayer() );
mCanvas->mapSettings()->setLayers( layers );
} }
void Qgs3DMapCanvasWidget::onMainCanvasColorChanged() void Qgs3DMapCanvasWidget::onMainCanvasColorChanged()

4
src/app/qgisapp.cpp
View File

@ -13294,11 +13294,13 @@ Qgs3DMapCanvas *QgisApp::createNewMapCanvas3D( const QString &name, Qgis::SceneM
map->setSelectionColor( mMapCanvas->selectionColor() ); map->setSelectionColor( mMapCanvas->selectionColor() );
map->setBackgroundColor( mMapCanvas->canvasColor() ); map->setBackgroundColor( mMapCanvas->canvasColor() );
const QList<QgsMapLayer *> layers = mMapCanvas->layers( true ); QList<QgsMapLayer *> layers = mMapCanvas->layers( true );
const bool has3DBasemap = std::any_of( layers.begin(), layers.end(), []( QgsMapLayer *layer ) { const bool has3DBasemap = std::any_of( layers.begin(), layers.end(), []( QgsMapLayer *layer ) {
return layer->properties().testFlag( Qgis::MapLayerProperty::Is3DBasemapLayer ); return layer->properties().testFlag( Qgis::MapLayerProperty::Is3DBasemapLayer );
} ); } );
layers.insert( 0, QgsProject::instance()->mainAnnotationLayer() );
map->setLayers( layers ); map->setLayers( layers );
map->setTemporalRange( mMapCanvas->temporalRange() ); map->setTemporalRange( mMapCanvas->temporalRange() );