[FEATURE] labels support in QgsPalettedRasterRenderer, fixes #8886

blazek · blazek · commit 24bcec43d5fa · 2013-11-02T18:21:31.000+01:00
diff --git a/python/core/raster/qgspalettedrasterrenderer.sip b/python/core/raster/qgspalettedrasterrenderer.sip
@@ -5,7 +5,7 @@ class QgsPalettedRasterRenderer : QgsRasterRenderer
 %End
   public:
     /**Renderer owns color array*/
-    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/ );
+    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/, const QVector<QString> labels = QVector<QString>() );
     ~QgsPalettedRasterRenderer();
     QgsRasterInterface * clone() const /Factory/;
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterInterface* input ) /Factory/;
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -774,6 +774,11 @@ void QgsProjectFileTransform::convertRasterProperties( QDomDocument& doc, QDomNo
       green = colorRampEntryElem.attribute( "green" ).toInt();
       blue = colorRampEntryElem.attribute( "blue" ).toInt();
       newPaletteElem.setAttribute( "color", QColor( red, green, blue ).name() );
+      QString label = colorRampEntryElem.attribute( "label" );
+      if ( !label.isEmpty() )
+      {
+        newPaletteElem.setAttribute( "label", label );
+      }
       newColorPaletteElem.appendChild( newPaletteElem );
     }
     rasterRendererElem.appendChild( newColorPaletteElem );
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -22,10 +22,11 @@
 #include <QDomDocument>
 #include <QDomElement>
 #include <QImage>
+#include <QVector>
 
 QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber,
-    QColor* colorArray, int nColors ):
-    QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mNColors( nColors )
+    QColor* colorArray, int nColors, const QVector<QString> labels ):
+    QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mNColors( nColors ), mLabels( labels )
 {
   mColors = new QRgb[nColors];
   for ( int i = 0; i < nColors; ++i )
@@ -35,8 +36,8 @@ QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input,
   delete[] colorArray;
 }
 
-QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors ):
-    QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mColors( colorArray ), mNColors( nColors )
+QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors, const QVector<QString> labels ):
+    QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mColors( colorArray ), mNColors( nColors ), mLabels( labels )
 {
 }
 
@@ -51,6 +52,7 @@ QgsRasterInterface * QgsPalettedRasterRenderer::clone() const
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
   renderer->setRasterTransparency( mRasterTransparency );
+  renderer->mLabels = mLabels;
   return renderer;
 }
 
@@ -64,6 +66,7 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q
   int bandNumber = elem.attribute( "band", "-1" ).toInt();
   int nColors = 0;
   QRgb* colors = 0;
+  QVector<QString> labels;
 
   QDomElement paletteElem = elem.firstChildElement( "colorPalette" );
   if ( !paletteElem.isNull() )
@@ -94,14 +97,20 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q
       if ( value >= 0 && value < nColors )
       {
         colors[value] = QColor( entryElem.attribute( "color", "#000000" ) ).rgba();
+        QString label = entryElem.attribute( "label" );
+        if ( !label.isEmpty() )
+        {
+          if ( value >= labels.size() ) labels.resize( value + 1 );
+          labels[value] = label;
+        }
       }
       else
       {
         QgsDebugMsg( QString( "value %1 out of range" ).arg( value ) );
       }
     }
   }
-  QgsRasterRenderer* r = new QgsPalettedRasterRenderer( input, bandNumber, colors, nColors );
+  QgsPalettedRasterRenderer* r = new QgsPalettedRasterRenderer( input, bandNumber, colors, nColors, labels );
   r->readXML( elem );
   return r;
 }
@@ -134,6 +143,15 @@ QRgb* QgsPalettedRasterRenderer::rgbArray() const
   return rgbValues;
 }
 
