[QGIS Commit] r12939 - trunk/qgis/src/gui/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-02-12 12:59:24 -0500 (Fri, 12 Feb 2010)
New Revision: 12939

Modified:
   trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
   trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
   trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
Log:
Fixed #2422


Modified: trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp	2010-02-12 12:28:11 UTC (rev 12938)
+++ trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp	2010-02-12 17:59:24 UTC (rev 12939)
@@ -188,7 +188,7 @@
 
 void QgsCategorizedSymbolRendererV2Widget::categoryColumnChanged()
 {
-  deleteAllCategories();
+  mRenderer->setClassAttribute( cboCategorizedColumn->currentText() );
 }
 
 void QgsCategorizedSymbolRendererV2Widget::categoriesDoubleClicked( const QModelIndex & idx )

Modified: trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp	2010-02-12 12:28:11 UTC (rev 12938)
+++ trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp	2010-02-12 17:59:24 UTC (rev 12939)
@@ -54,6 +54,7 @@
 
   mGraduatedSymbol = QgsSymbolV2::defaultSymbol( mLayer->geometryType() );
 
+  connect( cboGraduatedColumn, SIGNAL( currentIndexChanged( int ) ), this, SLOT( graduatedColumnChanged() ) );
   connect( viewGraduated, SIGNAL( doubleClicked( const QModelIndex & ) ), this, SLOT( rangesDoubleClicked( const QModelIndex & ) ) );
   connect( viewGraduated, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( rangesClicked( const QModelIndex & ) ) );
   connect( mg, SIGNAL( itemChanged( QStandardItem * ) ), this, SLOT( changeCurrentValue( QStandardItem * ) ) );
@@ -92,11 +93,11 @@
     spinGraduatedClasses->setValue( mRenderer->ranges().count() );
 
   // set column
-  //disconnect(cboGraduatedColumn, SIGNAL(currentIndexChanged(int)), this, SLOT(graduatedColumnChanged()));
+  disconnect( cboGraduatedColumn, SIGNAL( currentIndexChanged( int ) ), this, SLOT( graduatedColumnChanged() ) );
   QString attrName = mRenderer->classAttribute();
   int idx = cboGraduatedColumn->findText( attrName, Qt::MatchExactly );
   cboGraduatedColumn->setCurrentIndex( idx >= 0 ? idx : 0 );
-  //connect(cboGraduatedColumn, SIGNAL(currentIndexChanged(int)), this, SLOT(graduatedColumnChanged()));
+  connect( cboGraduatedColumn, SIGNAL( currentIndexChanged( int ) ), this, SLOT( graduatedColumnChanged() ) );
 
   // set source symbol
   if ( mRenderer->sourceSymbol() )
@@ -134,7 +135,12 @@
   }
 }
 
+void QgsGraduatedSymbolRendererV2Widget::graduatedColumnChanged()
+{
+  mRenderer->setClassAttribute( cboGraduatedColumn->currentText() );
+}
 
+
 void QgsGraduatedSymbolRendererV2Widget::populateColorRamps()
 {
   QSize rampIconSize( 50, 16 );

Modified: trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h	2010-02-12 12:28:11 UTC (rev 12938)
+++ trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h	2010-02-12 17:59:24 UTC (rev 12939)
@@ -23,6 +23,7 @@
 
   public slots:
     void changeGraduatedSymbol();
+    void graduatedColumnChanged();
     void classifyGraduated();
     void rangesDoubleClicked( const QModelIndex & idx );
     void rangesClicked( const QModelIndex & idx );