Rule-based renderer: respect the original scale range when refining the rule based on scales.

wonder · wonder · commit 1fbb58e0b2df · 2010-06-12T10:59:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13711 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -355,14 +355,20 @@ QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleRanges( Qg
 
 QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleScales( QgsRuleBasedRendererV2::Rule& initialRule, QList<int> scales )
 {
+  qSort(scales); // make sure the scales are in ascending order
   QList<Rule> rules;
-  int oldScale = 0;
+  int oldScale = initialRule.scaleMinDenom();
+  int maxDenom = initialRule.scaleMaxDenom();
   foreach( int scale, scales )
   {
+    if ( initialRule.scaleMinDenom() >= scale )
+      continue; // jump over the first scales out of the interval
+    if ( maxDenom != 0 && maxDenom  <= scale )
+      break; // ignore the latter scales out of the interval
     rules.append( Rule( initialRule.symbol()->clone(), oldScale, scale, initialRule.filterExpression() ) );
     oldScale = scale;
   }
   // last rule
-  rules.append( Rule( initialRule.symbol()->clone(), oldScale, 0, initialRule.filterExpression() ) );
+  rules.append( Rule( initialRule.symbol()->clone(), oldScale, maxDenom, initialRule.filterExpression() ) );
   return rules;
 }

Original file line number	Diff line number	Diff line change
`@@ -355,14 +355,20 @@ QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleRanges( Qg`
`355`	`355`
`356`	`356`	`QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleScales( QgsRuleBasedRendererV2::Rule& initialRule, QList<int> scales )`
`357`	`357`	`{`
	`358`	`+ qSort(scales); // make sure the scales are in ascending order`
`358`	`359`	`QList<Rule> rules;`
`359`		`- int oldScale = 0;`
	`360`	`+ int oldScale = initialRule.scaleMinDenom();`
	`361`	`+ int maxDenom = initialRule.scaleMaxDenom();`
`360`	`362`	`foreach( int scale, scales )`
`361`	`363`	`{`
	`364`	`+ if ( initialRule.scaleMinDenom() >= scale )`
	`365`	`+ continue; // jump over the first scales out of the interval`
	`366`	`+ if ( maxDenom != 0 && maxDenom <= scale )`
	`367`	`+ break; // ignore the latter scales out of the interval`
`362`	`368`	`rules.append( Rule( initialRule.symbol()->clone(), oldScale, scale, initialRule.filterExpression() ) );`
`363`	`369`	`oldScale = scale;`
`364`	`370`	`}`
`365`	`371`	`// last rule`
`366`		`- rules.append( Rule( initialRule.symbol()->clone(), oldScale, 0, initialRule.filterExpression() ) );`
	`372`	`+ rules.append( Rule( initialRule.symbol()->clone(), oldScale, maxDenom, initialRule.filterExpression() ) );`
`367`	`373`	`return rules;`
`368`	`374`	`}`