patch_on_first_1_7_0_symbol-levels_rbr_jef.diff

Patch on freshly branched 1_7_0 commit:6c835b4cf5cd4a4be687e829bb57e3d51e7345f7 taking into accounts jef's comments at https://github.com/qgis/Quantum-GIS/pull/3 - Mayeul Kauffmann, 2011-05-07 03:32 AM

Download (16.9 KB)

       QgsFeatureRendererV2* r = m->createRenderer( element );
       if ( r )
+      {
         r->setUsingSymbolLevels( element.attribute( "symbollevels", "0" ).toInt() );
         r->setUsingFirstRule( element.attribute( "firstrule", "0" ).toInt() );
+      }
       return r;
+    }
     -- src/core/symbology-ng/qgsrendererv2.h	2011-05-04 22:52:30.000000000 +0200
     ++ src/core/symbology-ng/qgsrendererv2.h	2011-05-05 00:18:01.000000000 +0200
-...
         bool usingSymbolLevels() const { return mUsingSymbolLevels; }
         void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; }
         bool usingFirstRule() const { return mUsingFirstRule; }
         void setUsingFirstRule( bool usingFirstRule ) { mUsingFirstRule = usingFirstRule; }
         //! create a renderer from XML element
         static QgsFeatureRendererV2* load( QDomElement& symbologyElem );
-...
         QString mType;
         bool mUsingSymbolLevels;
         bool mUsingFirstRule;
         /** The current type of editing marker */
         int mCurrentVertexMarkerType;
     -- src/core/symbology-ng/qgsrulebasedrendererv2.cpp	2011-05-04 22:52:30.000000000 +0200
     ++ src/core/symbology-ng/qgsrulebasedrendererv2.cpp	2011-05-07 10:52:24.078518005 +0200
-...
     QgsSymbolV2* QgsRuleBasedRendererV2::symbolForFeature( QgsFeature& feature )
+    {
       return mCurrentSymbol;
       if( ! usingFirstRule() )
         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() );
       r->setUsingFirstRule( usingFirstRule() );
       setUsingFirstRule( usingFirstRule() );
       setUsingSymbolLevels( usingSymbolLevels() );
       return r;
+    }
-...
+    {
       QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
       rendererElem.setAttribute( "type", "RuleRenderer" );
       rendererElem.setAttribute( "symbollevels", ( mUsingSymbolLevels ? "1" : "0" ) );
       rendererElem.setAttribute( "firstrule", ( mUsingFirstRule ? "1" : "0" ) );
       QDomElement rulesElem = doc.createElement( "rules" );
-...
       mRules.removeAt( index );
+    }
     void QgsRuleBasedRendererV2::swapRules( int index1,  int index2 )
+    {
       mRules.swap( index1, index2 );
+    }
     #include "qgscategorizedsymbolrendererv2.h"
     #include "qgsgraduatedsymbolrendererv2.h"
     -- src/core/symbology-ng/qgsrulebasedrendererv2.h	2011-05-04 22:52:30.000000000 +0200
     ++ src/core/symbology-ng/qgsrulebasedrendererv2.h	2011-05-05 00:18:01.000000000 +0200
-...
+        {
           public:
             //! Constructor takes ownership of the symbol
             Rule( QgsSymbolV2* symbol, int scaleMinDenom = 0, int scaleMaxDenom = 0, QString filterExp = QString(), QString label = QString(), QString description = QString() );
             Rule( QgsSymbolV2* symbol, int scaleMinDenom = 0, int scaleMaxDenom = 0, QString filterExp = QString(),
               QString label = QString(), QString description = QString() );
             Rule( const Rule& other );
             ~Rule();
             QString dump() const;
-...
         void updateRuleAt( int index, const Rule& rule );
         //! remove the rule at the specified index
         void removeRuleAt( int index );
         //! swap the two rules specified by the indices
         void swapRules( int index1,  int index2);
         //////
-...
         QList<Rule*> mCurrentRules;
         QgsFieldMap mCurrentFields;
         QgsSymbolV2* mCurrentSymbol;
     };
     #endif // QGSRULEBASEDRENDERERV2_H
     -- src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp	2011-05-04 22:52:30.000000000 +0200
     ++ src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp	2011-05-05 00:18:01.000000000 +0200
