Skip to content

Commit 60c59f9

Browse files
author
ersts
committed
-Updated setYmin/setYmax to setYMinimum/setYMaximum
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9176 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent aff6fad commit 60c59f9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/core/qgsrect.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ QgsRect QgsRect::intersect( QgsRect * rect ) const
135135

136136
intersection.setXMinimum( xmin > rect->xMin() ? xmin : rect->xMin() );
137137
intersection.setXMaximum( xmax < rect->xMax() ? xmax : rect->xMax() );
138-
intersection.setYmin( ymin > rect->yMin() ? ymin : rect->yMin() );
139-
intersection.setYmax( ymax < rect->yMax() ? ymax : rect->yMax() );
138+
intersection.setYMinimum( ymin > rect->yMin() ? ymin : rect->yMin() );
139+
intersection.setYMaximum( ymax < rect->yMax() ? ymax : rect->yMax() );
140140
return intersection;
141141
}
142142

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

299299
bool QgsRect::isFinite() const

src/core/qgsrect.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class CORE_EXPORT QgsRect
5353
void setXMinimum( double x );
5454
//! Set the maximum x value
5555
void setXMaximum( double x );
56+
//! Set the minimum y value
57+
void setYMinimum( double y );
5658
//! Set the maximum y value
57-
void setYmin( double y );
58-
//! Set the maximum y value
59-
void setYmax( double y );
59+
void setYMaximum( double y );
6060
//! Set a rectangle so that min corner is at max
6161
// and max corner is at min. It is NOT normalized.
6262
void setMinimal();

0 commit comments

Comments
 (0)