From 14cbce3c86e1c971dc75d854bf8f37d140a3c2fa Mon Sep 17 00:00:00 2001 From: gsherman Date: Fri, 11 Jan 2008 06:59:16 +0000 Subject: [PATCH] Fix for wacked sip files git-svn-id: http://svn.osgeo.org/qgis/trunk@7928 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/core/qgscontrastenhancement.sip | 161 ------------- .../core/qgscontrastenhancementfunction.sip | 45 ---- python/core/qgsrastershader.sip | 80 ------- python/core/qgsrastershaderfunction.sip | 42 ---- python/core/qgsrastertransparency.sip | 212 ------------------ 5 files changed, 540 deletions(-) diff --git a/python/core/qgscontrastenhancement.sip b/python/core/qgscontrastenhancement.sip index b705e91d1b4..dd49efecd25 100644 --- a/python/core/qgscontrastenhancement.sip +++ b/python/core/qgscontrastenhancement.sip @@ -80,164 +80,3 @@ public: }; -class QgsContrastEnhancement -{ -%TypeHeaderCode -#include -%End - -public: - - /** \brief This enumerator describes the types of contrast enhancement algorithms that can be used. */ - enum CONTRAST_ENHANCEMENT_ALGORITHM - { - NO_STRETCH, //this should be the default color scaling algorithm - STRETCH_TO_MINMAX, //linear histogram stretch - STRETCH_AND_CLIP_TO_MINMAX, - CLIP_TO_MINMAX, - USER_DEFINED - }; - - /*! These are exactly the same as GDAL pixel data types */ - enum QgsRasterDataType { - QGS_Unknown = 0, - /*! Eight bit unsigned integer */ QGS_Byte = 1, - /*! Sixteen bit unsigned integer */ QGS_UInt16 = 2, - /*! Sixteen bit signed integer */ QGS_Int16 = 3, - /*! Thirty two bit unsigned integer */ QGS_UInt32 = 4, - /*! Thirty two bit signed integer */ QGS_Int32 = 5, - /*! Thirty two bit floating point */ QGS_Float32 = 6, - /*! Sixty four bit floating point */ QGS_Float64 = 7, - /*! Complex Int16 */ QGS_CInt16 = 8, - /*! Complex Int32 */ QGS_CInt32 = 9, - /*! Complex Float32 */ QGS_CFloat32 = 10, - /*! Complex Float64 */ QGS_CFloat64 = 11, - QGS_TypeCount = 12 /* maximum type # + 1 */ - }; - - QgsContrastEnhancement(QgsContrastEnhancement::QgsRasterDataType theDatatype=QGS_Byte); - ~QgsContrastEnhancement(); - - /* - * - * Static methods - * - */ - /** \brief Helper function that returns the maximum possible value for a GDAL data type */ - static double getMaximumPossibleValue(QgsRasterDataType); - /** \brief Helper function that returns the minimum possible value for a GDAL data type */ - static double getMinimumPossibleValue(QgsRasterDataType); - - /* - * - * Non-Static Inline methods - * - */ - /** \brief Return the maximum value for the contrast enhancement range. */ - double getMaximumValue(); - - /** \brief Return the minimum value for the contrast enhancement range. */ - double getMinimumValue(); - - CONTRAST_ENHANCEMENT_ALGORITHM getContrastEnhancementAlgorithm(); - - /* - * - * Non-Static methods - * - */ - /** \brief Return true if pixel is in stretable range, false if pixel is outside of range (i.e., clipped) */ - bool isValueInDisplayableRange(double); - /** \brief Set the contrast enhancement algorithm */ - void setContrastEnhancementAlgorithm(CONTRAST_ENHANCEMENT_ALGORITHM, bool generateTable=true); - /** \brief A public method that allows the user to set their own custom contrast enhancment function */ - void setContrastEnhancementFunction(QgsContrastEnhancementFunction*); - /** \brief Set the maximum value for the contrast enhancement range. */ - void setMaximumValue(double, bool generateTable=true); - /** \brief Return the minimum value for the contrast enhancement range. */ - void setMinimumValue(double, bool generateTable=true); - /** \brief Apply the contrast enhancement to a value. Return values are 0 - 254, -1 means the pixel was clipped and should not be displayed */ - int stretch(double); - -}; - -class QgsContrastEnhancement -{ -%TypeHeaderCode -#include -%End - -public: - - /** \brief This enumerator describes the types of contrast enhancement algorithms that can be used. */ - enum CONTRAST_ENHANCEMENT_ALGORITHM - { - NO_STRETCH, //this should be the default color scaling algorithm - STRETCH_TO_MINMAX, //linear histogram stretch - STRETCH_AND_CLIP_TO_MINMAX, - CLIP_TO_MINMAX, - USER_DEFINED - }; - - /*! These are exactly the same as GDAL pixel data types */ - enum QgsRasterDataType { - QGS_Unknown = 0, - /*! Eight bit unsigned integer */ QGS_Byte = 1, - /*! Sixteen bit unsigned integer */ QGS_UInt16 = 2, - /*! Sixteen bit signed integer */ QGS_Int16 = 3, - /*! Thirty two bit unsigned integer */ QGS_UInt32 = 4, - /*! Thirty two bit signed integer */ QGS_Int32 = 5, - /*! Thirty two bit floating point */ QGS_Float32 = 6, - /*! Sixty four bit floating point */ QGS_Float64 = 7, - /*! Complex Int16 */ QGS_CInt16 = 8, - /*! Complex Int32 */ QGS_CInt32 = 9, - /*! Complex Float32 */ QGS_CFloat32 = 10, - /*! Complex Float64 */ QGS_CFloat64 = 11, - QGS_TypeCount = 12 /* maximum type # + 1 */ - }; - - QgsContrastEnhancement(QgsContrastEnhancement::QgsRasterDataType theDatatype=QGS_Byte); - ~QgsContrastEnhancement(); - - /* - * - * Static methods - * - */ - /** \brief Helper function that returns the maximum possible value for a GDAL data type */ - static double getMaximumPossibleValue(QgsRasterDataType); - /** \brief Helper function that returns the minimum possible value for a GDAL data type */ - static double getMinimumPossibleValue(QgsRasterDataType); - - /* - * - * Non-Static Inline methods - * - */ - /** \brief Return the maximum value for the contrast enhancement range. */ - double getMaximumValue(); - - /** \brief Return the minimum value for the contrast enhancement range. */ - double getMinimumValue(); - - CONTRAST_ENHANCEMENT_ALGORITHM getContrastEnhancementAlgorithm(); - - /* - * - * Non-Static methods - * - */ - /** \brief Return true if pixel is in stretable range, false if pixel is outside of range (i.e., clipped) */ - bool isValueInDisplayableRange(double); - /** \brief Set the contrast enhancement algorithm */ - void setContrastEnhancementAlgorithm(CONTRAST_ENHANCEMENT_ALGORITHM, bool generateTable=true); - /** \brief A public method that allows the user to set their own custom contrast enhancment function */ - void setContrastEnhancementFunction(QgsContrastEnhancementFunction*); - /** \brief Set the maximum value for the contrast enhancement range. */ - void setMaximumValue(double, bool generateTable=true); - /** \brief Return the minimum value for the contrast enhancement range. */ - void setMinimumValue(double, bool generateTable=true); - /** \brief Apply the contrast enhancement to a value. Return values are 0 - 254, -1 means the pixel was clipped and should not be displayed */ - int stretch(double); - -}; diff --git a/python/core/qgscontrastenhancementfunction.sip b/python/core/qgscontrastenhancementfunction.sip index 333d6ca3e6e..8079f4def26 100644 --- a/python/core/qgscontrastenhancementfunction.sip +++ b/python/core/qgscontrastenhancementfunction.sip @@ -22,48 +22,3 @@ class QgsContrastEnhancementFunction }; -class QgsContrastEnhancementFunction -{ -%TypeHeaderCode -#include -#include -%End - - public: - QgsContrastEnhancementFunction(QgsContrastEnhancement::QgsRasterDataType, double, double); - virtual ~QgsContrastEnhancementFunction(); - - /** \brief Mustator for the maximum value */ - void setMaximumValue(double); - /** \brief Mutator for the minimum value */ - void setMinimumValue(double); - - /** \brief A customizable method that takes in a double and returns a int between 0 and 255 */ - virtual int enhanceValue(double); - /** \brief A customicable method to indicate if the pixels is displayable */ - virtual bool isValueInDisplayableRange(double); - -}; - -class QgsContrastEnhancementFunction -{ -%TypeHeaderCode -#include -#include -%End - - public: - QgsContrastEnhancementFunction(QgsContrastEnhancement::QgsRasterDataType, double, double); - virtual ~QgsContrastEnhancementFunction(); - - /** \brief Mustator for the maximum value */ - void setMaximumValue(double); - /** \brief Mutator for the minimum value */ - void setMinimumValue(double); - - /** \brief A customizable method that takes in a double and returns a int between 0 and 255 */ - virtual int enhanceValue(double); - /** \brief A customicable method to indicate if the pixels is displayable */ - virtual bool isValueInDisplayableRange(double); - -}; \ No newline at end of file diff --git a/python/core/qgsrastershader.sip b/python/core/qgsrastershader.sip index 259c188c18b..7d293e53c74 100644 --- a/python/core/qgsrastershader.sip +++ b/python/core/qgsrastershader.sip @@ -6,86 +6,6 @@ class QgsRasterShader #include %End -public: - QgsRasterShader(double theMinimumValue=0.0, double theMaximumValue=255.0); - ~QgsRasterShader(); - /* - * - * Non-Static Inline methods - * - */ - /** \brief Return the maximum value for the raster shader */ - double getMaximumValue(); - - /** \brief Return the minimum value for the raster shader */ - double getMinimumValue(); - - QgsRasterShaderFunction* getRasterShaderFunction(); - - /* - * - * Non-Static methods - * - */ - /** \brief generates and new RGB value based on one input value */ - bool generateShadedValue(double, int*, int*, int*); - /** \brief generates and new RGB value based on original RGB value */ - bool generateShadedValue(double, double, double, int*, int*, int*); - /** \brief A public method that allows the user to set their own shader function */ - void setRasterShaderFunction(QgsRasterShaderFunction*); - /** \brief Set the maximum value */ - void setMaximumValue(double); - /** \brief Return the minimum value */ - void setMinimumValue(double); -}; - -class QgsRasterShader -{ -%TypeHeaderCode -#include -#include -%End - -public: - QgsRasterShader(double theMinimumValue=0.0, double theMaximumValue=255.0); - ~QgsRasterShader(); - /* - * - * Non-Static Inline methods - * - */ - /** \brief Return the maximum value for the raster shader */ - double getMaximumValue(); - - /** \brief Return the minimum value for the raster shader */ - double getMinimumValue(); - - QgsRasterShaderFunction* getRasterShaderFunction(); - - /* - * - * Non-Static methods - * - */ - /** \brief generates and new RGB value based on one input value */ - bool generateShadedValue(double, int*, int*, int*); - /** \brief generates and new RGB value based on original RGB value */ - bool generateShadedValue(double, double, double, int*, int*, int*); - /** \brief A public method that allows the user to set their own shader function */ - void setRasterShaderFunction(QgsRasterShaderFunction*); - /** \brief Set the maximum value */ - void setMaximumValue(double); - /** \brief Return the minimum value */ - void setMinimumValue(double); -}; - -class QgsRasterShader -{ -%TypeHeaderCode -#include -#include -%End - public: QgsRasterShader(double theMinimumValue=0.0, double theMaximumValue=255.0); ~QgsRasterShader(); diff --git a/python/core/qgsrastershaderfunction.sip b/python/core/qgsrastershaderfunction.sip index f6d4e724e7a..40d073c6794 100644 --- a/python/core/qgsrastershaderfunction.sip +++ b/python/core/qgsrastershaderfunction.sip @@ -19,45 +19,3 @@ public: /** \brief Return the minimum value */ virtual void setMinimumValue(double); }; - -class QgsRasterShaderFunction -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterShaderFunction(double theMinimumValue = 0.0, double theMaximumValue = 255.0); - virtual ~QgsRasterShaderFunction(); - - /** \brief generates and new RGB value based on one input value */ - virtual bool generateShadedValue(double, int*, int*, int*); - /** \brief generates and new RGB value based on original RGB value */ - virtual bool generateShadedValue(double, double, double, int*, int*, int*); - - /** \brief Set the maximum value */ - virtual void setMaximumValue(double); - /** \brief Return the minimum value */ - virtual void setMinimumValue(double); -}; - -class QgsRasterShaderFunction -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterShaderFunction(double theMinimumValue = 0.0, double theMaximumValue = 255.0); - virtual ~QgsRasterShaderFunction(); - - /** \brief generates and new RGB value based on one input value */ - virtual bool generateShadedValue(double, int*, int*, int*); - /** \brief generates and new RGB value based on original RGB value */ - virtual bool generateShadedValue(double, double, double, int*, int*, int*); - - /** \brief Set the maximum value */ - virtual void setMaximumValue(double); - /** \brief Return the minimum value */ - virtual void setMinimumValue(double); -}; diff --git a/python/core/qgsrastertransparency.sip b/python/core/qgsrastertransparency.sip index 4bf73ebbeac..4376c097ff0 100644 --- a/python/core/qgsrastertransparency.sip +++ b/python/core/qgsrastertransparency.sip @@ -51,215 +51,3 @@ public: /** \brief Return the transparency value for a RGB Pixel */ int getAlphaValue(double, double, double, int theGlobalTransparency=255); }; - -class QgsRasterTransparency -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterTransparency(); - - // - // Structs to hold transparent pixel vlaues - // - struct TransparentThreeValuePixel - { - double red; - double green; - double blue; - double percentTransparent; - }; - - struct TransparentSingleValuePixel - { - double pixelValue; - double percentTransparent; - }; - - // - // Initializer, Accessor and mutator for transparency tables. - // - /** \brief Mutator for transparentSingleValuePixelList */ - QList getTransparentSingleValuePixelList(); - - /** \brief Mutator for transparentThreeValuePixelList */ - QList getTransparentThreeValuePixelList(); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double, double, double); - - /** \brief Accessor for transparentSingleValuePixelList */ - void setTransparentSingleValuePixelList(QList); - - /** \brief Accessor for transparentThreeValuePixelList */ - void setTransparentThreeValuePixelList(QList); - - /** \brief Returns the transparency value for a single value Pixel */ - int getAlphaValue(double, int theGlobalTransparency=255); - /** \brief Return the transparency value for a RGB Pixel */ - int getAlphaValue(double, double, double, int theGlobalTransparency=255); -}; - -class QgsRasterTransparency -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterTransparency(); - - // - // Structs to hold transparent pixel vlaues - // - struct TransparentThreeValuePixel - { - double red; - double green; - double blue; - double percentTransparent; - }; - - struct TransparentSingleValuePixel - { - double pixelValue; - double percentTransparent; - }; - - // - // Initializer, Accessor and mutator for transparency tables. - // - /** \brief Mutator for transparentSingleValuePixelList */ - QList getTransparentSingleValuePixelList(); - - /** \brief Mutator for transparentThreeValuePixelList */ - QList getTransparentThreeValuePixelList(); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double, double, double); - - /** \brief Accessor for transparentSingleValuePixelList */ - void setTransparentSingleValuePixelList(QList); - - /** \brief Accessor for transparentThreeValuePixelList */ - void setTransparentThreeValuePixelList(QList); - - /** \brief Returns the transparency value for a single value Pixel */ - int getAlphaValue(double, int theGlobalTransparency=255); - /** \brief Return the transparency value for a RGB Pixel */ - int getAlphaValue(double, double, double, int theGlobalTransparency=255); -}; - -class QgsRasterTransparency -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterTransparency(); - - // - // Structs to hold transparent pixel vlaues - // - struct TransparentThreeValuePixel - { - double red; - double green; - double blue; - double percentTransparent; - }; - - struct TransparentSingleValuePixel - { - double pixelValue; - double percentTransparent; - }; - - // - // Initializer, Accessor and mutator for transparency tables. - // - /** \brief Mutator for transparentSingleValuePixelList */ - QList getTransparentSingleValuePixelList(); - - /** \brief Mutator for transparentThreeValuePixelList */ - QList getTransparentThreeValuePixelList(); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double, double, double); - - /** \brief Accessor for transparentSingleValuePixelList */ - void setTransparentSingleValuePixelList(QList); - - /** \brief Accessor for transparentThreeValuePixelList */ - void setTransparentThreeValuePixelList(QList); - - /** \brief Returns the transparency value for a single value Pixel */ - int getAlphaValue(double, int theGlobalTransparency=255); - /** \brief Return the transparency value for a RGB Pixel */ - int getAlphaValue(double, double, double, int theGlobalTransparency=255); -}; - -class QgsRasterTransparency -{ -%TypeHeaderCode -#include -%End - -public: - QgsRasterTransparency(); - - // - // Structs to hold transparent pixel vlaues - // - struct TransparentThreeValuePixel - { - double red; - double green; - double blue; - double percentTransparent; - }; - - struct TransparentSingleValuePixel - { - double pixelValue; - double percentTransparent; - }; - - // - // Initializer, Accessor and mutator for transparency tables. - // - /** \brief Mutator for transparentSingleValuePixelList */ - QList getTransparentSingleValuePixelList(); - - /** \brief Mutator for transparentThreeValuePixelList */ - QList getTransparentThreeValuePixelList(); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double); - - /** \brief Reset to the transparency list to a single value */ - void initializeTransparentPixelList(double, double, double); - - /** \brief Accessor for transparentSingleValuePixelList */ - void setTransparentSingleValuePixelList(QList); - - /** \brief Accessor for transparentThreeValuePixelList */ - void setTransparentThreeValuePixelList(QList); - - /** \brief Returns the transparency value for a single value Pixel */ - int getAlphaValue(double, int theGlobalTransparency=255); - /** \brief Return the transparency value for a RGB Pixel */ - int getAlphaValue(double, double, double, int theGlobalTransparency=255); -};