-...
       QgsSymbolV2List symbols = r->symbols();
       QgsSymbolLevelsV2Dialog dlg( symbols, r->usingSymbolLevels(), this );
       connect( this, SIGNAL( forceChkUsingFirstRule() ), mActiveWidget, SLOT( forceUsingFirstRule() ), Qt::UniqueConnection );
       connect( this, SIGNAL( forceUncheckSymbolLevels() ), mActiveWidget, SLOT( forceNoSymbolLevels() ), Qt::UniqueConnection );
       if ( dlg.exec() )
+      {
         r->setUsingSymbolLevels( dlg.usingLevels() );
         if ( r->type() == "RuleRenderer" )
+        {
           if( dlg.usingLevels() )
+          {
             r->setUsingFirstRule( true );
             emit forceChkUsingFirstRule();
+          }
           else
+          {
             emit forceUncheckSymbolLevels();
+          }
+        }
+      }
+    }
     void QgsRendererV2PropertiesDialog::useOldSymbology()
+    {
       int res = QMessageBox::question( this, tr( "Symbology" ),
     -- src/gui/symbology-ng/qgsrendererv2propertiesdialog.h	2011-05-04 22:52:30.000000000 +0200
     ++ src/gui/symbology-ng/qgsrendererv2propertiesdialog.h	2011-05-05 00:18:01.000000000 +0200
-...
       signals:
         void useNewSymbology( bool );
         void forceChkUsingFirstRule();
         void forceUncheckSymbolLevels();
       protected:
     -- src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp	2011-05-04 22:52:30.000000000 +0200
     ++ src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp	2011-05-07 11:46:08.954278394 +0200
-...
     #include "qgsapplication.h"
     #include "qgssearchtreenode.h"
     #include "qgssymbolv2selectordialog.h"
     #include "qgslogger.h"
     #include "qstring.h"
     #include <QMenu>
     #include <QTreeWidgetItem>
-...
       btnAddRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
       btnEditRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) );
       btnRemoveRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
       btnIncreasePriority->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
       btnDecreasePriority->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
       connect( treeRules, SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ), this, SLOT( editRule() ) );
       connect( btnAddRule, SIGNAL( clicked() ), this, SLOT( addRule() ) );
       connect( btnEditRule, SIGNAL( clicked() ), this, SLOT( editRule() ) );
       connect( btnRemoveRule, SIGNAL( clicked() ), this, SLOT( removeRule() ) );
       connect( btnIncreasePriority, SIGNAL( clicked() ), this, SLOT( increasePriority() ) );
       connect( btnDecreasePriority, SIGNAL( clicked() ), this, SLOT( decreasePriority() ) );
       connect( radNoGrouping, SIGNAL( clicked() ), this, SLOT( setGrouping() ) );
       connect( radGroupFilter, SIGNAL( clicked() ), this, SLOT( setGrouping() ) );
       connect( radGroupScale, SIGNAL( clicked() ), this, SLOT( setGrouping() ) );
       // Make sure buttons are always in the correct state
       chkUsingFirstRule->setChecked( mRenderer->usingFirstRule() );
       chkEnableSymbolLevels->setChecked( mRenderer->usingSymbolLevels() );
       // If symbol levels are used, forcefully check and gray-out the chkUsingFirstRule checkbox
       if (mRenderer->usingSymbolLevels() ) { forceUsingFirstRule(); }
       connect( chkUsingFirstRule, SIGNAL( clicked() ), this, SLOT( usingFirstRuleChanged() ));
       connect( chkEnableSymbolLevels, SIGNAL( clicked() ), this, SLOT( symbolLevelsEnabledChanged() ) );
       connect( this, SIGNAL( forceChkUsingFirstRule() ), this, SLOT( forceUsingFirstRule() ) );
       treeRules->populateRules();
+    }
-...
+    }
     void QgsRuleBasedRendererV2Widget::increasePriority()
