patch_on_r15538-rbr_with_symbol_levels.diff

     QgsSymbolV2* QgsRuleBasedRendererV2::symbolForFeature( QgsFeature& feature )
+    {
       return mCurrentSymbol;
             QgsDebugMsg( "usingSymbolLevels:" );
         QgsDebugMsg( QString(usingSymbolLevels()?"T":"F") );
         QgsDebugMsg( QString(mUsingSymbolLevels?"T":"F") );
         if( !usingSymbolLevels() )    return mCurrentSymbol;
       for ( QList<Rule*>::iterator it = mCurrentRules.begin(); it != mCurrentRules.end(); ++it )
+      {
         Rule* rule = *it;
         if ( rule->isFilterOK( mCurrentFields, feature ) )
+            {
                 return rule->symbol(); //works with levels but takes only first rule
+            }
+      }
+    }
     void QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature,
-...
       QgsSymbolV2* s = mDefaultSymbol->clone();
       QgsRuleBasedRendererV2* r = new QgsRuleBasedRendererV2( s );
       r->mRules = mRules;
       r->setUsingSymbolLevels( usingSymbolLevels() );
       return r;
+    }
-...
+    {
       QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
       rendererElem.setAttribute( "type", "RuleRenderer" );
       rendererElem.setAttribute( "symbollevels", ( mUsingSymbolLevels ? "1" : "0" ) );
       QDomElement rulesElem = doc.createElement( "rules" );

     #include <QTreeWidgetItem>
     #include <QVBoxLayout>
     #include <QMessageBox>
     #include <sstream>
     QgsRendererV2Widget* QgsRuleBasedRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
+    {
-...
         //item->setBackground( 1, Qt::lightGray );
         //item->setBackground( 3, Qt::lightGray );
         // Id: add 1 to rule number and convert to string
         std::ostringstream ioss;
         ioss << i+1;
         std::string ruleIdx = ioss.str();
         while( ruleIdx.size() < 4 ){ ruleIdx.insert( 0, " " );} // pad to left with spaces (to fix string-based sorting)
         item->setText( 4, QString(ruleIdx.c_str()) );// Insert Id in table (as 'Priority' column)
         item->setTextAlignment (4, Qt::AlignRight);
         lst << item;
+      }
-...
         //item->setBackground( 1, Qt::lightGray );
         //item->setBackground( 3, Qt::lightGray );
         // Id: add 1 to rule number and convert to string
         std::ostringstream ioss;
         ioss << i+1;
         std::string ruleIdx = ioss.str();
         while( ruleIdx.size() < 4 ){ ruleIdx.insert( 0, " " );} // pad to left with spaces (to fix string-based sorting)
         item->setText( 4, QString(ruleIdx.c_str()) );// Insert Id in table  TODO: base it on SymbolIdx ? How to access it?
         item->setTextAlignment (4, Qt::AlignRight);
+      }
       addTopLevelItems( scale_items.values() );
+    }
-...
           item->setTextAlignment( 2, Qt::AlignRight );
           item->setTextAlignment( 3, Qt::AlignRight );
+        }
         // Id: add 1 to rule number and convert to string
         std::ostringstream ioss;
         ioss << i+1;
         std::string ruleIdx = ioss.str();
         while( ruleIdx.size() < 4 ){ ruleIdx.insert( 0, " " );} // pad to left with spaces (to fix string-based sorting)
         item->setText( 4, QString(ruleIdx.c_str()) );// Insert Id in table
         item->setTextAlignment (4, Qt::AlignRight);
+      }
       addTopLevelItems( filter_items.values() );

            <set>AlignHCenter|AlignVCenter|AlignCenter</set>
           </property>
          </column>
          <column>
           <property name="text">
            <string>Priority</string>
           </property>
           <property name="textAlignment">
            <set>AlignHCenter|AlignVCenter|AlignCenter</set>
           </property>
          </column>
         </widget>
        </item>
        <item row="0" column="1">

QGIS » QGIS Application