Allow QgsVectorFileWriter to report approx progress

nyalldawson · nyalldawson · commit c42f1ec7f537 · 2017-02-13T08:30:29.000+10:00
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -2424,6 +2424,9 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
   writer->mFields = layer->fields();
 
   // write all features
+  long saved = 0;
+  long total = options.onlySelectedFeatures ? layer->selectedFeatureCount() : layer->featureCount();
+  int lastProgressReport = 0;
   while ( fit.nextFeature( fet ) )
   {
     if ( options.feedback && options.feedback->isCanceled() )
@@ -2432,6 +2435,18 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
       return Canceled;
     }
 
+    saved++;
+    if ( options.feedback )
+    {
+      //avoid spamming progress reports
+      int newProgress = ( 100.0 * saved ) / total;
+      if ( newProgress < 100 && newProgress != lastProgressReport )
+      {
+        lastProgressReport = newProgress;
+        options.feedback->setProgress( lastProgressReport );
+      }
+    }
+
     if ( shallTransform )
     {
       try
diff --git a/src/core/qgsvectorfilewritertask.cpp b/src/core/qgsvectorfilewritertask.cpp
@@ -44,6 +44,8 @@ bool QgsVectorFileWriterTask::run()
   if ( !mLayer )
     return false;
 
+  connect( mOptions.feedback, &QgsFeedback::progressChanged, this, &QgsVectorFileWriterTask::setProgress );
+
   mError = QgsVectorFileWriter::writeAsVectorFormat(
              mLayer, mDestFileName, mOptions, &mNewFilename, &mErrorMessage );
   return mError == QgsVectorFileWriter::NoError;
