From 29fa7b6e7b054607c12e1c4328b5a164c2eb32e8 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 13 Feb 2019 05:52:07 +1000 Subject: [PATCH] Fix build, indentation --- .../db_manager/db_plugins/oracle/plugin.py | 2 +- .../plugins/processing/gui/AlgorithmDialog.py | 2 +- .../plugins/processing/gui/Postprocessing.py | 2 +- src/3d/qgs3dutils.cpp | 1 + src/3d/symbols/qgsmesh3dsymbol_p.cpp | 1 + src/core/raster/qgsmultibandcolorrenderer.cpp | 20 +++++++++---------- .../test_qgsrasterrerderer_createsld.py | 1 + 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py index 878d70f795b..e2b0f978baf 100644 --- a/python/plugins/db_manager/db_plugins/oracle/plugin.py +++ b/python/plugins/db_manager/db_plugins/oracle/plugin.py @@ -527,7 +527,7 @@ class ORTableField(TableField): def type2String(self): if (u"TIMESTAMP" in self.dataType or self.dataType in [u"DATE", u"SDO_GEOMETRY", - u"BINARY_FLOAT", u"BINARY_DOUBLE"]): + u"BINARY_FLOAT", u"BINARY_DOUBLE"]): return u"{}".format(self.dataType) if self.charMaxLen in [None, -1]: return u"{}".format(self.dataType) diff --git a/python/plugins/processing/gui/AlgorithmDialog.py b/python/plugins/processing/gui/AlgorithmDialog.py index 79fd1aa9ce8..23b57053432 100644 --- a/python/plugins/processing/gui/AlgorithmDialog.py +++ b/python/plugins/processing/gui/AlgorithmDialog.py @@ -301,7 +301,7 @@ class AlgorithmDialog(QgsProcessingAlgorithmDialogBase): for out in self.algorithm().outputDefinitions(): if isinstance(out, QgsProcessingOutputHtml) and out.name() in result and result[out.name()]: resultsList.addResult(icon=self.algorithm().icon(), name=out.description(), timestamp=time.localtime(), - result=result[out.name()]) + result=result[out.name()]) if not handleAlgorithmResults(self.algorithm(), context, feedback, not keepOpen, result): self.resetGui() return diff --git a/python/plugins/processing/gui/Postprocessing.py b/python/plugins/processing/gui/Postprocessing.py index 2980db98be8..67cb833fcab 100644 --- a/python/plugins/processing/gui/Postprocessing.py +++ b/python/plugins/processing/gui/Postprocessing.py @@ -104,7 +104,7 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True, parame if outValue == l: outputName = out.name() break - style = None + style = None if outputName: style = RenderingStyles.getStyle(alg.id(), outputName) if style is None: diff --git a/src/3d/qgs3dutils.cpp b/src/3d/qgs3dutils.cpp index ba91401aa96..4b6da1b9e77 100644 --- a/src/3d/qgs3dutils.cpp +++ b/src/3d/qgs3dutils.cpp @@ -22,6 +22,7 @@ #include "qgsfeature.h" #include "qgsabstractgeometry.h" #include "qgsvectorlayer.h" +#include "qgsexpressioncontextutils.h" #include "qgs3dmapscene.h" #include "qgsabstract3dengine.h" diff --git a/src/3d/symbols/qgsmesh3dsymbol_p.cpp b/src/3d/symbols/qgsmesh3dsymbol_p.cpp index 5bfdb41b95a..372a14f8030 100644 --- a/src/3d/symbols/qgsmesh3dsymbol_p.cpp +++ b/src/3d/symbols/qgsmesh3dsymbol_p.cpp @@ -28,6 +28,7 @@ #include "qgsmultipolygon.h" #include "qgsmeshlayer.h" #include "qgstriangularmesh.h" +#include "qgsexpressioncontextutils.h" static QgsExpressionContext _expressionContext3D() { diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp index a9e06156747..5a88ee41148 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.cpp +++ b/src/core/raster/qgsmultibandcolorrenderer.cpp @@ -475,18 +475,18 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element, // look for RasterSymbolizer tag QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) ); - if ( elements.size() == 0 ) - return; + if ( elements.size() == 0 ) + return; - // there SHOULD be only one - QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement(); + // there SHOULD be only one + QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement(); - // add Channel Selection tags - // Need to insert channelSelection in the correct sequence as in SLD standard e.g. - // after opacity or geometry or as first element after sld:RasterSymbolizer - QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) ); - elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) ); - if ( elements.size() != 0 ) + // add Channel Selection tags + // Need to insert channelSelection in the correct sequence as in SLD standard e.g. + // after opacity or geometry or as first element after sld:RasterSymbolizer + QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) ); + elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) ); + if ( elements.size() != 0 ) { rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) ); } diff --git a/tests/src/python/test_qgsrasterrerderer_createsld.py b/tests/src/python/test_qgsrasterrerderer_createsld.py index bbdf0965261..a7075dbcdd6 100644 --- a/tests/src/python/test_qgsrasterrerderer_createsld.py +++ b/tests/src/python/test_qgsrasterrerderer_createsld.py @@ -423,6 +423,7 @@ class TestQgsRasterRendererCreateSld(unittest.TestCase): def testRasterRenderer(self): class fakerenderer(QgsRasterRenderer): + def __init__(self, interface): QgsRasterRenderer.__init__(self, interface, '')