+    {
       QTreeWidgetItem * item = treeRules->currentItem();
         if ( ! item ) return; // No rule selected, exit
       int rule_index = item->data( 0, Qt::UserRole + 1 ).toInt();
       if ( rule_index < 0 )
+      {
         return;// Group of rules selected, exit
+      }
       else
+      {
        if ( rule_index > 0 ) // do not increase priority of first rule
+       {
           mRenderer->swapRules(rule_index, rule_index - 1);
           treeRules->populateRules();
         // TODO: find out where the moved rule goes and reselect it (at least for non-grouped display)
         // maybe based on the following functions :
         //  findItems(QString(rule_index - 1), Qt::MatchExactly, 4).first.index)
         //  setCurrentItem, setSelected, scrollToItem
+       }
+      }
+    }
     void QgsRuleBasedRendererV2Widget::decreasePriority()
+    {
       QTreeWidgetItem * item = treeRules->currentItem();
         if ( ! item ) return; // No rule selected, exit
       int rule_index = item->data( 0, Qt::UserRole + 1 ).toInt();
       if ( rule_index < 0 )
+      {
         return;// Group of rules selected, exit
+      }
       else
+      {
        if ( rule_index +1 < mRenderer->ruleCount() ) // do not increase priority of last rule
+       {
          mRenderer->swapRules(rule_index, rule_index + 1);
          treeRules->populateRules();
+       }
+      }
+    }
     void QgsRuleBasedRendererV2Widget::usingFirstRuleChanged()
+    {
       if ( chkUsingFirstRule->checkState() == Qt::Checked )
+      {
         mRenderer->setUsingFirstRule(true);
+      }
       else
+      {
         mRenderer->setUsingFirstRule(false);
+      }
+    }
     void QgsRuleBasedRendererV2Widget::forceUsingFirstRule()
+    {
       chkEnableSymbolLevels->setChecked( true );
       chkUsingFirstRule->setChecked( true );
       chkUsingFirstRule->setEnabled(false);
       mRenderer->setUsingFirstRule(true);
+    }
     void QgsRuleBasedRendererV2Widget::forceNoSymbolLevels()
+    {
         chkEnableSymbolLevels->setChecked( false );
         chkUsingFirstRule->setEnabled( true );
         mRenderer->setUsingSymbolLevels( false );
+    }
     void QgsRuleBasedRendererV2Widget::symbolLevelsEnabledChanged()
+    {
       if ( chkEnableSymbolLevels->checkState() == Qt::Checked )
+      {
         mRenderer->setUsingSymbolLevels(true);
         emit forceChkUsingFirstRule();
+      }
       else
+      {
        mRenderer->setUsingSymbolLevels(false);
        chkUsingFirstRule->setEnabled(true);
+      }
+    }
     #include "qgscategorizedsymbolrendererv2.h"
     #include "qgscategorizedsymbolrendererv2widget.h"
     #include "qgsgraduatedsymbolrendererv2.h"
-...
         //item->setBackground( 1, Qt::lightGray );
         //item->setBackground( 3, Qt::lightGray );
         // Priority (Id): add 1 to rule number and convert to string
         item->setText( 4,  QString("%1").arg( i+1, 4 ) );
         item->setTextAlignment (4, Qt::AlignRight);
         lst << item;
+      }
-...
         //item->setBackground( 1, Qt::lightGray );
         //item->setBackground( 3, Qt::lightGray );
         // Priority (Id): add 1 to rule number and convert to string
         item->setText( 4,  QString("%1").arg( i+1, 4 ) );
         item->setTextAlignment (4, Qt::AlignRight);
+      }
       addTopLevelItems( scale_items.values() );
+    }
-...
           item->setTextAlignment( 2, Qt::AlignRight );
           item->setTextAlignment( 3, Qt::AlignRight );
+        }
         // Priority (Id): add 1 to rule number and convert to string
         item->setText( 4,  QString("%1").arg( i+1, 4 ) );
         item->setTextAlignment (4, Qt::AlignRight);
+      }
       addTopLevelItems( filter_items.values() );
     -- src/gui/symbology-ng/qgsrulebasedrendererv2widget.h	2011-05-04 22:52:30.000000000 +0200
     ++ src/gui/symbology-ng/qgsrulebasedrendererv2widget.h	2011-05-05 00:18:01.000000000 +0200
