Fix #10663 (additional nodata value pixels not transparent)

wonder-sk · wonder-sk · commit e8d80a36de4f · 2014-06-22T23:20:17.000+07:00
diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp
@@ -513,4 +513,14 @@ bool QgsRasterDataProvider::userNoDataValuesContains( int bandNo, double value )
   return QgsRasterRange::contains( value, rangeList );
 }
 
+void QgsRasterDataProvider::copyBaseSettings( const QgsRasterDataProvider& other )
+{
+  mDpi = other.mDpi;
+  mSrcNoDataValue = other.mSrcNoDataValue;
+  mSrcHasNoDataValue = other.mSrcHasNoDataValue;
+  mUseSrcNoDataValue = other.mUseSrcNoDataValue;
+  mUserNoDataValue = other.mUserNoDataValue;
+  mExtent = other.mExtent;
+}
+
 // ENDS
diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
@@ -379,6 +379,9 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     /** Returns true if user no data contains value */
     bool userNoDataValuesContains( int bandNo, double value ) const;
 
+    /** Copy member variables from other raster data provider. Useful for implementation of clone() method in subclasses */
+    void copyBaseSettings( const QgsRasterDataProvider& other );
+
     static QStringList cStringList2Q_( char ** stringList );
 
     static QString makeTableCell( const QString & value );
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -157,6 +157,7 @@ QgsRasterInterface * QgsGdalProvider::clone() const
 {
   QgsDebugMsg( "Entered" );
   QgsGdalProvider * provider = new QgsGdalProvider( dataSourceUri() );
+  provider->copyBaseSettings( *this );
   return provider;
 }
 
diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp
@@ -154,6 +154,7 @@ QgsGrassRasterProvider::~QgsGrassRasterProvider()
 QgsRasterInterface * QgsGrassRasterProvider::clone() const
 {
   QgsGrassRasterProvider * provider = new QgsGrassRasterProvider( dataSourceUri() );
+  provider->copyBaseSettings( *this );
   return provider;
 }
 
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
@@ -459,6 +459,7 @@ QgsWcsProvider::~QgsWcsProvider()
 QgsRasterInterface * QgsWcsProvider::clone() const
 {
   QgsWcsProvider * provider = new QgsWcsProvider( dataSourceUri() );
+  provider->copyBaseSettings( *this );
   return provider;
 }
 
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -185,7 +185,9 @@ QgsWmsProvider::~QgsWmsProvider()
 
 QgsRasterInterface * QgsWmsProvider::clone() const
 {
-  return new QgsWmsProvider( dataSourceUri(), mCaps.isValid() ? &mCaps : 0 );
+  QgsWmsProvider* provider = new QgsWmsProvider( dataSourceUri(), mCaps.isValid() ? &mCaps : 0 );
+  provider->copyBaseSettings( *this );
+  return provider;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ QgsRasterInterface * QgsGdalProvider::clone() const`
`157`	`157`	`{`
`158`	`158`	`QgsDebugMsg( "Entered" );`
`159`	`159`	`QgsGdalProvider * provider = new QgsGdalProvider( dataSourceUri() );`
	`160`	`+ provider->copyBaseSettings( *this );`
`160`	`161`	`return provider;`
`161`	`162`	`}`
`162`	`163`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ QgsGrassRasterProvider::~QgsGrassRasterProvider()`
`154`	`154`	`QgsRasterInterface * QgsGrassRasterProvider::clone() const`
`155`	`155`	`{`
`156`	`156`	`QgsGrassRasterProvider * provider = new QgsGrassRasterProvider( dataSourceUri() );`
	`157`	`+ provider->copyBaseSettings( *this );`
`157`	`158`	`return provider;`
`158`	`159`	`}`
`159`	`160`
Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,7 @@ QgsWcsProvider::~QgsWcsProvider()`
`459`	`459`	`QgsRasterInterface * QgsWcsProvider::clone() const`
`460`	`460`	`{`
`461`	`461`	`QgsWcsProvider * provider = new QgsWcsProvider( dataSourceUri() );`
	`462`	`+ provider->copyBaseSettings( *this );`
`462`	`463`	`return provider;`
`463`	`464`	`}`
`464`	`465`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,9 @@ QgsWmsProvider::~QgsWmsProvider()`
`185`	`185`
`186`	`186`	`QgsRasterInterface * QgsWmsProvider::clone() const`
`187`	`187`	`{`
`188`		`- return new QgsWmsProvider( dataSourceUri(), mCaps.isValid() ? &mCaps : 0 );`
	`188`	`+ QgsWmsProvider* provider = new QgsWmsProvider( dataSourceUri(), mCaps.isValid() ? &mCaps : 0 );`
	`189`	`+ provider->copyBaseSettings( *this );`
	`190`	`+ return provider;`
`189`	`191`	`}`
`190`	`192`
`191`	`193`