Skip to content

Commit 8c86b61

Browse files
blazekblazek
committedAug 14, 2012
default raster contrast enhancement by type
·
ltr-3_40Before-merge-new_vector_api
1 parent 538ebe0 commit 8c86b61

9 files changed

+452
-251
lines changed
 

‎src/app/qgsoptions.cpp

Lines changed: 38 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
7575

7676
connect( spinFontSize, SIGNAL( valueChanged( const QString& ) ), this, SLOT( fontSizeChanged( const QString& ) ) );
7777

78-
connect( chkUseStandardDeviation, SIGNAL( stateChanged( int ) ), this, SLOT( toggleStandardDeviation( int ) ) );
7978
#ifdef Q_WS_X11
8079
connect( chkEnableBackbuffer, SIGNAL( stateChanged( int ) ), this, SLOT( toggleEnableBackbuffer( int ) ) );
8180
#endif
@@ -384,33 +383,20 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
384383
spnGreen->setValue( settings.value( "/Raster/defaultGreenBand", 2 ).toInt() );
385384
spnBlue->setValue( settings.value( "/Raster/defaultBlueBand", 3 ).toInt() );
386385

387-
//add items to the color enhanceContrast combo box
388-
cboxContrastEnhancementAlgorithm->addItem( tr( "No Stretch" ) );
389-
cboxContrastEnhancementAlgorithm->addItem( tr( "Stretch To MinMax" ) );
390-
cboxContrastEnhancementAlgorithm->addItem( tr( "Stretch And Clip To MinMax" ) );
391-
cboxContrastEnhancementAlgorithm->addItem( tr( "Clip To MinMax" ) );
386+
initContrastEnhancement( cboxContrastEnhancementAlgorithmSingleBand, "singleBand", "StretchToMinimumMaximum" );
387+
initContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandSingleByte, "multiBandSingleByte", "NoEnhancement" );
388+
initContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandMultiByte, "multiBandMultiByte", "StretchToMinimumMaximum" );
392389

393-
QString contrastEnchacement = settings.value( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" ).toString();
394-
if ( contrastEnchacement == "NoEnhancement" )
395-
{
396-
cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "No Stretch" ) ) );
397-
}
398-
if ( contrastEnchacement == "StretchToMinimumMaximum" )
399-
{
400-
cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "Stretch To MinMax" ) ) );
401-
}
402-
else if ( contrastEnchacement == "StretchAndClipToMinimumMaximum" )
403-
{
404-
cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "Stretch And Clip To MinMax" ) ) );
405-
}
406-
else if ( contrastEnchacement == "ClipToMinimumMaximum" )
407-
{
408-
cboxContrastEnhancementAlgorithm->setCurrentIndex( cboxContrastEnhancementAlgorithm->findText( tr( "Clip To MinMax" ) ) );
409-
}
390+
QString cumulativeCutText = tr( "Cumulative pixel count cut" );
391+
cboxContrastEnhancementLimits->addItem( tr( "Cumulative pixel count cut" ), "CumulativeCut" );
392+
cboxContrastEnhancementLimits->addItem( tr( "Minimum / maximum" ), "MinMax" );
393+
cboxContrastEnhancementLimits->addItem( tr( "Mean +/- standard deviation" ), "StdDev" );
394+
395+
QString contrastEnchacementLimits = settings.value( "/Raster/defaultContrastEnhancementLimits", "CumulativeCut" ).toString();
396+
397+
cboxContrastEnhancementLimits->setCurrentIndex( cboxContrastEnhancementLimits->findData( contrastEnchacementLimits ) );
410398

411-
chkUseStandardDeviation->setChecked( settings.value( "/Raster/useStandardDeviation", false ).toBool() );
412399
spnThreeBandStdDev->setValue( settings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble() );
413-
toggleStandardDeviation( chkUseStandardDeviation->checkState() );
414400

415401
mRasterCumulativeCutLowerDoubleSpinBox->setValue( 100.0 * settings.value( "/Raster/cumulativeCutLower", QString::number( QgsRasterLayer::CUMULATIVE_CUT_LOWER ) ).toDouble() );
416402
mRasterCumulativeCutUpperDoubleSpinBox->setValue( 100.0 * settings.value( "/Raster/cumulativeCutUpper", QString::number( QgsRasterLayer::CUMULATIVE_CUT_UPPER ) ).toDouble() );
@@ -726,18 +712,6 @@ void QgsOptions::fontSizeChanged( const QString &fontSize )
726712
QgisApp::instance()->setFontSize( fontSize.toInt() );
727713
}
728714

