address review comments

qgis · Jul 4, 2024 · 5e53e18 · 5e53e18
1 parent 7bd8c07
commit 5e53e18
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/python/plugins/processing/tests/testdata/expected/statistics_text.gml b/python/plugins/processing/tests/testdata/expected/statistics_text.gml
@@ -17,9 +17,9 @@
       <ogr:max>Test</ogr:max>
       <ogr:min_length>0</ogr:min_length>
       <ogr:max_length>4</ogr:max_length>
-      <ogr:mean_length xsi:nil="true"/>
-      <ogr:minority>Test</ogr:minority>
-      <ogr:majority xsi:nil="true"/>
+      <ogr:mean_length>3</ogr:mean_length>
+      <ogr:minority xsi:nil="true"/>
+      <ogr:majority>Test</ogr:majority>
     </ogr:statistics_text>
   </ogr:featureMember>
 </ogr:FeatureCollection>
diff --git a/src/analysis/processing/qgsalgorithmbasicstatistics.cpp b/src/analysis/processing/qgsalgorithmbasicstatistics.cpp
@@ -174,15 +174,15 @@ QVariantMap QgsBasicStatisticsAlgorithm::processAlgorithm( const QVariantMap &pa
 
   if ( field.isNumeric() )
   {
-    outputs = calculateNumericStatistics( field, features, count, sink.get(), data, feedback );
+    outputs = calculateNumericStatistics( fieldIndex, features, count, sink.get(), data, feedback );
   }
   else if ( field.isDateOrTime() )
   {
-    outputs = calculateDateTimeStatistics( field, features, count, sink.get(), data, feedback );
+    outputs = calculateDateTimeStatistics( fieldIndex, field, features, count, sink.get(), data, feedback );
   }
   else
   {
-    outputs = calculateStringStatistics( field, features, count, sink.get(), data, feedback );
+    outputs = calculateStringStatistics( fieldIndex, features, count, sink.get(), data, feedback );
   }
 
   if ( !outputHtml.isEmpty() )
@@ -213,7 +213,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::processAlgorithm( const QVariantMap &pa
   return outputs;
 }
 
-QVariantMap QgsBasicStatisticsAlgorithm::calculateNumericStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
+QVariantMap QgsBasicStatisticsAlgorithm::calculateNumericStatistics( const int fieldIndex, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
 {
   const double step = count > 0 ? 100.0 / count : 1;
   long long current = 0;
@@ -228,7 +228,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateNumericStatistics( QgsField fi
       break;
     }
 
-    stat.addVariant( f.attribute( field.name() ) );
+    stat.addVariant( f.attribute( fieldIndex ) );
     feedback->setProgress( current * step );
     current++;
   }
@@ -299,7 +299,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateNumericStatistics( QgsField fi
   return outputs;
 }
 
-QVariantMap QgsBasicStatisticsAlgorithm::calculateDateTimeStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
+QVariantMap QgsBasicStatisticsAlgorithm::calculateDateTimeStatistics( const int fieldIndex, QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
 {
   const double step = count > 0 ? 100.0 / count : 1;
   long long current = 0;
@@ -314,7 +314,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateDateTimeStatistics( QgsField f
       break;
     }
 
-    stat.addValue( f.attribute( field.name() ) );
+    stat.addValue( f.attribute( fieldIndex ) );
     feedback->setProgress( current * step );
     current++;
   }
@@ -353,7 +353,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateDateTimeStatistics( QgsField f
   return outputs;
 }
 
-QVariantMap QgsBasicStatisticsAlgorithm::calculateStringStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
+QVariantMap QgsBasicStatisticsAlgorithm::calculateStringStatistics( const int fieldIndex, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback )
 {
   const double step = count > 0 ? 100.0 / count : 1;
   long long current = 0;
@@ -368,7 +368,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateStringStatistics( QgsField fie
       break;
     }
 
-    stat.addValue( f.attribute( field.name() ) );
+    stat.addValue( f.attribute( fieldIndex ) );
     feedback->setProgress( current * step );
     current++;
   }
@@ -410,6 +410,7 @@ QVariantMap QgsBasicStatisticsAlgorithm::calculateStringStatistics( QgsField fie
                      << outputs.value( QStringLiteral( "MAX" ) )
                      << outputs.value( QStringLiteral( "MIN_LENGTH" ) )
                      << outputs.value( QStringLiteral( "MAX_LENGTH" ) )
+                     << outputs.value( QStringLiteral( "MEAN_LENGTH" ) )
                      << outputs.value( QStringLiteral( "MINORITY" ) )
                      << outputs.value( QStringLiteral( "MAJORITY" ) ) );
     sink->addFeature( f, QgsFeatureSink::FastInsert );

diff --git a/src/analysis/processing/qgsalgorithmbasicstatistics.h b/src/analysis/processing/qgsalgorithmbasicstatistics.h
@@ -53,9 +53,9 @@ class QgsBasicStatisticsAlgorithm : public QgsProcessingAlgorithm
 
   private:
 
-    QVariantMap calculateNumericStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
-    QVariantMap calculateDateTimeStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
-    QVariantMap calculateStringStatistics( QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
+    QVariantMap calculateNumericStatistics( const int fieldIndex, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
+    QVariantMap calculateDateTimeStatistics( const int fieldIndex, QgsField field, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
+    QVariantMap calculateStringStatistics( const int fieldIndex, QgsFeatureIterator features, const long long count, QgsFeatureSink *sink, QStringList &data, QgsProcessingFeedback *feedback );
 };
 
 ///@endcond PRIVATE