@@ -173,31 +173,31 @@ int QgsZonalStatistics::calculateStatistics( QgsFeedback *feedback )
173
173
vectorProvider->addAttributes ( newFieldList );
174
174
175
175
// index of the new fields
176
- int countIndex = mStatistics & QgsZonalStatistics::Count ? vectorProvider->fieldNameIndex ( countFieldName ) : -1 ;
177
- int sumIndex = mStatistics & QgsZonalStatistics::Sum ? vectorProvider->fieldNameIndex ( sumFieldName ) : -1 ;
178
- int meanIndex = mStatistics & QgsZonalStatistics::Mean ? vectorProvider->fieldNameIndex ( meanFieldName ) : -1 ;
179
- int medianIndex = mStatistics & QgsZonalStatistics::Median ? vectorProvider->fieldNameIndex ( medianFieldName ) : -1 ;
180
- int stdevIndex = mStatistics & QgsZonalStatistics::StDev ? vectorProvider->fieldNameIndex ( stdevFieldName ) : -1 ;
181
- int minIndex = mStatistics & QgsZonalStatistics::Min ? vectorProvider->fieldNameIndex ( minFieldName ) : -1 ;
182
- int maxIndex = mStatistics & QgsZonalStatistics::Max ? vectorProvider->fieldNameIndex ( maxFieldName ) : -1 ;
183
- int rangeIndex = mStatistics & QgsZonalStatistics::Range ? vectorProvider->fieldNameIndex ( rangeFieldName ) : -1 ;
184
- int minorityIndex = mStatistics & QgsZonalStatistics::Minority ? vectorProvider->fieldNameIndex ( minorityFieldName ) : -1 ;
185
- int majorityIndex = mStatistics & QgsZonalStatistics::Majority ? vectorProvider->fieldNameIndex ( majorityFieldName ) : -1 ;
186
- int varietyIndex = mStatistics & QgsZonalStatistics::Variety ? vectorProvider->fieldNameIndex ( varietyFieldName ) : -1 ;
187
- int varianceIndex = mStatistics & QgsZonalStatistics::Variance ? vectorProvider->fieldNameIndex ( varianceFieldName ) : -1 ;
188
-
189
- if ( ( mStatistics & QgsZonalStatistics::Count && countIndex == -1 )
190
- || ( mStatistics & QgsZonalStatistics::Sum && sumIndex == -1 )
191
- || ( mStatistics & QgsZonalStatistics::Mean && meanIndex == -1 )
192
- || ( mStatistics & QgsZonalStatistics::Median && medianIndex == -1 )
193
- || ( mStatistics & QgsZonalStatistics::StDev && stdevIndex == -1 )
194
- || ( mStatistics & QgsZonalStatistics::Min && minIndex == -1 )
195
- || ( mStatistics & QgsZonalStatistics::Max && maxIndex == -1 )
196
- || ( mStatistics & QgsZonalStatistics::Range && rangeIndex == -1 )
197
- || ( mStatistics & QgsZonalStatistics::Minority && minorityIndex == -1 )
198
- || ( mStatistics & QgsZonalStatistics::Majority && majorityIndex == -1 )
199
- || ( mStatistics & QgsZonalStatistics::Variety && varietyIndex == -1 )
200
- || ( mStatistics & QgsZonalStatistics::Variance && varianceIndex == -1 )
176
+ int countIndex = ( mStatistics & QgsZonalStatistics::Count ) ? vectorProvider->fieldNameIndex ( countFieldName ) : -1 ;
177
+ int sumIndex = ( mStatistics & QgsZonalStatistics::Sum ) ? vectorProvider->fieldNameIndex ( sumFieldName ) : -1 ;
178
+ int meanIndex = ( mStatistics & QgsZonalStatistics::Mean ) ? vectorProvider->fieldNameIndex ( meanFieldName ) : -1 ;
179
+ int medianIndex = ( mStatistics & QgsZonalStatistics::Median ) ? vectorProvider->fieldNameIndex ( medianFieldName ) : -1 ;
180
+ int stdevIndex = ( mStatistics & QgsZonalStatistics::StDev ) ? vectorProvider->fieldNameIndex ( stdevFieldName ) : -1 ;
181
+ int minIndex = ( mStatistics & QgsZonalStatistics::Min ) ? vectorProvider->fieldNameIndex ( minFieldName ) : -1 ;
182
+ int maxIndex = ( mStatistics & QgsZonalStatistics::Max ) ? vectorProvider->fieldNameIndex ( maxFieldName ) : -1 ;
183
+ int rangeIndex = ( mStatistics & QgsZonalStatistics::Range ) ? vectorProvider->fieldNameIndex ( rangeFieldName ) : -1 ;
184
+ int minorityIndex = ( mStatistics & QgsZonalStatistics::Minority ) ? vectorProvider->fieldNameIndex ( minorityFieldName ) : -1 ;
185
+ int majorityIndex = ( mStatistics & QgsZonalStatistics::Majority ) ? vectorProvider->fieldNameIndex ( majorityFieldName ) : -1 ;
186
+ int varietyIndex = ( mStatistics & QgsZonalStatistics::Variety ) ? vectorProvider->fieldNameIndex ( varietyFieldName ) : -1 ;
187
+ int varianceIndex = ( mStatistics & QgsZonalStatistics::Variance ) ? vectorProvider->fieldNameIndex ( varianceFieldName ) : -1 ;
188
+
189
+ if ( ( ( mStatistics & QgsZonalStatistics::Count ) && countIndex == -1 )
190
+ || ( ( mStatistics & QgsZonalStatistics::Sum ) && sumIndex == -1 )
191
+ || ( ( mStatistics & QgsZonalStatistics::Mean ) && meanIndex == -1 )
192
+ || ( ( mStatistics & QgsZonalStatistics::Median ) && medianIndex == -1 )
193
+ || ( ( mStatistics & QgsZonalStatistics::StDev ) && stdevIndex == -1 )
194
+ || ( ( mStatistics & QgsZonalStatistics::Min ) && minIndex == -1 )
195
+ || ( ( mStatistics & QgsZonalStatistics::Max ) && maxIndex == -1 )
196
+ || ( ( mStatistics & QgsZonalStatistics::Range ) && rangeIndex == -1 )
197
+ || ( ( mStatistics & QgsZonalStatistics::Minority ) && minorityIndex == -1 )
198
+ || ( ( mStatistics & QgsZonalStatistics::Majority ) && majorityIndex == -1 )
199
+ || ( ( mStatistics & QgsZonalStatistics::Variety ) && varietyIndex == -1 )
200
+ || ( ( mStatistics & QgsZonalStatistics::Variance ) && varianceIndex == -1 )
201
201
)
202
202
{
203
203
// failed to create a required field
0 commit comments