From 4ee10b5f88a2d5d14d0177a7190ca3a420c8bf22 Mon Sep 17 00:00:00 2001 From: vcloarec Date: Wed, 5 Aug 2020 21:41:47 -0400 Subject: [PATCH] fix typo and SIP --- python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in | 7 +++++++ src/analysis/interpolation/qgsdualedgetriangulation.cpp | 3 ++- src/analysis/interpolation/qgsdualedgetriangulation.h | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in index b23497cd3b2..aa838356c44 100644 --- a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in @@ -73,6 +73,13 @@ Returns an edge at the index Remove all vertices, edges and faces .. versionadded:: 3.14 +%End + + static bool compareFaces( const QgsMeshFace &face1, const QgsMeshFace &face2 ); +%Docstring +Compare two faces, return true if they are equivalent : same indexes and same clock wise + +.. versionadded:: 3.16 %End }; diff --git a/src/analysis/interpolation/qgsdualedgetriangulation.cpp b/src/analysis/interpolation/qgsdualedgetriangulation.cpp index cf4fbc6e81e..2ac30a6a74c 100644 --- a/src/analysis/interpolation/qgsdualedgetriangulation.cpp +++ b/src/analysis/interpolation/qgsdualedgetriangulation.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - DualEdgeTriangulation.cpp + QgsDualEdgeTriangulation.cpp ------------------------- copyright : (C) 2004 by Marco Hugentobler email : mhugent@geo.unizh.ch @@ -2663,6 +2663,7 @@ bool QgsDualEdgeTriangulation::pointInside( double x, double y ) break; } } + else//point is on the right side { actedge = mHalfEdge[actedge]->getDual(); diff --git a/src/analysis/interpolation/qgsdualedgetriangulation.h b/src/analysis/interpolation/qgsdualedgetriangulation.h index 4beaf489e01..5023483919a 100644 --- a/src/analysis/interpolation/qgsdualedgetriangulation.h +++ b/src/analysis/interpolation/qgsdualedgetriangulation.h @@ -1,5 +1,5 @@ -/*************************************************************************** - DualEdgeTriangulation.h - description +/************************************************************************** + QgsDualEdgeTriangulation.h - description ------------------- copyright : (C) 2004 by Marco Hugentobler email : mhugent@geo.unizh.ch