sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Show some more diverse format for an interval

Browse Source 
Before showing an interval of two hours would show you:
interval: 0.0833333 days
Now depending on the range of the interval you will see output
in days, minutes or seconds:

make_interval(years:=0.75)
<interval: 273.938 days>

make_interval(days:=2, hours:=3)
<interval: 2.125 days>

make_interval(hours:=3,days:=1)
<interval: 1.125 days>

make_interval(minutes:=30)
<interval: 30 minutes>

make_interval(minutes:=0.5,seconds:=5)
<interval: 35 seconds>
This commit is contained in:
Richard Duivenvoorde 2020-10-04 15:38:01 +02:00 committed by Nyall Dawson
parent 667af7f29f
commit 51b650afdf
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/expression/qgsexpression.cpp
View File

@ -975,7 +975,22 @@ QString QgsExpression::formatPreviewString( const QVariant &value, const bool ht
else if ( value.canConvert< QgsInterval >() )
{
QgsInterval interval = value.value<QgsInterval>();
return startToken + tr( "interval: %1 days" ).arg( interval.days() ) + endToken;
if ( interval.days() > 1 )
{
return startToken + tr( "interval: %1 days" ).arg( interval.days() ) + endToken;
}
else if ( interval.hours() > 1 )
{
return startToken + tr( "interval: %1 hours" ).arg( interval.hours() ) + endToken;
}
else if ( interval.minutes() > 1 )
{
return startToken + tr( "interval: %1 minutes" ).arg( interval.minutes() ) + endToken;
}
else
{
return startToken + tr( "interval: %1 seconds" ).arg( interval.seconds() ) + endToken;
}
}
else if ( value.canConvert< QgsGradientColorRamp >() )
{