-some adjustments to the raster API as suggested by Timlinux

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9566 c8812cc2-4d05-0410-92ff-de0c093fc19c

python/core/qgscontrastenhancement.sip

@@ -14,7 +14,7 @@ public:
     StretchToMinimumMaximum, //linear histogram enhanceContrast
     StretchAndClipToMinimumMaximum,
     ClipToMinimumMaximum,
-    UserDefined
+    UserDefinedEnhancement
   };
 
   /*! These are exactly the same as GDAL pixel data types */

python/core/qgsrasterlayer.sip

@@ -55,11 +55,11 @@ public:
     /** \brief This enumerator describes the types of shading that can be used */
     enum ColorShadingAlgorithm
     {
-      UndefinedShadingAlgorithm,
-      PseudoColor,
-      FreakOut,
-      ColorRamp,
-      UserDefined
+      UndefinedShader,
+      PseudoColorShader,
+      FreakOutShader,
+      ColorRampShader,
+      UserDefinedShader
     };
 
     /** \brief This enumerator describes the different kinds of drawing we can do */
@@ -214,7 +214,7 @@ public:
     void setRGBMinimumMaximumEstimated( bool theBool );
 
     /** \brief Mutator to alter the number of standard deviations that should be plotted */
-    void setStandardDeviationsToPlot( double theStdDevsToPlot );
+    void setStandardDeviations( double theStdDevsToPlot );
 
     /** \brief Mutator for mUserDefinedGrayMinimumMaximum */
     void setUserDefinedGrayMinimumMaximum( bool theBool );
@@ -223,7 +223,7 @@ public:
     void setUserDefinedRGBMinimumMaximum( bool theBool );
 
     /** \brief Accessor to find out how many standard deviations are being plotted */
-    double standardDeviationsToPlot() const;
+    double standardDeviations() const;
 
     /** \brief  Accessor for transparent band name mapping */
     QString transparentBandName() const;

src/app/qgsrasterlayerproperties.cpp

@@ -588,19 +588,19 @@ void QgsRasterLayerProperties::sync()
        mRasterLayer->drawingStyle() == QgsRasterLayer::PalettedSingleBandPseudoColor ||
        mRasterLayer->drawingStyle() == QgsRasterLayer::MultiBandSingleBandPseudoColor )
   {
-    if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::PseudoColor )
+    if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::PseudoColorShader )
     {
       cboxColorMap->setCurrentIndex( cboxColorMap->findText( tr( "Pseudocolor" ) ) );
     }
-    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::FreakOut )
+    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::FreakOutShader )
     {
       cboxColorMap->setCurrentIndex( cboxColorMap->findText( tr( "Freak Out" ) ) );
     }
-    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::ColorRamp )
+    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::ColorRampShader )
     {
       cboxColorMap->setCurrentIndex( cboxColorMap->findText( tr( "Colormap" ) ) );
     }
-    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::UserDefined )
+    else if ( mRasterLayer->colorShadingAlgorithm() == QgsRasterLayer::UserDefinedShader )
     {
       cboxColorMap->setCurrentIndex( cboxColorMap->findText( tr( "User Defined" ) ) );
     }
@@ -638,7 +638,7 @@ void QgsRasterLayerProperties::sync()
     }
     else
     {
-      sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+      sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviations() );
       rbtnThreeBandStdDev->setChecked( true );
       rbtnThreeBandMinMax->setChecked( false );
     }
@@ -677,7 +677,7 @@ void QgsRasterLayerProperties::sync()
     }
     else
     {
-      sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+      sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviations() );
       rbtnSingleBandStdDev->setChecked( true );
       rbtnSingleBandMinMax->setChecked( false );
     }
@@ -709,7 +709,7 @@ void QgsRasterLayerProperties::sync()
   {
     cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "Clip To MinMax" ) ) );
   }
-  else if ( QgsContrastEnhancement::UserDefined == mRasterLayer->contrastEnhancementAlgorithm() )
+  else if ( QgsContrastEnhancement::UserDefinedEnhancement == mRasterLayer->contrastEnhancementAlgorithm() )
   {
     cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "User Defined" ) ) );
   }
@@ -851,7 +851,7 @@ void QgsRasterLayerProperties::syncColormapTab()
     return;
   }
 
-  if ( QgsRasterLayer::ColorRamp != mRasterLayer->colorShadingAlgorithm() )
+  if ( QgsRasterLayer::ColorRampShader != mRasterLayer->colorShadingAlgorithm() )
   {
     return;
   }
@@ -1059,15 +1059,15 @@ void QgsRasterLayerProperties::apply()
   //If UserDefined do nothing, user defined can only be set programatically
   if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) )
   {
-    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::PseudoColor );
+    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::PseudoColorShader );
   }
   else if ( cboxColorMap->currentText() == tr( "Freak Out" ) )
   {
-    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::FreakOut );
+    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::FreakOutShader );
   }
   else if ( cboxColorMap->currentText() == tr( "Colormap" ) )
   {
-    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::ColorRamp );
+    mRasterLayer->setColorShadingAlgorithm( QgsRasterLayer::ColorRampShader );
   }
 
   //set the color scaling algorithm
