use project extent for saved 3d views in old projects

qgis · Jan 24, 2023 · d94a371 · d94a371
1 parent ea97d48
commit d94a371
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -20,6 +20,7 @@
 #include "qgsdemterraingenerator.h"
 #include "qgsmeshterraingenerator.h"
 #include "qgsonlineterraingenerator.h"
+#include "qgsprojectviewsettings.h"
 #include "qgsvectorlayer3drenderer.h"
 #include "qgsmeshlayer3drenderer.h"
 #include "qgspointcloudlayer3drenderer.h"
@@ -130,11 +131,18 @@ void Qgs3DMapSettings::readXml( const QDomElement &elem, const QgsReadWriteConte
               elemOrigin.attribute( QStringLiteral( "z" ) ).toDouble() );
 
   QDomElement elemExtent = elem.firstChildElement( QStringLiteral( "extent" ) );
-  mExtent = QgsRectangle(
-              elemExtent.attribute( QStringLiteral( "xMin" ) ).toDouble(),
-              elemExtent.attribute( QStringLiteral( "yMin" ) ).toDouble(),
-              elemExtent.attribute( QStringLiteral( "xMax" ) ).toDouble(),
-              elemExtent.attribute( QStringLiteral( "yMax" ) ).toDouble() );
+  if ( !elemExtent.isNull() )
+  {
+    mExtent = QgsRectangle(
+                elemExtent.attribute( QStringLiteral( "xMin" ) ).toDouble(),
+                elemExtent.attribute( QStringLiteral( "yMin" ) ).toDouble(),
+                elemExtent.attribute( QStringLiteral( "xMax" ) ).toDouble(),
+                elemExtent.attribute( QStringLiteral( "yMax" ) ).toDouble() );
+  }
+  else
+  {
+    mExtent = QgsProject::instance()->viewSettings()->fullExtent();
+  }
 
   QDomElement elemCamera = elem.firstChildElement( QStringLiteral( "camera" ) );
   if ( !elemCamera.isNull() )