Skip to content
Permalink
Browse files
fix qt6 compilation after mesh editing PR (#44240)
  • Loading branch information
PeterPetrik committed Jul 19, 2021
1 parent ff54bd5 commit 9b864c54639ef3bc8dcae1efec3d75b185ce49cf
@@ -15,6 +15,7 @@
***************************************************************************/
#include "qgsmaptooleditmeshframe.h"

#include "qgis.h"
#include "qgisapp.h"
#include "qgsapplication.h"

@@ -1272,7 +1273,7 @@ void QgsMapToolEditMeshFrame::selectInGeometry( const QgsGeometry &geometry, Qt:
std::unique_ptr<QgsPolygon> faceGeom( new QgsPolygon( new QgsLineString( nativeFaceGeometry( faceIndex ) ) ) );
if ( engine->intersects( faceGeom.get() ) )
{
QSet<int> faceToAdd = face.toList().toSet();
QSet<int> faceToAdd = qgis::listToSet( face.toList() );
selectedVertices.unite( faceToAdd );
}
}
@@ -15,6 +15,7 @@
***************************************************************************/
#include "qgsmeshadvancedediting.h"

#include "qgis.h"
#include "qgsmesheditor.h"
#include "poly2tri.h"

@@ -63,7 +64,7 @@ QgsMeshEditRefineFaces::QgsMeshEditRefineFaces() = default;

QgsTopologicalMesh::Changes QgsMeshEditRefineFaces::apply( QgsMeshEditor *meshEditor )
{
QSet<int> facesToRefine = mInputFaces.toSet();
QSet<int> facesToRefine = qgis::listToSet( mInputFaces );
QHash<int, FaceRefinement> facesRefinement;
QHash<int, BorderFace> borderFaces;

@@ -1189,7 +1189,7 @@ QgsMeshEditingError QgsTopologicalMesh::canFacesBeAdded( const QgsTopologicalMes
return QgsMeshEditingError( Qgis::MeshEditingErrorType::UniqueSharedVertex, uniqueSharedVertexBoundary.first() );

// Check if internal vertices of new faces block are free in the mesh
QSet<int> boundaryVertices = topologicFaces.mBoundaries.toSet();
QSet<int> boundaryVertices = qgis::listToSet( topologicFaces.mBoundaries );
for ( const QgsMeshFace &newFace : std::as_const( topologicFaces.mFaces ) )
{
for ( const int vertexIndex : newFace )

0 comments on commit 9b864c5

Please sign in to comment.