layer crs instead of provider crs in raster save dialog

blazek · blazek · commit a205034999d6 · 2012-08-21T11:07:16.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3924,7 +3924,7 @@ void QgisApp::saveAsRasterFile()
     return;
   }
 
-  QgsRasterLayerSaveAsDialog d( rasterLayer->dataProvider(),  mMapCanvas->extent(), mMapCanvas->mapRenderer()->destinationCrs() );
+  QgsRasterLayerSaveAsDialog d( rasterLayer->dataProvider(),  mMapCanvas->extent(), rasterLayer->crs(), mMapCanvas->mapRenderer()->destinationCrs() );
   if ( d.exec() == QDialog::Accepted )
   {
     QgsRasterFileWriter fileWriter( d.outputFileName() );
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -9,11 +9,13 @@
 #include <QSettings>
 
 QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,
+    const QgsCoordinateReferenceSystem& layerCrs,
     const QgsCoordinateReferenceSystem& currentCrs,
     QWidget* parent, Qt::WindowFlags f ):
     QDialog( parent, f )
     , mDataProvider( sourceProvider )
     , mCurrentExtent( currentExtent )
+    , mLayerCrs( layerCrs )
     , mCurrentCrs( currentCrs )
     , mExtentState( OriginalExtent )
     , mResolutionState( OriginalResolution )
@@ -40,7 +42,7 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* s
   if ( mDataProvider )
   {
     //extent
-    setOutputExtent( mDataProvider->extent(), mDataProvider->crs(), OriginalExtent );
+    setOutputExtent( mDataProvider->extent(), mLayerCrs, OriginalExtent );
 
     if ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactResolution )
     {
@@ -130,7 +132,7 @@ void QgsRasterLayerSaveAsDialog::on_mOriginalExtentButton_clicked()
 {
   if ( mDataProvider )
   {
-    setOutputExtent( mDataProvider->extent(), mDataProvider->crs(), OriginalExtent );
+    setOutputExtent( mDataProvider->extent(), mLayerCrs, OriginalExtent );
   }
 }
 
@@ -266,7 +268,7 @@ void QgsRasterLayerSaveAsDialog::setOriginalResolution()
     // Init to something if no original resolution is available
     xRes = yRes = mDataProvider->extent().width() / 100;
   }
-  setResolution( xRes, yRes, mDataProvider->crs() );
+  setResolution( xRes, yRes, mLayerCrs );
   mResolutionState = OriginalResolution;
   recalcSize();
 }
@@ -414,7 +416,7 @@ void QgsRasterLayerSaveAsDialog::crsChanged()
     if ( mExtentState == OriginalExtent )
     {
       previousExtent = mDataProvider->extent();
-      previousCrs = mDataProvider->crs();
+      previousCrs = mLayerCrs;
     }
     else if ( mExtentState == CurrentExtent )
     {
@@ -456,7 +458,7 @@ void QgsRasterLayerSaveAsDialog::updateCrsGroup()
   QgsDebugMsg( "Entered" );
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( OriginalCrs ),
-                             tr( "Layer" ) + " (" + mDataProvider->crs().description() + ", " + mDataProvider->crs().authid() + ")" );
+                             tr( "Layer" ) + " (" + mLayerCrs.description() + ", " + mLayerCrs.authid() + ")" );
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( CurrentCrs ),
                              tr( "Project" ) + " (" + mCurrentCrs.description() + ", " + mCurrentCrs.authid() + ")" );
@@ -470,7 +472,7 @@ QgsCoordinateReferenceSystem QgsRasterLayerSaveAsDialog::outputCrs()
   int state = mCrsComboBox->itemData( mCrsComboBox->currentIndex() ).toInt();
   if ( state == OriginalCrs )
   {
-    return mDataProvider->crs();
+    return mLayerCrs;
   }
   else if ( state == CurrentCrs )
   {
diff --git a/src/gui/qgsrasterlayersaveasdialog.h b/src/gui/qgsrasterlayersaveasdialog.h
@@ -35,7 +35,7 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
       UserResolution
     };
 
-    QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent, const QgsCoordinateReferenceSystem& currentCrs, QWidget* parent = 0, Qt::WindowFlags f = 0 );
+    QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent, const QgsCoordinateReferenceSystem& layerCrs, const QgsCoordinateReferenceSystem& currentCrs, QWidget* parent = 0, Qt::WindowFlags f = 0 );
     ~QgsRasterLayerSaveAsDialog();
 
     Mode mode() const;
@@ -82,6 +82,7 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
   private:
     QgsRasterDataProvider* mDataProvider;
     QgsRectangle mCurrentExtent;
+    QgsCoordinateReferenceSystem mLayerCrs; // may differ from provider CRS
     QgsCoordinateReferenceSystem mCurrentCrs;
     QgsCoordinateReferenceSystem mUserCrs;
     QgsCoordinateReferenceSystem mPreviousCrs;

