[QGIS Commit] r9177 - in trunk/qgis: python/core src/app src/core
src/core/composer src/core/raster src/gui
src/providers/postgres src/providers/wfs
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Aug 26 16:47:54 EDT 2008
Author: ersts
Date: 2008-08-26 16:47:53 -0400 (Tue, 26 Aug 2008)
New Revision: 9177
Modified:
trunk/qgis/python/core/qgsrect.sip
trunk/qgis/src/app/qgsmaptoolidentify.cpp
trunk/qgis/src/core/composer/qgscomposermap.cpp
trunk/qgis/src/core/qgsmaprenderer.cpp
trunk/qgis/src/core/qgsmaptopixel.cpp
trunk/qgis/src/core/qgsmaptopixel.h
trunk/qgis/src/core/qgsrect.h
trunk/qgis/src/core/qgsvectorlayer.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/gui/qgsmapcanvas.cpp
trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
trunk/qgis/src/gui/qgsmaptip.cpp
trunk/qgis/src/gui/qgsmaptoolzoom.cpp
trunk/qgis/src/providers/postgres/qgspostgresextentthread.cpp
trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
Log:
-Propogated updates for QgsRect setYMin/setYMax
Modified: trunk/qgis/python/core/qgsrect.sip
===================================================================
--- trunk/qgis/python/core/qgsrect.sip 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/python/core/qgsrect.sip 2008-08-26 20:47:53 UTC (rev 9177)
@@ -31,9 +31,9 @@
//! Set the maximum x value
void setXMaximum(double x);
//! Set the maximum y value
- void setYmin(double y);
+ void setYMinimum(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();
Modified: trunk/qgis/src/app/qgsmaptoolidentify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/app/qgsmaptoolidentify.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -244,8 +244,8 @@
QgsRect r;
r.setXMinimum( point.x() - searchRadius );
r.setXMaximum( point.x() + searchRadius );
- r.setYmin( point.y() - searchRadius );
- r.setYmax( point.y() + searchRadius );
+ r.setYMinimum( point.y() - searchRadius );
+ r.setYMaximum( point.y() + searchRadius );
r = toLayerCoords( layer, r );
Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -263,8 +263,8 @@
mExtent.setXMinimum( mExtent.xMin() + xMoveMapCoord );
mExtent.setXMaximum( mExtent.xMax() + xMoveMapCoord );
- mExtent.setYmin( mExtent.yMin() + yMoveMapCoord );
- mExtent.setYmax( mExtent.yMax() + yMoveMapCoord );
+ mExtent.setYMinimum( mExtent.yMin() + yMoveMapCoord );
+ mExtent.setYMaximum( mExtent.yMax() + yMoveMapCoord );
emit extentChanged();
cache();
update();
Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -182,8 +182,8 @@
// update extent
mExtent.setXMinimum( dxmin );
mExtent.setXMaximum( dxmax );
- mExtent.setYmin( dymin );
- mExtent.setYmax( dymax );
+ mExtent.setYMinimum( dymin );
+ mExtent.setYMaximum( dymax );
// update the scale
updateScale();
@@ -326,7 +326,7 @@
bk_mapToPixel = mRenderContext.mapToPixel();
rasterMapToPixel = mRenderContext.mapToPixel();
rasterMapToPixel.setMapUnitsPerPixel( mRenderContext.mapToPixel().mapUnitsPerPixel() / rasterScaleFactor );
- rasterMapToPixel.setYmax( mSize.height() * rasterScaleFactor );
+ rasterMapToPixel.setYMaximum( mSize.height() * rasterScaleFactor );
mRenderContext.setMapToPixel( rasterMapToPixel );
mRenderContext.painter()->save();
mRenderContext.painter()->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
@@ -754,7 +754,7 @@
exElement = yminNode.toElement();
double ymin = exElement.text().toDouble();
- aoi.setYmin( ymin );
+ aoi.setYMinimum( ymin );
exElement = xmaxNode.toElement();
double xmax = exElement.text().toDouble();
@@ -762,7 +762,7 @@
exElement = ymaxNode.toElement();
double ymax = exElement.text().toDouble();
- aoi.setYmax( ymax );
+ aoi.setYMaximum( ymax );
setExtent( aoi );
Modified: trunk/qgis/src/core/qgsmaptopixel.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaptopixel.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/qgsmaptopixel.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -64,12 +64,12 @@
return mMapUnitsPerPixel;
}
-void QgsMapToPixel::setYmax( double ymax )
+void QgsMapToPixel::setYMaximum( double ymax )
{
yMax = ymax;
}
-void QgsMapToPixel::setYmin( double ymin )
+void QgsMapToPixel::setYMinimum( double ymin )
{
yMin = ymin;
}
Modified: trunk/qgis/src/core/qgsmaptopixel.h
===================================================================
--- trunk/qgis/src/core/qgsmaptopixel.h 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/qgsmaptopixel.h 2008-08-26 20:47:53 UTC (rev 9177)
@@ -91,9 +91,9 @@
double mapUnitsPerPixel() const;
//! Set maximum y value
- void setYmax( double ymax );
+ void setYMaximum( double ymax );
//! Set minimum y value
- void setYmin( double ymin );
+ void setYMinimum( double ymin );
//! set minimum x value
void setXMinimum( double xmin );
/*! Set parameters for use in tranfsorming coordinates
Modified: trunk/qgis/src/core/qgsrect.h
===================================================================
--- trunk/qgis/src/core/qgsrect.h 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/qgsrect.h 2008-08-26 20:47:53 UTC (rev 9177)
@@ -145,12 +145,12 @@
xmax = x;
}
-inline void QgsRect::setYmin( double y )
+inline void QgsRect::setYMinimum( double y )
{
ymin = y;
}
-inline void QgsRect::setYmax( double y )
+inline void QgsRect::setYMaximum( double y )
{
ymax = y;
}
Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -1535,8 +1535,8 @@
if ( boundingBoxFromPointList( ring, xMin, yMin, xMax, yMax ) == 0 )
{
- bBox.setXMinimum( xMin ); bBox.setYmin( yMin );
- bBox.setXMaximum( xMax ); bBox.setYmax( yMax );
+ bBox.setXMinimum( xMin ); bBox.setYMinimum( yMin );
+ bBox.setXMaximum( xMax ); bBox.setYMaximum( yMax );
}
else
{
@@ -1661,8 +1661,8 @@
{
if ( boundingBoxFromPointList( splitLine, xMin, yMin, xMax, yMax ) == 0 )
{
- bBox.setXMinimum( xMin ); bBox.setYmin( yMin );
- bBox.setXMaximum( xMax ); bBox.setYmax( yMax );
+ bBox.setXMinimum( xMin ); bBox.setYMinimum( yMin );
+ bBox.setXMaximum( xMax ); bBox.setYMaximum( yMax );
}
else
{
@@ -1679,8 +1679,8 @@
}
else if ( bBox.height() == 0.0 && bBox.width() > 0 )
{
- bBox.setYmin( bBox.yMin() - bBox.width() / 2 );
- bBox.setYmax( bBox.yMax() + bBox.width() / 2 );
+ bBox.setYMinimum( bBox.yMin() - bBox.width() / 2 );
+ bBox.setYMaximum( bBox.yMax() + bBox.width() / 2 );
}
else
{
@@ -2176,8 +2176,8 @@
// store the extent
mLayerExtent.setXMaximum( mbr.xMax() );
mLayerExtent.setXMinimum( mbr.xMin() );
- mLayerExtent.setYmax( mbr.yMax() );
- mLayerExtent.setYmin( mbr.yMin() );
+ mLayerExtent.setYMaximum( mbr.yMax() );
+ mLayerExtent.setYMinimum( mbr.yMin() );
// get and store the feature type
mGeometryType = mDataProvider->geometryType();
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -483,8 +483,8 @@
// The affine transform reduces to these values at the
// top-left corner of the raster
mLayerExtent.setXMinimum( mGeoTransform[0] );
- mLayerExtent.setYmax( mGeoTransform[3] );
- mLayerExtent.setYmin( myYMin );
+ mLayerExtent.setYMaximum( mGeoTransform[3] );
+ mLayerExtent.setYMinimum( myYMin );
//
// Set up the x and y dimensions of this raster layer
@@ -4864,8 +4864,8 @@
// store the extent
mLayerExtent.setXMaximum( mbr.xMax() );
mLayerExtent.setXMinimum( mbr.xMin() );
- mLayerExtent.setYmax( mbr.yMax() );
- mLayerExtent.setYmin( mbr.yMin() );
+ mLayerExtent.setYMaximum( mbr.yMax() );
+ mLayerExtent.setYMinimum( mbr.yMin() );
// upper case the first letter of the layer name
QgsDebugMsg( "mLayerName: " + name() );
Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -628,8 +628,8 @@
case Qt::Key_Up:
QgsDebugMsg( "Pan up" );
- currentExtent.setYmax( currentExtent.yMax() + dy );
- currentExtent.setYmin( currentExtent.yMin() + dy );
+ currentExtent.setYMaximum( currentExtent.yMax() + dy );
+ currentExtent.setYMinimum( currentExtent.yMin() + dy );
setExtent( currentExtent );
refresh();
break;
@@ -637,8 +637,8 @@
case Qt::Key_Down:
QgsDebugMsg( "Pan down" );
- currentExtent.setYmax( currentExtent.yMax() - dy );
- currentExtent.setYmin( currentExtent.yMin() - dy );
+ currentExtent.setYMaximum( currentExtent.yMax() - dy );
+ currentExtent.setYMinimum( currentExtent.yMin() - dy );
setExtent( currentExtent );
refresh();
break;
@@ -1134,14 +1134,14 @@
if ( end.y() < start.y() )
{
- r.setYmax( r.yMax() + dy );
- r.setYmin( r.yMin() + dy );
+ r.setYMaximum( r.yMax() + dy );
+ r.setYMinimum( r.yMin() + dy );
}
else
{
- r.setYmax( r.yMax() - dy );
- r.setYmin( r.yMin() - dy );
+ r.setYMaximum( r.yMax() - dy );
+ r.setYMinimum( r.yMin() - dy );
}
Modified: trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -188,8 +188,8 @@
QgsRect ext;
ext.setXMinimum( center.x() - oldExtent.width() / 2 );
ext.setXMaximum( center.x() + oldExtent.width() / 2 );
- ext.setYmin( center.y() - oldExtent.height() / 2 );
- ext.setYmax( center.y() + oldExtent.height() / 2 );
+ ext.setYMinimum( center.y() - oldExtent.height() / 2 );
+ ext.setYMaximum( center.y() + oldExtent.height() / 2 );
QgsDebugMsg( QString( "panning: new position: [%1,%2] [%3x%4]" ).arg( rect.left() ).arg( rect.top() ).arg( rect.width() ).arg( rect.height() ) );
Modified: trunk/qgis/src/gui/qgsmaptip.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmaptip.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/gui/qgsmaptip.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -92,8 +92,8 @@
QgsRect r;
r.setXMinimum( mapPosition.x() - searchRadius );
r.setXMaximum( mapPosition.x() + searchRadius );
- r.setYmin( mapPosition.y() - searchRadius );
- r.setYmax( mapPosition.y() + searchRadius );
+ r.setYMinimum( mapPosition.y() - searchRadius );
+ r.setYMaximum( mapPosition.y() + searchRadius );
// Get the data provider
QgsVectorDataProvider* dataProvider = dynamic_cast<QgsVectorLayer*>( layer )->dataProvider();
Modified: trunk/qgis/src/gui/qgsmaptoolzoom.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmaptoolzoom.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/gui/qgsmaptoolzoom.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -85,9 +85,9 @@
QgsRect r;
r.setXMinimum( ll.x() );
- r.setYmin( ll.y() );
+ r.setYMinimum( ll.y() );
r.setXMaximum( ur.x() );
- r.setYmax( ur.y() );
+ r.setYMaximum( ur.y() );
r.normalize();
// prevent zooming to an empty extent
Modified: trunk/qgis/src/providers/postgres/qgspostgresextentthread.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresextentthread.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/providers/postgres/qgspostgresextentthread.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -137,8 +137,8 @@
/*
layerExtent.setXMaximum(maxx);
layerExtent.setXMinimum(minx);
- layerExtent.setYmax(maxy);
- layerExtent.setYmin(miny);
+ layerExtent.setYMaximum(maxy);
+ layerExtent.setYMinimum(miny);
*/
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -698,8 +698,8 @@
{
layerExtent.setXMaximum( newExtent.xMax() );
layerExtent.setXMinimum( newExtent.xMin() );
- layerExtent.setYmax( newExtent.yMax() );
- layerExtent.setYmin( newExtent.yMin() );
+ layerExtent.setYMaximum( newExtent.yMax() );
+ layerExtent.setYMinimum( newExtent.yMin() );
}
// TODO - make this function return the real extent_
@@ -2388,8 +2388,8 @@
layerExtent.setXMaximum( maxx );
layerExtent.setXMinimum( minx );
- layerExtent.setYmax( maxy );
- layerExtent.setYmin( miny );
+ layerExtent.setYMaximum( maxy );
+ layerExtent.setYMinimum( miny );
}
}
else
Modified: trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2008-08-26 20:31:45 UTC (rev 9176)
+++ trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2008-08-26 20:47:53 UTC (rev 9177)
@@ -620,10 +620,10 @@
std::list<QgsPoint>::const_iterator it = boundingPoints.begin();
extent->setXMinimum( it->x() );
- extent->setYmin( it->y() );
+ extent->setYMinimum( it->y() );
++it;
extent->setXMaximum( it->x() );
- extent->setYmax( it->y() );
+ extent->setYMaximum( it->y() );
return 0;
}
else if ( coordinatesNode.localName() == "coord" )
@@ -659,9 +659,9 @@
return 10;
}
extent->setXMinimum( x1 );
- extent->setYmin( y1 );
+ extent->setYMinimum( y1 );
extent->setXMaximum( x2 );
- extent->setYmax( y2 );
+ extent->setYMaximum( y2 );
return 0;
}
else
More information about the QGIS-commit
mailing list