Possibility to ignore features in the avoid intersection function

Marco Hugentobler · Marco Hugentobler · commit efc4cb68dd8e · 2012-09-25T11:34:16.000+02:00
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -6696,7 +6696,7 @@ bool QgsGeometry::deletePart( int partNum )
   return true;
 }
 
-int QgsGeometry::avoidIntersections()
+int QgsGeometry::avoidIntersections( QMap<QgsVectorLayer*, QSet<qint64> > ignoreFeatures )
 {
   int returnValue = 0;
 
@@ -6724,7 +6724,14 @@ int QgsGeometry::avoidIntersections()
     currentLayer = dynamic_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( *aIt ) );
     if ( currentLayer )
     {
-      if ( currentLayer->removePolygonIntersections( this ) != 0 )
+      QgsFeatureIds ignoreIds;
+      QMap<QgsVectorLayer*, QSet<qint64> >::const_iterator ignoreIt = ignoreFeatures.find( currentLayer );
+      if ( ignoreIt != ignoreFeatures.constEnd() )
+      {
+        ignoreIds = ignoreIt.value();
+      }
+
+      if ( currentLayer->removePolygonIntersections( this, ignoreIds ) != 0 )
       {
         returnValue = 3;
       }
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -30,6 +30,9 @@ email                : morb at ozemail dot com dot au
 
 #include "qgspoint.h"
 #include "qgscoordinatetransform.h"
+#include <QSet>
+
+class QgsVectorLayer;
 
 /** polyline is represented as a vector of points */
 typedef QVector<QgsPoint> QgsPolyline;
@@ -429,9 +432,10 @@ class CORE_EXPORT QgsGeometry
      *          1 if geometry is not of polygon type,
      *          2 if avoid intersection would change the geometry type,
      *          3 other error during intersection removal
+     *  @ignoreFeatures possibility to give a list of features where intersections should be ignored
      *  @note added in 1.5
      */
-    int avoidIntersections();
+    int avoidIntersections( QMap<QgsVectorLayer*, QSet<qint64> > ignoreFeatures = QMap<QgsVectorLayer*, QSet<qint64> >() );
 
     class Error
     {
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -430,8 +430,8 @@ unsigned char *QgsVectorLayer::drawLineString( unsigned char *feature, QgsRender
   // the rest of them so end the loop at that point.
   for ( int i = 0; i < nPoints; ++i )
   {
-    if ( qAbs( x.at(i) ) > QgsClipper::MAX_X ||
-         qAbs( y.at(i) ) > QgsClipper::MAX_Y )
+    if ( qAbs( x.at( i ) ) > QgsClipper::MAX_X ||
+         qAbs( y.at( i ) ) > QgsClipper::MAX_Y )
     {
       QgsClipper::trimFeature( x, y, true ); // true = polyline
       nPoints = x.size(); // trimming may change nPoints.
@@ -443,8 +443,8 @@ unsigned char *QgsVectorLayer::drawLineString( unsigned char *feature, QgsRender
   QPolygonF pa( nPoints );
   for ( int i = 0; i < nPoints; ++i )
   {
-    pa[i].setX( x.at(i) );
-    pa[i].setY( y.at(i) );
+    pa[i].setX( x.at( i ) );
+    pa[i].setY( y.at( i ) );
   }
 
   // The default pen gives bevelled joins between segements of the
@@ -2489,7 +2489,7 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo
   return returnCode;
 }
 
-int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom )
+int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom, QgsFeatureIds ignoreFeatures )
 {
   if ( !hasGeometryType() )
     return 1;
@@ -2511,6 +2511,11 @@ int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom )
   QgsFeature f;
   while ( nextFeature( f ) )
   {
+    if ( ignoreFeatures.contains( f.id() ) )
+    {
+      continue;
+    }
+
     //call geometry->makeDifference for each feature
     QgsGeometry *currentGeom = f.geometry();
     if ( currentGeom )
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -442,9 +442,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /**Changes the specified geometry such that it has no intersections with other
      *  polygon (or multipolygon) geometries in this vector layer
      *  @param geom geometry to modify
+     *  @param ignoreFeatures list of feature ids where intersections should be ignored
      *  @return 0 in case of success
      */
-    int removePolygonIntersections( QgsGeometry* geom );
+    int removePolygonIntersections( QgsGeometry* geom, QgsFeatureIds ignoreFeatures = QgsFeatureIds() );
 
     /** Adds topological points for every vertex of the geometry.
      * @param geom the geometry where each vertex is added to segments of other features

Original file line number	Diff line number	Diff line change
`@@ -6696,7 +6696,7 @@ bool QgsGeometry::deletePart( int partNum )`
`6696`	`6696`	`return true;`
`6697`	`6697`	`}`
`6698`	`6698`
`6699`		`-int QgsGeometry::avoidIntersections()`
	`6699`	`+int QgsGeometry::avoidIntersections( QMap<QgsVectorLayer*, QSet<qint64> > ignoreFeatures )`
`6700`	`6700`	`{`
`6701`	`6701`	`int returnValue = 0;`
`6702`	`6702`
`@@ -6724,7 +6724,14 @@ int QgsGeometry::avoidIntersections()`
`6724`	`6724`	`currentLayer = dynamic_cast<QgsVectorLayer>( QgsMapLayerRegistry::instance()->mapLayer( aIt ) );`
`6725`	`6725`	`if ( currentLayer )`
`6726`	`6726`	`{`
`6727`		`- if ( currentLayer->removePolygonIntersections( this ) != 0 )`
	`6727`	`+ QgsFeatureIds ignoreIds;`
	`6728`	`+ QMap<QgsVectorLayer*, QSet<qint64> >::const_iterator ignoreIt = ignoreFeatures.find( currentLayer );`
	`6729`	`+ if ( ignoreIt != ignoreFeatures.constEnd() )`
	`6730`	`+ {`
	`6731`	`+ ignoreIds = ignoreIt.value();`
	`6732`	`+ }`
	`6733`	`+`
	`6734`	`+ if ( currentLayer->removePolygonIntersections( this, ignoreIds ) != 0 )`
`6728`	`6735`	`{`
`6729`	`6736`	`returnValue = 3;`
`6730`	`6737`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,8 +430,8 @@ unsigned char QgsVectorLayer::drawLineString( unsigned char feature, QgsRender`
`430`	`430`	`// the rest of them so end the loop at that point.`
`431`	`431`	`for ( int i = 0; i < nPoints; ++i )`
`432`	`432`	`{`
`433`		`- if ( qAbs( x.at(i) ) > QgsClipper::MAX_X \|\|`
`434`		`- qAbs( y.at(i) ) > QgsClipper::MAX_Y )`
	`433`	`+ if ( qAbs( x.at( i ) ) > QgsClipper::MAX_X \|\|`
	`434`	`+ qAbs( y.at( i ) ) > QgsClipper::MAX_Y )`
`435`	`435`	`{`
`436`	`436`	`QgsClipper::trimFeature( x, y, true ); // true = polyline`
`437`	`437`	`nPoints = x.size(); // trimming may change nPoints.`
`@@ -443,8 +443,8 @@ unsigned char QgsVectorLayer::drawLineString( unsigned char feature, QgsRender`
`443`	`443`	`QPolygonF pa( nPoints );`
`444`	`444`	`for ( int i = 0; i < nPoints; ++i )`
`445`	`445`	`{`
`446`		`- pa[i].setX( x.at(i) );`
`447`		`- pa[i].setY( y.at(i) );`
	`446`	`+ pa[i].setX( x.at( i ) );`
	`447`	`+ pa[i].setY( y.at( i ) );`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`// The default pen gives bevelled joins between segements of the`
`@@ -2489,7 +2489,7 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo`
`2489`	`2489`	`return returnCode;`
`2490`	`2490`	`}`
`2491`	`2491`
`2492`		`-int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom )`
	`2492`	`+int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom, QgsFeatureIds ignoreFeatures )`
`2493`	`2493`	`{`
`2494`	`2494`	`if ( !hasGeometryType() )`
`2495`	`2495`	`return 1;`
`@@ -2511,6 +2511,11 @@ int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom )`
`2511`	`2511`	`QgsFeature f;`
`2512`	`2512`	`while ( nextFeature( f ) )`
`2513`	`2513`	`{`
	`2514`	`+ if ( ignoreFeatures.contains( f.id() ) )`
	`2515`	`+ {`
	`2516`	`+ continue;`
	`2517`	`+ }`
	`2518`	`+`
`2514`	`2519`	`//call geometry->makeDifference for each feature`
`2515`	`2520`	`QgsGeometry *currentGeom = f.geometry();`
`2516`	`2521`	`if ( currentGeom )`