Skip to content

Commit d49524c

Browse files
luipirluipir
committedFeb 12, 2019
AStyle
·
final-3_4_15final-3_4_5
1 parent b4faa0d commit d49524c

14 files changed

+252
-252
lines changed
 

‎python/core/auto_generated/raster/qgscontrastenhancement.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ By default it will be generated.
128128

129129
void toSld( QDomDocument &doc, QDomElement &element ) const;
130130
%Docstring
131-
! Write ContrastEnhancement tags following SLD v1.0 specs
131+
Write ContrastEnhancement tags following SLD v1.0 specs
132132
SLD1.0 is limited to the parameters listed in:
133133
https://docs.geoserver.org/stable/en/user/styling/sld/reference/rastersymbolizer.html#contrastenhancement
134134
Btw only <Normalize> + vendor options are supported because there is no clear mapping

‎python/core/auto_generated/raster/qgsrasterrenderer.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Sets origin of min/max values
115115

116116
virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
117117
%Docstring
118-
! Used from subclasses to create SLD Rule elements following SLD v1.0 specs
118+
Used from subclasses to create SLD Rule elements following SLD v1.0 specs
119119

120120
.. versionadded:: 3.6
121121
%End

‎src/core/qgsmaplayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
14001400

14011401
const QgsVectorLayer *vlayer = qobject_cast<const QgsVectorLayer *>( this );
14021402
QgsRasterLayer *rlayer = qobject_cast<QgsRasterLayer *>( this );
1403-
if (!vlayer && !rlayer)
1403+
if ( !vlayer && !rlayer )
14041404
{
14051405
errorMsg = tr( "Could not save symbology because:\n%1" )
14061406
.arg( QStringLiteral( "Non vector or raster layers are supported yet" ) );
@@ -1447,7 +1447,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
14471447
props[ QStringLiteral( "scaleMaxDenom" ) ] = QString::number( mMaxScale );
14481448
}
14491449

1450-
if (vlayer)
1450+
if ( vlayer )
14511451
{
14521452
if ( !vlayer->writeSld( layerNode, myDocument, errorMsg, props ) )
14531453
{
@@ -1456,7 +1456,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
14561456
}
14571457
}
14581458

