Skip to content

Commit 7f20833

Browse files
endmaxendmax
committedOct 2, 2012
- QgsSymbolLayerV2 descendants missing from sip.
 QgsSymbolLayerV2 class has been modified to convert into SubClass as needed - A test is provided for check subclasses binding and behaviour - A fix has been done for src\core\symbology-ng\qgsellipsesymbollayerv2.cpp because of an error in createFromSld about fillColor Signed-off-by: endmax <massimo.endrighi@geopartner.it>
·
ltr-3_40Before-merge-new_vector_api
1 parent 58e423a commit 7f20833

17 files changed

+1000
-13
lines changed
 

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

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,52 @@ class QgsSymbolLayerV2
88
switch (sipCpp->type())
99
{
1010
case QgsSymbolV2::Marker:
11-
if( sipCpp->layerType() == "VectorField" )
12-
{
13-
sipClass = sipClass_QgsVectorFieldSymbolLayer;
14-
}
15-
else
16-
{
11+
if (dynamic_cast<QgsEllipseSymbolLayerV2*>(sipCpp) != NULL)
12+
sipClass = sipClass_QgsEllipseSymbolLayerV2;
13+
else if (dynamic_cast<QgsFontMarkerSymbolLayerV2*>(sipCpp) != NULL)
14+
sipClass = sipClass_QgsFontMarkerSymbolLayerV2;
15+
else if (dynamic_cast<QgsSimpleMarkerSymbolLayerV2*>(sipCpp) != NULL)
16+
sipClass = sipClass_QgsSimpleMarkerSymbolLayerV2;
17+
else if (dynamic_cast<QgsSvgMarkerSymbolLayerV2*>(sipCpp) != NULL)
18+
sipClass = sipClass_QgsSvgMarkerSymbolLayerV2;
19+
else if (dynamic_cast<QgsVectorFieldSymbolLayer*>(sipCpp) != NULL)
20+
sipClass = sipClass_QgsVectorFieldSymbolLayer;
21+
else
1722
sipClass = sipClass_QgsMarkerSymbolLayerV2;
18-
}
1923
break;
20-
case QgsSymbolV2::Line: sipClass = sipClass_QgsLineSymbolLayerV2; break;
21-
case QgsSymbolV2::Fill: sipClass = sipClass_QgsFillSymbolLayerV2; break;
22-
default: sipClass = 0; break;
24+
25+
case QgsSymbolV2::Line:
26+
if (dynamic_cast<QgsLineDecorationSymbolLayerV2*>(sipCpp) != NULL)
27+
sipClass = sipClass_QgsLineDecorationSymbolLayerV2;
28+
else if (dynamic_cast<QgsMarkerLineSymbolLayerV2*>(sipCpp) != NULL)
29+
sipClass = sipClass_QgsMarkerLineSymbolLayerV2;
30+
else if (dynamic_cast<QgsSimpleLineSymbolLayerV2*>(sipCpp) != NULL)
31+
sipClass = sipClass_QgsSimpleLineSymbolLayerV2;
32+
else
33+
sipClass = sipClass_QgsLineSymbolLayerV2;
34+
break;
35+
36+
case QgsSymbolV2::Fill:
37+
if (dynamic_cast<QgsSimpleFillSymbolLayerV2*>(sipCpp) != NULL)
38+
sipClass = sipClass_QgsSimpleFillSymbolLayerV2;
39+
else if (dynamic_cast<QgsImageFillSymbolLayer*>(sipCpp) != NULL)
40+
if (dynamic_cast<QgsLinePatternFillSymbolLayer*>(sipCpp) != NULL)
41+
sipClass = sipClass_QgsLinePatternFillSymbolLayer;
42+
else if (dynamic_cast<QgsPointPatternFillSymbolLayer*>(sipCpp) != NULL)
43+
sipClass = sipClass_QgsPointPatternFillSymbolLayer;
44+
else if (dynamic_cast<QgsSVGFillSymbolLayer*>(sipCpp) != NULL)
45+
sipClass = sipClass_QgsSVGFillSymbolLayer;
46+
else
47+
sipClass = sipClass_QgsImageFillSymbolLayer;
48+
else if (dynamic_cast<QgsCentroidFillSymbolLayerV2*>(sipCpp) != NULL)
49+
sipClass = sipClass_QgsCentroidFillSymbolLayerV2;
50+
else
51+
sipClass = sipClass_QgsFillSymbolLayerV2;
52+
break;
53+
54+
default:
55+
sipClass = 0;
56+
break;
2357
}
2458
%End
2559

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element )
274274
return NULL;
275275

276276
QString name = "circle";
277-
QColor color, borderColor;
277+
QColor fillColor, borderColor;
278278
double borderWidth, size;
279279
double widthHeightFactor = 1.0;
280280