-...
         void addRule();
         void editRule();
         void removeRule();
         void increasePriority();
         void decreasePriority();
         void setGrouping();
-...
         void refineRuleCategories();
         void refineRuleRanges();
         void usingFirstRuleChanged( );
         void symbolLevelsEnabledChanged();
         void forceNoSymbolLevels();
         void forceUsingFirstRule();
       signals:
         void forceChkUsingFirstRule();
       protected:
         void refineRule( int type );
     -- src/ui/qgsrulebasedrendererv2widget.ui	2011-05-04 22:52:31.000000000 +0200
     ++ src/ui/qgsrulebasedrendererv2widget.ui	2011-05-05 00:18:01.000000000 +0200
-...
        <rect>
         <x>0</x>
         <y>0</y>
         <width>622</width>
         <height>273</height>
         <width>640</width>
         <height>401</height>
        </rect>
       </property>
       <property name="windowTitle">
-...
       <layout class="QGridLayout" name="gridLayout">
        <item row="0" column="0">
         <widget class="QgsRendererRulesTreeWidget" name="treeRules">
          <property name="styleSheet">
           <string notr="true"/>
          </property>
          <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
-...
            <set>AlignHCenter|AlignVCenter|AlignCenter</set>
           </property>
          </column>
          <column>
           <property name="text">
            <string>Priority</string>
           </property>
           <property name="toolTip">
            <string>Priority when symbol levels are enabled (only first matching rule will be applied)</string>
           </property>
           <property name="textAlignment">
            <set>AlignHCenter|AlignVCenter|AlignCenter</set>
           </property>
          </column>
         </widget>
        </item>
        <item row="0" column="1">
-...
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnEditRule">
            <property name="text">
             <string>Edit</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnRemoveRule">
            <property name="text">
             <string>Remove</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnRefineRule">
            <property name="text">
             <string>Refine</string>
-...
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnEditRule">
           <widget class="QPushButton" name="btnIncreasePriority">
            <property name="text">
             <string>Edit</string>
             <string>Increase priority</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnRemoveRule">
           <widget class="QPushButton" name="btnDecreasePriority">
            <property name="text">
             <string>Remove</string>
             <string>Decrease priority</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item row="1" column="0" colspan="2">
        <item row="3" column="0" colspan="2">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>35</height>
           </size>
          </property>
          <property name="baseSize">
           <size>
            <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="title">
           <string/>
          </property>
          <widget class="QCheckBox" name="chkEnableSymbolLevels">
           <property name="geometry">
            <rect>
             <x>113</x>
             <y>10</y>
             <width>231</width>
             <height>24</height>
            </rect>
           </property>
           <property name="text">
            <string>Enable symbol levels</string>
           </property>
          </widget>
          <widget class="QCheckBox" name="chkUsingFirstRule">
           <property name="geometry">
            <rect>
             <x>360</x>
             <y>10</y>
             <width>271</width>
             <height>24</height>
            </rect>
           </property>
           <property name="text">
            <string>Use only first matched rule</string>
           </property>
          </widget>
          <widget class="QLabel" name="label_2">
           <property name="geometry">
            <rect>
             <x>10</x>
             <y>10</y>
             <width>84</width>
             <height>24</height>
            </rect>
           </property>
           <property name="text">
            <string>Behavior</string>
           </property>
          </widget>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Rule grouping</string>
           <string notr="true"/>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Rule grouping</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radNoGrouping">
             <property name="text">
              <string>No grouping</string>
              <string comment="No grouping for displaying rules">None</string>
             </property>
             <property name="checked">
              <bool>true</bool>
-...
           <item>
            <widget class="QRadioButton" name="radGroupFilter">
             <property name="text">
              <string>Group by filter</string>
              <string comment="Group rules by filter">By filter</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radGroupScale">
             <property name="text">
              <string>Group by scale</string>
              <string comment="Group rules by scale">By scale</string>
             </property>
            </widget>
           </item>

QGIS » QGIS Application

patch_on_first_1_7_0_symbol-levels_rbr_jef.diff