Merge pull request #4713 from nyalldawson/rect_api

nyalldawson · web-flow · commit dd0bb8c1612a · 2017-06-12T07:25:38.000+10:00
Remove duplicate QgsRectangle::unionRect method
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -1927,6 +1927,7 @@ QgsRectangle        {#qgis_api_break_3_0_QgsRectangle}
 ------------
 
 - The protected members were removed - QgsRectangle is not intended to be subclassed.
+- unionRect was removed. Use combineExtentWith instead.
 
 QgsRelation        {#qgis_api_break_3_0_QgsRelation}
 -----------
diff --git a/python/core/geometry/qgsrectangle.sip b/python/core/geometry/qgsrectangle.sip
@@ -267,11 +267,6 @@ Copy constructor
 %End
 
 
-    void unionRect( const QgsRectangle &rect );
-%Docstring
- Updates the rectangle to include another rectangle.
-%End
-
     bool isFinite() const;
 %Docstring
  Returns true if the rectangle has finite boundaries. Will
diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp
@@ -342,18 +342,6 @@ QgsRectangle &QgsRectangle::operator=( const QgsRectangle &r )
   return *this;
 }
 
-void QgsRectangle::unionRect( const QgsRectangle &r )
-{
-  if ( r.xMinimum() < xMinimum() )
-    setXMinimum( r.xMinimum() );
-  if ( r.xMaximum() > xMaximum() )
-    setXMaximum( r.xMaximum() );
-  if ( r.yMinimum() < yMinimum() )
-    setYMinimum( r.yMinimum() );
-  if ( r.yMaximum() > yMaximum() )
-    setYMaximum( r.yMaximum() );
-}
-
 bool QgsRectangle::isFinite() const
 {
   if ( qIsInf( mXmin ) || qIsInf( mYmin ) || qIsInf( mXmax ) || qIsInf( mYmax ) )
diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
@@ -259,11 +259,6 @@ class CORE_EXPORT QgsRectangle
      */
     QgsRectangle &operator=( const QgsRectangle &r1 );
 
-    /**
-     * Updates the rectangle to include another rectangle.
-     */
-    void unionRect( const QgsRectangle &rect );
-
     /**
      * Returns true if the rectangle has finite boundaries. Will
      * return false if any of the rectangle boundaries are NaN or Inf.
diff --git a/src/core/providers/memory/qgsmemoryprovider.cpp b/src/core/providers/memory/qgsmemoryprovider.cpp
@@ -278,7 +278,7 @@ QgsRectangle QgsMemoryProvider::extent() const
     Q_FOREACH ( const QgsFeature &feat, mFeatures )
     {
       if ( feat.hasGeometry() )
-        mExtent.unionRect( feat.geometry().boundingBox() );
+        mExtent.combineExtentWith( feat.geometry().boundingBox() );
     }
   }
 
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -249,7 +249,7 @@ void QgsGml::calculateExtentFromFeatures()
       }
       else
       {
-        mExtent.unionRect( currentGeometry.boundingBox() );
+        mExtent.combineExtentWith( currentGeometry.boundingBox() );
       }
     }
   }
diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -523,7 +523,7 @@ QgsRectangle QgsMapSettings::fullExtent() const
       QgsRectangle extent = layerExtentToOutputExtent( lyr, lyr->extent() );
 
       QgsDebugMsg( "Output extent: " + extent.toString() );
-      fullExtent.unionRect( extent );
+      fullExtent.combineExtentWith( extent );
     }
   }
 
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp
@@ -117,7 +117,7 @@ void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError *> &errors,
       if ( QgsGeometryCheckerUtils::sharedEdgeLength( geom, geom2, QgsGeometryCheckPrecision::reducedTolerance() ) > 0 )
       {
         neighboringIds.insert( feature.id() );
-        gapAreaBBox.unionRect( geom2->boundingBox() );
+        gapAreaBBox.combineExtentWith( geom2->boundingBox() );
       }
     }
     if ( neighboringIds.isEmpty() )
diff --git a/src/plugins/geometry_checker/qgsgeometrychecker.cpp b/src/plugins/geometry_checker/qgsgeometrychecker.cpp
@@ -117,7 +117,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method )
       if ( mFeaturePool->get( id, f ) )
       {
         recheckFeatures.insert( id );
-        recheckArea.unionRect( f.geometry().boundingBox() );
+        recheckArea.combineExtentWith( f.geometry().boundingBox() );
       }
     }
   }
@@ -128,7 +128,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method )
     {
       if ( err->affectedAreaBBox().intersects( recheckArea ) )
       {
-        recheckArea.unionRect( err->affectedAreaBBox() );
+        recheckArea.combineExtentWith( err->affectedAreaBBox() );
       }
     }
   }
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@@ -366,7 +366,7 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )
       }
       else
       {
-        totextent.unionRect( geomextent );
+        totextent.combineExtentWith( geomextent );
       }
     }
   }
@@ -392,12 +392,12 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )
       extent.setXMaximum( extent.xMaximum() + diff.x() );
       extent.setYMinimum( extent.yMinimum() + diff.y() );
       extent.setYMaximum( extent.yMaximum() + diff.y() );
-      extent.unionRect( pointExtent );
+      extent.combineExtentWith( pointExtent );
       totextent = extent;
     }
     else
     {
-      totextent.unionRect( pointExtent );
+      totextent.combineExtentWith( pointExtent );
     }
   }
 
diff --git a/tests/src/core/testqgsrectangle.cpp b/tests/src/core/testqgsrectangle.cpp
@@ -47,8 +47,8 @@ void TestQgsRectangle::manipulate()
   QVERIFY( ! rect2.contains( rect1 ) );
 
   // Create the union
-  rect3.unionRect( rect1 );
-  rect3.unionRect( rect2 );
+  rect3.combineExtentWith( rect1 );
+  rect3.combineExtentWith( rect2 );
   // Check union
   QVERIFY( rect3 == QgsRectangle( 1.0, 1.0, 7.0, 5.0 ) );
 }
diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py
@@ -172,7 +172,7 @@ def testUnion(self):
         self.assertEqual(myResult, myExpectedResult, myMessage)
 
         rect1 = QgsRectangle(0.0, 0.0, 5.0, 5.0)
-        rect1.unionRect(rect2)
+        rect1.combineExtentWith(rect2)
         myMessage = ('Expected: %s\nGot: %s\n' %
                      (True, rect1.contains(rect2)))
         assert rect1.contains(rect2), myMessage

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ QgsRectangle QgsMemoryProvider::extent() const`
`278`	`278`	`Q_FOREACH ( const QgsFeature &feat, mFeatures )`
`279`	`279`	`{`
`280`	`280`	`if ( feat.hasGeometry() )`
`281`		`- mExtent.unionRect( feat.geometry().boundingBox() );`
	`281`	`+ mExtent.combineExtentWith( feat.geometry().boundingBox() );`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void QgsGml::calculateExtentFromFeatures()`
`249`	`249`	`}`
`250`	`250`	`else`
`251`	`251`	`{`
`252`		`- mExtent.unionRect( currentGeometry.boundingBox() );`
	`252`	`+ mExtent.combineExtentWith( currentGeometry.boundingBox() );`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ QgsRectangle QgsMapSettings::fullExtent() const`
`523`	`523`	`QgsRectangle extent = layerExtentToOutputExtent( lyr, lyr->extent() );`
`524`	`524`
`525`	`525`	`QgsDebugMsg( "Output extent: " + extent.toString() );`
`526`		`- fullExtent.unionRect( extent );`
	`526`	`+ fullExtent.combineExtentWith( extent );`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError *> &errors,`
`117`	`117`	`if ( QgsGeometryCheckerUtils::sharedEdgeLength( geom, geom2, QgsGeometryCheckPrecision::reducedTolerance() ) > 0 )`
`118`	`118`	`{`
`119`	`119`	`neighboringIds.insert( feature.id() );`
`120`		`- gapAreaBBox.unionRect( geom2->boundingBox() );`
	`120`	`+ gapAreaBBox.combineExtentWith( geom2->boundingBox() );`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`if ( neighboringIds.isEmpty() )`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method )`
`117`	`117`	`if ( mFeaturePool->get( id, f ) )`
`118`	`118`	`{`
`119`	`119`	`recheckFeatures.insert( id );`
`120`		`- recheckArea.unionRect( f.geometry().boundingBox() );`
	`120`	`+ recheckArea.combineExtentWith( f.geometry().boundingBox() );`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`
`@@ -128,7 +128,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method )`
`128`	`128`	`{`
`129`	`129`	`if ( err->affectedAreaBBox().intersects( recheckArea ) )`
`130`	`130`	`{`
`131`		`- recheckArea.unionRect( err->affectedAreaBBox() );`
	`131`	`+ recheckArea.combineExtentWith( err->affectedAreaBBox() );`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )`
`366`	`366`	`}`
`367`	`367`	`else`
`368`	`368`	`{`
`369`		`- totextent.unionRect( geomextent );`
	`369`	`+ totextent.combineExtentWith( geomextent );`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`	`}`
`@@ -392,12 +392,12 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )`
`392`	`392`	`extent.setXMaximum( extent.xMaximum() + diff.x() );`
`393`	`393`	`extent.setYMinimum( extent.yMinimum() + diff.y() );`
`394`	`394`	`extent.setYMaximum( extent.yMaximum() + diff.y() );`
`395`		`- extent.unionRect( pointExtent );`
	`395`	`+ extent.combineExtentWith( pointExtent );`
`396`	`396`	`totextent = extent;`
`397`	`397`	`}`
`398`	`398`	`else`
`399`	`399`	`{`
`400`		`- totextent.unionRect( pointExtent );`
	`400`	`+ totextent.combineExtentWith( pointExtent );`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`