Correctly set band number for pseudocolor renderer widget

nyalldawson · nyalldawson · commit e887d075aa4f · 2014-12-04T16:15:36.000+11:00
Previously the band was always reset to the first band when opening
the raster layer properties.
diff --git a/python/core/raster/qgssinglebandpseudocolorrenderer.sip b/python/core/raster/qgssinglebandpseudocolorrenderer.sip
@@ -24,6 +24,11 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer
 
     QList<int> usesBands() const;
 
+    /**Returns the band used by the renderer
+     * @note added in QGIS 2.7
+     */
+    int band() const;
+
     double classificationMin() const;
     double classificationMax() const;
     void setClassificationMin( double min );
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h
@@ -49,6 +49,11 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
 
     QList<int> usesBands() const;
 
+    /**Returns the band used by the renderer
+     * @note added in QGIS 2.7
+     */
+    int band() const { return mBand; }
+
     double classificationMin() const { return mClassificationMin; }
     double classificationMax() const { return mClassificationMax; }
     void setClassificationMin( double min ) { mClassificationMin = min; }
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -561,6 +561,8 @@ void QgsSingleBandPseudoColorRendererWidget::setFromRenderer( const QgsRasterRen
   const QgsSingleBandPseudoColorRenderer* pr = dynamic_cast<const QgsSingleBandPseudoColorRenderer*>( r );
   if ( pr )
   {
+    mBandComboBox->setCurrentIndex( mBandComboBox->findData( pr->band() ) );
+
     const QgsRasterShader* rasterShader = pr->shader();
     if ( rasterShader )
     {

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,8 @@ void QgsSingleBandPseudoColorRendererWidget::setFromRenderer( const QgsRasterRen`
`561`	`561`	`const QgsSingleBandPseudoColorRenderer* pr = dynamic_cast<const QgsSingleBandPseudoColorRenderer*>( r );`
`562`	`562`	`if ( pr )`
`563`	`563`	`{`
	`564`	`+ mBandComboBox->setCurrentIndex( mBandComboBox->findData( pr->band() ) );`
	`565`	`+`
`564`	`566`	`const QgsRasterShader* rasterShader = pr->shader();`
`565`	`567`	`if ( rasterShader )`
`566`	`568`	`{`