Skip to content

Commit 29fa7b6

Browse files
committedFeb 12, 2019
Fix build, indentation
1 parent 6648a95 commit 29fa7b6

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed
 

‎python/plugins/db_manager/db_plugins/oracle/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ def __init__(self, row, table):
527527
def type2String(self):
528528
if (u"TIMESTAMP" in self.dataType
529529
or self.dataType in [u"DATE", u"SDO_GEOMETRY",
530-
u"BINARY_FLOAT", u"BINARY_DOUBLE"]):
530+
u"BINARY_FLOAT", u"BINARY_DOUBLE"]):
531531
return u"{}".format(self.dataType)
532532
if self.charMaxLen in [None, -1]:
533533
return u"{}".format(self.dataType)

‎python/plugins/processing/gui/AlgorithmDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def finish(self, successful, result, context, feedback):
301301
for out in self.algorithm().outputDefinitions():
302302
if isinstance(out, QgsProcessingOutputHtml) and out.name() in result and result[out.name()]:
303303
resultsList.addResult(icon=self.algorithm().icon(), name=out.description(), timestamp=time.localtime(),
304-
result=result[out.name()])
304+
result=result[out.name()])
305305
if not handleAlgorithmResults(self.algorithm(), context, feedback, not keepOpen, result):
306306
self.resetGui()
307307
return

‎python/plugins/processing/gui/Postprocessing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True, parame
104104
if outValue == l:
105105
outputName = out.name()
106106
break
107-
style = None
107+
style = None
108108
if outputName:
109109
style = RenderingStyles.getStyle(alg.id(), outputName)
110110
if style is None:

‎src/3d/qgs3dutils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgsfeature.h"
2323
#include "qgsabstractgeometry.h"
2424
#include "qgsvectorlayer.h"
25+
#include "qgsexpressioncontextutils.h"
2526

2627
#include "qgs3dmapscene.h"
2728
#include "qgsabstract3dengine.h"

‎src/3d/symbols/qgsmesh3dsymbol_p.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "qgsmultipolygon.h"
2929
#include "qgsmeshlayer.h"
3030
#include "qgstriangularmesh.h"
31+
#include "qgsexpressioncontextutils.h"
3132

3233
static QgsExpressionContext _expressionContext3D()
3334
{

‎src/core/raster/qgsmultibandcolorrenderer.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -475,18 +475,18 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
475475

476476
// look for RasterSymbolizer tag
477477
QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
478-
if ( elements.size() == 0 )
479-
return;
478+
if ( elements.size() == 0 )
479+
return;
480480

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

484-
// add Channel Selection tags
485-
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
486-
// after opacity or geometry or as first element after sld:RasterSymbolizer
487-
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
488-
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
489-
if ( elements.size() != 0 )
484+
// add Channel Selection tags
485+
// Need to insert channelSelection in the correct sequence as in SLD standard e.g.
486+
// after opacity or geometry or as first element after sld:RasterSymbolizer
487+
QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
488+
elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
489+
if ( elements.size() != 0 )
490490
{
491491
rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
492492
}

‎tests/src/python/test_qgsrasterrerderer_createsld.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ def testSingleBandGrayRenderer(self):
423423

424424
def testRasterRenderer(self):
425425
class fakerenderer(QgsRasterRenderer):
426+
426427
def __init__(self, interface):
427428
QgsRasterRenderer.__init__(self, interface, '')
428429

0 commit comments

Comments
 (0)
Please sign in to comment.