[QGIS Commit] r9176 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: ersts
Date: 2008-08-26 16:31:45 -0400 (Tue, 26 Aug 2008)
New Revision: 9176

Modified:
   trunk/qgis/src/core/qgsrect.cpp
   trunk/qgis/src/core/qgsrect.h
Log:
-Updated setYmin/setYmax to setYMinimum/setYMaximum

Modified: trunk/qgis/src/core/qgsrect.cpp
===================================================================
--- trunk/qgis/src/core/qgsrect.cpp	2008-08-26 20:04:13 UTC (rev 9175)
+++ trunk/qgis/src/core/qgsrect.cpp	2008-08-26 20:31:45 UTC (rev 9176)
@@ -135,8 +135,8 @@
 
   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 @@
 {
   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

Modified: trunk/qgis/src/core/qgsrect.h
===================================================================
--- trunk/qgis/src/core/qgsrect.h	2008-08-26 20:04:13 UTC (rev 9175)
+++ trunk/qgis/src/core/qgsrect.h	2008-08-26 20:31:45 UTC (rev 9176)
@@ -53,10 +53,10 @@
     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();