Add type name to renderers. Restore the corresponding renderer widget in raster properties

Author: mhugent

src/app/qgsrasterlayerproperties.cpp

@@ -345,6 +345,15 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
   {
     mRenderTypeComboBox->addItem( rendererIt->visibleName, rendererIt->name );
   }
+
+  if ( renderer )
+  {
+    int widgetIndex = mRenderTypeComboBox->findData( renderer->type() );
+    if ( widgetIndex != -1 )
+    {
+      mRenderTypeComboBox->setCurrentIndex( widgetIndex );
+    }
+  }
   on_mRenderTypeComboBox_currentIndexChanged( mRenderTypeComboBox->currentIndex() );
 } // QgsRasterLayerProperties ctor
 

src/core/raster/qgsmultibandcolorrenderer.cpp

@@ -26,7 +26,7 @@ QgsMultiBandColorRenderer::QgsMultiBandColorRenderer( QgsRasterDataProvider* pro
     QgsContrastEnhancement* redEnhancement,
     QgsContrastEnhancement* greenEnhancement,
     QgsContrastEnhancement* blueEnhancement ):
-    QgsRasterRenderer( provider ), mRedBand( redBand ), mGreenBand( greenBand ), mBlueBand( blueBand ),
+    QgsRasterRenderer( provider, "multibandcolor" ), mRedBand( redBand ), mGreenBand( greenBand ), mBlueBand( blueBand ),
     mRedContrastEnhancement( redEnhancement ), mGreenContrastEnhancement( greenEnhancement ), mBlueContrastEnhancement( blueEnhancement )
 {
 }

src/core/raster/qgspalettedrasterrenderer.cpp

@@ -23,7 +23,7 @@
 
 QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber,
     QColor* colorArray, int nColors ):
-    QgsRasterRenderer( provider ), mBandNumber( bandNumber ), mColors( colorArray ), mNColors( nColors )
+    QgsRasterRenderer( provider, "paletted" ), mBandNumber( bandNumber ), mColors( colorArray ), mNColors( nColors )
 {
 }
 

src/core/raster/qgsrasterrenderer.cpp

@@ -24,8 +24,9 @@
 #include <QImage>
 #include <QPainter>
 
-QgsRasterRenderer::QgsRasterRenderer( QgsRasterDataProvider* provider ): mProvider( provider ), mZoomedInResampler( 0 ), mZoomedOutResampler( 0 ),
-    mOpacity( 1.0 ), mRasterTransparency( 0 ), mAlphaBand( -1 ), mInvertColor( false ), mMaxOversampling( 2.0 )
+QgsRasterRenderer::QgsRasterRenderer( QgsRasterDataProvider* provider, const QString& type ): mProvider( provider ),
+    mType( type ), mZoomedInResampler( 0 ), mZoomedOutResampler( 0 ), mOpacity( 1.0 ), mRasterTransparency( 0 ),
+    mAlphaBand( -1 ), mInvertColor( false ), mMaxOversampling( 2.0 )
 {
 }
 

src/core/raster/qgsrasterrenderer.h

@@ -43,8 +43,10 @@ class QgsRasterRenderer
       QgsRasterProjector* prj; //raster projector (or 0 if no reprojection is done)
     };
 
-    QgsRasterRenderer( QgsRasterDataProvider* provider );
+    QgsRasterRenderer( QgsRasterDataProvider* provider, const QString& type );
     virtual ~QgsRasterRenderer();
+
+    virtual QString type() const { return mType; }
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel ) = 0;
 
     bool usesTransparency( QgsCoordinateReferenceSystem& srcSRS, QgsCoordinateReferenceSystem& dstSRS ) const;
@@ -97,6 +99,7 @@ class QgsRasterRenderer
 
 
     QgsRasterDataProvider* mProvider;
+    QString mType;
     /**Resampler used if screen resolution is higher than raster resolution (zoomed in). 0 means no resampling (nearest neighbour)*/
     QgsRasterResampler* mZoomedInResampler;
     /**Resampler used if raster resolution is higher than raster resolution (zoomed out). 0 mean no resampling (nearest neighbour)*/

src/core/raster/qgssinglebandcolordatarenderer.cpp

@@ -20,7 +20,7 @@
 #include <QImage>
 
 QgsSingleBandColorDataRenderer::QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band ):
-    QgsRasterRenderer( provider ), mBand( band )
+    QgsRasterRenderer( provider, "singlebandcolordata" ), mBand( band )
 {
 
 }
@@ -29,6 +29,11 @@ QgsSingleBandColorDataRenderer::~QgsSingleBandColorDataRenderer()
 {
 }
 
+QgsRasterRenderer* QgsSingleBandColorDataRenderer::create( const QDomElement& elem )
+{
+  return 0;
+}
+
 void QgsSingleBandColorDataRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
 {
   if ( !p || !mProvider || !viewPort || !theQgsMapToPixel )

src/core/raster/qgssinglebandcolordatarenderer.h

@@ -20,12 +20,16 @@
 
 #include "qgsrasterrenderer.h"
 
+class QDomElement;
+
 class QgsSingleBandColorDataRenderer: public QgsRasterRenderer
 {
   public:
     QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band );
     ~QgsSingleBandColorDataRenderer();
 
+    static QgsRasterRenderer* create( const QDomElement& elem );
+
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
 
   private:

src/core/raster/qgssinglebandgrayrenderer.cpp

@@ -21,14 +21,19 @@
 #include <QImage>
 
 QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand ):
-    QgsRasterRenderer( provider ), mGrayBand( grayBand ), mContrastEnhancement( 0 )
+    QgsRasterRenderer( provider, "singlebandgray" ), mGrayBand( grayBand ), mContrastEnhancement( 0 )
 {
 }
 
 QgsSingleBandGrayRenderer::~QgsSingleBandGrayRenderer()
 {
 }
 
+QgsRasterRenderer* QgsSingleBandGrayRenderer::create( const QDomElement& elem )
+{
+  return 0;
+}
+
 void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
 {
   if ( !p || !mProvider || !viewPort || !theQgsMapToPixel )

src/core/raster/qgssinglebandgrayrenderer.h

@@ -21,13 +21,16 @@
 #include "qgsrasterrenderer.h"
 
 class QgsContrastEnhancement;
+class QDomElement;
 
 class QgsSingleBandGrayRenderer: public QgsRasterRenderer
 {
   public:
     QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );
     ~QgsSingleBandGrayRenderer();
 
+    static QgsRasterRenderer* create( const QDomElement& elem );
+
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
 
     const QgsContrastEnhancement* contrastEnhancement() const { return mContrastEnhancement; }

src/core/raster/qgssinglebandpseudocolorrenderer.cpp

@@ -22,14 +22,19 @@
 #include <QImage>
 
 QgsSingleBandPseudoColorRenderer::QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader ):
-    QgsRasterRenderer( provider ), mShader( shader ), mBand( band )
+    QgsRasterRenderer( provider, "singlebandpseudocolor" ), mShader( shader ), mBand( band )
 {
 }
 
 QgsSingleBandPseudoColorRenderer::~QgsSingleBandPseudoColorRenderer()
 {
 }
 
+QgsRasterRenderer* QgsSingleBandPseudoColorRenderer::create( const QDomElement& elem )
+{
+  return 0;
+}
+
 void QgsSingleBandPseudoColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
 {
   if ( !p || !mProvider || !viewPort || !theQgsMapToPixel || !mShader )