Skip to content

Commit 4aef2db

Browse files
committedOct 1, 2016
Fix cherry-pickings
Do not generate a ogc:Filter where a ogc:Expression is expected. #3366 Emit valid SLD when mm are used as symbol unit #3414 Export map level scale based dependencies in most vector symbology #3436
1 parent 5297df7 commit 4aef2db

11 files changed

+56
-69
lines changed
 

‎python/core/qgsvectorlayer.sip

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -733,14 +733,6 @@ class QgsVectorLayer : QgsMapLayer
733733
*/
734734
bool writeSymbology( QDomNode& node, QDomDocument& doc, QString& errorMessage ) const;
735735

736-
/** Write just the style information for the layer into the document
737-
* @param node the node that will have the style element added to it.
738-
* @param doc the document that will have the QDomNode added.
739-
* @param errorMessage reference to string that will be updated with any error messages
740-
* @return true in case of success.
741-
*/
742-
bool writeStyle( QDomNode& node, QDomDocument& doc, QString& errorMessage ) const;
743-
744736
bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, QgsStringMap& props ) const;
745737
bool readSld( const QDomNode& node, QString& errorMessage );
746738

‎python/core/symbology-ng/qgssymbollayerv2utils.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,19 +417,19 @@ class QgsSymbolLayerV2Utils
417417
* returns the value un-modified
418418
* @note added in 3.0
419419
*/
420-
static double rescaleUom( double size, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props );
420+
static double rescaleUom( double size, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props );
421421

422422
/** Rescales the given point based on the uomScale found in the props, if any is found, otherwise
423423
* returns a copy of the original point
424424
* @note added in 3.0
425425
*/
426-
static QPointF rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) /PyName=rescalePointUom/;
426+
static QPointF rescaleUom( const QPointF& point, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props ) /PyName=rescalePointUom/;
427427

428428
/** Rescales the given array based on the uomScale found in the props, if any is found, otherwise
429429
* returns a copy of the original point
430430
* @note added in 3.0
431431
*/
432-
static QVector<qreal> rescaleUom( const QVector<qreal>& array, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) /PyName=rescaleArrayUom/;
432+
static QVector<qreal> rescaleUom( const QVector<qreal>& array, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props ) /PyName=rescaleArrayUom/;
433433

