fix spelling and SIP

qgis · Jan 21, 2023 · 5f6ac02 · 5f6ac02
1 parent e5006bb
commit 5f6ac02
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/python/core/auto_generated/mesh/qgsmesheditor.sip.in b/python/core/auto_generated/mesh/qgsmesheditor.sip.in
@@ -88,12 +88,16 @@ Tries to fix the topological ``error`` in the mesh. Returns ``False`` if the fix
 .. versionadded:: 3.28
 %End
 
-    bool faceCanBeAdded( const QgsMeshFace &face );
+    bool faceCanBeAdded( const QgsMeshFace &face ) const;
 %Docstring
 Returns ``True`` if a ``face`` can be added to the mesh
+
+.. note::
+
+   All vertices related to this face must be already in the mesh.
 %End
 
-    bool isFaceGeometricallyCompatible( const QgsMeshFace &face );
+    bool isFaceGeometricallyCompatible( const QgsMeshFace &face ) const;
 %Docstring
 Returns ``True`` if the face does not intersect or contains any other elements (faces or vertices)
 The topological compatibility is not checked

diff --git a/src/core/mesh/qgsmesheditor.cpp b/src/core/mesh/qgsmesheditor.cpp
@@ -341,18 +341,18 @@ bool QgsMeshEditor::faceCanBeAddedWithNewVertices( const QList<int> &verticesInd
     if ( !circulator.goBoundaryClockwise() ) //vertex not on boundary
       return false;
 
-    int prevOppositVertex = circulator.oppositeVertexClockwise();
-    if ( prevOppositVertex == nextIndex ) //manifold face
+    int prevOppVertex = circulator.oppositeVertexClockwise();
+    if ( prevOppVertex == nextIndex ) //manifold face
       return false;
 
     if ( !circulator.goBoundaryCounterClockwise() )
       return false;
 
-    int nextOppositVertex = circulator.oppositeVertexCounterClockwise();
-    if ( nextOppositVertex == prevIndex ) //manifold face
+    int nextOppVertex = circulator.oppositeVertexCounterClockwise();
+    if ( nextOppVertex == prevIndex ) //manifold face
       return false;
 
-    if ( nextIndex != nextOppositVertex && prevIndex != prevOppositVertex ) //unique shared vertex
+    if ( nextIndex != nextOppVertex && prevIndex != prevOppVertex ) //unique shared vertex
       return false;
   }
 

diff --git a/src/core/mesh/qgsmesheditor.h b/src/core/mesh/qgsmesheditor.h
@@ -140,7 +140,7 @@ class CORE_EXPORT QgsMeshEditor : public QObject
      *
      * \since QGIS 3.28
      */
-    QgsMeshEditingError addFaceWithNewVertices( const QList<int> &vertexIndexes, const QList<QgsMeshVertex> &newVertices );
+    QgsMeshEditingError addFaceWithNewVertices( const QList<int> &vertexIndexes, const QList<QgsMeshVertex> &newVertices ); SIP_SKIP
 
     //! Removes faces \a faces to the mesh, returns topological errors if this operation fails (operation is not realized)
     QgsMeshEditingError removeFaces( const QList<int> &facesToRemove );