Allow overwriting of existing raster datasets

mhugent · mhugent · commit 7c9b2c10dfbd · 2012-07-19T17:00:19.000+02:00
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -69,7 +69,7 @@ void QgsRasterLayerSaveAsDialog::on_mBrowseButton_clicked()
   }
   else
   {
-    fileName = QFileDialog::getOpenFileName( this, tr( "Select output file" ) );
+    fileName = QFileDialog::getSaveFileName( this, tr( "Select output file" ) );
   }
 
   if ( !fileName.isEmpty() )
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -2055,11 +2055,6 @@ void QgsGdalProvider::initBaseDataset()
 bool QgsGdalProvider::create( const QString& format, int nBands, QgsRasterDataProvider::DataType type, int width, int height,
                               double* geoTransform, const QgsCoordinateReferenceSystem& crs )
 {
-  if ( isValid() ) //datasource already exists
-  {
-    return false;
-  }
-
   //get driver
   GDALDriverH driver = GDALGetDriverByName( format.toLocal8Bit().data() );
   if ( !driver )
@@ -2091,12 +2086,12 @@ bool QgsGdalProvider::create( const QString& format, int nBands, QgsRasterDataPr
 
 bool QgsGdalProvider::write( void* data, int band, int width, int height, int xOffset, int yOffset )
 {
-    GDALRasterBandH rasterBand = GDALGetRasterBand( mGdalDataset, band );
-    if ( rasterBand == NULL )
-    {
-        return false;
-    }
-    return ( GDALRasterIO( rasterBand, GF_Write, xOffset, yOffset, width, height, data, width, height, GDALGetRasterDataType( rasterBand ), 0, 0 ) == CE_None );
+  GDALRasterBandH rasterBand = GDALGetRasterBand( mGdalDataset, band );
+  if ( rasterBand == NULL )
+  {
+    return false;
+  }
+  return ( GDALRasterIO( rasterBand, GF_Write, xOffset, yOffset, width, height, data, width, height, GDALGetRasterDataType( rasterBand ), 0, 0 ) == CE_None );
 }
 
 QStringList QgsGdalProvider::createFormats() const

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ void QgsRasterLayerSaveAsDialog::on_mBrowseButton_clicked()`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`		`- fileName = QFileDialog::getOpenFileName( this, tr( "Select output file" ) );`
	`72`	`+ fileName = QFileDialog::getSaveFileName( this, tr( "Select output file" ) );`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if ( !fileName.isEmpty() )`