Skip to content

Commit 1f1fe88

Browse files
committedSep 28, 2014
migrate old renderer ranges (followup fcfafa0)
1 parent fcfafa0 commit 1f1fe88

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed
 

‎src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
#include <ctime>
3535

3636
QgsRendererRangeV2::QgsRendererRangeV2()
37-
: mLowerValue( 0 ), mUpperValue( 0 ), mSymbol( 0 ), mLabel()
37+
: mLowerValue( 0 )
38+
, mUpperValue( 0 )
39+
, mSymbol( 0 )
40+
, mLabel()
3841
{
3942
}
4043

@@ -220,12 +223,16 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper
220223
if ( upperStr.contains( '.' ) ) upperStr = upperStr.replace( mReTrailingZeroes, "" );
221224
}
222225

223-
return mFormat.arg(lowerStr, upperStr);
226+
return mFormat.arg( lowerStr, upperStr );
224227
}
225228

226229
void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
227230
{
228-
mFormat = element.attribute( "format", " %1 - %2" );
231+
mFormat = element.attribute( "format",
232+
element.attribute( "prefix", " " ) + "%1" +
233+
element.attribute( "separator", " - " ) + "%2" +
234+
element.attribute( "suffix", " " )
235+
);
229236
mDecimalPlaces = element.attribute( "decimalplaces", "4" ).toInt();
230237
mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";
231238
}

0 commit comments

Comments
 (0)
Please sign in to comment.