Original file line number	Diff line number	Diff line change
`@@ -3924,7 +3924,7 @@ void QgisApp::saveAsRasterFile()`
`3924`	`3924`	`return;`
`3925`	`3925`	`}`
`3926`	`3926`
`3927`		`- QgsRasterLayerSaveAsDialog d( rasterLayer->dataProvider(), mMapCanvas->extent(), mMapCanvas->mapRenderer()->destinationCrs() );`
	`3927`	`+ QgsRasterLayerSaveAsDialog d( rasterLayer->dataProvider(), mMapCanvas->extent(), rasterLayer->crs(), mMapCanvas->mapRenderer()->destinationCrs() );`
`3928`	`3928`	`if ( d.exec() == QDialog::Accepted )`
`3929`	`3929`	`{`
`3930`	`3930`	`QgsRasterFileWriter fileWriter( d.outputFileName() );`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,13 @@`
`9`	`9`	`#include <QSettings>`
`10`	`10`
`11`	`11`	`QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,`
	`12`	`+ const QgsCoordinateReferenceSystem& layerCrs,`
`12`	`13`	`const QgsCoordinateReferenceSystem& currentCrs,`
`13`	`14`	`QWidget* parent, Qt::WindowFlags f ):`
`14`	`15`	`QDialog( parent, f )`
`15`	`16`	`, mDataProvider( sourceProvider )`
`16`	`17`	`, mCurrentExtent( currentExtent )`
	`18`	`+ , mLayerCrs( layerCrs )`
`17`	`19`	`, mCurrentCrs( currentCrs )`
`18`	`20`	`, mExtentState( OriginalExtent )`
`19`	`21`	`, mResolutionState( OriginalResolution )`
`@@ -40,7 +42,7 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* s`
`40`	`42`	`if ( mDataProvider )`
`41`	`43`	`{`
`42`	`44`	`//extent`
`43`		`- setOutputExtent( mDataProvider->extent(), mDataProvider->crs(), OriginalExtent );`
	`45`	`+ setOutputExtent( mDataProvider->extent(), mLayerCrs, OriginalExtent );`
`44`	`46`
`45`	`47`	`if ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactResolution )`
`46`	`48`	`{`
`@@ -130,7 +132,7 @@ void QgsRasterLayerSaveAsDialog::on_mOriginalExtentButton_clicked()`
`130`	`132`	`{`
`131`	`133`	`if ( mDataProvider )`
`132`	`134`	`{`
`133`		`- setOutputExtent( mDataProvider->extent(), mDataProvider->crs(), OriginalExtent );`
	`135`	`+ setOutputExtent( mDataProvider->extent(), mLayerCrs, OriginalExtent );`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`
`@@ -266,7 +268,7 @@ void QgsRasterLayerSaveAsDialog::setOriginalResolution()`
`266`	`268`	`// Init to something if no original resolution is available`
`267`	`269`	`xRes = yRes = mDataProvider->extent().width() / 100;`
`268`	`270`	`}`
`269`		`- setResolution( xRes, yRes, mDataProvider->crs() );`
	`271`	`+ setResolution( xRes, yRes, mLayerCrs );`
`270`	`272`	`mResolutionState = OriginalResolution;`
`271`	`273`	`recalcSize();`
`272`	`274`	`}`
`@@ -414,7 +416,7 @@ void QgsRasterLayerSaveAsDialog::crsChanged()`
`414`	`416`	`if ( mExtentState == OriginalExtent )`
`415`	`417`	`{`
`416`	`418`	`previousExtent = mDataProvider->extent();`
`417`		`- previousCrs = mDataProvider->crs();`
	`419`	`+ previousCrs = mLayerCrs;`
`418`	`420`	`}`
`419`	`421`	`else if ( mExtentState == CurrentExtent )`
`420`	`422`	`{`
`@@ -456,7 +458,7 @@ void QgsRasterLayerSaveAsDialog::updateCrsGroup()`
`456`	`458`	`QgsDebugMsg( "Entered" );`
`457`	`459`
`458`	`460`	`mCrsComboBox->setItemText( mCrsComboBox->findData( OriginalCrs ),`
`459`		`- tr( "Layer" ) + " (" + mDataProvider->crs().description() + ", " + mDataProvider->crs().authid() + ")" );`
	`461`	`+ tr( "Layer" ) + " (" + mLayerCrs.description() + ", " + mLayerCrs.authid() + ")" );`
`460`	`462`
`461`	`463`	`mCrsComboBox->setItemText( mCrsComboBox->findData( CurrentCrs ),`
`462`	`464`	`tr( "Project" ) + " (" + mCurrentCrs.description() + ", " + mCurrentCrs.authid() + ")" );`
`@@ -470,7 +472,7 @@ QgsCoordinateReferenceSystem QgsRasterLayerSaveAsDialog::outputCrs()`
`470`	`472`	`int state = mCrsComboBox->itemData( mCrsComboBox->currentIndex() ).toInt();`
`471`	`473`	`if ( state == OriginalCrs )`
`472`	`474`	`{`
`473`		`- return mDataProvider->crs();`
	`475`	`+ return mLayerCrs;`
`474`	`476`	`}`
`475`	`477`	`else if ( state == CurrentCrs )`
`476`	`478`	`{`