Drag'n'drop for rules, rule does not need a symbol

Author: wonder-sk

src/core/symbology-ng/qgsrulebasedrendererv2.cpp

@@ -106,6 +106,12 @@ QgsSymbolV2List QgsRuleBasedRendererV2::Rule::symbols()
   return lst;
 }
 
+void QgsRuleBasedRendererV2::Rule::setSymbol( QgsSymbolV2* sym )
+{
+  delete mSymbol;
+  mSymbol = sym;
+}
+
 QgsLegendSymbolList QgsRuleBasedRendererV2::Rule::legendSymbolItems()
 {
   QgsLegendSymbolList lst;
@@ -534,34 +540,21 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element )
 
 void QgsRuleBasedRendererV2::refineRuleCategories( QgsRuleBasedRendererV2::Rule* initialRule, QgsCategorizedSymbolRendererV2* r )
 {
-  RuleList rules;
   foreach( const QgsRendererCategoryV2& cat, r->categories() )
   {
-    QString newfilter = QString( "%1 = '%2'" ).arg( r->classAttribute() ).arg( cat.value().toString() );
-    QString filter = initialRule->filterExpression();
-    QString label = initialRule->label();
-    QString description = initialRule->description();
-    if ( filter.isEmpty() )
-      filter = newfilter;
-    else
-      filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter );
-    initialRule->appendChild( new Rule( cat.symbol()->clone(), initialRule->scaleMinDenom(), initialRule->scaleMaxDenom(), filter, label, description ) );
+    QString filter = QString( "%1 = '%2'" ).arg( r->classAttribute() ).arg( cat.value().toString() );
+    QString label = filter;
+    initialRule->appendChild( new Rule( cat.symbol()->clone(), 0, 0, filter, label ) );
   }
 }
 
 void QgsRuleBasedRendererV2::refineRuleRanges( QgsRuleBasedRendererV2::Rule* initialRule, QgsGraduatedSymbolRendererV2* r )
 {
   foreach( const QgsRendererRangeV2& rng, r->ranges() )
   {
-    QString newfilter = QString( "%1 >= '%2' AND %1 <= '%3'" ).arg( r->classAttribute() ).arg( rng.lowerValue() ).arg( rng.upperValue() );
-    QString filter = initialRule->filterExpression();
-    QString label = initialRule->label();
-    QString description = initialRule->description();
-    if ( filter.isEmpty() )
-      filter = newfilter;
-    else
-      filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter );
-    initialRule->appendChild( new Rule( rng.symbol()->clone(), initialRule->scaleMinDenom(), initialRule->scaleMaxDenom(), filter, label, description ) );
+    QString filter = QString( "%1 >= '%2' AND %1 <= '%3'" ).arg( r->classAttribute() ).arg( rng.lowerValue() ).arg( rng.upperValue() );
+    QString label = filter;
+    initialRule->appendChild( new Rule( rng.symbol()->clone(), 0, 0, filter, label ) );
   }
 }
 
@@ -570,21 +563,18 @@ void QgsRuleBasedRendererV2::refineRuleScales( QgsRuleBasedRendererV2::Rule* ini
   qSort( scales ); // make sure the scales are in ascending order
   int oldScale = initialRule->scaleMinDenom();
   int maxDenom = initialRule->scaleMaxDenom();
-  QString filter = initialRule->filterExpression();
-  QString label = initialRule->label();
-  QString description = initialRule->description();
   QgsSymbolV2* symbol = initialRule->symbol();
   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
-    initialRule->appendChild( new Rule( symbol->clone(), oldScale, scale, filter, label, description ) );
+    initialRule->appendChild( new Rule( symbol->clone(), oldScale, scale, QString(), QString( "%1 - %2" ).arg( oldScale ).arg( scale ) ) );
     oldScale = scale;
   }
   // last rule
-  initialRule->appendChild( new Rule( symbol->clone(), oldScale, maxDenom, filter, label, description ) );
+  initialRule->appendChild( new Rule( symbol->clone(), oldScale, maxDenom, QString(), QString( "%1 - %2" ).arg( oldScale ).arg( maxDenom ) ) );
 }
 
 QString QgsRuleBasedRendererV2::dump()

src/core/symbology-ng/qgsrulebasedrendererv2.h

@@ -93,6 +93,8 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
         QString filterExpression() const { return mFilterExp; }
         QString description() const { return mDescription; }
 
+        //! set a new symbol (or NULL). Deletes old symbol.
+        void setSymbol( QgsSymbolV2* sym );
         void setLabel( QString label ) { mLabel = label; }
         void setScaleMinDenom( int scaleMinDenom ) { mScaleMinDenom = scaleMinDenom; }
         void setScaleMaxDenom( int scaleMaxDenom ) { mScaleMaxDenom = scaleMaxDenom; }