Skip to content

Commit 8ddf119

Browse files
committed
Fix style classes which lost their attribute association for some reason
1 parent f6d9b6d commit 8ddf119

File tree

3 files changed

+233
-236
lines changed

3 files changed

+233
-236
lines changed

tests/testdata/lines.qml

Lines changed: 71 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,73 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
3-
<id>lines20080110101725388</id>
4-
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
5-
<layername>lines</layername>
6-
<srs>
7-
<spatialrefsys>
8-
<proj4>+proj=longlat +ellps=WGS84 +no_defs</proj4>
9-
<srsid>1449</srsid>
10-
<srid>4031</srid>
11-
<epsg>4031</epsg>
12-
<description>Unknown datum based upon the GEM 10C ellipsoid</description>
13-
<projectionacronym>longlat</projectionacronym>
14-
<ellipsoidacronym>WGS84</ellipsoidacronym>
15-
<geographicflag>true</geographicflag>
16-
</spatialrefsys>
17-
</srs>
18-
<transparencyLevelInt>255</transparencyLevelInt>
19-
<provider>ogr</provider>
20-
<encoding>System</encoding>
21-
<classificationattribute>Name</classificationattribute>
22-
<displayfield>Name</displayfield>
23-
<label>0</label>
24-
<attributeactions/>
25-
<uniquevalue>
26-
<classificationfield>0</classificationfield>
27-
<symbol>
28-
<lowervalue>Arterial</lowervalue>
29-
<uppervalue></uppervalue>
30-
<label></label>
31-
<pointsymbol>hard:circle</pointsymbol>
32-
<pointsize>11</pointsize>
33-
<rotationclassificationfield>-1</rotationclassificationfield>
34-
<scaleclassificationfield>-1</scaleclassificationfield>
35-
<outlinecolor red="154" blue="116" green="139" />
36-
<outlinestyle>DashDotDotLine</outlinestyle>
37-
<outlinewidth>5</outlinewidth>
38-
<fillcolor red="0" blue="0" green="0" />
39-
<fillpattern>NoBrush</fillpattern>
40-
<texturepath></texturepath>
41-
</symbol>
42-
<symbol>
43-
<lowervalue>Highway</lowervalue>
44-
<uppervalue></uppervalue>
45-
<label></label>
46-
<pointsymbol>hard:circle</pointsymbol>
47-
<pointsize>11</pointsize>
48-
<rotationclassificationfield>-1</rotationclassificationfield>
49-
<scaleclassificationfield>-1</scaleclassificationfield>
50-
<outlinecolor red="94" blue="55" green="89" />
51-
<outlinestyle>SolidLine</outlinestyle>
52-
<outlinewidth>7</outlinewidth>
53-
<fillcolor red="0" blue="0" green="0" />
54-
<fillpattern>NoBrush</fillpattern>
55-
<texturepath></texturepath>
56-
</symbol>
57-
</uniquevalue>
58-
<labelattributes>
59-
<label field="" text="Label" />
60-
<family field="" name="Lucida Grande" />
61-
<size field="" units="pt" value="12" />
62-
<bold field="" on="0" />
63-
<italic field="" on="0" />
64-
<underline field="" on="0" />
65-
<color field="" red="0" blue="0" green="0" />
66-
<x field="" />
67-
<y field="" />
68-
<offset x="0" y="0" yfield="-1" xfield="-1" units="pt" />
69-
<angle field="" value="0" />
70-
<alignment field="-1" value="center" />
71-
<buffercolor field="" red="255" blue="255" green="255" />
72-
<buffersize field="" units="pt" value="1" />
73-
<bufferenabled field="" on="" />
74-
</labelattributes>
2+
<qgis version="1.9.90-Alpha" minimumScale="1" maximumScale="1e+08" minLabelScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0">
3+
<transparencyLevelInt>255</transparencyLevelInt>
4+
<classificationattribute>Name</classificationattribute>
5+
<uniquevalue>
6+
<classificationfield>Name</classificationfield>
7+
<symbol>
8+
<lowervalue>Arterial</lowervalue>
9+
<uppervalue></uppervalue>
10+
<label></label>
11+
<pointsymbol>hard:circle</pointsymbol>
12+
<pointsize>11</pointsize>
13+
<pointsizeunits>pixels</pointsizeunits>
14+
<rotationclassificationfieldname></rotationclassificationfieldname>
15+
<scaleclassificationfieldname></scaleclassificationfieldname>
16+
<symbolfieldname></symbolfieldname>
17+
<outlinecolor red="154" blue="116" green="139"/>
18+
<outlinestyle>DashDotDotLine</outlinestyle>
19+
<outlinewidth>5</outlinewidth>
20+
<fillcolor red="0" blue="0" green="0"/>
21+
<fillpattern>NoBrush</fillpattern>
22+
<texturepath></texturepath>
23+
</symbol>
24+
<symbol>
25+
<lowervalue>Highway</lowervalue>
26+
<uppervalue></uppervalue>
27+
<label></label>
28+
<pointsymbol>hard:circle</pointsymbol>
29+
<pointsize>11</pointsize>
30+
<pointsizeunits>pixels</pointsizeunits>
31+
<rotationclassificationfieldname></rotationclassificationfieldname>
32+
<scaleclassificationfieldname></scaleclassificationfieldname>
33+
<symbolfieldname></symbolfieldname>
34+
<outlinecolor red="94" blue="55" green="89"/>
35+
<outlinestyle>SolidLine</outlinestyle>
36+
<outlinewidth>7</outlinewidth>
37+
<fillcolor red="0" blue="0" green="0"/>
38+
<fillpattern>NoBrush</fillpattern>
39+
<texturepath></texturepath>
40+
</symbol>
41+
</uniquevalue>
42+
<customproperties/>
43+
<displayfield>Name</displayfield>
44+
<label>0</label>
45+
<labelattributes>
46+
<label fieldname="" text="Label"/>
47+
<family fieldname="" name="Lucida Grande"/>
48+
<size fieldname="" units="pt" value="12"/>
49+
<bold fieldname="" on="0"/>
50+
<italic fieldname="" on="0"/>
51+
<underline fieldname="" on="0"/>
52+
<strikeout fieldname="" on="0"/>
53+
<color fieldname="" red="0" blue="0" green="0"/>
54+
<x fieldname=""/>
55+
<y fieldname=""/>
56+
<offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
57+
<angle fieldname="" value="0" auto="0"/>
58+
<alignment fieldname="" value="center"/>
59+
<buffercolor fieldname="" red="255" blue="255" green="255"/>
60+
<buffersize fieldname="" units="pt" value="1"/>
61+
<bufferenabled fieldname="" on=""/>
62+
<multilineenabled fieldname="" on=""/>
63+
<selectedonly on=""/>
64+
</labelattributes>
65+
<edittypes>
66+
<edittype type="0" name="Name"/>
67+
<edittype type="0" name="Value"/>
68+
</edittypes>
69+
<editform></editform>
70+
<editforminit></editforminit>
71+
<annotationform></annotationform>
72+
<attributeactions/>
7573
</qgis>

