Completed single band gray widget

mhugent · mhugent · commit c7d284d2caab · 2012-03-11T13:35:13.000+01:00
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -27,13 +27,20 @@ QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterDataProvider* pro
 
 QgsSingleBandGrayRenderer::~QgsSingleBandGrayRenderer()
 {
+  delete mContrastEnhancement;
 }
 
 QgsRasterRenderer* QgsSingleBandGrayRenderer::create( const QDomElement& elem )
 {
   return 0;
 }
 
+void QgsSingleBandGrayRenderer::setContrastEnhancement( QgsContrastEnhancement* ce )
+{
+  delete mContrastEnhancement;
+  mContrastEnhancement = ce;
+}
+
 void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
 {
   if ( !p || !mProvider || !viewPort || !theQgsMapToPixel )
diff --git a/src/core/raster/qgssinglebandgrayrenderer.h b/src/core/raster/qgssinglebandgrayrenderer.h
@@ -33,8 +33,11 @@ class QgsSingleBandGrayRenderer: public QgsRasterRenderer
 
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
 
+    int grayBand() const { return mGrayBand; }
+    void setGrayBand( int band ) { mGrayBand = band; }
     const QgsContrastEnhancement* contrastEnhancement() const { return mContrastEnhancement; }
-    void setContrastEnhancement( QgsContrastEnhancement* ce ) { mContrastEnhancement = ce; }
+    /**Takes ownership*/
+    void setContrastEnhancement( QgsContrastEnhancement* ce );
 
   private:
     int mGrayBand;
diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgssinglebandgrayrendererwidget.h"
+#include "qgssinglebandgrayrenderer.h"
 #include "qgsrasterlayer.h"
 
 QgsSingleBandGrayRendererWidget::QgsSingleBandGrayRendererWidget( QgsRasterLayer* layer ): QgsRasterRendererWidget( layer )
@@ -42,6 +43,20 @@ QgsSingleBandGrayRendererWidget::QgsSingleBandGrayRendererWidget( QgsRasterLayer
     mContrastEnhancementComboBox->addItem( tr( "Stretch to MinMax" ), 1 );
     mContrastEnhancementComboBox->addItem( tr( "Stretch and clip to MinMax" ), 2 );
     mContrastEnhancementComboBox->addItem( tr( "Clip to MinMax" ), 3 );
+
+    QgsSingleBandGrayRenderer* r = dynamic_cast<QgsSingleBandGrayRenderer*>( layer->renderer() );
+    if ( r )
+    {
+      //band
+      mGrayBandComboBox->setCurrentIndex( mGrayBandComboBox->findData( r->grayBand() ) );
+      const QgsContrastEnhancement* ce = r->contrastEnhancement();
+      //minmax
+      mMinLineEdit->setText( QString::number( ce->minimumValue() ) );
+      mMaxLineEdit->setText( QString::number( ce->maximumValue() ) );
+      //contrast enhancement algorithm
+      mContrastEnhancementComboBox->setCurrentIndex(
+        mContrastEnhancementComboBox->findData(( int )( ce->contrastEnhancementAlgorithm() ) ) );
+    }
   }
 }
 
@@ -51,5 +66,26 @@ QgsSingleBandGrayRendererWidget::~QgsSingleBandGrayRendererWidget()
 
 QgsRasterRenderer* QgsSingleBandGrayRendererWidget::renderer()
 {
-  return 0; //soon...
+  if ( !mRasterLayer )
+  {
+    return 0;
+  }
+  QgsRasterDataProvider* provider = mRasterLayer->dataProvider();
+  if ( !provider )
+  {
+    return 0;
+  }
+  int band = mGrayBandComboBox->itemData( mGrayBandComboBox->currentIndex() ).toInt();
+
+  QgsContrastEnhancement* e = new QgsContrastEnhancement(( QgsContrastEnhancement::QgsRasterDataType )(
+        provider->dataType( band ) ) );
+  e->setMinimumValue( mMinLineEdit->text().toInt() );
+  e->setMaximumValue( mMaxLineEdit->text().toInt() );
+  e->setContrastEnhancementAlgorithm(( QgsContrastEnhancement::ContrastEnhancementAlgorithm )( mContrastEnhancementComboBox->itemData(
+                                       mContrastEnhancementComboBox->currentIndex() ).toInt() ) );
+
+
+  QgsSingleBandGrayRenderer* renderer = new QgsSingleBandGrayRenderer( provider, band );
+  renderer->setContrastEnhancement( e );
+  return renderer;
 }

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,20 @@ QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterDataProvider* pro`
`27`	`27`
`28`	`28`	`QgsSingleBandGrayRenderer::~QgsSingleBandGrayRenderer()`
`29`	`29`	`{`
	`30`	`+ delete mContrastEnhancement;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`QgsRasterRenderer* QgsSingleBandGrayRenderer::create( const QDomElement& elem )`
`33`	`34`	`{`
`34`	`35`	`return 0;`
`35`	`36`	`}`
`36`	`37`
	`38`	`+void QgsSingleBandGrayRenderer::setContrastEnhancement( QgsContrastEnhancement* ce )`
	`39`	`+{`
	`40`	`+ delete mContrastEnhancement;`
	`41`	`+ mContrastEnhancement = ce;`
	`42`	`+}`
	`43`	`+`
`37`	`44`	`void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )`
`38`	`45`	`{`
`39`	`46`	`if ( !p \|\| !mProvider \|\| !viewPort \|\| !theQgsMapToPixel )`