Merge pull request #2691 from m-kuhn/fixrulebased

Also render all parent features on refined rules
qgis · Jan 20, 2016 · 47549eb · 47549eb
2 parents 45d5b1c + fc6f2cb
commit 47549eb
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 19 deletions.
diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -274,7 +274,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
         void removeChildAt( int i );
 
         //! take child rule out, set parent as null
-        void takeChild( QgsRuleBasedRendererV2::Rule* rule );
+        QgsRuleBasedRendererV2::Rule* takeChild( QgsRuleBasedRendererV2::Rule* rule ) /TransferBack/;
 
         //! take child rule out, set parent as null
         QgsRuleBasedRendererV2::Rule* takeChildAt( int i ) /TransferBack/;

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -36,13 +36,20 @@
 
 
 QgsRuleBasedRendererV2::Rule::Rule( QgsSymbolV2* symbol, int scaleMinDenom, int scaleMaxDenom, const QString& filterExp, const QString& label, const QString& description, bool elseRule )
-    : mParent( nullptr ), mSymbol( symbol )
-    , mScaleMinDenom( scaleMinDenom ), mScaleMaxDenom( scaleMaxDenom )
-    , mFilterExp( filterExp ), mLabel( label ), mDescription( description )
+    : mParent( nullptr )
+    , mSymbol( symbol )
+    , mScaleMinDenom( scaleMinDenom )
+    , mScaleMaxDenom( scaleMaxDenom )
+    , mFilterExp( filterExp )
+    , mLabel( label )
+    , mDescription( description )
     , mElseRule( elseRule )
     , mIsActive( true )
     , mFilter( nullptr )
 {
+  if ( mElseRule )
+    mFilterExp = "ELSE";
+
   mRuleKey = QUuid::createUuid().toString();
   initFilter();
 }
@@ -57,19 +64,23 @@ QgsRuleBasedRendererV2::Rule::~Rule()
 
 void QgsRuleBasedRendererV2::Rule::initFilter()
 {
-  if ( mElseRule || mFilterExp.compare( "ELSE", Qt::CaseInsensitive ) == 0 )
+  if ( mFilterExp.trimmed().compare( "ELSE", Qt::CaseInsensitive ) == 0 )
   {
     mElseRule = true;
+    delete mFilter;
     mFilter = nullptr;
   }
-  else if ( !mFilterExp.isEmpty() )
+  else if ( mFilterExp.trimmed().isEmpty() )
   {
+    mElseRule = false;
     delete mFilter;
-    mFilter = new QgsExpression( mFilterExp );
+    mFilter = nullptr;
   }
   else
   {
-    mFilter = nullptr;
+    mElseRule = false;
+    delete mFilter;
+    mFilter = new QgsExpression( mFilterExp );
   }
 }
 
@@ -96,24 +107,24 @@ void QgsRuleBasedRendererV2::Rule::removeChild( Rule* rule )
 
 void QgsRuleBasedRendererV2::Rule::removeChildAt( int i )
 {
-  delete mChildren.at( i );
-  mChildren.removeAt( i );
+  delete mChildren.takeAt( i );
   updateElseRules();
 }
 
-void QgsRuleBasedRendererV2::Rule::takeChild( Rule* rule )
+QgsRuleBasedRendererV2::Rule*  QgsRuleBasedRendererV2::Rule::takeChild( Rule* rule )
 {
   mChildren.removeAll( rule );
   rule->mParent = nullptr;
   updateElseRules();
+  return rule;
 }
 
 QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::takeChildAt( int i )
 {
   Rule* rule = mChildren.takeAt( i );
   rule->mParent = nullptr;
+  updateElseRules();
   return rule;
-  // updateElseRules();
 }
 
 QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::findRuleByKey( const QString& key )
@@ -142,6 +153,14 @@ void QgsRuleBasedRendererV2::Rule::updateElseRules()
   }
 }
 
+void QgsRuleBasedRendererV2::Rule::setIsElse( bool iselse )
+{
+  mFilterExp = "ELSE";
+  mElseRule = iselse;
+  delete mFilter;
+  mFilter = nullptr;
+}
+
 
 QString QgsRuleBasedRendererV2::Rule::dump( int indent ) const
 {
@@ -197,6 +216,12 @@ void QgsRuleBasedRendererV2::Rule::setSymbol( QgsSymbolV2* sym )
   mSymbol = sym;
 }
 
+void QgsRuleBasedRendererV2::Rule::setFilterExpression( const QString& filterExp )
+{
+  mFilterExp = filterExp;
+  initFilter();
+}
+
 QgsLegendSymbolList QgsRuleBasedRendererV2::Rule::legendSymbolItems( double scaleDenominator, const QString& ruleFilter ) const
 {
   QgsLegendSymbolList lst;
@@ -428,7 +453,7 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const
   // Finally they are joined with their parent (this) with AND
   QString sf;
   // If there are subfilters present (and it's not a single empty one), group them and join them with OR
-  if ( subfilters.length() > 1 || subfilters.value( 0 ).trimmed().length() > 0 )
+  if ( subfilters.length() > 1 || !subfilters.value( 0 ).isEmpty() )
   {
     if ( subfilters.contains( "TRUE" ) )
       sf = "TRUE";
@@ -440,14 +465,17 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const
   // * The parent is an else rule
   // * The existence of parent filter and subfilters
 
-  if ( isElse() )
+  // No filter expression: ELSE rule or catchall rule
+  if ( !mFilter )
   {
-    if ( sf.trimmed().isEmpty() )
+    if ( mSymbol || sf.isEmpty() )
       filter = "TRUE";
     else
       filter = sf;
   }
-  else if ( !mFilterExp.trimmed().isEmpty() && !sf.trimmed().isEmpty() )
+  else if ( mSymbol )
+    filter = mFilterExp;
+  else if ( !mFilterExp.trimmed().isEmpty() && !sf.isEmpty() )
     filter = QString( "(%1) AND (%2)" ).arg( mFilterExp, sf );
   else if ( !mFilterExp.trimmed().isEmpty() )
     filter = mFilterExp;

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -204,7 +204,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
          *
          * @param filterExp An expression
          */
-        void setFilterExpression( const QString& filterExp ) { mFilterExp = filterExp; initFilter(); }
+        void setFilterExpression( const QString& filterExp );
 
         /**
          * Set a human readable description for this rule
@@ -317,7 +317,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
         void removeChildAt( int i );
 
         //! take child rule out, set parent as null
-        void takeChild( Rule* rule );
+        Rule* takeChild( Rule* rule );
 
         //! take child rule out, set parent as null
         Rule* takeChildAt( int i );
@@ -338,7 +338,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
          *
          * @param iselse If true, this rule is an ELSE rule
          */
-        void setIsElse( bool iselse ) { mElseRule = iselse; }
+        void setIsElse( bool iselse );
 
         /**
          * Check if this rule is an ELSE rule