sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-05 00:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

WCS extent and save as fix

Browse Source
This commit is contained in:
Radim Blazek 2012-09-12 14:51:37 +02:00
parent e8061c7fea
commit 3cb46692b5
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/qgsrasterlayersaveasdialog.cpp
View File

@ -251,10 +251,10 @@ void QgsRasterLayerSaveAsDialog::setOutputExtent( const QgsRectangle& r, const Q
extent = ct.transformBoundingBox( r ); extent = ct.transformBoundingBox( r );
} }
mXMinLineEdit->setText( QString::number( extent.xMinimum() ) ); mXMinLineEdit->setText( QgsRasterInterface::printValue( extent.xMinimum() ) );
mXMaxLineEdit->setText( QString::number( extent.xMaximum() ) ); mXMaxLineEdit->setText( QgsRasterInterface::printValue( extent.xMaximum() ) );
mYMinLineEdit->setText( QString::number( extent.yMinimum() ) ); mYMinLineEdit->setText( QgsRasterInterface::printValue( extent.yMinimum() ) );
mYMaxLineEdit->setText( QString::number( extent.yMaximum() ) ); mYMaxLineEdit->setText( QgsRasterInterface::printValue( extent.yMaximum() ) );
mExtentState = state; mExtentState = state;
extentChanged(); extentChanged();

1
src/providers/wcs/qgswcscapabilities.cpp
View File

@ -762,6 +762,7 @@ bool QgsWcsCapabilities::parseDescribeCoverageDom10( QByteArray const &xml, QgsW
QList<int> high = parseInts( domElementText( gridElement, "limits.GridEnvelope.high" ) ); QList<int> high = parseInts( domElementText( gridElement, "limits.GridEnvelope.high" ) );
if ( low.size() == 2 && high.size() == 2 ) if ( low.size() == 2 && high.size() == 2 )
{ {
// low/high are indexes in grid -> size is hight - low + 1
double width = high[0] - low[0] + 1; double width = high[0] - low[0] + 1;
double height = high[1] - low[1] + 1; double height = high[1] - low[1] + 1;
if ( width > 0 && height > 0 ) if ( width > 0 && height > 0 )

10
src/providers/wcs/qgswcsprovider.cpp
View File

@ -171,11 +171,14 @@ QgsWcsProvider::QgsWcsProvider( QString const &uri )
// in that case we continue without CRS and user is asked for it // in that case we continue without CRS and user is asked for it
//if ( mCoverageCrs.isEmpty() ) return; //if ( mCoverageCrs.isEmpty() ) return;
// Native size
mWidth = mCoverageSummary.width; mWidth = mCoverageSummary.width;
mHeight = mCoverageSummary.height; mHeight = mCoverageSummary.height;
mHasSize = mCoverageSummary.hasSize; mHasSize = mCoverageSummary.hasSize;
QgsDebugMsg( QString( "mWidth = %1 mHeight = %2" ).arg( mWidth ).arg( mHeight ) ) ; QgsDebugMsg( QString( "mWidth = %1 mHeight = %2" ).arg( mWidth ).arg( mHeight ) );
// TODO: Consider if/how to recalculate mWidth, mHeight if non native CRS is used
if ( !calculateExtent() ) if ( !calculateExtent() )
{ {
@ -1288,7 +1291,8 @@ bool QgsWcsProvider::calculateExtent()
// Prefer to use extent from capabilities / coverage description because // Prefer to use extent from capabilities / coverage description because
// transformation from WGS84 increases the extent // transformation from WGS84 increases the extent
mCoverageExtent = mCoverageSummary.boundingBoxes.value( mCoverageCrs ); mCoverageExtent = mCoverageSummary.boundingBoxes.value( mCoverageCrs );
if ( !mCoverageExtent.isEmpty() && !mCoverageExtent.isFinite() ) QgsDebugMsg( "mCoverageCrs = " + mCoverageCrs + " mCoverageExtent = " + mCoverageExtent.toString() );
if ( !mCoverageExtent.isEmpty() && mCoverageExtent.isFinite() )
{ {
QgsDebugMsg( "mCoverageExtent = " + mCoverageExtent.toString() ); QgsDebugMsg( "mCoverageExtent = " + mCoverageExtent.toString() );
return true; return true;
@ -1308,9 +1312,11 @@ bool QgsWcsProvider::calculateExtent()
//QgsDebugMsg( "qgisSrsDest: " + qgisSrsDest.toWkt() ); //QgsDebugMsg( "qgisSrsDest: " + qgisSrsDest.toWkt() );
mCoordinateTransform = new QgsCoordinateTransform( qgisSrsSource, qgisSrsDest ); mCoordinateTransform = new QgsCoordinateTransform( qgisSrsSource, qgisSrsDest );
} }
QgsDebugMsg( "mCoverageSummary.wgs84BoundingBox= " + mCoverageSummary.wgs84BoundingBox.toString() ); QgsDebugMsg( "mCoverageSummary.wgs84BoundingBox= " + mCoverageSummary.wgs84BoundingBox.toString() );
// Convert to the user's CRS as required // Convert to the user's CRS as required
try try
{ {