729-
void QgsOptions::toggleStandardDeviation( int state )
730-
{
731-
if ( Qt::Checked == state )
732-
{
733-
spnThreeBandStdDev->setEnabled( true );
734-
}
735-
else
736-
{
737-
spnThreeBandStdDev->setEnabled( false );
738-
}
739-
}
740-
741715
void QgsOptions::toggleEnableBackbuffer( int state )
742716
{
743717
#ifdef Q_WS_X11
@@ -904,24 +878,13 @@ void QgsOptions::saveOptions()
904878
settings.setValue( "/Raster/defaultGreenBand", spnGreen->value() );
905879
settings.setValue( "/Raster/defaultBlueBand", spnBlue->value() );
906880

907-
if ( cboxContrastEnhancementAlgorithm->currentText() == tr( "No Stretch" ) )
908-
{
909-
settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" );
910-
}
911-
else if ( cboxContrastEnhancementAlgorithm->currentText() == tr( "Stretch To MinMax" ) )
912-
{
913-
settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm", "StretchToMinimumMaximum" );
914-
}
915-
else if ( cboxContrastEnhancementAlgorithm->currentText() == tr( "Stretch And Clip To MinMax" ) )
916-
{
917-
settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm", "StretchAndClipToMinimumMaximum" );
918-
}
919-
else if ( cboxContrastEnhancementAlgorithm->currentText() == tr( "Clip To MinMax" ) )
920-
{
921-
settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm", "ClipToMinimumMaximum" );
922-
}
881+
saveContrastEnhancement( cboxContrastEnhancementAlgorithmSingleBand, "singleBand" );
882+
saveContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandSingleByte, "multiBandSingleByte" );
883+
saveContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandMultiByte, "multiBandMultiByte" );
884+
885+
QString contrastEnhancementLimits = cboxContrastEnhancementLimits->itemData( cboxContrastEnhancementLimits->currentIndex() ).toString();
886+
settings.setValue( "/Raster/defaultContrastEnhancementLimits", contrastEnhancementLimits );
923887

924-
settings.setValue( "/Raster/useStandardDeviation", chkUseStandardDeviation->isChecked() );
925888
settings.setValue( "/Raster/defaultStandardDeviation", spnThreeBandStdDev->value() );
926889

927890
settings.setValue( "/Raster/cumulativeCutLower", mRasterCumulativeCutLowerDoubleSpinBox->value() / 100.0 );
@@ -1655,3 +1618,24 @@ void QgsOptions::on_pbnExportScales_clicked()
16551618
QgsDebugMsg( msg );
16561619
}
16571620
}
1621+
1622+
void QgsOptions::initContrastEnhancement( QComboBox *cbox, QString name, QString defaultVal )
1623+
{
1624+
QSettings settings;
1625+
1626+
//add items to the color enhanceContrast combo box
1627+
cbox->addItem( tr( "No Stretch" ), "NoEnhancement" );
1628+
cbox->addItem( tr( "Stretch To MinMax" ), "StretchToMinimumMaximum" );
1629+
cbox->addItem( tr( "Stretch And Clip To MinMax" ), "StretchAndClipToMinimumMaximum" );
1630+
cbox->addItem( tr( "Clip To MinMax" ), "ClipToMinimumMaximum" );
1631+
1632+
QString contrastEnchacement = settings.value( "/Raster/defaultContrastEnhancementAlgorithm/" + name, defaultVal ).toString();
1633+
cbox->setCurrentIndex( cbox->findData( contrastEnchacement ) );
1634+
}
1635+
1636+
void QgsOptions::saveContrastEnhancement( QComboBox *cbox, QString name )
1637+
{
1638+
QSettings settings;
1639+
QString value = cbox->itemData( cbox->currentIndex() ).toString();
1640+
settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm/" + name, value );
1641+
}

‎src/app/qgsoptions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
7272

7373
void fontSizeChanged( const QString &fontSize );
7474

75-
void toggleStandardDeviation( int );
76-
7775
//! Slot to change backbuffering. This is handled when the user changes
7876
// the value of the checkbox
7977
void toggleEnableBackbuffer( int );
@@ -191,6 +189,8 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
191189

192190
private:
193191
QStringList i18nList();
192+
void initContrastEnhancement( QComboBox *cbox, QString name, QString defaultVal );
193+
void saveContrastEnhancement( QComboBox *cbox, QString name );
194194
QgsCoordinateReferenceSystem mDefaultCrs;
195195
QgsCoordinateReferenceSystem mLayerDefaultCrs;
196196
bool mLoadedGdalDriverList;