@@ -290,7 +290,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element )
290290
}
291291
}
292292

293-
if ( !QgsSymbolLayerV2Utils::wellKnownMarkerFromSld( graphicElem, name, color, borderColor, borderWidth, size ) )
293+
if ( !QgsSymbolLayerV2Utils::wellKnownMarkerFromSld( graphicElem, name, fillColor, borderColor, borderWidth, size ) )
294294
return NULL;
295295

296296
double angle = 0.0;
@@ -305,7 +305,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element )
305305

306306
QgsEllipseSymbolLayerV2 *m = new QgsEllipseSymbolLayerV2();
307307
m->setSymbolName( name );
308-
m->setColor( color );
308+
m->setFillColor( fillColor );
309309
m->setOutlineColor( borderColor );
310310
m->setOutlineWidth( borderWidth );
311311
m->setSymbolWidth( size );

‎tests/src/python/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ ADD_PYTHON_TEST(PyQgsComposerHtml test_qgscomposerhtml.py)
1313
ADD_PYTHON_TEST(PyQgsComposition test_qgscomposition.py)
1414
ADD_PYTHON_TEST(PyQgsAnalysis test_qgsanalysis.py)
1515
#ADD_PYTHON_TEST(PyQgsComposerMap test_qgscomposermap.py)
16+
ADD_PYTHON_TEST(PyQgsSymbolLayerV2 test_qgssymbollayerv2.py)

‎tests/src/python/test_qgssymbollayerv2.py

