fix after Nyall review

qgis · Oct 26, 2020 · acccc63 · acccc63
1 parent b7e8071
commit acccc63
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -73,6 +73,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/core/numericformats
       ${CMAKE_SOURCE_DIR}/src/core/pal
       ${CMAKE_SOURCE_DIR}/src/core/processing
+      ${CMAKE_SOURCE_DIR}/src/core/pointcloud
       ${CMAKE_SOURCE_DIR}/src/core/providers
       ${CMAKE_SOURCE_DIR}/src/core/providers/memory
       ${CMAKE_SOURCE_DIR}/src/core/raster
@@ -96,6 +97,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/gui/locator
       ${CMAKE_SOURCE_DIR}/src/gui/numericformats
       ${CMAKE_SOURCE_DIR}/src/gui/ogr
+      ${CMAKE_SOURCE_DIR}/src/gui/pointcloud
       ${CMAKE_SOURCE_DIR}/src/gui/processing
       ${CMAKE_SOURCE_DIR}/src/gui/processing/models
       ${CMAKE_SOURCE_DIR}/src/gui/raster

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7619,6 +7619,12 @@ bool QgisApp::openLayer( const QString &fileName, bool allowInteractive )
     ok = static_cast< bool >( addMeshLayerPrivate( fileName, fileInfo.completeBaseName(), QStringLiteral( "mdal" ), false ) );
   }
 
+  // Try to load as point cloud layer after raster & vector & mesh
+  if ( !ok )
+  {
+    ok = static_cast< bool >( addPointCloudLayerPrivate( fileName, fileInfo.completeBaseName(), false ) );
+  }
+
   if ( !ok )
   {
     // we have no idea what this file is...

diff --git a/src/core/pointcloud/qgspointcloudprovidermetadata.h b/src/core/pointcloud/qgspointcloudprovidermetadata.h
@@ -26,7 +26,7 @@
 
 /**
  * This metadata class does not support creation of provider instances, because
- * vector tile layer currently does not have a concept of data providers. This class
+ * point cloud layer currently does not have a concept of data providers. This class
  * is only used to create data item provider (for browser integration).
  */
 class QgsPointCloudProviderMetadata : public QgsProviderMetadata