Load raster category names by GDAL provider, fixes #8886

qgis · Nov 3, 2013 · 8bdaf42 · 8bdaf42 · dakcarto · Nov 3, 2013
1 parent 37d365c
commit 8bdaf42
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/core/raster/qgsrasterrendererregistry.cpp b/src/core/raster/qgsrasterrendererregistry.cpp
@@ -132,15 +132,23 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
       colorArraySize += 1; //usually starts at 0
       QColor* colorArray = new QColor[ colorArraySize ];
       colorIt = colorEntries.constBegin();
+      QVector<QString> labels;
       for ( ; colorIt != colorEntries.constEnd(); ++colorIt )
       {
-        colorArray[( int )( colorIt->value )] = colorIt->color;
+        int idx = ( int )( colorIt->value );
+        colorArray[idx] = colorIt->color;
+        if ( !colorIt->label.isEmpty() )
+        {
+          if ( labels.size() <= idx ) labels.resize( idx + 1 );
+          labels[idx] = colorIt->label;
+        }
       }
 
       renderer = new QgsPalettedRasterRenderer( provider,
           grayBand,
           colorArray,
-          colorArraySize );
+          colorArraySize,
+          labels );
     }
     break;
     case QgsRaster::MultiBandSingleBandGray:

diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp
@@ -60,9 +60,15 @@ QList<QgsColorRampShader::ColorRampItem> QgsGdalProviderBase::colorTable( GDALDa
   {
     QgsDebugMsg( "Color table found" );
 
-    // TODO: load category labels and use them for ColorRampItem.label once
-    // GDALGetCategoryNames C function is added to GDAL, see #8886
-    //char ** categoryNames = GDALGetCategoryNames( myGdalBand );
+    // load category labels
+    char ** categoryNames = GDALGetRasterCategoryNames( myGdalBand );
+    QVector<QString> labels;
+    int i = 0;
+    while ( categoryNames[i] )
+    {
+      labels.append( QString( categoryNames[i] ) );
+      i++;
+    }
 
     int myEntryCount = GDALGetColorEntryCount( myGdalColorTable );
     GDALColorInterp myColorInterpretation =  GDALGetRasterColorInterpretation( myGdalBand );
@@ -81,20 +87,25 @@ QList<QgsColorRampShader::ColorRampItem> QgsGdalProviderBase::colorTable( GDALDa
       }
       else
       {
+        QString label = labels.value( myIterator );
+        if ( label.isEmpty() )
+        {
+          label = QString::number( myIterator );
+        }
         //Branch on the color interpretation type
         if ( myColorInterpretation == GCI_GrayIndex )
         {
           QgsColorRampShader::ColorRampItem myColorRampItem;
-          myColorRampItem.label = "";
           myColorRampItem.value = ( double )myIterator;
+          myColorRampItem.label = label;
           myColorRampItem.color = QColor::fromRgb( myColorEntry->c1, myColorEntry->c1, myColorEntry->c1, myColorEntry->c4 );
           ct.append( myColorRampItem );
         }
         else if ( myColorInterpretation == GCI_PaletteIndex )
         {
           QgsColorRampShader::ColorRampItem myColorRampItem;
           myColorRampItem.value = ( double )myIterator;
-          myColorRampItem.label = QString::number( myColorRampItem.value );
+          myColorRampItem.label = label;
           //Branch on palette interpretation
           if ( myPaletteInterpretation  == GPI_RGB )
           {