@@ -588,19 +588,19 @@ void QgsRasterLayerProperties::sync()
588
588
mRasterLayer ->drawingStyle () == QgsRasterLayer::PalettedSingleBandPseudoColor ||
589
589
mRasterLayer ->drawingStyle () == QgsRasterLayer::MultiBandSingleBandPseudoColor )
590
590
{
591
- if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::PseudoColor )
591
+ if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::PseudoColorShader )
592
592
{
593
593
cboxColorMap->setCurrentIndex ( cboxColorMap->findText ( tr ( " Pseudocolor" ) ) );
594
594
}
595
- else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::FreakOut )
595
+ else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::FreakOutShader )
596
596
{
597
597
cboxColorMap->setCurrentIndex ( cboxColorMap->findText ( tr ( " Freak Out" ) ) );
598
598
}
599
- else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::ColorRamp )
599
+ else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::ColorRampShader )
600
600
{
601
601
cboxColorMap->setCurrentIndex ( cboxColorMap->findText ( tr ( " Colormap" ) ) );
602
602
}
603
- else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::UserDefined )
603
+ else if ( mRasterLayer ->colorShadingAlgorithm () == QgsRasterLayer::UserDefinedShader )
604
604
{
605
605
cboxColorMap->setCurrentIndex ( cboxColorMap->findText ( tr ( " User Defined" ) ) );
606
606
}
@@ -638,7 +638,7 @@ void QgsRasterLayerProperties::sync()
638
638
}
639
639
else
640
640
{
641
- sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
641
+ sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
642
642
rbtnThreeBandStdDev->setChecked ( true );
643
643
rbtnThreeBandMinMax->setChecked ( false );
644
644
}
@@ -677,7 +677,7 @@ void QgsRasterLayerProperties::sync()
677
677
}
678
678
else
679
679
{
680
- sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
680
+ sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
681
681
rbtnSingleBandStdDev->setChecked ( true );
682
682
rbtnSingleBandMinMax->setChecked ( false );
683
683
}
@@ -709,7 +709,7 @@ void QgsRasterLayerProperties::sync()
709
709
{
710
710
cboxContrastEnhancementAlgorithm->setCurrentIndex ( cboxContrastEnhancementAlgorithm->findText ( tr ( " Clip To MinMax" ) ) );
711
711
}
712
- else if ( QgsContrastEnhancement::UserDefined == mRasterLayer ->contrastEnhancementAlgorithm () )
712
+ else if ( QgsContrastEnhancement::UserDefinedEnhancement == mRasterLayer ->contrastEnhancementAlgorithm () )
713
713
{
714
714
cboxContrastEnhancementAlgorithm->setCurrentIndex ( cboxContrastEnhancementAlgorithm->findText ( tr ( " User Defined" ) ) );
715
715
}
@@ -851,7 +851,7 @@ void QgsRasterLayerProperties::syncColormapTab()
851
851
return ;
852
852
}
853
853
854
- if ( QgsRasterLayer::ColorRamp != mRasterLayer ->colorShadingAlgorithm () )
854
+ if ( QgsRasterLayer::ColorRampShader != mRasterLayer ->colorShadingAlgorithm () )
855
855
{
856
856
return ;
857
857
}
@@ -1059,15 +1059,15 @@ void QgsRasterLayerProperties::apply()
1059
1059
// If UserDefined do nothing, user defined can only be set programatically
1060
1060
if ( cboxColorMap->currentText () == tr ( " Pseudocolor" ) )
1061
1061
{
1062
- mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::PseudoColor );
1062
+ mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::PseudoColorShader );
1063
1063
}
1064
1064
else if ( cboxColorMap->currentText () == tr ( " Freak Out" ) )
1065
1065
{
1066
- mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::FreakOut );
1066
+ mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::FreakOutShader );
1067
1067
}
1068
1068
else if ( cboxColorMap->currentText () == tr ( " Colormap" ) )
1069
1069
{
1070
- mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::ColorRamp );
1070
+ mRasterLayer ->setColorShadingAlgorithm ( QgsRasterLayer::ColorRampShader );
1071
1071
}
1072
1072
1073
1073
// set the color scaling algorithm
@@ -1086,7 +1086,7 @@ void QgsRasterLayerProperties::apply()
1086
1086
{
1087
1087
mRasterLayer ->setContrastEnhancementAlgorithm ( QgsContrastEnhancement::ClipToMinimumMaximum, false );
1088
1088
}
1089
- else if ( QgsContrastEnhancement::UserDefined == mRasterLayer ->contrastEnhancementAlgorithm () )
1089
+ else if ( QgsContrastEnhancement::UserDefinedEnhancement == mRasterLayer ->contrastEnhancementAlgorithm () )
1090
1090
{
1091
1091
// do nothing
1092
1092
}
@@ -1117,17 +1117,17 @@ void QgsRasterLayerProperties::apply()
1117
1117
mRasterLayer ->setMinimumValue ( cboBlue->currentText (), leBlueMin->text ().toDouble (), false );
1118
1118
mRasterLayer ->setMaximumValue ( cboBlue->currentText (), leBlueMax->text ().toDouble () );
1119
1119
}
1120
- mRasterLayer ->setStandardDeviationsToPlot ( 0.0 );
1120
+ mRasterLayer ->setStandardDeviations ( 0.0 );
1121
1121
mRasterLayer ->setUserDefinedRGBMinimumMaximum ( true );
1122
1122
}
1123
1123
else if ( rbtnThreeBandStdDev->isEnabled () && rbtnThreeBandStdDev->isChecked () )
1124
1124
{
1125
- mRasterLayer ->setStandardDeviationsToPlot ( sboxThreeBandStdDev->value () );
1125
+ mRasterLayer ->setStandardDeviations ( sboxThreeBandStdDev->value () );
1126
1126
mRasterLayer ->setUserDefinedRGBMinimumMaximum ( false );
1127
1127
}
1128
1128
else
1129
1129
{
1130
- mRasterLayer ->setStandardDeviationsToPlot ( 0.0 );
1130
+ mRasterLayer ->setStandardDeviations ( 0.0 );
1131
1131
mRasterLayer ->setUserDefinedRGBMinimumMaximum ( false );
1132
1132
}
1133
1133
}
@@ -1142,17 +1142,17 @@ void QgsRasterLayerProperties::apply()
1142
1142
mRasterLayer ->setMinimumValue ( cboGray->currentText (), leGrayMin->text ().toDouble (), false );
1143
1143
mRasterLayer ->setMaximumValue ( cboGray->currentText (), leGrayMax->text ().toDouble () );
1144
1144
}
1145
- mRasterLayer ->setStandardDeviationsToPlot ( 0.0 );
1145
+ mRasterLayer ->setStandardDeviations ( 0.0 );
1146
1146
mRasterLayer ->setUserDefinedGrayMinimumMaximum ( true );
1147
1147
}
1148
1148
else if ( rbtnSingleBandStdDev->isEnabled () && rbtnSingleBandStdDev->isChecked () )
1149
1149
{
1150
- mRasterLayer ->setStandardDeviationsToPlot ( sboxSingleBandStdDev->value () );
1150
+ mRasterLayer ->setStandardDeviations ( sboxSingleBandStdDev->value () );
1151
1151
mRasterLayer ->setUserDefinedGrayMinimumMaximum ( false );
1152
1152
}
1153
1153
else
1154
1154
{
1155
- mRasterLayer ->setStandardDeviationsToPlot ( 0.0 );
1155
+ mRasterLayer ->setStandardDeviations ( 0.0 );
1156
1156
mRasterLayer ->setUserDefinedGrayMinimumMaximum ( false );
1157
1157
}
1158
1158
}
@@ -1468,7 +1468,7 @@ void QgsRasterLayerProperties::apply()
1468
1468
{
1469
1469
if ( rbtnThreeBandStdDev->isEnabled () )
1470
1470
{
1471
- sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
1471
+ sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
1472
1472
}
1473
1473
1474
1474
if ( rbtnThreeBandMinMax->isEnabled () )
@@ -1496,7 +1496,7 @@ void QgsRasterLayerProperties::apply()
1496
1496
{
1497
1497
if ( rbtnSingleBandStdDev->isEnabled () )
1498
1498
{
1499
- sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
1499
+ sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
1500
1500
}
1501
1501
1502
1502
if ( rbtnSingleBandMinMax->isEnabled () )
@@ -2390,7 +2390,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled( bool theState )
2390
2390
}
2391
2391
else
2392
2392
{
2393
- sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
2393
+ sboxSingleBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
2394
2394
rbtnSingleBandStdDev->setChecked ( true );
2395
2395
}
2396
2396
@@ -2471,7 +2471,7 @@ void QgsRasterLayerProperties::on_rbtnThreeBand_toggled( bool theState )
2471
2471
}
2472
2472
else
2473
2473
{
2474
- sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviationsToPlot () );
2474
+ sboxThreeBandStdDev->setValue ( mRasterLayer ->standardDeviations () );
2475
2475
rbtnThreeBandStdDev->setChecked ( true );
2476
2476
}
2477
2477
0 commit comments