[Geometry checker] Be more verbose about output file creation failure reason

manisandro · manisandro · commit 9b7afc8f4894 · 2016-01-19T09:39:29.000+01:00
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -218,10 +218,11 @@ void QgsGeometryCheckerSetupTab::runChecks()
       QgsMapLayerRegistry::instance()->removeMapLayers( toRemove );
     }
 
-    QgsVectorFileWriter::WriterError err =  QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly );
+    QString errMsg;
+    QgsVectorFileWriter::WriterError err =  QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly, &errMsg );
     if ( err != QgsVectorFileWriter::NoError )
     {
-      QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer." ) );
+      QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer: %1" ).arg( errMsg ) );
       mRunButton->setEnabled( true );
       ui.labelStatus->hide();
       unsetCursor();
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
@@ -220,10 +220,11 @@ void QgsGeometrySnapperDialog::run()
       QgsMapLayerRegistry::instance()->removeMapLayers( toRemove );
     }
 
-    QgsVectorFileWriter::WriterError err =  QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly );
+    QString errMsg;
+    QgsVectorFileWriter::WriterError err =  QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly, &errMsg );
     if ( err != QgsVectorFileWriter::NoError )
     {
-      QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer." ) );
+      QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer: %1" ).arg( errMsg ) );
       return;
     }
     QgsVectorLayer* newlayer = new QgsVectorLayer( filename, QFileInfo( filename ).completeBaseName(), "ogr" );

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,11 @@ void QgsGeometryCheckerSetupTab::runChecks()`
`218`	`218`	`QgsMapLayerRegistry::instance()->removeMapLayers( toRemove );`
`219`	`219`	`}`
`220`	`220`
`221`		`- QgsVectorFileWriter::WriterError err = QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly );`
	`221`	`+ QString errMsg;`
	`222`	`+ QgsVectorFileWriter::WriterError err = QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly, &errMsg );`
`222`	`223`	`if ( err != QgsVectorFileWriter::NoError )`
`223`	`224`	`{`
`224`		`- QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer." ) );`
	`225`	`+ QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer: %1" ).arg( errMsg ) );`
`225`	`226`	`mRunButton->setEnabled( true );`
`226`	`227`	`ui.labelStatus->hide();`
`227`	`228`	`unsetCursor();`
Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,11 @@ void QgsGeometrySnapperDialog::run()`
`220`	`220`	`QgsMapLayerRegistry::instance()->removeMapLayers( toRemove );`
`221`	`221`	`}`
`222`	`222`
`223`		`- QgsVectorFileWriter::WriterError err = QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly );`
	`223`	`+ QString errMsg;`
	`224`	`+ QgsVectorFileWriter::WriterError err = QgsVectorFileWriter::writeAsVectorFormat( layer, filename, layer->dataProvider()->encoding(), &layer->crs(), mOutputDriverName, selectedOnly, &errMsg );`
`224`	`225`	`if ( err != QgsVectorFileWriter::NoError )`
`225`	`226`	`{`
`226`		`- QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer." ) );`
	`227`	`+ QMessageBox::critical( this, tr( "Layer Creation Failed" ), tr( "Failed to create the output layer: %1" ).arg( errMsg ) );`
`227`	`228`	`return;`
`228`	`229`	`}`
`229`	`230`	`QgsVectorLayer* newlayer = new QgsVectorLayer( filename, QFileInfo( filename ).completeBaseName(), "ogr" );`