‎src/core/raster/qgscontrastenhancement.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,3 +395,23 @@ void QgsContrastEnhancement::readXML( const QDomElement& elem )
395395
setContrastEnhancementAlgorithm(( ContrastEnhancementAlgorithm )( algorithmElem.text().toInt() ) );
396396
}
397397
}
398+
399+
QgsContrastEnhancement::ContrastEnhancementAlgorithm QgsContrastEnhancement::contrastEnhancementAlgorithmFromString( const QString& contrastEnhancementString )
400+
{
401+
if ( contrastEnhancementString == "StretchToMinimumMaximum" )
402+
{
403+
return StretchToMinimumMaximum;
404+
}
405+
else if ( contrastEnhancementString == "StretchAndClipToMinimumMaximum" )
406+
{
407+
return StretchAndClipToMinimumMaximum;
408+
}
409+
else if ( contrastEnhancementString == "ClipToMinimumMaximum" )
410+
{
411+
return ClipToMinimumMaximum;
412+
}
413+
else
414+
{
415+
return NoEnhancement;
416+
}
417+
}

‎src/core/raster/qgscontrastenhancement.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class originally created circa 2004 by T.Sutton, Gary E.Sherman, Steve Halasz
2626
class QgsContrastEnhancementFunction;
2727
class QDomDocument;
2828
class QDomElement;
29+
class QString;
2930

