sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better error reporting for aggregate calculation failures

Browse Source
This commit is contained in:
Nyall Dawson 2021-08-11 17:04:27 +10:00
parent 1b8397edd5
commit a5261ff141
3 changed files with 90 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/core/auto_generated/qgsaggregatecalculator.sip.in
View File

@ -162,6 +162,13 @@ Converts a string to a aggregate type.
:param ok: if specified, will be set to ``True`` if conversion was successful
:return: aggregate type
%End
static QString displayName( Aggregate aggregate );
%Docstring
Returns the friendly display name for a ``aggregate``.
.. versionadded:: 3.22
%End
static QList< QgsAggregateCalculator::AggregateInfo > aggregates();

78
src/core/qgsaggregatecalculator.cpp
View File

@ -106,6 +106,7 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
//determine result type
QVariant::Type resultType = QVariant::Double;
int userType = 0;
if ( attrNum == -1 )
{
if ( aggregate == GeometryCollect )
@ -132,13 +133,14 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
context->setFeature( f );
QVariant v = expression->evaluate( context );
resultType = v.type();
userType = v.userType();
}
}
else
resultType = mLayer->fields().at( attrNum ).type();
QgsFeatureIterator fit = mLayer->getFeatures( request );
return calculate( aggregate, fit, resultType, attrNum, expression.get(), mDelimiter, context, ok );
return calculate( aggregate, fit, resultType, userType, attrNum, expression.get(), mDelimiter, context, ok, &mLastError );
}
QgsAggregateCalculator::Aggregate QgsAggregateCalculator::stringToAggregate( const QString &string, bool *ok )
@ -199,6 +201,58 @@ QgsAggregateCalculator::Aggregate QgsAggregateCalculator::stringToAggregate( con
return Count;
}
QString QgsAggregateCalculator::displayName( Aggregate aggregate )
{
switch ( aggregate )
{
case QgsAggregateCalculator::Count:
return QObject::tr( "count" );
case QgsAggregateCalculator::CountDistinct:
return QObject::tr( "count distinct" );
case QgsAggregateCalculator::CountMissing:
return QObject::tr( "count missing" );
case QgsAggregateCalculator::Min:
return QObject::tr( "minimum" );
case QgsAggregateCalculator::Max:
return QObject::tr( "maximum" );
case QgsAggregateCalculator::Sum:
return QObject::tr( "sum" );
case QgsAggregateCalculator::Mean:
return QObject::tr( "mean" );
case QgsAggregateCalculator::Median:
return QObject::tr( "median" );
case QgsAggregateCalculator::StDev:
return QObject::tr( "standard deviation" );
case QgsAggregateCalculator::StDevSample:
return QObject::tr( "standard deviation (sample)" );
case QgsAggregateCalculator::Range:
return QObject::tr( "range" );
case QgsAggregateCalculator::Minority:
return QObject::tr( "minority" );
case QgsAggregateCalculator::Majority:
return QObject::tr( "majority" );
case QgsAggregateCalculator::FirstQuartile:
return QObject::tr( "first quartile" );
case QgsAggregateCalculator::ThirdQuartile:
return QObject::tr( "third quartile" );
case QgsAggregateCalculator::InterQuartileRange:
return QObject::tr( "inter quartile range" );
case QgsAggregateCalculator::StringMinimumLength:
return QObject::tr( "minimum length" );
case QgsAggregateCalculator::StringMaximumLength:
return QObject::tr( "maximum length" );
case QgsAggregateCalculator::StringConcatenate:
return QObject::tr( "concatenate" );
case QgsAggregateCalculator::GeometryCollect:
return QObject::tr( "collection" );
case QgsAggregateCalculator::ArrayAggregate:
return QObject::tr( "array aggregate" );
case QgsAggregateCalculator::StringConcatenateUnique:
return QObject::tr( "concatenate (unique)" );
}
return QString();
}
QList<QgsAggregateCalculator::AggregateInfo> QgsAggregateCalculator::aggregates()
{
QList< AggregateInfo > aggregates;
@ -429,8 +483,8 @@ QList<QgsAggregateCalculator::AggregateInfo> QgsAggregateCalculator::aggregates(
return aggregates;
}
QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate aggregate, QgsFeatureIterator &fit, QVariant::Type resultType,
int attr, QgsExpression *expression, const QString &delimiter, QgsExpressionContext *context, bool *ok )
QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate aggregate, QgsFeatureIterator &fit, QVariant::Type resultType, int userType,
int attr, QgsExpression *expression, const QString &delimiter, QgsExpressionContext *context, bool *ok, QString *error )
{
if ( ok )
*ok = false;
@ -453,7 +507,11 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
bool statOk = false;
QgsStatisticalSummary::Statistic stat = numericStatFromAggregate( aggregate, &statOk );
if ( !statOk )
{
if ( error )
*error = QObject::tr( "Cannot calculate %1 on numeric fields" ).arg( displayName( aggregate ) );
return QVariant();
}
if ( ok )
*ok = true;
@ -466,7 +524,11 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
bool statOk = false;
QgsDateTimeStatisticalSummary::Statistic stat = dateTimeStatFromAggregate( aggregate, &statOk );
if ( !statOk )
{
if ( error )
*error = QObject::tr( "Cannot calculate %1 on date/datetime fields" ).arg( displayName( aggregate ) );
return QVariant();
}
if ( ok )
*ok = true;
@ -508,7 +570,17 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
bool statOk = false;
QgsStringStatisticalSummary::Statistic stat = stringStatFromAggregate( aggregate, &statOk );
if ( !statOk )
{
QString typeString;
if ( resultType == QVariant::UserType )
typeString = QMetaType::typeName( userType );
else
typeString = resultType == QVariant::String ? QObject::tr( "string" ) : QVariant::typeToName( resultType );
if ( error )
*error = QObject::tr( "Cannot calculate %1 on %3 fields" ).arg( displayName( aggregate ), typeString );
return QVariant();
}
if ( ok )
*ok = true;

10
src/core/qgsaggregatecalculator.h
View File

@ -196,6 +196,12 @@ class CORE_EXPORT QgsAggregateCalculator
*/
static Aggregate stringToAggregate( const QString &string, bool *ok = nullptr );
/**
* Returns the friendly display name for a \a aggregate.
* \since QGIS 3.22
*/
static QString displayName( Aggregate aggregate );
/**
* Structured information for available aggregates.
*
@ -242,10 +248,10 @@ class CORE_EXPORT QgsAggregateCalculator
static QVariant calculateArrayAggregate( QgsFeatureIterator &fit, int attr, QgsExpression *expression,
QgsExpressionContext *context );
static QVariant calculate( Aggregate aggregate, QgsFeatureIterator &fit, QVariant::Type resultType,
static QVariant calculate( Aggregate aggregate, QgsFeatureIterator &fit, QVariant::Type resultType, int userType,
int attr, QgsExpression *expression,
const QString &delimiter,
QgsExpressionContext *context, bool *ok = nullptr );
QgsExpressionContext *context, bool *ok = nullptr, QString *error = nullptr );
static QVariant concatenateStrings( QgsFeatureIterator &fit, int attr, QgsExpression *expression,
QgsExpressionContext *context, const QString &delimiter, bool unique = false );