Skip to content
Permalink
Browse files
-Updated setYmin/setYmax to setYMinimum/setYMaximum
git-svn-id: http://svn.osgeo.org/qgis/trunk@9176 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
ersts committed Aug 26, 2008
1 parent 0c77403 commit 6e8b4a2a3ef327d5e3a23c4723efe8edc86fe57f
Showing with 7 additions and 7 deletions.
  1. +4 −4 src/core/qgsrect.cpp
  2. +3 −3 src/core/qgsrect.h
@@ -135,8 +135,8 @@ QgsRect QgsRect::intersect( QgsRect * rect ) const

intersection.setXMinimum( xmin > rect->xMin() ? xmin : rect->xMin() );
intersection.setXMaximum( xmax < rect->xMax() ? xmax : rect->xMax() );
intersection.setYmin( ymin > rect->yMin() ? ymin : rect->yMin() );
intersection.setYmax( ymax < rect->yMax() ? ymax : rect->yMax() );
intersection.setYMinimum( ymin > rect->yMin() ? ymin : rect->yMin() );
intersection.setYMaximum( ymax < rect->yMax() ? ymax : rect->yMax() );
return intersection;
}

@@ -292,8 +292,8 @@ void QgsRect::unionRect( const QgsRect& r )
{
if ( r.xMin() < xMin() ) setXMinimum( r.xMin() );
if ( r.xMax() > xMax() ) setXMaximum( r.xMax() );
if ( r.yMin() < yMin() ) setYmin( r.yMin() );
if ( r.yMax() > yMax() ) setYmax( r.yMax() );
if ( r.yMin() < yMin() ) setYMinimum( r.yMin() );
if ( r.yMax() > yMax() ) setYMaximum( r.yMax() );
}

bool QgsRect::isFinite() const
@@ -53,10 +53,10 @@ class CORE_EXPORT QgsRect
void setXMinimum( double x );
//! Set the maximum x value
void setXMaximum( double x );
//! Set the minimum y value
void setYMinimum( double y );
//! Set the maximum y value
void setYmin( double y );
//! Set the maximum y value
void setYmax( double y );
void setYMaximum( double y );
//! Set a rectangle so that min corner is at max
// and max corner is at min. It is NOT normalized.
void setMinimal();

0 comments on commit 6e8b4a2

Please sign in to comment.