[3d] Use layout item bg color as 3D scene bg color

nirvn · web-flow · commit d952ba422ed6 · 2018-09-05T21:24:04.000+07:00
diff --git a/src/3d/qgslayoutitem3dmap.cpp b/src/3d/qgslayoutitem3dmap.cpp
@@ -106,6 +106,12 @@ void QgsLayoutItem3DMap::draw( QgsLayoutItemRenderContext &context )
     return;
   }
 
+  if ( mSettings->backgroundColor() != backgroundColor() )
+  {
+    mSettings->setBackgroundColor( backgroundColor() );
+    mCapturedImage = QImage();
+  }
+
   if ( !mCapturedImage.isNull() )
   {
     painter->drawImage( r, mCapturedImage );
diff --git a/src/app/layout/qgslayout3dmapwidget.cpp b/src/app/layout/qgslayout3dmapwidget.cpp
@@ -115,16 +115,23 @@ void QgsLayout3DMapWidget::updateCameraPoseWidgetsFromItem()
 void QgsLayout3DMapWidget::copy3DMapSettings()
 {
   Qgs3DMapCanvasDockWidget *dock = _dock3DViewFromSender( sender() );
+  if ( !dock )
+    return;
 
-  // if this is the first settings passed on, also copy camera details
+  Qgs3DMapSettings *settings = new Qgs3DMapSettings( *dock->mapCanvas3D()->map() );
+
+  // first setting passed on
   if ( !mMap3D->mapSettings() )
   {
+    // copy background color
+    mMap3D->setBackgroundColor( settings->backgroundColor() );
+
+    // copy camera position details
     mMap3D->setCameraPose( dock->mapCanvas3D()->cameraController()->cameraPose() );
     updateCameraPoseWidgetsFromItem();
   }
 
-  if ( dock )
-    mMap3D->setMapSettings( new Qgs3DMapSettings( *dock->mapCanvas3D()->map() ) );
+  mMap3D->setMapSettings( settings );
 }
 
 void QgsLayout3DMapWidget::copeCameraPose()
diff --git a/tests/src/3d/testqgslayout3dmap.cpp b/tests/src/3d/testqgslayout3dmap.cpp
@@ -114,6 +114,7 @@ void TestQgsLayout3DMap::testBasic()
   l.initializeDefaults();
 
   QgsLayoutItem3DMap *map3dItem = new QgsLayoutItem3DMap( &l );
+  map3dItem->setBackgroundColor( QColor( 0, 0, 0 ) );
   map3dItem->attemptSetSceneRect( QRectF( 0, 0, 297, 210 ) );
   map3dItem->setCameraPose( cam );
   map3dItem->setMapSettings( map );

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,12 @@ void QgsLayoutItem3DMap::draw( QgsLayoutItemRenderContext &context )`
`106`	`106`	`return;`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ if ( mSettings->backgroundColor() != backgroundColor() )`
	`110`	`+ {`
	`111`	`+ mSettings->setBackgroundColor( backgroundColor() );`
	`112`	`+ mCapturedImage = QImage();`
	`113`	`+ }`
	`114`	`+`
`109`	`115`	`if ( !mCapturedImage.isNull() )`
`110`	`116`	`{`
`111`	`117`	`painter->drawImage( r, mCapturedImage );`
Original file line number	Diff line number	Diff line change
`@@ -115,16 +115,23 @@ void QgsLayout3DMapWidget::updateCameraPoseWidgetsFromItem()`
`115`	`115`	`void QgsLayout3DMapWidget::copy3DMapSettings()`
`116`	`116`	`{`
`117`	`117`	`Qgs3DMapCanvasDockWidget *dock = _dock3DViewFromSender( sender() );`
	`118`	`+ if ( !dock )`
	`119`	`+ return;`
`118`	`120`
`119`		`- // if this is the first settings passed on, also copy camera details`
	`121`	`+ Qgs3DMapSettings settings = new Qgs3DMapSettings( dock->mapCanvas3D()->map() );`
	`122`	`+`
	`123`	`+ // first setting passed on`
`120`	`124`	`if ( !mMap3D->mapSettings() )`
`121`	`125`	`{`
	`126`	`+ // copy background color`
	`127`	`+ mMap3D->setBackgroundColor( settings->backgroundColor() );`
	`128`	`+`
	`129`	`+ // copy camera position details`
`122`	`130`	`mMap3D->setCameraPose( dock->mapCanvas3D()->cameraController()->cameraPose() );`
`123`	`131`	`updateCameraPoseWidgetsFromItem();`
`124`	`132`	`}`
`125`	`133`
`126`		`- if ( dock )`
`127`		`- mMap3D->setMapSettings( new Qgs3DMapSettings( *dock->mapCanvas3D()->map() ) );`
	`134`	`+ mMap3D->setMapSettings( settings );`
`128`	`135`	`}`
`129`	`136`
`130`	`137`	`void QgsLayout3DMapWidget::copeCameraPose()`