Fix progress reports, joined feature count

qgis · Jan 2, 2020 · db4c99f · db4c99f
1 parent c6565ef
commit db4c99f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/analysis/processing/qgsalgorithmjoinbylocation.cpp b/src/analysis/processing/qgsalgorithmjoinbylocation.cpp
@@ -182,20 +182,18 @@ QVariantMap QgsJoinByLocationAlgorithm::processAlgorithm( const QVariantMap &par
   if ( parameters.value( QStringLiteral( "NON_MATCHING" ) ).isValid() && !mUnjoinedFeatures )
     throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "NON_MATCHING" ) ) );
 
-  qlonglong joinedCount = 0;
   QgsFeatureIterator joinIter = joinSource->getFeatures( QgsFeatureRequest().setDestinationCrs( mBaseSource->sourceCrs(), context.transformContext() ).setSubsetOfAttributes( mJoinedFieldIndices ) );
   QgsFeature f;
 
   // Create output vector layer with additional attributes
-  const double step = mBaseSource->featureCount() > 0 ? 100.0 / mBaseSource->featureCount() : 1;
+  const double step = joinSource->featureCount() > 0 ? 100.0 / joinSource->featureCount() : 1;
   long i = 0;
   while ( joinIter.nextFeature( f ) )
   {
     if ( feedback->isCanceled() )
       break;
 
-    if ( processFeatures( f, feedback ) )
+    processFeatures( f, feedback );
-      joinedCount++;
 
     i++;
     feedback->setProgress( i * step );
@@ -243,7 +241,7 @@ QVariantMap QgsJoinByLocationAlgorithm::processAlgorithm( const QVariantMap &par
   {
     outputs.insert( QStringLiteral( "NON_MATCHING" ), nonMatchingSinkId );
   }
-  outputs.insert( QStringLiteral( "JOINED_COUNT" ), joinedCount );
+  outputs.insert( QStringLiteral( "JOINED_COUNT" ), static_cast< long long >( mJoinedCount ) );
   return outputs;
 }
 
@@ -376,6 +374,7 @@ bool QgsJoinByLocationAlgorithm::processFeatures( QgsFeature &joinFeature, QgsPr
         ok = true;
 
       mAddedIds.insert( baseFeature.id() );
+      mJoinedCount++;
     }
   }
   return ok;

diff --git a/src/analysis/processing/qgsalgorithmjoinbylocation.h b/src/analysis/processing/qgsalgorithmjoinbylocation.h
@@ -59,6 +59,7 @@ class QgsJoinByLocationAlgorithm : public QgsProcessingAlgorithm
       OneToMany = 0,
       OneToOne = 1,
     };
+    long mJoinedCount = 0;
     std::unique_ptr< QgsProcessingFeatureSource > mBaseSource;
     QgsAttributeList mJoinedFieldIndices;
     bool mDiscardNonMatching = false;