add method to list available pointcloud attribute names without the need

to index point cloud first
qgis · Apr 6, 2023 · 3dfa397 · 3dfa397
1 parent 80ab370
commit 3dfa397
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 0 deletions.
diff --git a/python/core/auto_generated/pointcloud/qgspointclouddataprovider.sip.in b/python/core/auto_generated/pointcloud/qgspointclouddataprovider.sip.in
@@ -96,6 +96,13 @@ Returns flags containing the supported capabilities for the data provider.
 %Docstring
 Returns the attributes available from this data provider.
 May return empty collection until :py:func:`~QgsPointCloudDataProvider.pointCloudIndexLoaded` is emitted
+%End
+
+    virtual QStringList attributeNames() const = 0;
+%Docstring
+Returns names of the attributes available from this data provider.
+
+.. versionadded:: 3.32
 %End
 
     virtual void loadIndex( ) = 0;

diff --git a/python/core/auto_generated/pointcloud/qgspointcloudlayer.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudlayer.sip.in
@@ -122,6 +122,13 @@ QgsPointCloudLayer cannot be copied.
     QgsPointCloudAttributeCollection attributes() const;
 %Docstring
 Returns the attributes available from the layer.
+%End
+
+    QStringList attributeNames() const;
+%Docstring
+Returns the names of the attributes available from the layer.
+
+.. versionadded:: 3.32
 %End
 
     qint64 pointCount() const;

diff --git a/src/core/pointcloud/qgspointclouddataprovider.h b/src/core/pointcloud/qgspointclouddataprovider.h
@@ -132,6 +132,13 @@ class CORE_EXPORT QgsPointCloudDataProvider: public QgsDataProvider
      */
     virtual QgsPointCloudAttributeCollection attributes() const = 0;
 
+    /**
+     * Returns names of the attributes available from this data provider.
+     *
+     * \since QGIS 3.32
+     */
+    virtual QStringList attributeNames() const = 0;
+
     /**
      * Triggers loading of the point cloud index
      *

diff --git a/src/core/pointcloud/qgspointcloudlayer.cpp b/src/core/pointcloud/qgspointcloudlayer.cpp
@@ -726,6 +726,13 @@ QgsPointCloudAttributeCollection QgsPointCloudLayer::attributes() const
   return mDataProvider ? mDataProvider->attributes() : QgsPointCloudAttributeCollection();
 }
 
+QStringList QgsPointCloudLayer::attributeNames() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+
+  return mDataProvider ? mDataProvider->attributeNames() : QStringList();
+}
+
 qint64 QgsPointCloudLayer::pointCount() const
 {
   QGIS_PROTECT_QOBJECT_THREAD_ACCESS

diff --git a/src/core/pointcloud/qgspointcloudlayer.h b/src/core/pointcloud/qgspointcloudlayer.h
@@ -162,6 +162,13 @@ class CORE_EXPORT QgsPointCloudLayer : public QgsMapLayer, public QgsAbstractPro
      */
     QgsPointCloudAttributeCollection attributes() const;
 
+    /**
+     * Returns the names of the attributes available from the layer.
+     *
+     * \since QGIS 3.32
+     */
+    QStringList attributeNames() const;
+
     /**
      * Returns the total number of points available in the layer.
      */

diff --git a/src/core/providers/copc/qgscopcprovider.cpp b/src/core/providers/copc/qgscopcprovider.cpp
@@ -78,6 +78,19 @@ QgsPointCloudAttributeCollection QgsCopcProvider::attributes() const
   return mIndex->attributes();
 }
 
+QStringList QgsCopcProvider::attributeNames() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+
+  QStringList attributeNames;
+  const QVector<QgsPointCloudAttribute> attrs = mIndex->attributes().attributes();
+  for ( const QgsPointCloudAttribute &a : attrs )
+  {
+    attributeNames << a.name();
+  }
+  return attributeNames;
+}
+
 bool QgsCopcProvider::isValid() const
 {
   QGIS_PROTECT_QOBJECT_THREAD_ACCESS

diff --git a/src/core/providers/copc/qgscopcprovider.h b/src/core/providers/copc/qgscopcprovider.h
@@ -43,6 +43,7 @@ class QgsCopcProvider: public QgsPointCloudDataProvider
 
     QgsRectangle extent() const override;
     QgsPointCloudAttributeCollection attributes() const override;
+    QStringList attributeNames() const override;
     bool isValid() const override;
     QString name() const override;
     QString description() const override;

diff --git a/src/core/providers/ept/qgseptprovider.cpp b/src/core/providers/ept/qgseptprovider.cpp
@@ -74,6 +74,19 @@ QgsPointCloudAttributeCollection QgsEptProvider::attributes() const
   return mIndex->attributes();
 }
 
+QStringList QgsEptProvider::attributeNames() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+
+  QStringList attributeNames;
+  QVector<QgsPointCloudAttribute> attrs = mIndex->attributes().attributes();
+  for ( const QgsPointCloudAttribute &a : attrs )
+  {
+    attributeNames << a.name();
+  }
+  return attributeNames;
+}
+
 bool QgsEptProvider::isValid() const
 {
   QGIS_PROTECT_QOBJECT_THREAD_ACCESS

diff --git a/src/core/providers/ept/qgseptprovider.h b/src/core/providers/ept/qgseptprovider.h
@@ -43,6 +43,7 @@ class QgsEptProvider: public QgsPointCloudDataProvider
 
     QgsRectangle extent() const override;
     QgsPointCloudAttributeCollection attributes() const override;
+    QStringList attributeNames() const override;
     bool isValid() const override;
     QString name() const override;
     QString description() const override;

diff --git a/src/providers/pdal/qgspdalprovider.cpp b/src/providers/pdal/qgspdalprovider.cpp
@@ -82,6 +82,11 @@ QgsPointCloudAttributeCollection QgsPdalProvider::attributes() const
   return mIndex ? mIndex->attributes() : QgsPointCloudAttributeCollection();
 }
 
+QStringList QgsPdalProvider::attributeNames() const
+{
+  return mAttributeNames;
+}
+
 static QString _outEptDir( const QString &filename )
 {
   const QFileInfo fi( filename );
@@ -308,6 +313,13 @@ bool QgsPdalProvider::load( const QString &uri )
       // projection
       const QString wkt = QString::fromStdString( quickInfo.m_srs.getWKT() );
       mCrs = QgsCoordinateReferenceSystem::fromWkt( wkt );
+
+      // attribute names
+      for ( auto &dim : quickInfo.m_dimNames )
+      {
+        mAttributeNames << QString::fromStdString( dim );
+      }
+
       return quickInfo.valid();
     }
     else

diff --git a/src/providers/pdal/qgspdalprovider.h b/src/providers/pdal/qgspdalprovider.h
@@ -37,6 +37,7 @@ class QgsPdalProvider: public QgsPointCloudDataProvider
     QgsCoordinateReferenceSystem crs() const override;
     QgsRectangle extent() const override;
     QgsPointCloudAttributeCollection attributes() const override;
+    QStringList attributeNames() const override;
     qint64 pointCount() const override;
     QVariantMap originalMetadata() const override;
     bool isValid() const override;
@@ -60,6 +61,7 @@ class QgsPdalProvider: public QgsPointCloudDataProvider
     qint64 mPointCount = 0;
 
     QVariantMap mOriginalMetadata;
+    QStringList mAttributeNames;
     std::unique_ptr<QgsPointCloudIndex> mIndex;
     QgsPdalIndexingTask *mRunningIndexingTask = nullptr;
     bool mGenerateCopc = true;