+void QgsPalettedRasterRenderer::setLabel( int idx, QString label )
+{
+  if ( idx >= mLabels.size() )
+  {
+    mLabels.resize( idx + 1 );
+  }
+  mLabels[idx] = label;
+}
+
 QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  const & extent, int width, int height )
 {
   QgsRasterBlock *outputBlock = new QgsRasterBlock();
@@ -240,6 +258,10 @@ void QgsPalettedRasterRenderer::writeXML( QDomDocument& doc, QDomElement& parent
     QDomElement colorElem = doc.createElement( "paletteEntry" );
     colorElem.setAttribute( "value", i );
     colorElem.setAttribute( "color", QColor( mColors[i] ).name() );
+    if ( !label( i ).isEmpty() )
+    {
+      colorElem.setAttribute( "label", label( i ) );
+    }
     colorPaletteElem.appendChild( colorElem );
   }
   rasterRendererElem.appendChild( colorPaletteElem );
@@ -251,7 +273,8 @@ void QgsPalettedRasterRenderer::legendSymbologyItems( QList< QPair< QString, QCo
 {
   for ( int i = 0; i < mNColors; ++i )
   {
-    symbolItems.push_back( qMakePair( QString::number( i ), QColor( mColors[i] ) ) );
+    QString lab = label( i ).isEmpty() ? QString::number( i ) : label( i );
+    symbolItems.push_back( qMakePair( lab, QColor( mColors[i] ) ) );
   }
 }
 
diff --git a/src/core/raster/qgspalettedrasterrenderer.h b/src/core/raster/qgspalettedrasterrenderer.h
@@ -18,6 +18,8 @@
 #ifndef QGSPALETTEDRASTERRENDERER_H
 #define QGSPALETTEDRASTERRENDERER_H
 
+#include <QVector>
+
 #include "qgsrasterrenderer.h"
 
 class QColor;
@@ -30,8 +32,8 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
 {
   public:
     /**Renderer owns color array*/
-    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray, int nColors );
-    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors );
+    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray, int nColors, const QVector<QString> labels = QVector<QString>() );
+    QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors, const QVector<QString> labels = QVector<QString>() );
     ~QgsPalettedRasterRenderer();
     QgsRasterInterface * clone() const;
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterInterface* input );
@@ -48,6 +50,14 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
      */
     QRgb* rgbArray() const;
 
+    /** Return optional category label
+     *  @note added in 2.1 */
+    QString label( int idx ) const { return mLabels.value( idx ); }
+
+    /** Set category label
+     *  @note added in 2.1 */
+    void setLabel( int idx, QString label );
+
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 
     void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
@@ -60,6 +70,8 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
     QRgb* mColors;
     /**Number of colors*/
     int mNColors;
+    /** Optional category labels, size of vector may be < mNColors */
+    QVector<QString> mLabels;
 };
 
 #endif // QGSPALETTEDRASTERRENDERER_H
diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp
@@ -52,24 +52,36 @@ QgsRasterRenderer* QgsPalettedRendererWidget::renderer()
 {
   int nColors = mTreeWidget->topLevelItemCount();
   QColor* colorArray = new QColor[nColors];
+  QVector<QString> labels;
   for ( int i = 0; i < nColors; ++i )
   {
     colorArray[i] = mTreeWidget->topLevelItem( i )->background( 1 ).color();
+    QString label = mTreeWidget->topLevelItem( i )->text( 2 );
+    if ( !label.isEmpty() )
+    {
+      if ( i >= labels.size() ) labels.resize( i + 1 );
+      labels[i] = label;
+    }
   }
   int bandNumber = mBandComboBox->itemData( mBandComboBox->currentIndex() ).toInt();
-  return new QgsPalettedRasterRenderer( mRasterLayer->dataProvider(), bandNumber, colorArray, nColors );
+  return new QgsPalettedRasterRenderer( mRasterLayer->dataProvider(), bandNumber, colorArray, nColors, labels );
 }
 
 void QgsPalettedRendererWidget::on_mTreeWidget_itemDoubleClicked( QTreeWidgetItem * item, int column )
 {
   if ( column == 1 && item ) //change item color
   {
+    item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
     QColor c = QColorDialog::getColor( item->background( column ).color() );
     if ( c.isValid() )
     {
       item->setBackground( column, QBrush( c ) );
     }
   }
+  else if ( column == 2 && item )
+  {
+    item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable );
+  }
 }
 
 void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )
@@ -85,6 +97,7 @@ void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )
       QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );
       item->setText( 0, QString::number( i ) );
       item->setBackground( 1, QBrush( colors[i] ) );
+      item->setText( 2, pr->label( i ) );
     }
     delete[] colors;
   }
@@ -102,6 +115,7 @@ void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )
         QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );
         item->setText( 0, QString::number( index ) );
         item->setBackground( 1, QBrush( itemIt->color ) );
+        item->setText( 2, itemIt->label );
         ++index;
       }
     }
diff --git a/src/ui/qgspalettedrendererwidgetbase.ui b/src/ui/qgspalettedrendererwidgetbase.ui
@@ -42,6 +42,9 @@
        <height>280</height>
       </size>
      </property>
+     <property name="columnCount">
+      <number>3</number>
+     </property>
      <column>
       <property name="text">
        <string>Value</string>
@@ -52,6 +55,11 @@
        <string>Color</string>
       </property>
      </column>
