Modify raster legend mechanism to work with raster renderers

mhugent · mhugent · commit c2361828cabd · 2012-04-14T18:54:52.000+02:00
diff --git a/src/core/raster/qgscolorrampshader.cpp b/src/core/raster/qgscolorrampshader.cpp
@@ -293,3 +293,12 @@ bool QgsColorRampShader::shade( double theRedValue, double theGreenValue,
 
   return false;
 }
+
+void QgsColorRampShader::legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const
+{
+  QList<QgsColorRampShader::ColorRampItem>::const_iterator colorRampIt = mColorRampItemList.constBegin();
+  for ( ; colorRampIt != mColorRampItemList.constEnd(); ++colorRampIt )
+  {
+    symbolItems.push_back( qMakePair( colorRampIt->label, colorRampIt->color ) );
+  }
+}
diff --git a/src/core/raster/qgscolorrampshader.h b/src/core/raster/qgscolorrampshader.h
@@ -91,6 +91,8 @@ class CORE_EXPORT QgsColorRampShader : public QgsRasterShaderFunction
     /** \brief Generates and new RGB value based on original RGB value */
     bool shade( double, double, double, int*, int*, int* );
 
+    void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
+
   private:
     /** Current index from which to start searching the color table*/
     int mCurrentColorRampItemIndex;
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1169,6 +1169,13 @@ QString QgsRasterLayer::lastErrorTitle()
 QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
 {
   QList< QPair< QString, QColor > > symbolList;
+  if ( mRenderer )
+  {
+    mRenderer->legendSymbologyItems( symbolList );
+  }
+  return symbolList;
+
+#if 0
   if ( mDrawingStyle == SingleBandGray || mDrawingStyle == PalettedSingleBandGray || mDrawingStyle == MultiBandSingleBandGray )
   {
     //add min/max from contrast enhancement
@@ -1244,6 +1251,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
     }
   }
   return symbolList;
+#endif //0
 }
 
 /**
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -19,6 +19,7 @@
 #define QGSRASTERRENDERER_H
 
 #include "qgsrasterdataprovider.h"
+#include <QPair>
 
 class QPainter;
 class QgsMapToPixel;
@@ -76,6 +77,9 @@ class QgsRasterRenderer
     void setMaxOversampling( double os ) { mMaxOversampling = os; }
     double maxOversampling() const { return mMaxOversampling; }
 
+    /**Get symbology items if provided by renderer*/
+    virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const { Q_UNUSED( symbolItems ); }
+
     virtual void writeXML( QDomDocument& doc, QDomElement& parentElem ) const = 0;
 
     /**Sets base class members from xml. Usually called from create() methods of subclasses*/
diff --git a/src/core/raster/qgsrastershaderfunction.h b/src/core/raster/qgsrastershaderfunction.h
@@ -24,6 +24,9 @@ email                : ersts@amnh.org
  * typically used to render grayscale images as false color.
  */
 
+#include <QColor>
+#include <QPair>
+
 class CORE_EXPORT QgsRasterShaderFunction
 {
 
@@ -48,6 +51,8 @@ class CORE_EXPORT QgsRasterShaderFunction
     double minimumValue() const { return mMinimumValue; }
     double maximumValue() const { return mMaximumValue; }
 
+    virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const { Q_UNUSED( symbolItems ); }
+
   protected:
     /** \brief User defineable maximum value for the shading function */
     double mMaximumValue;
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -179,3 +179,15 @@ void QgsSingleBandPseudoColorRenderer::writeXML( QDomDocument& doc, QDomElement&
   }
   parentElem.appendChild( rasterRendererElem );
 }
+
+void QgsSingleBandPseudoColorRenderer::legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const
+{
+  if ( mShader )
+  {
+    QgsRasterShaderFunction* shaderFunction = mShader->rasterShaderFunction();
+    if ( shaderFunction )
+    {
+      shaderFunction->legendSymbologyItems( symbolItems );
+    }
+  }
+}
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h
@@ -40,6 +40,8 @@ class QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 
+    void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
+
   private:
     QgsRasterShader* mShader;
     int mBand;

Original file line number	Diff line number	Diff line change
`@@ -1169,6 +1169,13 @@ QString QgsRasterLayer::lastErrorTitle()`
`1169`	`1169`	`QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const`
`1170`	`1170`	`{`
`1171`	`1171`	`QList< QPair< QString, QColor > > symbolList;`
	`1172`	`+ if ( mRenderer )`
	`1173`	`+ {`
	`1174`	`+ mRenderer->legendSymbologyItems( symbolList );`
	`1175`	`+ }`
	`1176`	`+ return symbolList;`
	`1177`	`+`
	`1178`	`+#if 0`
`1172`	`1179`	`if ( mDrawingStyle == SingleBandGray \|\| mDrawingStyle == PalettedSingleBandGray \|\| mDrawingStyle == MultiBandSingleBandGray )`
`1173`	`1180`	`{`
`1174`	`1181`	`//add min/max from contrast enhancement`
`@@ -1244,6 +1251,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const`
`1244`	`1251`	`}`
`1245`	`1252`	`}`
`1246`	`1253`	`return symbolList;`
	`1254`	`+#endif //0`
`1247`	`1255`	`}`
`1248`	`1256`
`1249`	`1257`	`/**`