Add renderer class for multiband color

mhugent · mhugent · commit 52b559ed9975 · 2011-12-19T14:48:28.000+01:00
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -165,8 +165,9 @@ SET(QGIS_CORE_SRCS
   raster/qgsrastershaderfunction.cpp
 
   raster/qgsrasterrenderer.cpp
-  raster/qgspalettedrasterrenderer.cpp
   raster/qgsbilinearrasterresampler.cpp
+  raster/qgspalettedrasterrenderer.cpp
+  raster/qgsmultibandcolorrenderer.cpp
 
   renderer/qgscontinuouscolorrenderer.cpp
   renderer/qgsgraduatedsymbolrenderer.cpp
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -0,0 +1,115 @@
+/***************************************************************************
+                         qgsmultibandcolorrenderer.cpp
+                         -----------------------------
+    begin                : December 2011
+    copyright            : (C) 2011 by Marco Hugentobler
+    email                : marco at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsmultibandcolorrenderer.h"
+#include "qgsmaptopixel.h"
+#include "qgsrasterresampler.h"
+#include "qgsrasterviewport.h"
+#include <QImage>
+#include <QPainter>
+
+QgsMultiBandColorRenderer::QgsMultiBandColorRenderer( QgsRasterDataProvider* provider, int redBand, int greenBand, int blueBand, QgsRasterResampler* resampler ):
+    QgsRasterRenderer( provider, resampler ), mRedBand( redBand ), mGreenBand( greenBand ), mBlueBand( blueBand )
+{
+}
+
+QgsMultiBandColorRenderer::~QgsMultiBandColorRenderer()
+{
+}
+
+void QgsMultiBandColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
+{
+  if ( !p || !mProvider || !viewPort || !theQgsMapToPixel )
+  {
+    return;
+  }
+
+  //read data from provider
+  int redTypeSize = mProvider->dataTypeSize( mRedBand ) / 8;
+  int greenTypeSize = mProvider->dataTypeSize( mGreenBand ) / 8;
+  int blueTypeSize = mProvider->dataTypeSize( mBlueBand ) / 8;
+
+  QgsRasterDataProvider::DataType redType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mRedBand );
+  QgsRasterDataProvider::DataType greenType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mGreenBand );
+  QgsRasterDataProvider::DataType blueType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBlueBand );
+
+  int nCols, nRows;
+
+  if ( mResampler )
+  {
+    //read data at source resolution if zoomed in, else do oversampling with factor 2.5
+    QgsRectangle providerExtent = mProvider->extent();
+    if ( viewPort->mSrcCRS.isValid() && viewPort->mDestCRS.isValid() && viewPort->mSrcCRS != viewPort->mDestCRS )
+    {
+      QgsCoordinateTransform t( viewPort->mSrcCRS, viewPort->mDestCRS );
+      providerExtent = t.transformBoundingBox( providerExtent );
+    }
+    double pixelRatio = theQgsMapToPixel->mapUnitsPerPixel() / ( providerExtent.width() / mProvider->xSize() );
+    double oversampling = pixelRatio > 1.0 ? 2.5 : pixelRatio;
+    nCols = viewPort->drawableAreaXDim * oversampling;
+    nRows = viewPort->drawableAreaYDim * oversampling;
+  }
+  else
+  {
+    nCols = viewPort->drawableAreaXDim;
+    nRows = viewPort->drawableAreaYDim;
+  }
+
+  void* redData = VSIMalloc( redTypeSize * nCols *  nRows );
+  void* greenData = VSIMalloc( greenTypeSize * nCols *  nRows );
+  void* blueData = VSIMalloc( blueTypeSize * nCols *  nRows );
+
+  mProvider->readBlock( mRedBand, viewPort->mDrawnExtent, nCols, nRows,
+                        viewPort->mSrcCRS, viewPort->mDestCRS, redData );
+  mProvider->readBlock( mGreenBand, viewPort->mDrawnExtent, nCols, nRows,
+                        viewPort->mSrcCRS, viewPort->mDestCRS, greenData );
+  mProvider->readBlock( mBlueBand, viewPort->mDrawnExtent, nCols, nRows,
+                        viewPort->mSrcCRS, viewPort->mDestCRS, blueData );
+
+  QImage img( nCols, nRows, QImage::Format_ARGB32_Premultiplied );
+  QRgb* imageScanLine = 0;
+  int currentRasterPos = 0;
+  int redVal, greenVal, blueVal;
+
+  for ( int i = 0; i < nRows; ++i )
+  {
+    imageScanLine = ( QRgb* )( img.scanLine( i ) );
+    for ( int j = 0; j < nCols; ++j )
+    {
+      redVal = readValue( redData, redType, currentRasterPos );
+      greenVal = readValue( greenData, greenType, currentRasterPos );
+      blueVal = readValue( blueData, blueType, currentRasterPos );
+      imageScanLine[j] = qRgba( redVal, greenVal, blueVal, 255 );
+      ++currentRasterPos;
+    }
+  }
+
+  CPLFree( redData );
+  CPLFree( greenData );
+  CPLFree( blueData );
+
+  if ( mResampler )
+  {
+    QImage dstImg( viewPort->drawableAreaXDim, viewPort->drawableAreaYDim, QImage::Format_ARGB32_Premultiplied );
+    mResampler->resample( img, dstImg );
+    p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), dstImg );
+  }
+  else
+  {
+    p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), img );
+  }
+}
diff --git a/src/core/raster/qgsmultibandcolorrenderer.h b/src/core/raster/qgsmultibandcolorrenderer.h
@@ -0,0 +1,38 @@
+/***************************************************************************
+                         qgsmultibandcolorrenderer.h
+                         ---------------------------
+    begin                : December 2011
+    copyright            : (C) 2011 by Marco Hugentobler
+    email                : marco at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSMULTIBANDCOLORRENDERER_H
+#define QGSMULTIBANDCOLORRENDERER_H
+
+#include "qgsrasterrenderer.h"
+
+/**Renderer for multiband images with the color components*/
+class QgsMultiBandColorRenderer: public QgsRasterRenderer
+{
+  public:
+    QgsMultiBandColorRenderer( QgsRasterDataProvider* provider, int redBand, int greenBand, int blueBand, QgsRasterResampler* resampler = 0 );
+    ~QgsMultiBandColorRenderer();
+
+    void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
+
+  private:
+    int mRedBand;
+    int mGreenBand;
+    int mBlueBand;
+};
+
+#endif // QGSMULTIBANDCOLORRENDERER_H
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -18,13 +18,12 @@
 #include "qgspalettedrasterrenderer.h"
 #include "qgscoordinatetransform.h"
 #include "qgsmaptopixel.h"
+#include "qgsrasterresampler.h"
 #include "qgsrasterviewport.h"
 #include <QColor>
 #include <QImage>
 #include <QPainter>
 
-#include "qgsbilinearrasterresampler.h"
-
 QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber,
     QColor* colorArray, int nColors, QgsRasterResampler* resampler ):
     QgsRasterRenderer( provider, resampler ), mBandNumber( bandNumber ), mColors( colorArray ), mNColors( nColors )