+     <column>
+      <property name="text">
+       <string>Label</string>
+      </property>
+     </column>
     </widget>
    </item>
   </layout>

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,11 @@`
`22`	`22`	`#include <QDomDocument>`
`23`	`23`	`#include <QDomElement>`
`24`	`24`	`#include <QImage>`
	`25`	`+#include <QVector>`
`25`	`26`
`26`	`27`	`QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber,`
`27`		`- QColor* colorArray, int nColors ):`
`28`		`- QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mNColors( nColors )`
	`28`	`+ QColor* colorArray, int nColors, const QVector<QString> labels ):`
	`29`	`+ QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mNColors( nColors ), mLabels( labels )`
`29`	`30`	`{`
`30`	`31`	`mColors = new QRgb[nColors];`
`31`	`32`	`for ( int i = 0; i < nColors; ++i )`
`@@ -35,8 +36,8 @@ QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input,`
`35`	`36`	`delete[] colorArray;`
`36`	`37`	`}`
`37`	`38`
`38`		`-QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors ):`
`39`		`- QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mColors( colorArray ), mNColors( nColors )`
	`39`	`+QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QRgb* colorArray, int nColors, const QVector<QString> labels ):`
	`40`	`+ QgsRasterRenderer( input, "paletted" ), mBand( bandNumber ), mColors( colorArray ), mNColors( nColors ), mLabels( labels )`
`40`	`41`	`{`
`41`	`42`	`}`
`42`	`43`
`@@ -51,6 +52,7 @@ QgsRasterInterface * QgsPalettedRasterRenderer::clone() const`
`51`	`52`	`renderer->setOpacity( mOpacity );`
`52`	`53`	`renderer->setAlphaBand( mAlphaBand );`
`53`	`54`	`renderer->setRasterTransparency( mRasterTransparency );`
	`55`	`+ renderer->mLabels = mLabels;`
`54`	`56`	`return renderer;`
`55`	`57`	`}`
`56`	`58`
`@@ -64,6 +66,7 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q`
`64`	`66`	`int bandNumber = elem.attribute( "band", "-1" ).toInt();`
`65`	`67`	`int nColors = 0;`
`66`	`68`	`QRgb* colors = 0;`
	`69`	`+ QVector<QString> labels;`
`67`	`70`
`68`	`71`	`QDomElement paletteElem = elem.firstChildElement( "colorPalette" );`
`69`	`72`	`if ( !paletteElem.isNull() )`
`@@ -94,14 +97,20 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q`
`94`	`97`	`if ( value >= 0 && value < nColors )`
`95`	`98`	`{`
`96`	`99`	`colors[value] = QColor( entryElem.attribute( "color", "#000000" ) ).rgba();`
	`100`	`+ QString label = entryElem.attribute( "label" );`
	`101`	`+ if ( !label.isEmpty() )`
	`102`	`+ {`
	`103`	`+ if ( value >= labels.size() ) labels.resize( value + 1 );`
	`104`	`+ labels[value] = label;`
	`105`	`+ }`
`97`	`106`	`}`
`98`	`107`	`else`
`99`	`108`	`{`
`100`	`109`	`QgsDebugMsg( QString( "value %1 out of range" ).arg( value ) );`
`101`	`110`	`}`
`102`	`111`	`}`
`103`	`112`	`}`
`104`		`- QgsRasterRenderer* r = new QgsPalettedRasterRenderer( input, bandNumber, colors, nColors );`
	`113`	`+ QgsPalettedRasterRenderer* r = new QgsPalettedRasterRenderer( input, bandNumber, colors, nColors, labels );`
`105`	`114`	`r->readXML( elem );`
`106`	`115`	`return r;`
`107`	`116`	`}`
`@@ -134,6 +143,15 @@ QRgb* QgsPalettedRasterRenderer::rgbArray() const`
`134`	`143`	`return rgbValues;`
`135`	`144`	`}`
`136`	`145`
	`146`	`+void QgsPalettedRasterRenderer::setLabel( int idx, QString label )`
	`147`	`+{`
	`148`	`+ if ( idx >= mLabels.size() )`
	`149`	`+ {`
	`150`	`+ mLabels.resize( idx + 1 );`
	`151`	`+ }`
	`152`	`+ mLabels[idx] = label;`
	`153`	`+}`
	`154`	`+`