@@ -1086,7 +1086,7 @@ void QgsRasterLayerProperties::apply()
   {
     mRasterLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::ClipToMinimumMaximum, false );
   }
-  else if ( QgsContrastEnhancement::UserDefined == mRasterLayer->contrastEnhancementAlgorithm() )
+  else if ( QgsContrastEnhancement::UserDefinedEnhancement == mRasterLayer->contrastEnhancementAlgorithm() )
   {
     //do nothing
   }
@@ -1117,17 +1117,17 @@ void QgsRasterLayerProperties::apply()
         mRasterLayer->setMinimumValue( cboBlue->currentText(), leBlueMin->text().toDouble(), false );
         mRasterLayer->setMaximumValue( cboBlue->currentText(), leBlueMax->text().toDouble() );
       }
-      mRasterLayer->setStandardDeviationsToPlot( 0.0 );
+      mRasterLayer->setStandardDeviations( 0.0 );
       mRasterLayer->setUserDefinedRGBMinimumMaximum( true );
     }
     else if ( rbtnThreeBandStdDev->isEnabled() && rbtnThreeBandStdDev->isChecked() )
     {
-      mRasterLayer->setStandardDeviationsToPlot( sboxThreeBandStdDev->value() );
+      mRasterLayer->setStandardDeviations( sboxThreeBandStdDev->value() );
       mRasterLayer->setUserDefinedRGBMinimumMaximum( false );
     }
     else
     {
-      mRasterLayer->setStandardDeviationsToPlot( 0.0 );
+      mRasterLayer->setStandardDeviations( 0.0 );
       mRasterLayer->setUserDefinedRGBMinimumMaximum( false );
     }
   }
@@ -1142,17 +1142,17 @@ void QgsRasterLayerProperties::apply()
         mRasterLayer->setMinimumValue( cboGray->currentText(), leGrayMin->text().toDouble(), false );
         mRasterLayer->setMaximumValue( cboGray->currentText(), leGrayMax->text().toDouble() );
       }
-      mRasterLayer->setStandardDeviationsToPlot( 0.0 );
+      mRasterLayer->setStandardDeviations( 0.0 );
       mRasterLayer->setUserDefinedGrayMinimumMaximum( true );
     }
     else if ( rbtnSingleBandStdDev->isEnabled() && rbtnSingleBandStdDev->isChecked() )
     {
-      mRasterLayer->setStandardDeviationsToPlot( sboxSingleBandStdDev->value() );
+      mRasterLayer->setStandardDeviations( sboxSingleBandStdDev->value() );
       mRasterLayer->setUserDefinedGrayMinimumMaximum( false );
     }
     else
     {
-      mRasterLayer->setStandardDeviationsToPlot( 0.0 );
+      mRasterLayer->setStandardDeviations( 0.0 );
       mRasterLayer->setUserDefinedGrayMinimumMaximum( false );
     }
   }
@@ -1468,7 +1468,7 @@ void QgsRasterLayerProperties::apply()
     {
       if ( rbtnThreeBandStdDev->isEnabled() )
       {
-        sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+        sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviations() );
       }
 
       if ( rbtnThreeBandMinMax->isEnabled() )
@@ -1496,7 +1496,7 @@ void QgsRasterLayerProperties::apply()
     {
       if ( rbtnSingleBandStdDev->isEnabled() )
       {
-        sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+        sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviations() );
       }
 
       if ( rbtnSingleBandMinMax->isEnabled() )
@@ -2390,7 +2390,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled( bool theState )
     }
     else
     {
-      sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+      sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviations() );
       rbtnSingleBandStdDev->setChecked( true );
     }
 
@@ -2471,7 +2471,7 @@ void QgsRasterLayerProperties::on_rbtnThreeBand_toggled( bool theState )
     }
     else
     {
-      sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviationsToPlot() );
+      sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviations() );
       rbtnThreeBandStdDev->setChecked( true );
     }
 

src/core/raster/qgscontrastenhancement.cpp

@@ -251,7 +251,7 @@ void QgsContrastEnhancement::setContrastEnhancementAlgorithm( ContrastEnhancemen
       case ClipToMinimumMaximum :
         mContrastEnhancementFunction = new QgsClipToMinMaxEnhancement( mRasterDataType, mMinimumValue, mMaximumValue );
         break;
-      case UserDefined :
+      case UserDefinedEnhancement :
         //Do nothing
         break;
       default:
@@ -281,7 +281,7 @@ void QgsContrastEnhancement::setContrastEnhancementFunction( QgsContrastEnhancem
   if ( 0 != theFunction )
   {
     mContrastEnhancementFunction = theFunction;
-    mContrastEnhancementAlgorithm = UserDefined;
+    mContrastEnhancementAlgorithm = UserDefinedEnhancement;
     generateLookupTable();
   }
 }

src/core/raster/qgscontrastenhancement.h

@@ -42,7 +42,7 @@ class CORE_EXPORT QgsContrastEnhancement
       StretchToMinimumMaximum,        //linear histogram enhanceContrast
       StretchAndClipToMinimumMaximum,
       ClipToMinimumMaximum,
-      UserDefined
+      UserDefinedEnhancement
     };
 
     /** These are exactly the same as GDAL pixel data types