434434
/**
435435
* Checks if the properties contain scaleMinDenom and scaleMaxDenom, if available, they are added into the SE Rule element

‎src/core/qgsvectorlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ bool QgsVectorLayer::writeSld( QDomNode& node, QDomDocument& doc, QString& error
21242124
QgsStringMap localProps = QgsStringMap( props );
21252125
if ( hasScaleBasedVisibility() )
21262126
{
2127-
QgsSymbolLayerUtils::mergeScaleDependencies( minimumScale(), maximumScale(), localProps );
2127+
QgsSymbolLayerV2Utils::mergeScaleDependencies( minimumScale(), maximumScale(), localProps );
21282128
}
21292129

21302130
if ( hasGeometryType() )

‎src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void QgsRendererCategoryV2::toSld( QDomDocument &doc, QDomElement &element, QgsS
142142
QgsSymbolLayerV2Utils::createFunctionElement( doc, ruleElem, filterFunc );
143143

144144
// add the mix/max scale denoms if we got any from the callers
145-
QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, props );
145+
QgsSymbolLayerV2Utils::applyScaleDependency( doc, ruleElem, props );
146146

147147
mSymbol->toSld( doc, ruleElem, props );
148148
}

‎src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ void QgsSimpleMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElemen
700700

701701
double outlineWidth = QgsSymbolLayerV2Utils::rescaleUom( mOutlineWidth, mOutlineWidthUnit, props );
702702
double size = QgsSymbolLayerV2Utils::rescaleUom( mSize, mSizeUnit, props );
703-
QgsSymbolLayerV2Utils::wellKnownMarkerToSld( doc, graphicElem, encodeShape( mShape ), mColor, mBorderColor, mOutlineStyle, outlineWidth, size );
703+
QgsSymbolLayerV2Utils::wellKnownMarkerToSld( doc, graphicElem, mName, mColor, mBorderColor, mOutlineStyle, outlineWidth, size );
704704

705705
// <Rotation>
706706
QString angleFunc;
@@ -2144,7 +2144,6 @@ void QgsFontMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement
21442144

21452145
QString fontPath = QString( "ttf://%1" ).arg( mFontFamily );
21462146
int markIndex = mChr.unicode();
2147-
QgsSymbolLayerV2Utils::externalMarkerToSld( doc, graphicElem, fontPath, "ttf", &markIndex, mColor, mSize );
21482147
double size = QgsSymbolLayerV2Utils::rescaleUom( mSize, mSizeUnit, props );
21492148
QgsSymbolLayerV2Utils::externalMarkerToSld( doc, graphicElem, fontPath, "ttf", &markIndex, mColor, size );
21502149

‎src/core/symbology-ng/qgsrulebasedrendererv2.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void QgsRuleBasedRendererV2::Rule::toSld( QDomDocument& doc, QDomElement &elemen
334334
props[ "filter" ] += mFilterExp;
335335
}
336336

337-
QgsSymbolLayerUtils::mergeScaleDependencies( mScaleMinDenom, mScaleMaxDenom, props );
337+
QgsSymbolLayerV2Utils::mergeScaleDependencies( mScaleMinDenom, mScaleMaxDenom, props );
338338

339339
if ( mSymbol )
340340
{
@@ -370,7 +370,7 @@ void QgsRuleBasedRendererV2::Rule::toSld( QDomDocument& doc, QDomElement &elemen
370370
QgsSymbolLayerV2Utils::createFunctionElement( doc, ruleElem, props.value( "filter", "" ) );
371371
}
372372

373-
QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, props );
373+
QgsSymbolLayerV2Utils::applyScaleDependency( doc, ruleElem, props );
374374

375375
mSymbol->toSld( doc, ruleElem, props );
376376
}
@@ -927,11 +927,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::clone() const
927927
return r;
928928
}
929929

930-
<<<<<<< HEAD:src/core/symbology-ng/qgsrulebasedrendererv2.cpp
931-
void QgsRuleBasedRendererV2::toSld( QDomDocument& doc, QDomElement &element ) const
932-
=======
933-
void QgsRuleBasedRenderer::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const
934-
>>>>>>> a25b025... Export map level scale based dependencies in most vector symbology:src/core/symbology-ng/qgsrulebasedrenderer.cpp
930+
void QgsRuleBasedRendererV2::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const
935931
{
936932
mRootRule->toSld( doc, element, props );
937933
}

‎src/core/symbology-ng/qgssinglesymbolrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void QgsSingleSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &element,
219219
nameElem.appendChild( doc.createTextNode( "Single symbol" ) );
220220
ruleElem.appendChild( nameElem );
221221

222-
QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, props );
222+
QgsSymbolLayerV2Utils::applyScaleDependency( doc, ruleElem, props );
223223

224224
if ( mSymbol.data() ) mSymbol->toSld( doc, ruleElem, props );
225225
}

‎src/core/symbology-ng/qgssymbollayerv2utils.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4044,11 +4044,11 @@ QList<double> QgsSymbolLayerV2Utils::prettyBreaks( double minimum, double maximu
40444044
return breaks;
40454045
}
40464046

4047-
double QgsSymbolLayerV2Utils::rescaleUom( double size, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props )
4047+
double QgsSymbolLayerV2Utils::rescaleUom( double size, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props )
40484048
{
40494049
double scale = 1;
40504050
bool roundToUnit = false;
4051-
if ( unit == QgsUnitTypes::RenderUnknownUnit )
4051+
if ( unit == QgsSymbolV2::Mixed )
40524052
{
40534053
if ( props.contains( "uomScale" ) )
40544054
{
@@ -4066,10 +4066,10 @@ double QgsSymbolLayerV2Utils::rescaleUom( double size, QgsUnitTypes::RenderUnit
40664066
{
40674067
switch ( unit )
40684068
{
4069-
case QgsUnitTypes::RenderMillimeters:
4069+
case QgsSymbolV2::MM:
40704070
scale = 0.001;
40714071
break;
4072-
case QgsUnitTypes::RenderPixels:
4072+
case QgsSymbolV2::Pixel:
40734073
scale = 0.00028;
40744074
roundToUnit = true;
40754075
break;
@@ -4082,7 +4082,7 @@ double QgsSymbolLayerV2Utils::rescaleUom( double size, QgsUnitTypes::RenderUnit
40824082
// target is pixels
40834083
switch ( unit )
40844084
{
4085-
case QgsUnitTypes::RenderMillimeters:
4085+
case QgsSymbolV2::MM:
40864086
scale = 1 / 0.28;
40874087
roundToUnit = true;
40884088
break;
@@ -4103,14 +4103,14 @@ double QgsSymbolLayerV2Utils::rescaleUom( double size, QgsUnitTypes::RenderUnit
41034103
return rescaled;
41044104
}
41054105

4106-
QPointF QgsSymbolLayerV2Utils::rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props )
4106+
QPointF QgsSymbolLayerV2Utils::rescaleUom( const QPointF& point, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props )
41074107
{
41084108
double x = rescaleUom( point.x(), unit, props );
41094109
double y = rescaleUom( point.y(), unit, props );
41104110
return QPointF( x, y );
41114111
}
41124112

4113-
QVector<qreal> QgsSymbolLayerV2Utils::rescaleUom( const QVector<qreal>& array, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props )
4113+
QVector<qreal> QgsSymbolLayerV2Utils::rescaleUom( const QVector<qreal>& array, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props )
41144114
{
41154115
QVector<qreal> result;
41164116
QVector<qreal>::const_iterator it = array.constBegin();
@@ -4121,7 +4121,7 @@ QVector<qreal> QgsSymbolLayerV2Utils::rescaleUom( const QVector<qreal>& array, Q
41214121
return result;
41224122
}
41234123

4124-
void QgsSymbolLayerUtils::applyScaleDependency( QDomDocument& doc, QDomElement& ruleElem, QgsStringMap& props )
4124+
void QgsSymbolLayerV2Utils::applyScaleDependency( QDomDocument& doc, QDomElement& ruleElem, QgsStringMap& props )
41254125
{
41264126
if ( !props.value( "scaleMinDenom", "" ).isEmpty() )
41274127
{
@@ -4138,7 +4138,7 @@ void QgsSymbolLayerUtils::applyScaleDependency( QDomDocument& doc, QDomElement&
41384138
}
41394139
}
41404140

4141-
void QgsSymbolLayerUtils::mergeScaleDependencies( int mScaleMinDenom, int mScaleMaxDenom, QgsStringMap& props )
4141+
void QgsSymbolLayerV2Utils::mergeScaleDependencies( int mScaleMinDenom, int mScaleMaxDenom, QgsStringMap& props )
41424142
{
41434143
if ( mScaleMinDenom != 0 )
41444144
{

‎src/core/symbology-ng/qgssymbollayerv2utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,19 +476,19 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
476476
* returns the value un-modified
477477
* @note added in 3.0
478478
*/
479-
static double rescaleUom( double size, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props );
479+
static double rescaleUom( double size, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props );
480480