`137`	`155`	`QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle const & extent, int width, int height )`
`138`	`156`	`{`
`139`	`157`	`QgsRasterBlock *outputBlock = new QgsRasterBlock();`
`@@ -240,6 +258,10 @@ void QgsPalettedRasterRenderer::writeXML( QDomDocument& doc, QDomElement& parent`
`240`	`258`	`QDomElement colorElem = doc.createElement( "paletteEntry" );`
`241`	`259`	`colorElem.setAttribute( "value", i );`
`242`	`260`	`colorElem.setAttribute( "color", QColor( mColors[i] ).name() );`
	`261`	`+ if ( !label( i ).isEmpty() )`
	`262`	`+ {`
	`263`	`+ colorElem.setAttribute( "label", label( i ) );`
	`264`	`+ }`
`243`	`265`	`colorPaletteElem.appendChild( colorElem );`
`244`	`266`	`}`
`245`	`267`	`rasterRendererElem.appendChild( colorPaletteElem );`
`@@ -251,7 +273,8 @@ void QgsPalettedRasterRenderer::legendSymbologyItems( QList< QPair< QString, QCo`
`251`	`273`	`{`
`252`	`274`	`for ( int i = 0; i < mNColors; ++i )`
`253`	`275`	`{`
`254`		`- symbolItems.push_back( qMakePair( QString::number( i ), QColor( mColors[i] ) ) );`
	`276`	`+ QString lab = label( i ).isEmpty() ? QString::number( i ) : label( i );`
	`277`	`+ symbolItems.push_back( qMakePair( lab, QColor( mColors[i] ) ) );`
`255`	`278`	`}`
`256`	`279`	`}`
`257`	`280`
Original file line number	Diff line number	Diff line change
`@@ -52,24 +52,36 @@ QgsRasterRenderer* QgsPalettedRendererWidget::renderer()`
`52`	`52`	`{`
`53`	`53`	`int nColors = mTreeWidget->topLevelItemCount();`
`54`	`54`	`QColor* colorArray = new QColor[nColors];`
	`55`	`+ QVector<QString> labels;`
`55`	`56`	`for ( int i = 0; i < nColors; ++i )`
`56`	`57`	`{`
`57`	`58`	`colorArray[i] = mTreeWidget->topLevelItem( i )->background( 1 ).color();`
	`59`	`+ QString label = mTreeWidget->topLevelItem( i )->text( 2 );`
	`60`	`+ if ( !label.isEmpty() )`
	`61`	`+ {`
	`62`	`+ if ( i >= labels.size() ) labels.resize( i + 1 );`
	`63`	`+ labels[i] = label;`
	`64`	`+ }`
`58`	`65`	`}`
`59`	`66`	`int bandNumber = mBandComboBox->itemData( mBandComboBox->currentIndex() ).toInt();`
`60`		`- return new QgsPalettedRasterRenderer( mRasterLayer->dataProvider(), bandNumber, colorArray, nColors );`
	`67`	`+ return new QgsPalettedRasterRenderer( mRasterLayer->dataProvider(), bandNumber, colorArray, nColors, labels );`
`61`	`68`	`}`
`62`	`69`
`63`	`70`	`void QgsPalettedRendererWidget::on_mTreeWidget_itemDoubleClicked( QTreeWidgetItem * item, int column )`
`64`	`71`	`{`
`65`	`72`	`if ( column == 1 && item ) //change item color`
`66`	`73`	`{`
	`74`	`+ item->setFlags( Qt::ItemIsEnabled \| Qt::ItemIsSelectable );`
`67`	`75`	`QColor c = QColorDialog::getColor( item->background( column ).color() );`
`68`	`76`	`if ( c.isValid() )`
`69`	`77`	`{`
`70`	`78`	`item->setBackground( column, QBrush( c ) );`
`71`	`79`	`}`
`72`	`80`	`}`
	`81`	`+ else if ( column == 2 && item )`
	`82`	`+ {`
	`83`	`+ item->setFlags( Qt::ItemIsEnabled \| Qt::ItemIsEditable \| Qt::ItemIsSelectable );`
	`84`	`+ }`
`73`	`85`	`}`
`74`	`86`
`75`	`87`	`void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )`
`@@ -85,6 +97,7 @@ void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )`
`85`	`97`	`QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );`
`86`	`98`	`item->setText( 0, QString::number( i ) );`
`87`	`99`	`item->setBackground( 1, QBrush( colors[i] ) );`
	`100`	`+ item->setText( 2, pr->label( i ) );`
`88`	`101`	`}`
`89`	`102`	`delete[] colors;`
`90`	`103`	`}`
`@@ -102,6 +115,7 @@ void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )`
`102`	`115`	`QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );`
`103`	`116`	`item->setText( 0, QString::number( index ) );`
`104`	`117`	`item->setBackground( 1, QBrush( itemIt->color ) );`
	`118`	`+ item->setText( 2, itemIt->label );`
`105`	`119`	`++index;`
`106`	`120`	`}`
`107`	`121`	`}`