sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrappers from QgsRasterLayer::computeMinimumMaximumFromLastExtent, computeMinimumMaximumEstimates

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14017 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2010-08-06 12:37:49 +00:00
parent adecbee568
commit 9e14a2f67d
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/core/qgsrasterlayer.sip
View File

@ -269,16 +269,24 @@ public:
QString colorShadingAlgorithmAsString() const; QString colorShadingAlgorithmAsString() const;
/** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */ /** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */
void computeMinimumMaximumEstimates( int theBand, double* theMinMax ); // (would need MethodCode directive) void computeMinimumMaximumEstimates( int theBand, double* theMinMax );
/** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */ /** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */
void computeMinimumMaximumEstimates( QString theBand, double* theMinMax ); // (would need MethodCode directive) void computeMinimumMaximumEstimates( QString theBand, double* theMinMax );
/** \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 */ /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent */
void computeMinimumMaximumFromLastExtent( int theBand, double* theMinMax ); // (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 */ /** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent */
void computeMinimumMaximumFromLastExtent( QString theBand, double* theMinMax ); // (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
\note added in v1.6 */
void computeMinimumMaximumFromLastExtent( int theBand, double& theMin /Out/, double& theMax /Out/ );
/** \brief Get a pointer to the contrast enhancement for the selected band */ /** \brief Get a pointer to the contrast enhancement for the selected band */
QgsContrastEnhancement* contrastEnhancement( unsigned int theBand ); QgsContrastEnhancement* contrastEnhancement( unsigned int theBand );

16
src/core/raster/qgsrasterlayer.cpp
View File

@ -1243,6 +1243,14 @@ void QgsRasterLayer::computeMinimumMaximumEstimates( QString theBand, double* th
computeMinimumMaximumEstimates( bandNumber( theBand ), theMinMax ); computeMinimumMaximumEstimates( bandNumber( theBand ), theMinMax );
} }
void QgsRasterLayer::computeMinimumMaximumEstimates( int theBand, double& theMin, double& theMax )
{
double theMinMax[2];
computeMinimumMaximumEstimates( theBand, theMinMax );
theMin = theMinMax[0];
theMax = theMinMax[1];
}
/** /**
* @param theBand The band (number) for which to calculate the min max values * @param theBand The band (number) for which to calculate the min max values
* @param theMinMax Pointer to a double[2] which hold the estimated min max * @param theMinMax Pointer to a double[2] which hold the estimated min max
@ -1293,6 +1301,14 @@ void QgsRasterLayer::computeMinimumMaximumFromLastExtent( QString theBand, doubl
computeMinimumMaximumFromLastExtent( bandNumber( theBand ), theMinMax ); computeMinimumMaximumFromLastExtent( bandNumber( theBand ), theMinMax );
} }
void QgsRasterLayer::computeMinimumMaximumFromLastExtent( int theBand, double& theMin, double& theMax )
{
double theMinMax[2];
computeMinimumMaximumFromLastExtent( theBand, theMinMax );
theMin = theMinMax[0];
theMax = theMinMax[1];
}
/** /**
* @param theBand The band (number) for which to get the contrast enhancement for * @param theBand The band (number) for which to get the contrast enhancement for
* @return Pointer to the contrast enhancement or 0 on failure * @return Pointer to the contrast enhancement or 0 on failure

8
src/core/raster/qgsrasterlayer.h
View File

@ -440,12 +440,20 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */ /** \brief Wrapper for GDALComputeRasterMinMax with the estimate option */
void computeMinimumMaximumEstimates( QString theBand, double* theMinMax ); void computeMinimumMaximumEstimates( QString theBand, double* theMinMax );
/** \brief Wrapper for GDALComputeRasterMinMax with the estimate option
\note added in v1.6 */
void computeMinimumMaximumEstimates( int theBand, double& theMin, double& theMax );
/** \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 */
void computeMinimumMaximumFromLastExtent( int theBand, double* theMinMax ); void computeMinimumMaximumFromLastExtent( int 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 */
void computeMinimumMaximumFromLastExtent( QString theBand, double* theMinMax ); void computeMinimumMaximumFromLastExtent( QString theBand, double* theMinMax );
/** \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, double& theMax );
/** \brief Get a pointer to the contrast enhancement for the selected band */ /** \brief Get a pointer to the contrast enhancement for the selected band */
QgsContrastEnhancement* contrastEnhancement( unsigned int theBand ); QgsContrastEnhancement* contrastEnhancement( unsigned int theBand );