Added QgsRectangle::contains predicate.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9973 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 15, 2009 · 1c02154 · 1c02154
1 parent 898e510
commit 1c02154
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/python/core/qgsrect.sip b/python/core/qgsrect.sip
@@ -61,6 +61,9 @@ class QgsRectangle
     QgsRectangle intersect(QgsRectangle *rect);
     //! returns true when rectangle intersects with other rectangle
     bool intersects(const QgsRectangle& rect) const;
+    //! return true when rectangle contains other rectangle
+    //! @note added in version 1.1
+    bool contains( const QgsRectangle& rect ) const;
     //! expand the rectangle so that covers both the original rectangle and the given rectangle
     void combineExtentWith(QgsRectangle *rect);
     //! expand the rectangle so that covers both the original rectangle and the given point

diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
@@ -156,6 +156,11 @@ bool QgsRectangle::intersects( const QgsRectangle& rect ) const
   return TRUE;
 }
 
+bool QgsRectangle::contains( const QgsRectangle& rect ) const
+{
+  return (rect.xmin >= xmin && rect.xmax <= xmax && rect.ymin >= ymin && rect.ymax <= ymax);
+}
+
 
 void QgsRectangle::combineExtentWith( QgsRectangle * rect )
 {

diff --git a/src/core/qgsrectangle.h b/src/core/qgsrectangle.h
@@ -84,6 +84,9 @@ class CORE_EXPORT QgsRectangle
     QgsRectangle intersect( QgsRectangle *rect ) const;
     //! returns true when rectangle intersects with other rectangle
     bool intersects( const QgsRectangle& rect ) const;
+    //! return true when rectangle contains other rectangle
+    //! @note added in version 1.1
+    bool contains( const QgsRectangle& rect ) const;
     //! expand the rectangle so that covers both the original rectangle and the given rectangle
     void combineExtentWith( QgsRectangle *rect );
     //! expand the rectangle so that covers both the original rectangle and the given point