qgis · Jan 24, 2012
diff --git a/‎python/core/symbology-ng-core.sip
Lines changed: 10 additions & 18 deletions b/‎python/core/symbology-ng-core.sip
Lines changed: 10 additions & 18 deletions
diff --git a/‎python/gui/symbology-ng-gui.sip
Lines changed: 0 additions & 2 deletions b/‎python/gui/symbology-ng-gui.sip
Lines changed: 0 additions & 2 deletions
@@ -390,6 +390,8 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
   public:
 
+    //typedef QList<QgsRuleBasedRendererV2::Rule*> RuleList;
+
     /**
       This class keeps data about a rules for rule-based renderer.
       A rule consists of a symbol, filter expression and range of scales.
@@ -403,10 +405,10 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
       public:
         //! Constructor takes ownership of the symbol
         Rule( QgsSymbolV2* symbol /Transfer/, int scaleMinDenom = 0, int scaleMaxDenom = 0, QString filterExp = QString() );
-        Rule( const QgsRuleBasedRendererV2::Rule& other );
+        //Rule( const QgsRuleBasedRendererV2::Rule& other );
         ~Rule();
         QString dump() const;
-        QStringList needsFields() const;
+        //QStringList needsFields() const;
         bool isFilterOK( QgsFeature& f ) const;
         bool isScaleOK( double scale ) const;
 
@@ -428,7 +430,9 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
     static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
 
-    //! Constructor. Takes ownership of the defult symbol.
+    //! Constructs the renderer from given tree of rules
+    QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root /Transfer/ );
+    //! Constructor for convenience. Creates a root rule and adds a default rule with symbol
     QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol /Transfer/ );
 
     //! return symbol for current feature. Should not be used individually: there could be more symbols for a feature
@@ -454,27 +458,15 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
     /////
 
-    //! return the total number of rules
-    int ruleCount();
-    //! get reference to rule at index (valid indexes: 0...count-1)
-    QgsRuleBasedRendererV2::Rule& ruleAt( int index );
-    //! add rule to the end of the list of rules
-    void addRule( const QgsRuleBasedRendererV2::Rule& rule );
-    //! insert rule to a specific position of the list of rules
-    void insertRule( int index, const QgsRuleBasedRendererV2::Rule& rule );
-    //! modify the rule at a specific position of the list of rules
-    void updateRuleAt( int index, const QgsRuleBasedRendererV2::Rule& rule );
-    //! remove the rule at the specified index
-    void removeRuleAt( int index );
 
     //////
 
     //! take a rule and create a list of new rules based on the categories from categorized symbol renderer
-    static QList<QgsRuleBasedRendererV2::Rule> refineRuleCategories( QgsRuleBasedRendererV2::Rule& initialRule, QgsCategorizedSymbolRendererV2* r );
+    //static QgsRuleBasedRendererV2::RuleList refineRuleCategories( QgsRuleBasedRendererV2::Rule* initialRule, QgsCategorizedSymbolRendererV2* r );
     //! take a rule and create a list of new rules based on the ranges from graduated symbol renderer
-    static QList<QgsRuleBasedRendererV2::Rule> refineRuleRanges( QgsRuleBasedRendererV2::Rule& initialRule, QgsGraduatedSymbolRendererV2* r );
+    //static QgsRuleBasedRendererV2::RuleList refineRuleRanges( QgsRuleBasedRendererV2::Rule* initialRule, QgsGraduatedSymbolRendererV2* r );
     //! take a rule and create a list of new rules with intervals of scales given by the passed scale denominators
-    static QList<QgsRuleBasedRendererV2::Rule> refineRuleScales( QgsRuleBasedRendererV2::Rule& initialRule, QList<int> scales );
+    //static QgsRuleBasedRendererV2::RuleList refineRuleScales( QgsRuleBasedRendererV2::Rule* initialRule, QList<int> scales );
 
 };
 
 
@@ -42,8 +42,6 @@ public slots:
     void apply();
     void onOK();
 
-    void showSymbolLevels();
-
 protected:
 
     //! Reimplements dialog keyPress event so we can ignore it