Lines changed: 562 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/testdata/symbol_layer/QgsCentroidFillSymbolLayerV2.sld

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>PAR022</se:Name>
5+
<UserStyle>
6+
<se:Name>PAR022</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:Mark>
13+
<se:WellKnownName>regular_star</se:WellKnownName>
14+
<se:Fill>
15+
<se:SvgParameter name="fill">#55aaff</se:SvgParameter>
16+
</se:Fill>
17+
<se:Stroke>
18+
<se:SvgParameter name="stroke">#00ff00</se:SvgParameter>
19+
</se:Stroke>
20+
</se:Mark>
21+
<se:Size>2</se:Size>
22+
</se:Graphic>
23+
</se:PointSymbolizer>
24+
</se:Rule>
25+
</se:FeatureTypeStyle>
26+
</UserStyle>
27+
</NamedLayer>
28+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsEllipseSymbolLayerV2.sld

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cs000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cs000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:Mark>
13+
<se:WellKnownName>circle</se:WellKnownName>
14+
<se:Fill>
15+
<se:SvgParameter name="fill">#ffff7f</se:SvgParameter>
16+
</se:Fill>
17+
<se:Stroke>
18+
<se:SvgParameter name="stroke">#aaaaff</se:SvgParameter>
19+
<se:SvgParameter name="stroke-width">1</se:SvgParameter>
20+
</se:Stroke>
21+
</se:Mark>
22+
<se:Size>7</se:Size>
23+
<VendorOption name="widthHeightFactor">1.4</VendorOption>
24+
</se:Graphic>
25+
</se:PointSymbolizer>
26+
</se:Rule>
27+
</se:FeatureTypeStyle>
28+
</UserStyle>
29+
</NamedLayer>
30+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsFontMarkerSymbolLayerV2.sld

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cs000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cs000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:Mark>
13+
<OnlineResource xlink:type="simple" xlink:href="ttf://Arial"/>
14+
<Format>ttf</Format>
15+
<se:MarkIndex>77</se:MarkIndex>
16+
<se:Fill>
17+
<se:SvgParameter name="fill">#000000</se:SvgParameter>
18+
</se:Fill>
19+
</se:Mark>
20+
<se:Size>6.23</se:Size>
21+
<se:Rotation>
22+
<ogc:Literal>3</ogc:Literal>
23+
</se:Rotation>
24+
</se:Graphic>
25+
</se:PointSymbolizer>
26+
</se:Rule>
27+
</se:FeatureTypeStyle>
28+
</UserStyle>
29+
</NamedLayer>
30+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsLineDecorationSymbolLayerV2.sld

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cl000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cl000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:LineSymbolizer>
11+
<se:Stroke>
12+
<se:GraphicStroke>
13+
<se:Graphic>
14+
<se:Mark>
15+
<se:WellKnownName>arrowhead</se:WellKnownName>
16+
<se:Stroke>
17+
<se:SvgParameter name="stroke">#aaaa7f</se:SvgParameter>
18+
<se:SvgParameter name="stroke-width">2.26</se:SvgParameter>
19+
</se:Stroke>
20+
</se:Mark>
21+
<se:Size>18.08</se:Size>
22+
</se:Graphic>
23+
</se:GraphicStroke>
24+
</se:Stroke>
25+
<VendorOption name="placement">lastPoint</VendorOption>
26+
</se:LineSymbolizer>
27+
</se:Rule>
28+
</se:FeatureTypeStyle>
29+
</UserStyle>
30+
</NamedLayer>
31+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsLinePatternFillSymbolLayer.sld

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>PAR022</se:Name>
5+
<UserStyle>
6+
<se:Name>PAR022</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PolygonSymbolizer>
11+
<se:Fill>
12+
<se:GraphicFill>
13+
<se:Graphic>
14+
<se:Mark>
15+
<se:WellKnownName>horline</se:WellKnownName>
16+
<se:Stroke>
17+
<se:SvgParameter name="stroke">#ff55ff</se:SvgParameter>
18+
<se:SvgParameter name="stroke-width">1.5</se:SvgParameter>
19+
</se:Stroke>
20+
</se:Mark>
21+
<se:Size>4</se:Size>
22+
<se:Rotation>
23+
<ogc:Literal>57</ogc:Literal>
24+
</se:Rotation>
25+
</se:Graphic>
26+
</se:GraphicFill>
27+
</se:Fill>
28+
</se:PolygonSymbolizer>
29+
</se:Rule>
30+
</se:FeatureTypeStyle>
31+
</UserStyle>
32+
</NamedLayer>
33+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsMarkerLineSymbolLayerV2.sld

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cl000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cl000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:LineSymbolizer>
11+
<VendorOption name="placement">centralPoint</VendorOption>
12+
<se:Stroke>
13+
<se:GraphicStroke>
14+
<se:Graphic>
15+
<se:Mark>
16+
<se:WellKnownName>circle</se:WellKnownName>
17+
<se:Fill>
18+
<se:SvgParameter name="fill">#ff0000</se:SvgParameter>
19+
</se:Fill>
20+
<se:Stroke>
21+
<se:SvgParameter name="stroke">#000000</se:SvgParameter>
22+
</se:Stroke>
23+
</se:Mark>
24+
<se:Size>2</se:Size>
25+
</se:Graphic>
26+
</se:GraphicStroke>
27+
</se:Stroke>
28+
</se:LineSymbolizer>
29+
</se:Rule>
30+
</se:FeatureTypeStyle>
31+
</UserStyle>
32+
</NamedLayer>
33+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsPointPatternFillSymbolLayer.sld

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>PolygonLayer</se:Name>
5+
<UserStyle>
6+
<se:Name>PolygonLayer</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PolygonSymbolizer>
11+
<se:Fill>
12+
<se:GraphicFill>
13+
<se:Graphic>
14+
<se:Mark>
15+
<se:WellKnownName>triangle</se:WellKnownName>
16+
<se:Fill>
17+
<se:SvgParameter name="fill">#ffaa00</se:SvgParameter>
18+
</se:Fill>
19+
<se:Stroke>
20+
<se:SvgParameter name="stroke">#ff007f</se:SvgParameter>
21+
</se:Stroke>
22+
</se:Mark>
23+
<se:Size>3</se:Size>
24+
<se:Rotation>
25+
<ogc:Literal>5</ogc:Literal>
26+
</se:Rotation>
27+
</se:Graphic>
28+
</se:GraphicFill>
29+
</se:Fill>
30+
<VendorOption name="distance">15,15</VendorOption>
31+
</se:PolygonSymbolizer>
32+
</se:Rule>
33+
</se:FeatureTypeStyle>
34+
</UserStyle>
35+
</NamedLayer>
36+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsSVGFillSymbolLayer.sld

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>PolygonLayer</se:Name>
5+
<UserStyle>
6+
<se:Name>PolygonLayer</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PolygonSymbolizer>
11+
<se:Fill>
12+
<se:GraphicFill>
13+
<se:Graphic>
14+
<se:ExternalGraphic>
15+
<OnlineResource xlink:type="simple" xlink:href="C:/Program Files/qgis1.8.0/./svg/accommodation/accommodation_camping.svg"/>
16+
<Format>image/svg+xml</Format>
17+
</se:ExternalGraphic>
18+
<se:Size>6</se:Size>
19+
<se:SvgParameter name="stroke">#000000</se:SvgParameter>
20+
<se:SvgParameter name="stroke-width">3</se:SvgParameter>
21+
<se:Rotation>
22+
<ogc:Literal>4</ogc:Literal>
23+
</se:Rotation>
24+
</se:Graphic>
25+
</se:GraphicFill>
26+
</se:Fill>
27+
</se:PolygonSymbolizer>
28+
<se:LineSymbolizer>
29+
<se:Stroke>
30+
<se:SvgParameter name="stroke">#000000</se:SvgParameter>
31+
<se:SvgParameter name="stroke-width">0.26</se:SvgParameter>
32+
<se:SvgParameter name="stroke-linejoin">bevel</se:SvgParameter>
33+
<se:SvgParameter name="stroke-linecap">square</se:SvgParameter>
34+
<se:SvgParameter name="stroke-dasharray">5 2</se:SvgParameter>
35+
</se:Stroke>
36+
</se:LineSymbolizer>
37+
</se:Rule>
38+
</se:FeatureTypeStyle>
39+
</UserStyle>
40+
</NamedLayer>
41+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsSimpleFillSymbolLayerV2.sld

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cp000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cp000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PolygonSymbolizer>
11+
<se:Fill>
12+
<se:SvgParameter name="fill">#aa55ff</se:SvgParameter>
13+
</se:Fill>
14+
<se:Stroke>
15+
<se:SvgParameter name="stroke">#ffaa7f</se:SvgParameter>
16+
<se:SvgParameter name="stroke-width">0.26</se:SvgParameter>
17+
<se:SvgParameter name="stroke-dasharray">1 2</se:SvgParameter>
18+
</se:Stroke>
19+
</se:PolygonSymbolizer>
20+
</se:Rule>
21+
</se:FeatureTypeStyle>
22+
</UserStyle>
23+
</NamedLayer>
24+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsSimpleLineSymbolLayerV2.sld

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cl000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cl000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:LineSymbolizer>
11+
<se:Stroke>
12+
<se:SvgParameter name="stroke">#aa007f</se:SvgParameter>
13+
<se:SvgParameter name="stroke-width">1.26</se:SvgParameter>
14+
<se:SvgParameter name="stroke-linejoin">mitre</se:SvgParameter>
15+
<se:SvgParameter name="stroke-linecap">round</se:SvgParameter>
16+
<se:SvgParameter name="stroke-dasharray">5 2</se:SvgParameter>
17+
</se:Stroke>
18+
</se:LineSymbolizer>
19+
</se:Rule>
20+
</se:FeatureTypeStyle>
21+
</UserStyle>
22+
</NamedLayer>
23+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsSimpleMarkerSymbolLayerV2.sld

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cs000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cs000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:Mark>
13+
<se:WellKnownName>pentagon</se:WellKnownName>
14+
<se:Fill>
15+
<se:SvgParameter name="fill">#68a0f4</se:SvgParameter>
16+
</se:Fill>
17+
<se:Stroke>
18+
<se:SvgParameter name="stroke">#5500ff</se:SvgParameter>
19+
</se:Stroke>
20+
</se:Mark>
21+
<se:Size>6</se:Size>
22+
<se:Rotation>
23+
<ogc:Literal>10</ogc:Literal>
24+
</se:Rotation>
25+
</se:Graphic>
26+
</se:PointSymbolizer>
27+
</se:Rule>
28+
</se:FeatureTypeStyle>
29+
</UserStyle>
30+
</NamedLayer>
31+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayerV2.sld

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cs000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cs000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:ExternalGraphic>
13+
<OnlineResource xlink:type="simple" xlink:href="C:/Program Files/qgis1.8.0/svg/gpsicons/skull.svg"/>
14+
<Format>image/svg+xml</Format>
15+
</se:ExternalGraphic>
16+
<se:Size>12</se:Size>
17+
<se:Rotation>
18+
<ogc:Literal>45</ogc:Literal>
19+
</se:Rotation>
20+
</se:Graphic>
21+
</se:PointSymbolizer>
22+
</se:Rule>
23+
</se:FeatureTypeStyle>
24+
</UserStyle>
25+
</NamedLayer>
26+
</StyledLayerDescriptor>

‎tests/testdata/symbol_layer/QgsVectorFieldSymbolLayer.sld

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>022cs000</se:Name>
5+
<UserStyle>
6+
<se:Name>022cs000</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<!--VectorField not implemented yet...-->
11+
<se:LineSymbolizer>
12+
<se:Stroke>
13+
<se:SvgParameter name="stroke">#000000</se:SvgParameter>
14+
<se:SvgParameter name="stroke-width">0.26</se:SvgParameter>
15+
<se:SvgParameter name="stroke-linejoin">bevel</se:SvgParameter>
16+
<se:SvgParameter name="stroke-linecap">square</se:SvgParameter>
17+
<se:SvgParameter name="stroke-dasharray">5 2</se:SvgParameter>
18+
</se:Stroke>
19+
</se:LineSymbolizer>
20+
</se:Rule>
21+
</se:FeatureTypeStyle>
22+
</UserStyle>
23+
</NamedLayer>
24+
</StyledLayerDescriptor>

0 commit comments

Comments
 (0)
Please sign in to comment.