@@ -74,13 +73,14 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
 
   QImage img( nCols, nRows, QImage::Format_ARGB32_Premultiplied );
   QRgb* imageScanLine = 0;
+  int val = 0;
 
   for ( int i = 0; i < nRows; ++i )
   {
     imageScanLine = ( QRgb* )( img.scanLine( i ) );
     for ( int j = 0; j < nCols; ++j )
     {
-      int val = readValue( rasterData, rasterType, currentRasterPos );
+      val = readValue( rasterData, rasterType, currentRasterPos );
       imageScanLine[j] = mColors[ val ].rgba();
       ++currentRasterPos;
     }
@@ -90,8 +90,7 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
   if ( mResampler ) //resample to output resolution
   {
     QImage dstImg( viewPort->drawableAreaXDim, viewPort->drawableAreaYDim, QImage::Format_ARGB32_Premultiplied );
-    QgsBilinearRasterResampler rs;
-    rs.resample( img, dstImg );
+    mResampler->resample( img, dstImg );
     p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), dstImg );
   }
   else //use original image
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -39,6 +39,7 @@ email                : tim at linfiniti.com
 //renderers
 #include "qgspalettedrasterrenderer.h"
 #include "qgsbilinearrasterresampler.h"
+#include "qgsmultibandcolorrenderer.h"
 
 #include <cstdio>
 #include <cmath>
@@ -936,8 +937,16 @@ void QgsRasterLayer::draw( QPainter * theQPainter,
       }
       else
       {
+        int red = bandNumber( mRedBandName );
+        int green = bandNumber( mGreenBandName );
+        int blue = bandNumber( mBlueBandName );
+        QgsBilinearRasterResampler resampler;
+        QgsMultiBandColorRenderer r( mDataProvider, red, green, blue, &resampler );
+        r.draw( theQPainter, theRasterViewPort, theQgsMapToPixel );
+#if 0
         drawMultiBandColor( theQPainter, theRasterViewPort,
                             theQgsMapToPixel );
+#endif //0
       }
       break;
     case SingleBandColorDataStyle:
diff --git a/src/core/raster/qgsrasterresampler.h b/src/core/raster/qgsrasterresampler.h
@@ -24,7 +24,7 @@ class QImage;
 class QgsRasterResampler
 {
   public:
-    void resample( const QImage& srcImage, QImage& dstImage ) const;
+    virtual void resample( const QImage& srcImage, QImage& dstImage ) const = 0;
 };
 
 #endif // QGSRASTERRESAMPLER_H

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class QImage;`
`24`	`24`	`class QgsRasterResampler`
`25`	`25`	`{`
`26`	`26`	`public:`
`27`		`- void resample( const QImage& srcImage, QImage& dstImage ) const;`
	`27`	`+ virtual void resample( const QImage& srcImage, QImage& dstImage ) const = 0;`
`28`	`28`	`};`
`29`	`29`
`30`	`30`	`#endif // QGSRASTERRESAMPLER_H`