Skip to content

Commit 0e9af79

Browse files
luipirluipir
committed
fixed AStyle with astyle-all.sh
1 parent 82e48f9 commit 0e9af79

15 files changed

+254
-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
@@ -1394,7 +1394,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
13941394

13951395
const QgsVectorLayer *vlayer = qobject_cast<const QgsVectorLayer *>( this );
13961396
QgsRasterLayer *rlayer = qobject_cast<QgsRasterLayer *>( this );
1397-
if (!vlayer && !rlayer)
1397+
if ( !vlayer && !rlayer )
13981398
{
13991399
errorMsg = tr( "Could not save symbology because:\n%1" )
14001400
.arg( QStringLiteral( "Non vector or raster layers are supported yet" ) );
@@ -1441,7 +1441,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
14411441
props[ QStringLiteral( "scaleMaxDenom" ) ] = QString::number( mMaxScale );
14421442
}
14431443

1444-
if (vlayer)
1444+
if ( vlayer )
14451445
{
14461446
if ( !vlayer->writeSld( layerNode, myDocument, errorMsg, props ) )
14471447
{
@@ -1450,7 +1450,7 @@ void QgsMapLayer::exportSldStyle( QDomDocument &doc, QString &errorMsg )
14501450
}
14511451
}
14521452

1453-
if (rlayer)
1453+
if ( rlayer )
14541454
{
14551455
if ( !rlayer->writeSld( layerNode, myDocument, errorMsg, props ) )
14561456
{

‎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
@@ -552,29 +552,29 @@ void QgsHillshadeRenderer::toSld( QDomDocument &doc, QDomElement &element, const
552552

553553
// look for RasterSymbolizer tag
554554
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
555-
if ( elements.size() == 0)
555+
if ( elements.size() == 0 )
556556
return;
557557

558558
// there SHOULD be only one
559-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
559+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
560560

561561
// add Channel Selection tags (if band is not default 1)
562562
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
563563
// after opacity or geometry or as first element after sld:RasterSymbolizer
564-
if ( band() != 1)
564+
if ( band() != 1 )
565565
{
566566
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
567567
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
568568
if ( elements.size() != 0 )
569569
{
570-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
570+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
571571
}
572572
else
573573
{
574574
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
575575
if ( elements.size() != 0 )
576576
{
577-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
577+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
578578
}
579579
else
580580
{

‎src/core/raster/qgsmultibandcolorrenderer.cpp

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

478478
// there SHOULD be only one
479-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
479+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
480480

481481
// add Channel Selection tags
482482
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
@@ -485,14 +485,14 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
485485
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
486486
if ( elements.size() != 0 )
487487
{
488-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
488+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
489489
}
490490
else
491491
{
492492
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
493493
if ( elements.size() != 0 )
494494
{
495-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
495+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
496496
}
497497
else
498498
{
@@ -504,16 +504,16 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
504504
QStringList tags;
505505
tags << QStringLiteral( "sld:RedChannel" ) << QStringLiteral( "sld:GreenChannel" ) << QStringLiteral( "sld:BlueChannel" );
506506

507-
QList<QgsContrastEnhancement*> contrastEnhancements;
507+
QList<QgsContrastEnhancement *> contrastEnhancements;
508508
contrastEnhancements.append( mRedContrastEnhancement );
509509
contrastEnhancements.append( mGreenContrastEnhancement );
510510
contrastEnhancements.append( mBlueContrastEnhancement );
511511

512512
QList<int> bands = usesBands();
513513
QList<int>::const_iterator bandIt = bands.constBegin();
514-
for ( int tagCounter = 0 ; bandIt != bands.constEnd(); ++bandIt, ++tagCounter)
514+
for ( int tagCounter = 0 ; bandIt != bands.constEnd(); ++bandIt, ++tagCounter )
515515
{
516-
if ( *bandIt < 0)
516+
if ( *bandIt < 0 )
517517
continue;
518518

519519
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
@@ -254,11 +254,11 @@ void QgsPalettedRasterRenderer::toSld( QDomDocument &doc, QDomElement &element,
254254

255255
// look for RasterSymbolizer tag
256256
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
257-
if ( elements.size() == 0)
257+
if ( elements.size() == 0 )
258258
return;
259259

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

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

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,15 +1348,15 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13481348
if ( hasScaleBasedVisibility() )
13491349
{
13501350
// note that denominator is the inverted value of scale
1351-
if ( maximumScale() != 0.0)
1351+
if ( maximumScale() != 0.0 )
13521352
{
13531353
QDomElement minScaleElem = doc.createElement( QStringLiteral( "sld:MinScaleDenominator" ) );
13541354
minScaleElem.appendChild( doc.createTextNode( QString::number( maximumScale() ) ) );
13551355
typeStyleRuleElem.appendChild( minScaleElem );
13561356
}
13571357

13581358
QDomElement maxScaleElem = doc.createElement( QStringLiteral( "sld:MaxScaleDenominator" ) );
1359-
maxScaleElem.appendChild( doc.createTextNode( QString::number( minimumScale() ) ) );
1359+
maxScaleElem.appendChild( doc.createTextNode( QString::number( minimumScale() ) ) );
13601360
typeStyleRuleElem.appendChild( maxScaleElem );
13611361
}
13621362

@@ -1370,10 +1370,10 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13701370
if ( elements.size() != 0 )
13711371
{
13721372
// there SHOULD be only one
1373-
QDomElement rasterSymbolizerElem = elements.at(0).toElement();
1373+
QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
13741374

13751375
// lamda helper used below to reduce code redundancy
1376-
auto vendorOptionWriter = [&](QString name, QString value)
1376+
auto vendorOptionWriter = [&]( QString name, QString value )
13771377
{
13781378
QDomElement vendorOptionElem = doc.createElement( QStringLiteral( "sld:VendorOption" ) );
13791379
vendorOptionElem.setAttribute( QStringLiteral( "name" ), name );
@@ -1385,19 +1385,19 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
13851385
if ( hueSaturationFilter()->grayscaleMode() != QgsHueSaturationFilter::GrayscaleOff )
13861386
{
13871387
QString property;
1388-
switch( hueSaturationFilter()->grayscaleMode() )
1388+
switch ( hueSaturationFilter()->grayscaleMode() )
13891389
{
1390-
case (QgsHueSaturationFilter::GrayscaleLightness):
1391-
property = QStringLiteral( "lightness" );
1392-
break;
1393-
case (QgsHueSaturationFilter::GrayscaleLuminosity):
1394-
property = QStringLiteral( "luminosity" );
1395-
break;
1396-
case (QgsHueSaturationFilter::GrayscaleAverage):
1397-
property = QStringLiteral( "average" );
1398-
break;
1399-
default:
1400-
break;
1390+
case ( QgsHueSaturationFilter::GrayscaleLightness ):
1391+
property = QStringLiteral( "lightness" );
1392+
break;
1393+
case ( QgsHueSaturationFilter::GrayscaleLuminosity ):
1394+
property = QStringLiteral( "luminosity" );
1395+
break;
1396+
case ( QgsHueSaturationFilter::GrayscaleAverage ):
1397+
property = QStringLiteral( "average" );
1398+
break;
1399+
default:
1400+
break;
14011401
}
14021402
if ( !property.isEmpty() )
14031403
vendorOptionWriter( QStringLiteral( "grayScale" ), property );
@@ -1421,7 +1421,7 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
14211421
{
14221422
// normlize value [-100:100] -> [0:1]
14231423
int s = hueSaturationFilter()->saturation();
1424-
double sF = ( s - (-100.0) ) / (100.0 - (-100.0) );
1424+
double sF = ( s - ( -100.0 ) ) / ( 100.0 - ( -100.0 ) );
14251425
vendorOptionWriter( QStringLiteral( "saturation" ), QString::number( sF ) );
14261426
}
14271427
}
@@ -1431,7 +1431,7 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
14311431
{
14321432
// normalize value [-255:255] -> [0:1]
14331433
int b = brightnessFilter()->brightness();
1434-
double bF = ( b - (-255.0) ) / (255.0 - (-255.0) );
1434+
double bF = ( b - ( -255.0 ) ) / ( 255.0 - ( -255.0 ) );
14351435
vendorOptionWriter( QStringLiteral( "brightness" ), QString::number( bF ) );
14361436
}
14371437

@@ -1440,8 +1440,8 @@ bool QgsRasterLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
14401440
{
14411441
// normlize value [-100:100] -> [0:1]
14421442
int c = brightnessFilter()->contrast();
1443-
double cF = ( c - (-100.0) ) / (100.0 - (-100.0) );
1444-
vendorOptionWriter( QStringLiteral( "contrast" ), QString::number(cF ) );
1443+
double cF = ( c - ( -100.0 ) ) / ( 100.0 - ( -100.0 ) );
1444+
vendorOptionWriter( QStringLiteral( "contrast" ), QString::number( cF ) );
14451445
}
14461446

14471447
// 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
@@ -228,11 +228,11 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
228228

229229
// look for RasterSymbolizer tag
230230
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
231-
if ( elements.size() == 0)
231+
if ( elements.size() == 0 )
232232
return;
233233

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

237237
// add Channel Selection tags
238238
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
@@ -241,14 +241,14 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
241241
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
242242
if ( elements.size() != 0 )
243243
{
244-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
244+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
245245
}
246246
else
247247
{
248248
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Geometry" ) );
249249
if ( elements.size() != 0 )
250250
{
251-
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at(0) );
251+
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
252252
}
253253
else
254254
{
@@ -289,12 +289,12 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
289289
QDomNodeList elements = contrastEnhancementElem.elementsByTagName( QStringLiteral( "sld:VendorOption" ) );
290290
for ( int i = 0; i < elements.size(); ++i )
291291
{
292-
QDomElement vendorOption = elements.at(i).toElement();
293-
if ( vendorOption.attribute( QStringLiteral( "name" ) ) != QStringLiteral( "minValue" ))
292+
QDomElement vendorOption = elements.at( i ).toElement();
293+
if ( vendorOption.attribute( QStringLiteral( "name" ) ) != QStringLiteral( "minValue" ) )
294294
continue;
295295

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

341-
colorMapping.prepend( QPair< QString, QColor >( lowValue, lowColor));
342-
colorMapping.append( QPair< QString, QColor >( highValue, highColor));
341+
colorMapping.prepend( QPair< QString, QColor >( lowValue, lowColor ) );
342+
colorMapping.append( QPair< QString, QColor >( highValue, highColor ) );
343343
break;
344344
}
345345
case ( QgsContrastEnhancement::NoEnhancement ):
346346
break;
347347
case ( QgsContrastEnhancement::StretchToMinimumMaximum ):
348-
// use default
348+
// use default
349349
default:
350350
{
351351
colorMapping[0].first = QStringLiteral( "0" );
@@ -356,7 +356,7 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element,
356356

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

0 commit comments

Comments
 (0)