enable QgsMeshTriangulation with SIP and change SIP_CONCAT_PARTS

qgis · Sep 11, 2020 · 89e4d49 · 89e4d49
1 parent 0f60631
commit 89e4d49
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -871,7 +871,7 @@ IF (WITH_CORE AND WITH_BINDINGS)
   INCLUDE(SIPMacros)
 
   SET(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  SET(SIP_CONCAT_PARTS 9)
+  SET(SIP_CONCAT_PARTS 11)
 
   IF (NOT BINDINGS_GLOBAL_INSTALL)
     SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)

diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
@@ -5,6 +5,7 @@
 %Include auto_generated/interpolation/qgsinterpolator.sip
 %Include auto_generated/interpolation/qgstininterpolator.sip
 %Include auto_generated/mesh/qgsmeshcontours.sip
+%Include auto_generated/mesh/qgsmeshtriangulation.sip
 %Include auto_generated/network/qgsgraph.sip
 %Include auto_generated/network/qgsgraphanalyzer.sip
 %Include auto_generated/network/qgsgraphbuilder.sip

diff --git a/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in b/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
@@ -0,0 +1,120 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/mesh/qgsmeshtriangulation.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+
+class QgsMeshTriangulation : QObject
+{
+%Docstring
+
+Class that handles mesh creation with Delaunay constrained triangulation
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsmeshtriangulation.h"
+%End
+  public:
+
+    QgsMeshTriangulation();
+%Docstring
+Constructor
+%End
+
+    ~QgsMeshTriangulation();
+
+    bool addVertices( QgsFeatureIterator &vertexFeatureIterator, int valueAttribute, const QgsCoordinateTransform &transform, QgsFeedback *feedback = 0, long featureCount = 1 );
+%Docstring
+Adds vertices to the triangulation from a feature iterator, return ``True`` if successful.
+
+:param vertexFeatureIterator: the feature iterator of vertices to insert
+:param valueAttribute: the index of the attribute that represents the value of vertices, if -1 uses Z coordinate of vertices
+:param transform: the coordinates transform used to transform coordinates
+:param feedback: feedback argument may be specified to allow cancellation and progress reports
+:param featureCount: the count of feature to allow progress report of the feedback
+%End
+
+    bool addBreakLines( QgsFeatureIterator &lineFeatureIterator, int valueAttribute, const QgsCoordinateTransform &transformContext, QgsFeedback *feedback = 0, long featureCount = 1 );
+%Docstring
+Adds break lines from a vector layer, return ``True`` if successful.
+
+:param lineFeatureIterator: the feature iterator of break lines to insert
+:param valueAttribute: the index of the attribute that represents the value of vertices, if -1 uses Z coordinate of vertices
+:param transform: the coordinates transform used to transform coordinates
+:param feedback: feedback argument may be specified to allow cancellation and progress reports
+:param featureCount: the count of feature to allow progress report of the feedback
+
+.. warning::
+
+   if the feature iterator contains only point geometries, the vertices will be added only without treating them as breaklines
+%End
+
+    QgsMesh triangulatedMesh() const;
+%Docstring
+Returns the triangulated mesh
+%End
+
+    void setCrs( const QgsCoordinateReferenceSystem &crs );
+%Docstring
+Sets the coordinate reference system used for the triangulation
+%End
+
+  private:
+    QgsMeshTriangulation( const QgsMeshTriangulation &rhs );
+};
+
+
+class QgsMeshZValueDatasetGroup: QgsMeshDatasetGroup
+{
+%Docstring
+
+Convenient class that can be used to obtain a datasetgroup on vertices that represents the Z value of the mesh vertices
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsmeshtriangulation.h"
+%End
+  public:
+
+    QgsMeshZValueDatasetGroup( const QString &datasetGroupName, const QgsMesh &mesh );
+%Docstring
+Constructor
+
+:param datasetGroupName: the name of the dataset group
+:param mesh: the mesh used to create the Z value dataset
+%End
+
+    virtual void initialize();
+
+    virtual QgsMeshDatasetMetadata datasetMetadata( int datasetIndex ) const;
+
+    virtual int datasetCount() const;
+
+    virtual QgsMeshDataset *dataset( int index ) const;
+
+    virtual QgsMeshDatasetGroup::Type type() const;
+    virtual QDomElement writeXml( QDomDocument &doc, const QgsReadWriteContext &context ) const;
+
+
+  private:
+    QgsMeshZValueDatasetGroup( const QgsMeshZValueDatasetGroup &rhs );
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/mesh/qgsmeshtriangulation.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/src/analysis/mesh/qgsmeshtriangulation.h b/src/analysis/mesh/qgsmeshtriangulation.h
@@ -22,7 +22,6 @@
 
 #include "qgis_analysis.h"
 
-SIP_NO_FILE
 
 class QgsVectorLayer;
 class QgsCoordinateTransformContext;