1459-
if (rlayer)
1459+
if ( rlayer )
14601460
{
14611461
if ( !rlayer->writeSld( layerNode, myDocument, errorMsg, props ) )
14621462
{

‎src/core/raster/qgscontrastenhancement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void QgsContrastEnhancement::toSld( QDomDocument &doc, QDomElement &element ) co
383383
return;
384384

385385
QString algName;
386-
switch( contrastEnhancementAlgorithm() )
386+
switch ( contrastEnhancementAlgorithm() )
387387
{
388388
case StretchToMinimumMaximum:
389389
algName = QStringLiteral( "StretchToMinimumMaximum" );

‎src/core/raster/qgscontrastenhancement.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ class CORE_EXPORT QgsContrastEnhancement
159159

160160
void readXml( const QDomElement &elem );
161161

162-
/*! Write ContrastEnhancement tags following SLD v1.0 specs
162+
/**
163+
* Write ContrastEnhancement tags following SLD v1.0 specs
163164
* SLD1.0 is limited to the parameters listed in:
164165
* https://docs.geoserver.org/stable/en/user/styling/sld/reference/rastersymbolizer.html#contrastenhancement
165166
* Btw only <Normalize> + vendor options are supported because there is no clear mapping

‎src/core/raster/qgshillshaderenderer.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -584,29 +584,29 @@ void QgsHillshadeRenderer::toSld( QDomDocument &doc, QDomElement &element, const
584584

585585
// look for RasterSymbolizer tag
586586
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
587-
if ( elements.size() == 0)
587+
if ( elements.size() == 0 )
588588
return;
589589

590590
// there SHOULD be only one
591-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
591+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
592592

593593
// add Channel Selection tags (if band is not default 1)
594594
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
595595
// after opacity or geometry or as first element after sld:RasterSymbolizer
596-
if ( band() != 1)
596+
if ( band() != 1 )
597597
{
598598
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
599599
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
600600
if ( elements.size() != 0 )
601601
{
602-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
602+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
603603
}
604604
else
605605
{
606606
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
607607
if ( elements.size() != 0 )
608608
{
609-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
609+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
610610
}
611611
else
612612
{

‎src/core/raster/qgsmultibandcolorrenderer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
479479
return;
480480

481481
// there SHOULD be only one
482-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
482+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
483483

484484
// add Channel Selection tags
485485
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
@@ -488,14 +488,14 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
488488
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
489489
if ( elements.size() != 0 )
490490
{
491-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
491+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
492492
}
493493
else
494494
{
495495
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
496496
if ( elements.size() != 0 )
497497
{
498-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
498+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
499499
}
500500
else
501501
{
@@ -507,16 +507,16 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
507507
QStringList tags;
508508
tags << QStringLiteral( "sld:RedChannel" ) << QStringLiteral( "sld:GreenChannel" ) << QStringLiteral( "sld:BlueChannel" );
509509

510-
QList<QgsContrastEnhancement*> contrastEnhancements;
510+
QList<QgsContrastEnhancement *> contrastEnhancements;
511511
contrastEnhancements.append( mRedContrastEnhancement );
512512
contrastEnhancements.append( mGreenContrastEnhancement );
513513
contrastEnhancements.append( mBlueContrastEnhancement );
514514

515515
QList<int> bands = usesBands();
516516
QList<int>::const_iterator bandIt = bands.constBegin();
517-
for ( int tagCounter = 0 ; bandIt != bands.constEnd(); ++bandIt, ++tagCounter)
517+
for ( int tagCounter = 0 ; bandIt != bands.constEnd(); ++bandIt, ++tagCounter )
518518
{
519-
if ( *bandIt < 0)
519+
if ( *bandIt < 0 )
520520
continue;
521521

522522
QDomElement channelElem = doc.createElement( tags[ tagCounter ] );

‎src/core/raster/qgspalettedrasterrenderer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ void QgsPalettedRasterRenderer::toSld( QDomDocument &doc, QDomElement &element,
252252

253253
// look for RasterSymbolizer tag
254254
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
255-
if ( elements.size() == 0)
255+
if ( elements.size() == 0 )
256256
return;
257257

258258
// there SHOULD be only one
259-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
259+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
260260

261261
// add Channel Selection tags
262262
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
@@ -282,7 +282,7 @@ void QgsPalettedRasterRenderer::toSld( QDomDocument &doc, QDomElement &element,
282282
// e.g. <ColorMapEntry color="#EEBE2F" quantity="-300" label="label" opacity="0"/>
283283
QList<QgsPalettedRasterRenderer::Class> classes = this->classes();
284284
QList<QgsPalettedRasterRenderer::Class>::const_iterator classDataIt = classes.constBegin();
285-
for (; classDataIt != classes.constEnd(); ++classDataIt )
285+
for ( ; classDataIt != classes.constEnd(); ++classDataIt )
286286
{
287287
QDomElement colorMapEntryElem = doc.createElement( QStringLiteral( "sld:ColorMapEntry" ) );
288288
colorMapElem.appendChild( colorMapEntryElem );

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,15 +1284,15 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
12841284
if ( hasScaleBasedVisibility() )
12851285
{
12861286
// note that denominator is the inverted value of scale
1287-
if ( maximumScale() != 0.0)
1287+
if ( maximumScale() != 0.0 )
12881288
{
12891289
QDomElement minScaleElem = doc.createElement( QStringLiteral( "sld:MinScaleDenominator" ) );
12901290
minScaleElem.appendChild( doc.createTextNode( QString::number( maximumScale() ) ) );
12911291
typeStyleRuleElem.appendChild( minScaleElem );
12921292
}
12931293

12941294
QDomElement maxScaleElem = doc.createElement( QStringLiteral( "sld:MaxScaleDenominator" ) );
1295-
maxScaleElem.appendChild( doc.createTextNode( QString::number( minimumScale() ) ) );
1295+
maxScaleElem.appendChild( doc.createTextNode( QString::number( minimumScale() ) ) );
12961296
typeStyleRuleElem.appendChild( maxScaleElem );
12971297
}
12981298

@@ -1306,10 +1306,10 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13061306
if ( elements.size() != 0 )
13071307
{
13081308
// there SHOULD be only one
1309-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
1309+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
13101310

13111311
// lamda helper used below to reduce code redundancy
1312-
auto vendorOptionWriter = [&](QString name, QString value)
1312+
auto vendorOptionWriter = [&]( QString name, QString value )
13131313
{
13141314
QDomElement vendorOptionElem = doc.createElement( QStringLiteral( "sld:VendorOption" ) );
13151315
vendorOptionElem.setAttribute( QStringLiteral( "name" ), name );
@@ -1321,19 +1321,19 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13211321
if ( hueSaturationFilter()->grayscaleMode() != QgsHueSaturationFilter::GrayscaleOff )
13221322
{
13231323
QString property;
1324-
switch( hueSaturationFilter()->grayscaleMode() )
1324+
switch ( hueSaturationFilter()->grayscaleMode() )
13251325
{
1326-
case (QgsHueSaturationFilter::GrayscaleLightness):
1327-
property = QStringLiteral( "lightness" );
1328-
break;
1329-
case (QgsHueSaturationFilter::GrayscaleLuminosity):
1330-
property = QStringLiteral( "luminosity" );
1331-
break;
1332-
case (QgsHueSaturationFilter::GrayscaleAverage):
1333-
property = QStringLiteral( "average" );
1334-
break;
1335-
default:
1336-
break;
1326+
case ( QgsHueSaturationFilter::GrayscaleLightness ):
1327+
property = QStringLiteral( "lightness" );
1328+
break;
1329+
case ( QgsHueSaturationFilter::GrayscaleLuminosity ):
1330+
property = QStringLiteral( "luminosity" );
1331+
break;
1332+
case ( QgsHueSaturationFilter::GrayscaleAverage ):
1333+
property = QStringLiteral( "average" );
1334+
break;
1335+
default:
1336+
break;
13371337
}
13381338
if ( !property.isEmpty() )
13391339
vendorOptionWriter( QStringLiteral( "grayScale" ), property );
@@ -1357,7 +1357,7 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13571357
{
13581358
// normlize value [-100:100] -> [0:1]
13591359
int s = hueSaturationFilter()->saturation();
1360-
double sF = ( s - (-100.0) ) / (100.0 - (-100.0) );
1360+
double sF = ( s - ( -100.0 ) ) / ( 100.0 - ( -100.0 ) );
13611361
vendorOptionWriter( QStringLiteral( "saturation" ), QString::number( sF ) );
13621362
}
13631363
}
@@ -1367,7 +1367,7 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13671367
{
13681368
// normalize value [-255:255] -> [0:1]
13691369
int b = brightnessFilter()->brightness();
1370-
double bF = ( b - (-255.0) ) / (255.0 - (-255.0) );
1370+
double bF = ( b - ( -255.0 ) ) / ( 255.0 - ( -255.0 ) );
13711371
vendorOptionWriter( QStringLiteral( "brightness" ), QString::number( bF ) );
13721372
}
13731373

@@ -1376,8 +1376,8 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13761376
{
13771377
// normlize value [-100:100] -> [0:1]
13781378
int c = brightnessFilter()->contrast();
1379-
double cF = ( c - (-100.0) ) / (100.0 - (-100.0) );
1380-
vendorOptionWriter( QStringLiteral( "contrast" ), QString::number(cF ) );
1379+
double cF = ( c - ( -100.0 ) ) / ( 100.0 - ( -100.0 ) );
1380+
vendorOptionWriter( QStringLiteral( "contrast" ), QString::number( cF ) );
13811381
}
13821382

13831383
// TODO: check if the below mapping formula make sense to map QGIS contrast with SLD gamma value

‎src/core/raster/qgsrasterrenderer.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
113113
//! Sets origin of min/max values
114114
void setMinMaxOrigin( const QgsRasterMinMaxOrigin &origin ) { mMinMaxOrigin = origin; }
115115

116-
/*! Used from subclasses to create SLD Rule elements following SLD v1.0 specs
116+
/**
117+
* Used from subclasses to create SLD Rule elements following SLD v1.0 specs
117118
* \since QGIS 3.6 */
118119
virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
119120

‎src/core/raster/qgssinglebandgrayrenderer.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
226226

227227
// look for RasterSymbolizer tag
228228
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
229-
if ( elements.size() == 0)
229+
if ( elements.size() == 0 )
230230
return;
231231

232232
// there SHOULD be only one
233-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
233+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
234234

235235
// add Channel Selection tags
236236
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
@@ -239,14 +239,14 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
239239
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
240240
if ( elements.size() != 0 )
241241
{
242-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
242+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
243243
}
244244
else
245245
{
246246
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
247247
if ( elements.size() != 0 )
248248
{
249-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
249+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
250250
}
251251
else
252252
{
@@ -287,12 +287,12 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
287287
QDomNodeList elements = contrastEnhancementElem.elementsByTagName( QStringLiteral( "sld:VendorOption" ) );
288288
for ( int i = 0; i < elements.size(); ++i )
289289
{
290-
QDomElement vendorOption = elements.at(i).toElement();
291-
if ( vendorOption.attribute( QStringLiteral( "name" ) ) != QStringLiteral( "minValue" ))
290+
QDomElement vendorOption = elements.at( i ).toElement();
291+
if ( vendorOption.attribute( QStringLiteral( "name" ) ) != QStringLiteral( "minValue" ) )
292292
continue;
293293

294294
// remove old value and add the new one
295-
vendorOption.removeChild(vendorOption.firstChild());
295+
vendorOption.removeChild( vendorOption.firstChild() );
296296
vendorOption.appendChild( doc.createTextNode( QString::number( myRasterBandStats.minimumValue ) ) );
297297
}
298298
}
@@ -323,27 +323,27 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
323323
// each ContrastEnhancementAlgorithm need a specfic management.
324324
// set type of ColorMap ramp [ramp, intervals, values]
325325
// basing on interpolation algorithm of the raster shader
326-
QList< QPair< QString, QColor > > colorMapping(classes);
326+
QList< QPair< QString, QColor > > colorMapping( classes );
327327
switch ( contrastEnhancement()->contrastEnhancementAlgorithm() )
328328
{
329329
case ( QgsContrastEnhancement::StretchAndClipToMinimumMaximum ):
330330
case ( QgsContrastEnhancement::ClipToMinimumMaximum ):
331331
{
332332
QString lowValue = classes[0].first;
333333
QColor lowColor = classes[0].second;
334-
lowColor.setAlpha(0);
334+
lowColor.setAlpha( 0 );
335335
QString highValue = classes[1].first;
336336
QColor highColor = classes[1].second;
337-
highColor.setAlpha(0);
337+
highColor.setAlpha( 0 );
338338

339-
colorMapping.prepend( QPair< QString, QColor >( lowValue, lowColor));
340-
colorMapping.append( QPair< QString, QColor >( highValue, highColor));
339+
colorMapping.prepend( QPair< QString, QColor >( lowValue, lowColor ) );
340+
colorMapping.append( QPair< QString, QColor >( highValue, highColor ) );
341341
break;
342342
}
343343
case ( QgsContrastEnhancement::NoEnhancement ):
344344
break;
345345
case ( QgsContrastEnhancement::StretchToMinimumMaximum ):
346-
// use default
346+
// use default
347347
default:
348348
{
349349
colorMapping[0].first = QStringLiteral( "0" );
@@ -354,7 +354,7 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
354354

355355
// create tags
356356
QList< QPair< QString, QColor > >::ConstIterator it;
357-
for ( it = colorMapping.begin(); it != colorMapping.constEnd() ; ++it)
357+
for ( it = colorMapping.begin(); it != colorMapping.constEnd() ; ++it )
358358
{
359359
// set low level color mapping
360360
QDomElement lowColorMapEntryElem = doc.createElement( QStringLiteral( "sld:ColorMapEntry" ) );

‎src/core/raster/qgssinglebandpseudocolorrenderer.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,11 @@ void QgsSingleBandPseudoColorRenderer::toSld( QDomDocument &doc, QDomElement &el
336336

337337
// look for RasterSymbolizer tag
338338
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
339-
if ( elements.size() == 0)
339+
if ( elements.size() == 0 )
340340
return;
341341

342342
// there SHOULD be only one
343-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
343+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
344344

345345
// add Channel Selection tags
346346
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
@@ -366,18 +366,18 @@ void QgsSingleBandPseudoColorRenderer::toSld( QDomDocument &doc, QDomElement &el
366366
{
367367
switch ( rampShader->colorRampType() )
368368
{
369-
case ( QgsColorRampShader::Exact ):
370-
rampType = QStringLiteral( "values" );
371-
break;
372-
case ( QgsColorRampShader::Discrete ):
373-
rampType = QStringLiteral( "intervals" );
374-
break;
375-
case ( QgsColorRampShader::Interpolated ):
369+
case ( QgsColorRampShader::Exact ):
370+
rampType = QStringLiteral( "values" );
371+
break;
372+
case ( QgsColorRampShader::Discrete ):
373+
rampType = QStringLiteral( "intervals" );
374+
break;
375+
case ( QgsColorRampShader::Interpolated ):
376376
// managed by default
377-
default:
378-
// TODO: what to do in case of new QgsColorRampShader types?
379-
rampType = QStringLiteral( "ramp" );
380-
break;
377+
default:
378+
// TODO: what to do in case of new QgsColorRampShader types?
379+
rampType = QStringLiteral( "ramp" );
380+
break;
381381
}
382382
}
383383

@@ -390,7 +390,7 @@ void QgsSingleBandPseudoColorRenderer::toSld( QDomDocument &doc, QDomElement &el
390390
// e.g. <ColorMapEntry color="#EEBE2F" quantity="-300" label="label" opacity="0"/>
391391
QList<QgsColorRampShader::ColorRampItem> classes = rampShader->colorRampItemList();
392392
QList<QgsColorRampShader::ColorRampItem>::const_iterator classDataIt = classes.constBegin();
393-
for (; classDataIt != classes.constEnd(); ++classDataIt )
393+
for ( ; classDataIt != classes.constEnd(); ++classDataIt )
394394
{
395395
QDomElement colorMapEntryElem = doc.createElement( QStringLiteral( "sld:ColorMapEntry" ) );
396396
colorMapElem.appendChild( colorMapEntryElem );

‎tests/src/python/test_qgsrasterlayer.py

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -706,141 +706,141 @@ def testWriteSld(self):
706706
assert myRasterLayer.isValid(), myMessage
707707

708708
# do generic export with default layer values
709-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
709+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
710710
elements = root.elementsByTagName('sld:LayerFeatureConstraints')
711-
self.assertEqual( len(elements), 1)
711+
self.assertEqual(len(elements), 1)
712712
element = elements.at(0).toElement()
713713

714714
elements = element.elementsByTagName('sld:FeatureTypeConstraint')
715-
self.assertEqual( len(elements), 1)
715+
self.assertEqual(len(elements), 1)
716716
element = elements.at(0).toElement()
717717

718718
elements = root.elementsByTagName('sld:UserStyle')
719-
self.assertEqual( len(elements), 1)
719+
self.assertEqual(len(elements), 1)
720720
element = elements.at(0).toElement()
721721

722722
name = element.firstChildElement('sld:Name')
723-
self.assertFalse( name.isNull() )
724-
self.assertEqual( name.text(), 'landsat')
723+
self.assertFalse(name.isNull())
724+
self.assertEqual(name.text(), 'landsat')
725725

726726
abstract = element.firstChildElement('sld:Abstract')
727-
self.assertTrue( abstract.isNull() )
727+
self.assertTrue(abstract.isNull())
728728

729729
title = element.firstChildElement('sld:Title')
730-
self.assertTrue( title.isNull() )
730+
self.assertTrue(title.isNull())
731731

732732
featureTypeStyle = element.firstChildElement('sld:FeatureTypeStyle')
733-
self.assertFalse( featureTypeStyle.isNull() )
733+
self.assertFalse(featureTypeStyle.isNull())
734734

735735
rule = featureTypeStyle.firstChildElement('sld:Rule')
736-
self.assertFalse( rule.isNull() )
736+
self.assertFalse(rule.isNull())
737737

738738
temp = rule.firstChildElement('sld:MinScaleDenominator')
739-
self.assertTrue( temp.isNull() )
739+
self.assertTrue(temp.isNull())
740740

741741
temp = rule.firstChildElement('sld:MaxScaleDenominator')
742-
self.assertTrue( temp.isNull() )
742+
self.assertTrue(temp.isNull())
743743

744744
rasterSymbolizer = rule.firstChildElement('sld:RasterSymbolizer')
745-
self.assertFalse( rule.isNull() )
745+
self.assertFalse(rule.isNull())
746746

747747
vendorOptions = rasterSymbolizer.elementsByTagName('sld:VendorOption')
748-
self.assertTrue( vendorOptions.size() == 0 )
748+
self.assertTrue(vendorOptions.size() == 0)
749749

750750
# set no defalt values and check exported sld
751751
myRasterLayer.setName('')
752752
myRasterLayer.setAbstract('fake')
753753
myRasterLayer.setTitle('fake')
754-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
754+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
755755
elements = root.elementsByTagName('sld:LayerFeatureConstraints')
756-
self.assertEqual( len(elements), 1)
756+
self.assertEqual(len(elements), 1)
757757
element = elements.at(0).toElement()
758758

759759
elements = element.elementsByTagName('sld:FeatureTypeConstraint')
760-
self.assertEqual( len(elements), 1)
760+
self.assertEqual(len(elements), 1)
761761
element = elements.at(0).toElement()
762762

763763
elements = root.elementsByTagName('sld:UserStyle')
764-
self.assertEqual( len(elements), 1)
764+
self.assertEqual(len(elements), 1)
765765
element = elements.at(0).toElement()
766766

767767
# no generated if empty
768768
name = element.firstChildElement('sld:Name')
769-
self.assertTrue( name.isNull() )
769+
self.assertTrue(name.isNull())
770770

771771
# generated if not empty
772772
abstract = element.firstChildElement('sld:Abstract')
773-
self.assertFalse( abstract.isNull() )
774-
self.assertEqual( abstract.text(), 'fake')
773+
self.assertFalse(abstract.isNull())
774+
self.assertEqual(abstract.text(), 'fake')
775775

776776
title = element.firstChildElement('sld:Title')
777-
self.assertFalse( title.isNull() )
778-
self.assertEqual( title.text(), 'fake')
777+
self.assertFalse(title.isNull())
778+
self.assertEqual(title.text(), 'fake')
779779

780780
# if setScaleBasedVisibility is true print scales
781781
myRasterLayer.setScaleBasedVisibility(True)
782782
myRasterLayer.setMaximumScale(0.0001)
783783
myRasterLayer.setMinimumScale(0.01)
784-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
784+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
785785
elements = dom.elementsByTagName('sld:Rule')
786-
self.assertEqual( len(elements), 1)
786+
self.assertEqual(len(elements), 1)
787787
rule = elements.at(0).toElement()
788-
self.assertFalse( rule.isNull() )
788+
self.assertFalse(rule.isNull())
789789

790790
temp = rule.firstChildElement('sld:MinScaleDenominator')
791-
self.assertFalse( temp.isNull() )
792-
self.assertEqual( temp.text(), '0.0001')
791+
self.assertFalse(temp.isNull())
792+
self.assertEqual(temp.text(), '0.0001')
793793

794794
temp = rule.firstChildElement('sld:MaxScaleDenominator')
795-
self.assertFalse( temp.isNull() )
796-
self.assertEqual( temp.text(), '0.01')
795+
self.assertFalse(temp.isNull())
796+
self.assertEqual(temp.text(), '0.01')
797797

798798
# check non default hueSaturationFilter values
799799
hue = myRasterLayer.hueSaturationFilter()
800800
hue.setGrayscaleMode(QgsHueSaturationFilter.GrayscaleLightness)
801-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
801+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
802802
elements = dom.elementsByTagName('sld:RasterSymbolizer')
803-
self.assertEqual( len(elements), 1)
803+
self.assertEqual(len(elements), 1)
804804
element = elements.at(0).toElement()
805-
self.assertFalse( element.isNull() )
805+
self.assertFalse(element.isNull())
806806
self.assertVendorOption(element, 'grayScale', 'lightness')
807807

808808
hue = myRasterLayer.hueSaturationFilter()
809809
hue.setGrayscaleMode(QgsHueSaturationFilter.GrayscaleLuminosity)
810-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
810+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
811811
elements = dom.elementsByTagName('sld:RasterSymbolizer')
812-
self.assertEqual( len(elements), 1)
812+
self.assertEqual(len(elements), 1)
813813
element = elements.at(0).toElement()
814-
self.assertFalse( element.isNull() )
814+
self.assertFalse(element.isNull())
815815
self.assertVendorOption(element, 'grayScale', 'luminosity')
816816

817817
hue = myRasterLayer.hueSaturationFilter()
818818
hue.setGrayscaleMode(QgsHueSaturationFilter.GrayscaleAverage)
819-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
819+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
820820
elements = dom.elementsByTagName('sld:RasterSymbolizer')
821-
self.assertEqual( len(elements), 1)
821+
self.assertEqual(len(elements), 1)
822822
element = elements.at(0).toElement()
823-
self.assertFalse( element.isNull() )
823+
self.assertFalse(element.isNull())
824824
self.assertVendorOption(element, 'grayScale', 'average')
825825

826826
hue = myRasterLayer.hueSaturationFilter()
827827
hue.setGrayscaleMode(QgsHueSaturationFilter.GrayscaleOff)
828-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
828+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
829829
elements = dom.elementsByTagName('sld:RasterSymbolizer')
830-
self.assertEqual( len(elements), 1)
830+
self.assertEqual(len(elements), 1)
831831
element = elements.at(0).toElement()
832-
self.assertFalse( element.isNull() )
832+
self.assertFalse(element.isNull())
833833
self.assertVendorOption(element, 'grayScale', None)
834834

835835
# manage colorize vendorOption tags
836836
hue = myRasterLayer.hueSaturationFilter()
837837
hue.setColorizeOn(True)
838838
hue.setColorizeStrength(50)
839-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
839+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
840840
elements = dom.elementsByTagName('sld:RasterSymbolizer')
841-
self.assertEqual( len(elements), 1)
841+
self.assertEqual(len(elements), 1)
842842
element = elements.at(0).toElement()
843-
self.assertFalse( element.isNull() )
843+
self.assertFalse(element.isNull())
844844
self.assertVendorOption(element, 'colorizeOn', '1')
845845
self.assertVendorOption(element, 'colorizeRed', '255')
846846
self.assertVendorOption(element, 'colorizeGreen', '128')
@@ -851,12 +851,12 @@ def testWriteSld(self):
851851
# other hue non default values, no colorize and saturation = 0
852852
hue = myRasterLayer.hueSaturationFilter()
853853
hue.setColorizeOn(False)
854-
hue.setSaturation(0)
855-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
854+
hue.setSaturation(0)
855+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
856856
elements = dom.elementsByTagName('sld:RasterSymbolizer')
857-
self.assertEqual( len(elements), 1)
857+
self.assertEqual(len(elements), 1)
858858
element = elements.at(0).toElement()
859-
self.assertFalse( element.isNull() )
859+
self.assertFalse(element.isNull())
860860
self.assertVendorOption(element, 'colorizeOn', None)
861861
self.assertVendorOption(element, 'colorizeRed', None)
862862
self.assertVendorOption(element, 'colorizeGreen', None)
@@ -870,27 +870,27 @@ def testWriteSld(self):
870870
hue = myRasterLayer.hueSaturationFilter()
871871
hue.setColorizeOn(False)
872872
hue.setSaturation(100)
873-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
873+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
874874
elements = dom.elementsByTagName('sld:RasterSymbolizer')
875-
self.assertEqual( len(elements), 1)
875+
self.assertEqual(len(elements), 1)
876876
element = elements.at(0).toElement()
877-
self.assertFalse( element.isNull() )
877+
self.assertFalse(element.isNull())
878878
self.assertVendorOption(element, 'colorizeOn', None)
879879
self.assertVendorOption(element, 'colorizeRed', None)
880880
self.assertVendorOption(element, 'colorizeGreen', None)
881881
self.assertVendorOption(element, 'colorizeBlue', None)
882882
self.assertVendorOption(element, 'colorizeStrength', None)
883883
self.assertVendorOption(element, 'saturation', '1')
884884
hue.setSaturation(-100)
885-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
885+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
886886
self.assertVendorOption(root, 'saturation', '0')
887887

888888
# brightness filter default values
889-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
889+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
890890
elements = dom.elementsByTagName('sld:RasterSymbolizer')
891-
self.assertEqual( len(elements), 1)
891+
self.assertEqual(len(elements), 1)
892892
element = elements.at(0).toElement()
893-
self.assertFalse( element.isNull() )
893+
self.assertFalse(element.isNull())
894894
self.assertTrue(myRasterLayer.brightnessFilter().brightness() == 0)
895895
self.assertTrue(myRasterLayer.brightnessFilter().contrast() == 0)
896896
self.assertVendorOption(element, 'brightness', None)
@@ -900,21 +900,21 @@ def testWriteSld(self):
900900
bf = myRasterLayer.brightnessFilter()
901901
bf.setBrightness(-255)
902902
bf.setContrast(-100)
903-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
903+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
904904
elements = dom.elementsByTagName('sld:RasterSymbolizer')
905-
self.assertEqual( len(elements), 1)
905+
self.assertEqual(len(elements), 1)
906906
element = elements.at(0).toElement()
907-
self.assertFalse( element.isNull() )
907+
self.assertFalse(element.isNull())
908908
self.assertVendorOption(element, 'brightness', '0')
909909
self.assertVendorOption(element, 'contrast', '0')
910910

911911
bf.setBrightness(255)
912912
bf.setContrast(100)
913-
dom, root, errorMessage = self.layerToSld( myRasterLayer )
913+
dom, root, errorMessage = self.layerToSld(myRasterLayer)
914914
elements = dom.elementsByTagName('sld:RasterSymbolizer')
915-
self.assertEqual( len(elements), 1)
915+
self.assertEqual(len(elements), 1)
916916
element = elements.at(0).toElement()
917-
self.assertFalse( element.isNull() )
917+
self.assertFalse(element.isNull())
918918
self.assertVendorOption(element, 'brightness', '1')
919919
self.assertVendorOption(element, 'contrast', '1')
920920

@@ -925,15 +925,14 @@ def assertVendorOption(self, root, name, expectedValue):
925925
for vendorOptionIndex in range(vendorOptions.count()):
926926
vendorOption = vendorOptions.at(vendorOptionIndex)
927927
self.assertEqual('sld:VendorOption', vendorOption.nodeName())
928-
if ( vendorOption.attributes().namedItem('name').nodeValue() == name):
928+
if (vendorOption.attributes().namedItem('name').nodeValue() == name):
929929
found = True
930930
self.assertEqual(vendorOption.firstChild().nodeValue(), expectedValue)
931-
if ( expectedValue is None ) and found:
931+
if (expectedValue is None) and found:
932932
self.fail("found VendorOption: {} where supposed not present".format(name))
933933
if expectedValue and not found:
934934
self.fail("Not found VendorOption: {}".format(name))
935935

936-
937936
def layerToSld(self, layer, properties={}):
938937
dom = QDomDocument()
939938
root = dom.createElement("FakeRoot")
@@ -945,4 +944,4 @@ def layerToSld(self, layer, properties={}):
945944

946945
if __name__ == '__main__':
947946
unittest.main()
948-
rule
947+
rule

‎tests/src/python/test_qgsrasterrerderer_createsld.py

Lines changed: 115 additions & 116 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.