add pointsLimit and SIP

qgis · Jan 13, 2021 · 432f29b · 432f29b
1 parent c4c7e25
commit 432f29b
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 5 deletions.
diff --git a/python/core/auto_generated/geometry/qgsbox3d.sip.in b/python/core/auto_generated/geometry/qgsbox3d.sip.in
@@ -220,6 +220,9 @@ will be performed on the x/y extent of the box only.
 %End
 
     float distanceFromPoint( double x, double y, double z );
+%Docstring
+Returns shortest distance from the box to a point
+%End
 
     QgsRectangle toRectangle() const;
 %Docstring

diff --git a/python/core/auto_generated/pointcloud/qgspointclouddataprovider.sip.in b/python/core/auto_generated/pointcloud/qgspointclouddataprovider.sip.in
@@ -90,6 +90,41 @@ the number of points returned to ``pointsLimit`` points
 %End
 
 
+    SIP_PYLIST getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle, int pointsLimit = 1000 );
+%Docstring
+Returns the Points that are on a ray
+
+:param rayOrigin: : The origin of the ray in layer coordinates
+:param rayDirection: : The direction of the ray in layer coordinates
+:param maxScreenError: : Maximum screen error (as taken from the 3D point cloud layer renderer)
+:param cameraFov: : The field of view of the camera in degrees
+:param screenSizePx: : The size of the screen's viewport in pixels
+:param pointAngle: : the maximum accepted angle between the point and it's projected point on the ray in degrees
+:param pointsLimit: : the maximum number of points returned
+
+:return: a vector of the identified points
+
+.. versionadded:: 3.18
+%End
+%MethodCode
+    {
+      QVector<QMap<QString, QVariant>> res = sipCpp->identify( *a0, *a1, a2, a3, a4, a5, a6 );
+      sipRes = PyList_New( res.size() );
+      for ( int i = 0; i < res.size(); ++i )
+      {
+        PyObject *dict = PyDict_New();
+        for ( QString key : res[i].keys() )
+        {
+          PyObject *keyObj = sipConvertFromNewType( new QString( key ), sipType_QString, Py_None );
+          PyObject *valObj = sipConvertFromNewType( new QVariant( res[i][key] ), sipType_QVariant, Py_None );
+          PyDict_SetItem( dict, keyObj, valObj );
+        }
+        PyList_SET_ITEM( sipRes, i, dict );
+      }
+    }
+%End
+
+
     virtual QgsPointCloudDataProvider::Capabilities capabilities() const;
 %Docstring
 Returns flags containing the supported capabilities for the data provider.

diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -279,5 +279,4 @@ void Qgs3DMapCanvas::identifyPointCloudOnMouseEvent( QVector<QPair<QgsMapLayer *
   rayDirWorld = rayDirWorld.normalized();
 
   mScene->identifyPointCloudOnRay( result, QVector3D( rayOriginWorld ), rayDirWorld );
-  return true;
 }
diff --git a/src/core/pointcloud/qgspointclouddataprovider.cpp b/src/core/pointcloud/qgspointclouddataprovider.cpp
@@ -409,7 +409,7 @@ QVector<IndexedPointCloudNode> QgsPointCloudDataProvider::traverseTree(
   return nodes;
 }
 
-QVector<QVariantMap> QgsPointCloudDataProvider::getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle )
+QVector<QVariantMap> QgsPointCloudDataProvider::getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle, int pointsLimit )
 {
   QVector<QVariantMap> points;
   QgsPointCloudIndex *index = this->index();
@@ -425,18 +425,21 @@ QVector<QVariantMap> QgsPointCloudDataProvider::getPointsOnRay( const QVector3D
 
   for ( IndexedPointCloudNode n : nodes )
   {
-    std::unique_ptr<QgsPointCloudBlock> block( index->nodeData( n, request ) );
+    if ( points.size() >= pointsLimit )
+      break;
 
+    std::unique_ptr<QgsPointCloudBlock> block( index->nodeData( n, request ) );
     if ( !block )
       continue;
+
     const char *ptr = block->data();
     QgsPointCloudAttributeCollection blockAttributes = block->attributes();
     const std::size_t recordSize = blockAttributes.pointRecordSize();
     int xOffset, yOffset, zOffset;
     blockAttributes.find( QStringLiteral( "X" ), xOffset );
     blockAttributes.find( QStringLiteral( "Y" ), yOffset );
     blockAttributes.find( QStringLiteral( "Z" ), zOffset );
-    for ( int i = 0; i < block->pointCount(); ++i )
+    for ( int i = 0; i < block->pointCount() && points.size() < pointsLimit; ++i )
     {
       double x, y, z;
       _pointXY( ptr, i, recordSize, xOffset, yOffset, index->scale(), index->offset(), x, y );

diff --git a/src/core/pointcloud/qgspointclouddataprovider.h b/src/core/pointcloud/qgspointclouddataprovider.h
@@ -122,6 +122,8 @@ class CORE_EXPORT QgsPointCloudDataProvider: public QgsDataProvider
     % End
 #endif
 
+#ifndef SIP_RUN
+
     /**
      * Returns the Points that are on a ray
      *
@@ -131,11 +133,48 @@ class CORE_EXPORT QgsPointCloudDataProvider: public QgsDataProvider
      * \param cameraFov : The field of view of the camera in degrees
      * \param screenSizePx : The size of the screen's viewport in pixels
      * \param pointAngle : the maximum accepted angle between the point and it's projected point on the ray in degrees
+     * \param pointsLimit : the maximum number of points returned
+     * \return a list of the identified points
+     *
+     * \since QGIS 3.18
+     */
+    QVector<QVariantMap> getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle, int pointsLimit = 1000 );
+#else
+
+    /**
+     * Returns the Points that are on a ray
+     *
+     * \param rayOrigin : The origin of the ray in layer coordinates
+     * \param rayDirection : The direction of the ray in layer coordinates
+     * \param maxScreenError : Maximum screen error (as taken from the 3D point cloud layer renderer)
+     * \param cameraFov : The field of view of the camera in degrees
+     * \param screenSizePx : The size of the screen's viewport in pixels
+     * \param pointAngle : the maximum accepted angle between the point and it's projected point on the ray in degrees
+     * \param pointsLimit : the maximum number of points returned
      * \return a vector of the identified points
      *
      * \since QGIS 3.18
      */
-    QVector<QVariantMap> getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle ) SIP_SKIP;
+    SIP_PYLIST getPointsOnRay( const QVector3D &rayOrigin, const QVector3D &rayDirection, double maxScreenError, double cameraFov, int screenSizePx, double pointAngle, int pointsLimit = 1000 );
+    % MethodCode
+    {
+      QVector<QMap<QString, QVariant>> res = sipCpp->identify( *a0, *a1, a2, a3, a4, a5, a6 );
+      sipRes = PyList_New( res.size() );
+      for ( int i = 0; i < res.size(); ++i )
+      {
+        PyObject *dict = PyDict_New();
+        for ( QString key : res[i].keys() )
+        {
+          PyObject *keyObj = sipConvertFromNewType( new QString( key ), sipType_QString, Py_None );
+          PyObject *valObj = sipConvertFromNewType( new QVariant( res[i][key] ), sipType_QVariant, Py_None );
+          PyDict_SetItem( dict, keyObj, valObj );
+        }
+        PyList_SET_ITEM( sipRes, i, dict );
+      }
+    }
+    % End
+#endif
+
 
     /**
      * Returns flags containing the supported capabilities for the data provider.