tests/testdata/points.qml

Lines changed: 91 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,93 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
3-
<id>points20080109122431720</id>
4-
<datasource>/home/timlinux/dev/cpp/qgis/tests/testdata/points.shp</datasource>
5-
<layername>Points</layername>
6-
<srs>
7-
<spatialrefsys>
8-
<proj4>+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs</proj4>
9-
<srsid>2585</srsid>
10-
<srid>4326</srid>
11-
<epsg>4326</epsg>
12-
<description>WGS 84</description>
13-
<projectionacronym>longlat</projectionacronym>
14-
<ellipsoidacronym>WGS84</ellipsoidacronym>
15-
<geographicflag>true</geographicflag>
16-
</spatialrefsys>
17-
</srs>
18-
<transparencyLevelInt>255</transparencyLevelInt>
19-
<provider>ogr</provider>
20-
<encoding>System</encoding>
21-
<classificationattribute>Importance</classificationattribute>
22-
<classificationattribute>Heading</classificationattribute>
23-
<classificationattribute>Class</classificationattribute>
24-
<displayfield>Class</displayfield>
25-
<label>0</label>
26-
<attributeactions/>
27-
<uniquevalue>
28-
<classificationfield>0</classificationfield>
29-
<symbol>
30-
<lowervalue>B52</lowervalue>
31-
<uppervalue></uppervalue>
32-
<label></label>
33-
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane.svg</pointsymbol>
34-
<pointsize>11</pointsize>
35-
<rotationclassificationfield>2</rotationclassificationfield>
36-
<scaleclassificationfield>2</scaleclassificationfield>
37-
<outlinecolor red="0" blue="0" green="0" />
38-
<outlinestyle>SolidLine</outlinestyle>
39-
<outlinewidth>1</outlinewidth>
40-
<fillcolor red="176" blue="238" green="151" />
41-
<fillpattern>SolidPattern</fillpattern>
42-
<texturepath></texturepath>
43-
</symbol>
44-
<symbol>
45-
<lowervalue>Biplane</lowervalue>
46-
<uppervalue></uppervalue>
47-
<label></label>
48-
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane_orange.svg</pointsymbol>
49-
<pointsize>18</pointsize>
50-
<rotationclassificationfield>1</rotationclassificationfield>
51-
<scaleclassificationfield>2</scaleclassificationfield>
52-
<outlinecolor red="0" blue="0" green="0" />
53-
<outlinestyle>SolidLine</outlinestyle>
54-
<outlinewidth>1</outlinewidth>
55-
<fillcolor red="216" blue="24" green="135" />
56-
<fillpattern>SolidPattern</fillpattern>
57-
<texturepath></texturepath>
58-
</symbol>
59-
<symbol>
60-
<lowervalue>Jet</lowervalue>
61-
<uppervalue></uppervalue>
62-
<label></label>
63-
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane.svg</pointsymbol>
64-
<pointsize>11</pointsize>
65-
<rotationclassificationfield>1</rotationclassificationfield>
66-
<scaleclassificationfield>2</scaleclassificationfield>
67-
<outlinecolor red="0" blue="0" green="0" />
68-
<outlinestyle>SolidLine</outlinestyle>
69-
<outlinewidth>1</outlinewidth>
70-
<fillcolor red="167" blue="179" green="107" />
71-
<fillpattern>SolidPattern</fillpattern>
72-
<texturepath></texturepath>
73-
</symbol>
74-
</uniquevalue>
75-
<labelattributes>
76-
<label field="" text="Label" />
77-
<family field="" name="Lucida Grande" />
78-
<size field="" units="pt" value="12" />
79-
<bold field="" on="0" />
80-
<italic field="" on="0" />
81-
<underline field="" on="0" />
82-
<color field="" red="0" blue="0" green="0" />
83-
<x field="" />
84-
<y field="" />
85-
<offset x="0" y="0" yfield="-1" xfield="-1" units="pt" />
86-
<angle field="" value="0" />
87-
<alignment field="-1" value="center" />
88-
<buffercolor field="" red="255" blue="255" green="255" />
89-
<buffersize field="" units="pt" value="1" />
90-
<bufferenabled field="" on="" />
91-
</labelattributes>
2+
<qgis version="1.9.90-Alpha" minimumScale="1" maximumScale="1e+08" minLabelScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0">
3+
<transparencyLevelInt>255</transparencyLevelInt>
4+
<classificationattribute>Importance</classificationattribute>
5+
<classificationattribute>Heading</classificationattribute>
6+
<classificationattribute>Class</classificationattribute>
7+
<uniquevalue>
8+
<classificationfield>Class</classificationfield>
9+
<symbol>
10+
<lowervalue>B52</lowervalue>
11+
<uppervalue></uppervalue>
12+
<label></label>
13+
<pointsymbol>svg:/gpsicons/plane.svg</pointsymbol>
14+
<pointsize>11</pointsize>
15+
<pointsizeunits>pixels</pointsizeunits>
16+
<rotationclassificationfieldname>Importance</rotationclassificationfieldname>
17+
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
18+
<symbolfieldname></symbolfieldname>
19+
<outlinecolor red="0" blue="0" green="0"/>
20+
<outlinestyle>SolidLine</outlinestyle>
21+
<outlinewidth>1</outlinewidth>
22+
<fillcolor red="176" blue="238" green="151"/>
23+
<fillpattern>SolidPattern</fillpattern>
24+
<texturepath></texturepath>
25+
</symbol>
26+
<symbol>
27+
<lowervalue>Biplane</lowervalue>
28+
<uppervalue></uppervalue>
29+
<label></label>
30+
<pointsymbol>svg:/gpsicons/plane_orange.svg</pointsymbol>
31+
<pointsize>18</pointsize>
32+
<pointsizeunits>pixels</pointsizeunits>
33+
<rotationclassificationfieldname>Heading</rotationclassificationfieldname>
34+
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
35+
<symbolfieldname></symbolfieldname>
36+
<outlinecolor red="0" blue="0" green="0"/>
37+
<outlinestyle>SolidLine</outlinestyle>
38+
<outlinewidth>1</outlinewidth>
39+
<fillcolor red="216" blue="24" green="135"/>
40+
<fillpattern>SolidPattern</fillpattern>
41+
<texturepath></texturepath>
42+
</symbol>
43+
<symbol>
44+
<lowervalue>Jet</lowervalue>
45+
<uppervalue></uppervalue>
46+
<label></label>
47+
<pointsymbol>svg:/gpsicons/plane.svg</pointsymbol>
48+
<pointsize>11</pointsize>
49+
<pointsizeunits>pixels</pointsizeunits>
50+
<rotationclassificationfieldname>Heading</rotationclassificationfieldname>
51+
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
52+
<symbolfieldname></symbolfieldname>
53+
<outlinecolor red="0" blue="0" green="0"/>
54+
<outlinestyle>SolidLine</outlinestyle>
55+
<outlinewidth>1</outlinewidth>
56+
<fillcolor red="167" blue="179" green="107"/>
57+
<fillpattern>SolidPattern</fillpattern>
58+
<texturepath></texturepath>
59+
</symbol>
60+
</uniquevalue>
61+
<customproperties/>
62+
<displayfield>Class</displayfield>
63+
<label>0</label>
64+
<labelattributes>
65+
<label fieldname="" text="Label"/>
66+
<family fieldname="" name="Lucida Grande"/>
67+
<size fieldname="" units="pt" value="12"/>
68+
<bold fieldname="" on="0"/>
69+
<italic fieldname="" on="0"/>
70+
<underline fieldname="" on="0"/>
71+
<strikeout fieldname="" on="0"/>
72+
<color fieldname="" red="0" blue="0" green="0"/>
73+
<x fieldname=""/>
74+
<y fieldname=""/>
75+
<offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
76+
<angle fieldname="" value="0" auto="0"/>
77+
<alignment fieldname="" value="center"/>
78+
<buffercolor fieldname="" red="255" blue="255" green="255"/>
79+
<buffersize fieldname="" units="pt" value="1"/>
80+
<bufferenabled fieldname="" on=""/>
81+
<multilineenabled fieldname="" on=""/>
82+
<selectedonly on=""/>
83+
</labelattributes>
84+
<edittypes>
85+
<edittype type="0" name="Class"/>
86+
<edittype type="0" name="Heading"/>
87+
<edittype type="0" name="Importance"/>
88+
</edittypes>
89+
<editform></editform>
90+
<editforminit></editforminit>
91+
<annotationform></annotationform>
92+
<attributeactions/>
9293
</qgis>

0 commit comments

Comments
 (0)