diff --git a/python/core/qgsrasterlayer.sip b/python/core/qgsrasterlayer.sip index 97d446394b8..5f42a85ddec 100644 --- a/python/core/qgsrasterlayer.sip +++ b/python/core/qgsrasterlayer.sip @@ -217,7 +217,7 @@ public: //void setUserDefinedRGBMinimumMaximum( bool theBool ); //removed with raster redesign /**Set raster renderer. Takes ownership of the renderer object*/ - void setRenderer( QgsRasterRenderer* renderer ); + void setRenderer( QgsRasterRenderer* renderer /Transfer/ ); QgsRasterRenderer* renderer(); /** \brief Accessor to find out how many standard deviations are being plotted */ @@ -226,7 +226,7 @@ public: /** \brief Accessor for transparent band name mapping */ //QString transparentBandName() const; //removed with raster redesign - /** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? + /** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? * @deprecated in 2.0 */ bool usesProvider() /Deprecated/; @@ -271,14 +271,14 @@ public: /** \brief Wrapper for GDALComputeRasterMinMax with the estimate option \note added in v1.6 */ void computeMinimumMaximumEstimates( int theBand, double& theMin /Out/, double& theMax /Out/ ); - + /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent */ // (would need MethodCode directive) void computeMinimumMaximumFromLastExtent( int theBand, double* theMinMax ); /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent */ // (would need MethodCode directive) void computeMinimumMaximumFromLastExtent( QString theBand, double* theMinMax ); - /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent + /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent \note added in v1.6 */ void computeMinimumMaximumFromLastExtent( int theBand, double& theMin /Out/, double& theMax /Out/ ); @@ -366,12 +366,12 @@ public: /** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */ QPixmap paletteAsPixmap( int theBand = 1 ); - /** \brief [ data provider interface ] Which provider is being used for this Raster Layer? + /** \brief [ data provider interface ] Which provider is being used for this Raster Layer? * @note added in 2.0 */ QString providerType() const; - /** \brief [ data provider interface ] Which provider is being used for this Raster Layer? + /** \brief [ data provider interface ] Which provider is being used for this Raster Layer? * @deprecated in 2.0 */ QString providerKey() const /Deprecated/; diff --git a/python/core/qgsrasterrenderer.sip b/python/core/qgsrasterrenderer.sip index 264a06e338d..0c4df410470 100644 --- a/python/core/qgsrasterrenderer.sip +++ b/python/core/qgsrasterrenderer.sip @@ -124,7 +124,7 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer %End public: /**Note: takes ownership of QgsRasterShader*/ - QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader ); + QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader /Transfer/ ); ~QgsSingleBandPseudoColorRenderer(); QgsRasterInterface * clone(); diff --git a/tests/src/python/test_qgsrasterlayer.py b/tests/src/python/test_qgsrasterlayer.py index 4f4eda10d0e..f60f0337424 100644 --- a/tests/src/python/test_qgsrasterlayer.py +++ b/tests/src/python/test_qgsrasterlayer.py @@ -140,6 +140,7 @@ class TestQgsRasterLayer(unittest.TestCase): myPseudoRenderer = QgsSingleBandPseudoColorRenderer(myRasterLayer.dataProvider(), 1, myRasterShader) myRasterLayer.setRenderer(myPseudoRenderer) + return ######## works first time ############# myRasterShader = QgsRasterShader()