481481
/** Rescales the given point based on the uomScale found in the props, if any is found, otherwise
482482
* returns a copy of the original point
483483
* @note added in 3.0
484484
*/
485-
static QPointF rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props );
485+
static QPointF rescaleUom( const QPointF& point, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props );
486486

487487
/** Rescales the given array based on the uomScale found in the props, if any is found, otherwise
488488
* returns a copy of the original point
489489
* @note added in 3.0
490490
*/
491-
static QVector<qreal> rescaleUom( const QVector<qreal>& array, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props );
491+
static QVector<qreal> rescaleUom( const QVector<qreal>& array, QgsSymbolV2::OutputUnit unit, const QgsStringMap& props );
492492

493493
/**
494494
* Checks if the properties contain scaleMinDenom and scaleMaxDenom, if available, they are added into the SE Rule element

‎tests/src/python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ ADD_PYTHON_TEST(PyQgsOGRProvider test_provider_ogr.py)
6464
ADD_PYTHON_TEST(PyQgsSpatialIndex test_qgsspatialindex.py)
6565
ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_provider_spatialite.py)
6666
ADD_PYTHON_TEST(PyQgsSymbolLayerV2 test_qgssymbollayerv2.py)
67-
ADD_PYTHON_TEST(PyQgsSymbolLayerCreateSld test_qgssymbollayer_createsld.py)
67+
ADD_PYTHON_TEST(PyQgsSymbolLayerV2CreateSld test_qgssymbollayerv2_createsld.py)
6868
ADD_PYTHON_TEST(PyQgsSymbolExpressionVariables test_qgssymbolexpressionvariables.py)
6969
ADD_PYTHON_TEST(PyQgsSyntacticSugar test_syntactic_sugar.py)
7070
ADD_PYTHON_TEST(PyQgsSymbolV2 test_qgssymbolv2.py)

‎tests/src/python/test_qgssymbollayer_createsld.py renamed to ‎tests/src/python/test_qgssymbollayerv2_createsld.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
***************************************************************************
5-
test_qgssymbollayer_createsld.py
5+
test_qgssymbollayerv2_createsld.py
66
---------------------
77
Date : July 2016
88
Copyright : (C) 2016 by Andrea Aime
@@ -33,9 +33,9 @@
3333
from qgis.PyQt.QtGui import QColor
3434

3535
from qgis.core import (
36-
QgsSimpleMarkerSymbolLayer, QgsUnitTypes, QgsSvgMarkerSymbolLayer,
37-
QgsFontMarkerSymbolLayer, QgsEllipseSymbolLayer, QgsSimpleLineSymbolLayer,
38-
QgsMarkerLineSymbolLayer, QgsMarkerSymbol, QgsSimpleFillSymbolLayer, QgsSVGFillSymbolLayer,
36+
QgsSimpleMarkerSymbolLayerV2, QgsSymbolV2, QgsSvgMarkerSymbolLayerV2,
37+
QgsFontMarkerSymbolLayerV2, QgsEllipseSymbolLayerV2, QgsSimpleLineSymbolLayerV2,
38+
QgsMarkerLineSymbolLayerV2, QgsMarkerSymbolV2, QgsSimpleFillSymbolLayerV2, QgsSVGFillSymbolLayer,
3939
QgsLinePatternFillSymbolLayer, QgsPointPatternFillSymbolLayer, QgsVectorLayer)
4040
from qgis.testing import start_app, unittest
4141
from utilities import unitTestDataPath
@@ -45,14 +45,14 @@
4545
start_app()
4646

4747

48-
class TestQgsSymbolLayerCreateSld(unittest.TestCase):
48+
class TestQgsSymbolLayerV2CreateSld(unittest.TestCase):
4949

5050
"""
5151
This class tests the creation of SLD from QGis layers
5252
"""
5353

5454
def testSimpleMarkerRotation(self):
55-
symbol = QgsSimpleMarkerSymbolLayer(
55+
symbol = QgsSimpleMarkerSymbolLayerV2(
5656
'star', QColor(255, 0, 0), QColor(0, 255, 0), 10)
5757
symbol.setAngle(50)
5858
dom, root = self.symbolToSld(symbol)
@@ -87,7 +87,7 @@ def assertFloatEquals(self, expected, actual, tol):
8787
self.assertLess(abs(expected - actual), tol)
8888

8989
def testSimpleMarkerUnitDefault(self):
90-
symbol = QgsSimpleMarkerSymbolLayer(
90+
symbol = QgsSimpleMarkerSymbolLayerV2(
9191
'star', QColor(255, 0, 0), QColor(0, 255, 0), 10)
9292
symbol.setOutlineWidth(3)
9393
symbol.setOffset(QPointF(5, 10))
@@ -110,11 +110,11 @@ def assertStrokeWidth(self, root, svgParameterIdx, expectedWidth):
110110
expectedWidth, strokeWidth.firstChild().nodeValue())
111111

112112
def testSimpleMarkerUnitPixels(self):
113-
symbol = QgsSimpleMarkerSymbolLayer(
113+
symbol = QgsSimpleMarkerSymbolLayerV2(
114114
'star', QColor(255, 0, 0), QColor(0, 255, 0), 10)
115115
symbol.setOutlineWidth(3)
116116
symbol.setOffset(QPointF(5, 10))
117-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
117+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
118118
dom, root = self.symbolToSld(symbol)
119119
# print("Marker unit mm: " + root.ownerDocument().toString())
120120

@@ -126,7 +126,7 @@ def testSimpleMarkerUnitPixels(self):
126126
self.assertStaticDisplacement(root, 5, 10)
127127

128128
def testSvgMarkerUnitDefault(self):
129-
symbol = QgsSvgMarkerSymbolLayer('symbols/star.svg', 10, 90)
129+
symbol = QgsSvgMarkerSymbolLayerV2('symbols/star.svg', 10, 90)
130130
symbol.setOffset(QPointF(5, 10))
131131

132132
dom, root = self.symbolToSld(symbol)
@@ -140,9 +140,9 @@ def testSvgMarkerUnitDefault(self):
140140
self.assertStaticDisplacement(root, 18, 36)
141141

142142
def testSvgMarkerUnitPixels(self):
143-
symbol = QgsSvgMarkerSymbolLayer('symbols/star.svg', 10, 0)
143+
symbol = QgsSvgMarkerSymbolLayerV2('symbols/star.svg', 10, 0)
144144
symbol.setOffset(QPointF(5, 10))
145-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
145+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
146146
dom, root = self.symbolToSld(symbol)
147147
# print("Svg marker unit px: " + dom.toString())
148148

@@ -151,7 +151,7 @@ def testSvgMarkerUnitPixels(self):
151151
self.assertStaticDisplacement(root, 5, 10)
152152

153153
def testFontMarkerUnitDefault(self):
154-
symbol = QgsFontMarkerSymbolLayer('sans', ',', 10, QColor('black'), 45)
154+
symbol = QgsFontMarkerSymbolLayerV2('sans', ',', 10, QColor('black'), 45)
155155
symbol.setOffset(QPointF(5, 10))
156156
dom, root = self.symbolToSld(symbol)
157157
# print "Font marker unit mm: " + dom.toString()
@@ -162,9 +162,9 @@ def testFontMarkerUnitDefault(self):
162162
self.assertStaticDisplacement(root, 18, 36)
163163

164164
def testFontMarkerUnitPixel(self):
165-
symbol = QgsFontMarkerSymbolLayer('sans', ',', 10, QColor('black'), 45)
165+
symbol = QgsFontMarkerSymbolLayerV2('sans', ',', 10, QColor('black'), 45)
166166
symbol.setOffset(QPointF(5, 10))
167-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
167+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
168168
dom, root = self.symbolToSld(symbol)
169169
# print ("Font marker unit mm: " + dom.toString())
170170

@@ -175,7 +175,7 @@ def testFontMarkerUnitPixel(self):
175175

176176
def createEllipseSymbolLayer(self):
177177
# No way to build it programmatically...
178-
mTestName = 'QgsEllipseSymbolLayer'
178+
mTestName = 'QgsEllipseSymbolLayerV2'
179179
mFilePath = QDir.toNativeSeparators(
180180
'%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
181181

@@ -184,14 +184,14 @@ def createEllipseSymbolLayer(self):
184184
mFile.open(QIODevice.ReadOnly)
185185
mDoc.setContent(mFile, True)
186186
mFile.close()
187-
mSymbolLayer = QgsEllipseSymbolLayer.createFromSld(
187+
mSymbolLayer = QgsEllipseSymbolLayerV2.createFromSld(
188188
mDoc.elementsByTagName('PointSymbolizer').item(0).toElement())
189189
return mSymbolLayer
190190

191191
def testEllipseMarkerUnitDefault(self):
192192
symbol = self.createEllipseSymbolLayer()
193193
symbol.setOffset(QPointF(5, 10))
194-
symbol.setOutputUnit(QgsUnitTypes.RenderMillimeters)
194+
symbol.setOutputUnit(QgsSymbolV2.MM)
195195
dom, root = self.symbolToSld(symbol)
196196
# print ("Ellipse marker unit mm: " + dom.toString())
197197

@@ -204,7 +204,7 @@ def testEllipseMarkerUnitDefault(self):
204204
def testEllipseMarkerUnitPixel(self):
205205
symbol = self.createEllipseSymbolLayer()
206206
symbol.setOffset(QPointF(5, 10))
207-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
207+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
208208
dom, root = self.symbolToSld(symbol)
209209
# print ("Ellipse marker unit mm: " + dom.toString())
210210

@@ -215,7 +215,7 @@ def testEllipseMarkerUnitPixel(self):
215215
self.assertStaticDisplacement(root, 5, 10)
216216

217217
def testSimpleLineUnitDefault(self):
218-
symbol = QgsSimpleLineSymbolLayer(QColor("black"), 1)
218+
symbol = QgsSimpleLineSymbolLayerV2(QColor("black"), 1)
219219
symbol.setCustomDashVector([10, 10])
220220
symbol.setUseCustomDashPattern(True)
221221
symbol.setOffset(5)
@@ -228,11 +228,11 @@ def testSimpleLineUnitDefault(self):
228228
self.assertStaticPerpendicularOffset(root, '18')
229229

230230
def testSimpleLineUnitPixel(self):
231-
symbol = QgsSimpleLineSymbolLayer(QColor("black"), 1)
231+
symbol = QgsSimpleLineSymbolLayerV2(QColor("black"), 1)
232232
symbol.setCustomDashVector([10, 10])
233233
symbol.setUseCustomDashPattern(True)
234234
symbol.setOffset(5)
235-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
235+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
236236
dom, root = self.symbolToSld(symbol)
237237

238238
# print ("Simple line px: \n" + dom.toString())
@@ -242,9 +242,9 @@ def testSimpleLineUnitPixel(self):
242242
self.assertStaticPerpendicularOffset(root, '5')
243243

244244
def testMarkLineUnitDefault(self):
245-
symbol = QgsMarkerLineSymbolLayer()
245+
symbol = QgsMarkerLineSymbolLayerV2()
246246
symbol.setSubSymbol(
247-
QgsMarkerSymbol.createSimple({'color': '#ffffff', 'size': '3'}))
247+
QgsMarkerSymbolV2.createSimple({'color': '#ffffff', 'size': '3'}))
248248
symbol.setInterval(5)
249249
symbol.setOffset(5)
250250
dom, root = self.symbolToSld(symbol)
@@ -258,12 +258,12 @@ def testMarkLineUnitDefault(self):
258258
self.assertStaticPerpendicularOffset(root, '18')
259259

260260
def testMarkLineUnitPixels(self):
261-
symbol = QgsMarkerLineSymbolLayer()
261+
symbol = QgsMarkerLineSymbolLayerV2()
262262
symbol.setSubSymbol(
263-
QgsMarkerSymbol.createSimple({'color': '#ffffff', 'size': '3'}))
263+
QgsMarkerSymbolV2.createSimple({'color': '#ffffff', 'size': '3'}))
264264
symbol.setInterval(5)
265265
symbol.setOffset(5)
266-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
266+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
267267
dom, root = self.symbolToSld(symbol)
268268

269269
# print ("Mark line px: \n" + dom.toString())
@@ -275,7 +275,7 @@ def testMarkLineUnitPixels(self):
275275
self.assertStaticPerpendicularOffset(root, '5')
276276

277277
def testSimpleFillDefault(self):
278-
symbol = QgsSimpleFillSymbolLayer(
278+
symbol = QgsSimpleFillSymbolLayerV2(
279279
QColor('red'), Qt.SolidPattern, QColor('green'), Qt.SolidLine, 5)
280280
symbol.setOffset(QPointF(5, 10))
281281

@@ -287,10 +287,10 @@ def testSimpleFillDefault(self):
287287
self.assertStaticDisplacement(root, 18, 36)
288288

289289
def testSimpleFillPixels(self):
290-
symbol = QgsSimpleFillSymbolLayer(
290+
symbol = QgsSimpleFillSymbolLayerV2(
291291
QColor('red'), Qt.SolidPattern, QColor('green'), Qt.SolidLine, 5)
292292
symbol.setOffset(QPointF(5, 10))
293-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
293+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
294294

295295
dom, root = self.symbolToSld(symbol)
296296
# print ( "Simple fill px: \n" + dom.toString())
@@ -315,7 +315,7 @@ def testSvgFillDefault(self):
315315
def testSvgFillPixel(self):
316316
symbol = QgsSVGFillSymbolLayer('test/star.svg', 10, 45)
317317
symbol.setSvgOutlineWidth(3)
318-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
318+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
319319

320320
dom, root = self.symbolToSld(symbol)
321321
# print ("Svg fill px: \n" + dom.toString())
@@ -346,7 +346,7 @@ def testLineFillPixels(self):
346346
symbol.setLineAngle(45)
347347
symbol.setLineWidth(1)
348348
symbol.setOffset(5)
349-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
349+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
350350

351351
dom, root = self.symbolToSld(symbol)
352352
# print ("Line fill px: \n" + dom.toString())
@@ -365,7 +365,7 @@ def testPointFillDefault(self):
365365

366366
def testPointFillpixels(self):
367367
symbol = QgsPointPatternFillSymbolLayer()
368-
symbol.setOutputUnit(QgsUnitTypes.RenderPixels)
368+
symbol.setOutputUnit(QgsSymbolV2.Pixel)
369369
dom, root = self.symbolToSld(symbol)
370370
# print ("Point fill px: \n" + dom.toString())
371371

0 commit comments

Comments
 (0)
Please sign in to comment.