migrate old renderer ranges (followup fcfafa0)

jef-n · jef-n · commit 1f1fe8886d6e · 2014-09-28T13:45:23.000+02:00
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -34,7 +34,10 @@
 #include <ctime>
 
 QgsRendererRangeV2::QgsRendererRangeV2()
-    : mLowerValue( 0 ), mUpperValue( 0 ), mSymbol( 0 ), mLabel()
+    : mLowerValue( 0 )
+    , mUpperValue( 0 )
+    , mSymbol( 0 )
+    , mLabel()
 {
 }
 
@@ -220,12 +223,16 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper
     if ( upperStr.contains( '.' ) ) upperStr = upperStr.replace( mReTrailingZeroes, "" );
   }
 
-  return mFormat.arg(lowerStr, upperStr);
+  return mFormat.arg( lowerStr, upperStr );
 }
 
 void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
 {
-  mFormat = element.attribute( "format", " %1 - %2" );
+  mFormat = element.attribute( "format",
+                               element.attribute( "prefix", " " ) + "%1" +
+                               element.attribute( "separator", " - " ) + "%2" +
+                               element.attribute( "suffix", " " )
+                             );
   mDecimalPlaces = element.attribute( "decimalplaces", "4" ).toInt();
   mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@`
`34`	`34`	`#include <ctime>`
`35`	`35`
`36`	`36`	`QgsRendererRangeV2::QgsRendererRangeV2()`
`37`		`- : mLowerValue( 0 ), mUpperValue( 0 ), mSymbol( 0 ), mLabel()`
	`37`	`+ : mLowerValue( 0 )`
	`38`	`+ , mUpperValue( 0 )`
	`39`	`+ , mSymbol( 0 )`
	`40`	`+ , mLabel()`
`38`	`41`	`{`
`39`	`42`	`}`
`40`	`43`
`@@ -220,12 +223,16 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper`
`220`	`223`	`if ( upperStr.contains( '.' ) ) upperStr = upperStr.replace( mReTrailingZeroes, "" );`
`221`	`224`	`}`
`222`	`225`
`223`		`- return mFormat.arg(lowerStr, upperStr);`
	`226`	`+ return mFormat.arg( lowerStr, upperStr );`
`224`	`227`	`}`
`225`	`228`
`226`	`229`	`void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )`
`227`	`230`	`{`
`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`	`+ );`
`229`	`236`	`mDecimalPlaces = element.attribute( "decimalplaces", "4" ).toInt();`
`230`	`237`	`mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";`
`231`	`238`	`}`