3031
/** \ingroup core
3132
* Manipulates raster pixel values so that they enhanceContrast or clip into a
@@ -98,6 +99,8 @@ class CORE_EXPORT QgsContrastEnhancement
9899

99100
ContrastEnhancementAlgorithm contrastEnhancementAlgorithm() const { return mContrastEnhancementAlgorithm; }
100101

102+
static ContrastEnhancementAlgorithm contrastEnhancementAlgorithmFromString( const QString& contrastEnhancementString );
103+
101104
/*
102105
*
103106
* Non-Static methods

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 93 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,19 @@ QgsRasterLayer::QgsRasterLayer(
128128
{
129129
QgsDebugMsg( "Entered" );
130130

131-
// TODO, call constructor with provider key for now
131+
// TODO, call constructor with provider key
132132
init();
133133
setDataProvider( "gdal" );
134134

135+
bool defaultLoadedFlag = false;
135136
if ( mValid && loadDefaultStyleFlag )
136137
{
137-
bool defaultLoadedFlag = false;
138138
loadDefaultStyle( defaultLoadedFlag );
139139
}
140+
if ( !defaultLoadedFlag )
141+
{
142+
setDefaultContrastEnhancement();
143+
}
140144
return;
141145
} // QgsRasterLayer ctor
142146

@@ -164,13 +168,16 @@ QgsRasterLayer::QgsRasterLayer( const QString & uri,
164168
init();
165169
setDataProvider( providerKey );
166170

167-
// load default style if provider is gdal and if no style was given
168-
// this should be an argument like in the other constructor
169-
if ( mValid && providerKey == "gdal" && loadDefaultStyleFlag )
171+
// load default style
172+
bool defaultLoadedFlag = false;
173+
if ( mValid && loadDefaultStyleFlag )
170174
{
171-
bool defaultLoadedFlag = false;
172175
loadDefaultStyle( defaultLoadedFlag );
173176
}
177+
if ( !defaultLoadedFlag )
178+
{
179+
setDefaultContrastEnhancement();
180+
}
174181

175182
// Default for the popup menu
176183
// TODO: popMenu = 0;
@@ -1974,6 +1981,86 @@ void QgsRasterLayer::setContrastEnhancementFunction( QgsContrastEnhancementFunct
19741981
}
19751982
}
19761983

1984+
void QgsRasterLayer::setDefaultContrastEnhancement()
1985+
{
1986+
QgsDebugMsg( QString( "mDrawingStyle = %1" ).arg( mDrawingStyle ) );
1987+
1988+
QSettings mySettings;
1989+
1990+
QString myKey;
1991+
QString myDefault;
1992+
1993+
if ( mDrawingStyle == SingleBandGray || mDrawingStyle == MultiBandSingleBandGray )
1994+
{
1995+
myKey = "singleBand";
1996+
myDefault = "StretchToMinimumMaximum";
1997+
}
1998+
else if ( mDrawingStyle == MultiBandColor )
1999+
{
2000+
if ( dataProvider()->typeSize( dataProvider()->srcDataType( 1 ) ) == 8 )
2001+
{
2002+
myKey = "multiBandSingleByte";
2003+
myDefault = "NoEnhancement";
2004+
}
2005+
else
2006+
{
2007+
myKey = "multiBandMultiByte";
2008+
myDefault = "StretchToMinimumMaximum";
2009+
}
2010+
}
2011+
2012+
if ( myKey.isEmpty() )
2013+
{
2014+
QgsDebugMsg( "No default contrast enhancement for this drawing style" );
2015+
}
2016+
QgsDebugMsg( "myKey = " + myKey );
2017+
2018+
QString myAlgorithmString = mySettings.value( "/Raster/defaultContrastEnhancementAlgorithm/" + myKey, myDefault ).toString();
2019+
2020+
QgsContrastEnhancement::ContrastEnhancementAlgorithm myAlgorithm = QgsContrastEnhancement::contrastEnhancementAlgorithmFromString( myAlgorithmString );
2021+
2022+
QString myLimitsString = mySettings.value( "/Raster/defaultContrastEnhancementLimits", "CumulativeCut" ).toString();
2023+
ContrastEnhancementLimits myLimits = contrastEnhancementLimitsFromString( myLimitsString );
2024+
2025+
setContrastEnhancementAlgorithm( myAlgorithm, myLimits );
2026+
}
2027+
2028+
QString QgsRasterLayer::contrastEnhancementLimitsAsString( ContrastEnhancementLimits theLimits )
2029+
{
2030+
switch ( theLimits )
2031+
{
2032+
case QgsRasterLayer::ContrastEnhancementMinMax:
2033+
return "MinMax";
2034+
break;
2035+
case QgsRasterLayer::ContrastEnhancementStdDev:
2036+
return "StdDev";
2037+
break;
2038+
case QgsRasterLayer::ContrastEnhancementCumulativeCut:
2039+
return "CumulativeCut";
2040+
break;
2041+
default:
2042+
break;
2043+
}
2044+
return "None";
2045+
}
2046+
2047+
QgsRasterLayer::ContrastEnhancementLimits QgsRasterLayer::contrastEnhancementLimitsFromString( QString theLimits )
2048+
{
2049+
if ( theLimits == "MinMax" )
2050+
{
2051+
return ContrastEnhancementMinMax;
2052+
}
2053+
else if ( theLimits == "StdDev" )
2054+
{
2055+
return ContrastEnhancementStdDev;
2056+
}
2057+
else if ( theLimits == "CumulativeCut" )
2058+
{
2059+
return ContrastEnhancementCumulativeCut;
2060+
}
2061+
return ContrastEnhancementNone;
2062+
}
2063+
19772064
/**
19782065
*
19792066
* Implemented mainly for serialisation / deserialisation of settings to xml.

‎src/core/raster/qgsrasterlayer.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
257257
/** \brief Contrast enhancement limits */
258258
enum ContrastEnhancementLimits
259259
{
260+
ContrastEnhancementNone,
260261
ContrastEnhancementMinMax,
261262
ContrastEnhancementStdDev,
262263
ContrastEnhancementCumulativeCut
@@ -565,6 +566,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
565566
/** \brief Mutator for color shader algorithm */
566567
Q_DECL_DEPRECATED void setColorShadingAlgorithm( QString theShaderAlgorithm );
567568

569+
static QString contrastEnhancementLimitsAsString( QgsRasterLayer::ContrastEnhancementLimits theLimits );
570+
static ContrastEnhancementLimits contrastEnhancementLimitsFromString( QString theLimits );
571+
568572
/** \brief Mutator for contrast enhancement algorithm using min/max */
569573
// TODO: remove in 2.0, replaced by following
570574
void setContrastEnhancementAlgorithm( QgsContrastEnhancement::ContrastEnhancementAlgorithm theAlgorithm,
@@ -590,6 +594,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
590594
/** \brief Mutator for contrast enhancement function */
591595
void setContrastEnhancementFunction( QgsContrastEnhancementFunction* theFunction );
592596

597+
/** \brief Set default contrast enhancement */
598+
void setDefaultContrastEnhancement();
599+
593600
/** \brief Overloaded version of the above function for convenience when restoring from xml */
594601
void setDrawingStyle( const QString & theDrawingStyleQString );
595602

‎src/core/raster/qgsrasterrendererregistry.cpp

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,16 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
154154
{
155155
int grayBand = 1;
156156
renderer = new QgsSingleBandGrayRenderer( provider, grayBand );
157+
157158
QgsContrastEnhancement* ce = new QgsContrastEnhancement(( QgsContrastEnhancement::QgsRasterDataType )(
158159
provider->dataType( grayBand ) ) );
159160

161+
// Default contrast enhancement is set from QgsRasterLayer, it has already setContrastEnhancementAlgorithm(). Default enhancement must only be set if default style was not loaded (to avoid stats calculation).
162+
// TODO: reconsider moving contrast setting of enhancement somwhere down from QgsRasterLayer
163+
#if 0
160164
QSettings s;
161165
QgsContrastEnhancement::ContrastEnhancementAlgorithm ceAlgorithm;
162-
ceAlgorithm = ( QgsContrastEnhancement::ContrastEnhancementAlgorithm )QgsRasterRendererRegistry::contrastEnhancementFromString(
166+
ceAlgorithm = QgsContrastEnhancement::contrastEnhancementAlgorithmFromString(
163167
s.value( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" ).toString() );
164168
ce->setContrastEnhancementAlgorithm( ceAlgorithm );
165169

@@ -171,6 +175,7 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
171175
ce->setMinimumValue( minValue );
172176
ce->setMaximumValue( maxValue );
173177
}
178+
#endif
174179
(( QgsSingleBandGrayRenderer* )renderer )->setContrastEnhancement( ce );
175180
break;
176181
}
@@ -179,6 +184,7 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
179184
int bandNo = 1;
180185
double minValue = 0;
181186
double maxValue = 0;
187+
// TODO: avoid calculating statistics if not necessary (default style loaded)
182188
minMaxValuesForBand( bandNo, provider, minValue, maxValue );
183189
QgsRasterShader* shader = new QgsRasterShader( minValue, maxValue );
184190
renderer = new QgsSingleBandPseudoColorRenderer( provider, bandNo, shader );
@@ -187,13 +193,15 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
187193
case QgsRasterLayer::MultiBandColor:
188194
{
189195
QSettings s;
196+
#if 0
190197
QgsContrastEnhancement::ContrastEnhancementAlgorithm ceAlgorithm;
191-
ceAlgorithm = ( QgsContrastEnhancement::ContrastEnhancementAlgorithm )QgsRasterRendererRegistry::contrastEnhancementFromString(
198+
ceAlgorithm = QgsContrastEnhancement::contrastEnhancementAlgorithmFromString(
192199
s.value( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" ).toString() );
193200

194201
QgsContrastEnhancement* redEnhancement = 0;
195202
QgsContrastEnhancement* greenEnhancement = 0;
196203
QgsContrastEnhancement* blueEnhancement = 0;
204+
#endif
197205

198206
int redBand = s.value( "/Raster/defaultRedBand", 1 ).toInt();
199207
if ( redBand < 0 || redBand > provider->bandCount() )
@@ -211,6 +219,7 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
211219
blueBand = -1;
212220
}
213221

222+
#if 0
214223
double minValue = 0;
215224
double maxValue = 0;
216225
if ( ceAlgorithm != QgsContrastEnhancement::NoEnhancement )
@@ -248,6 +257,8 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( co
248257

249258
renderer = new QgsMultiBandColorRenderer( provider, redBand, greenBand, blueBand,
250259
redEnhancement, greenEnhancement, blueEnhancement );
260+
#endif
261+
renderer = new QgsMultiBandColorRenderer( provider, redBand, greenBand, blueBand );
251262
break;
252263
}
253264
case QgsRasterLayer::SingleBandColorDataStyle:
@@ -341,25 +352,3 @@ bool QgsRasterRendererRegistry::minMaxValuesForBand( int band, QgsRasterDataProv
341352
}
342353
return true;
343354
}
344-
345-
int QgsRasterRendererRegistry::contrastEnhancementFromString( const QString& contrastEnhancementString )
346-
{
347-
if ( contrastEnhancementString == "StretchToMinimumMaximum" )
348-
{
349-
return ( int )QgsContrastEnhancement::StretchToMinimumMaximum;
350-
}
351-
else if ( contrastEnhancementString == "StretchAndClipToMinimumMaximum" )
352-
{
353-
return ( int )QgsContrastEnhancement::StretchAndClipToMinimumMaximum;
354-
}
355-
else if ( contrastEnhancementString == "ClipToMinimumMaximum" )
356-
{
357-
return ( int )QgsContrastEnhancement::ClipToMinimumMaximum;
358-
}
359-
else
360-
{
361-
return ( int )QgsContrastEnhancement::NoEnhancement;
362-
}
363-
}
364-
365-

‎src/core/raster/qgsrasterrendererregistry.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class CORE_EXPORT QgsRasterRendererRegistry
6969

7070
//read min/max values from
7171
bool minMaxValuesForBand( int band, QgsRasterDataProvider* provider, double& minValue, double& maxValue ) const;
72-
static int contrastEnhancementFromString( const QString& contrastEnhancementString );
7372
};
7473

7574
#endif // QGSRASTERRENDERERREGISTRY_H

‎src/ui/qgsoptionsbase.ui

Lines changed: 276 additions & 164 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.