sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not show the invalid geom warning if not necessary

Browse Source 
If the geoms where originally invalid, do not show the
warning.
This commit is contained in:
Alessandro Pasotti 2018-10-06 11:38:24 +02:00
parent 08b6b6065a
commit a3bf98d9a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/qgisapp.cpp
View File

@ -8629,6 +8629,7 @@ void QgisApp::pasteFromClipboard( QgsMapLayer *destinationLayer )
} }
QgsGeometry geom = featureIt->geometry(); QgsGeometry geom = featureIt->geometry();
bool geomWasInvalid = geom.isEmpty() || geom.isNull( );
if ( featureIt->hasGeometry() ) if ( featureIt->hasGeometry() )
{ {
// convert geometry to match destination layer // convert geometry to match destination layer
@ -8653,7 +8654,7 @@ void QgisApp::pasteFromClipboard( QgsMapLayer *destinationLayer )
// avoid intersection if enabled in digitize settings // avoid intersection if enabled in digitize settings
geom.avoidIntersections( QgsProject::instance()->avoidIntersectionsLayers() ); geom.avoidIntersections( QgsProject::instance()->avoidIntersectionsLayers() );
} }
if ( geom.isEmpty() || geom.isNull( ) ) if ( ! geomWasInvalid && ( geom.isEmpty() || geom.isNull( ) ) )
invalidGeometriesCount++; invalidGeometriesCount++;
// now create new feature using pasted feature as a template. This automatically handles default // now create new feature using pasted feature as a template. This automatically handles default