Skip to content

Commit

Permalink
Fix style classes which lost their attribute association for some reason
Browse files Browse the repository at this point in the history
  • Loading branch information
@timlinux
timlinux committed Dec 29, 2011
1 parent f6d9b6d commit 8ddf119
Show file tree
Hide file tree
Showing 3 changed files with 233 additions and 236 deletions.
144 changes: 71 additions & 73 deletions tests/testdata/lines.qml
View file
@@ -1,75 +1,73 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<id>lines20080110101725388</id>
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
<layername>lines</layername>
<srs>
<spatialrefsys>
<proj4>+proj=longlat +ellps=WGS84 +no_defs</proj4>
<srsid>1449</srsid>
<srid>4031</srid>
<epsg>4031</epsg>
<description>Unknown datum based upon the GEM 10C ellipsoid</description>
<projectionacronym>longlat</projectionacronym>
<ellipsoidacronym>WGS84</ellipsoidacronym>
<geographicflag>true</geographicflag>
</spatialrefsys>
</srs>
<transparencyLevelInt>255</transparencyLevelInt>
<provider>ogr</provider>
<encoding>System</encoding>
<classificationattribute>Name</classificationattribute>
<displayfield>Name</displayfield>
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<symbol>
<lowervalue>Arterial</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>hard:circle</pointsymbol>
<pointsize>11</pointsize>
<rotationclassificationfield>-1</rotationclassificationfield>
<scaleclassificationfield>-1</scaleclassificationfield>
<outlinecolor red="154" blue="116" green="139" />
<outlinestyle>DashDotDotLine</outlinestyle>
<outlinewidth>5</outlinewidth>
<fillcolor red="0" blue="0" green="0" />
<fillpattern>NoBrush</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Highway</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>hard:circle</pointsymbol>
<pointsize>11</pointsize>
<rotationclassificationfield>-1</rotationclassificationfield>
<scaleclassificationfield>-1</scaleclassificationfield>
<outlinecolor red="94" blue="55" green="89" />
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>7</outlinewidth>
<fillcolor red="0" blue="0" green="0" />
<fillpattern>NoBrush</fillpattern>
<texturepath></texturepath>
</symbol>
</uniquevalue>
<labelattributes>
<label field="" text="Label" />
<family field="" name="Lucida Grande" />
<size field="" units="pt" value="12" />
<bold field="" on="0" />
<italic field="" on="0" />
<underline field="" on="0" />
<color field="" red="0" blue="0" green="0" />
<x field="" />
<y field="" />
<offset x="0" y="0" yfield="-1" xfield="-1" units="pt" />
<angle field="" value="0" />
<alignment field="-1" value="center" />
<buffercolor field="" red="255" blue="255" green="255" />
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
<qgis version="1.9.90-Alpha" minimumScale="1" maximumScale="1e+08" minLabelScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0">
<transparencyLevelInt>255</transparencyLevelInt>
<classificationattribute>Name</classificationattribute>
<uniquevalue>
<classificationfield>Name</classificationfield>
<symbol>
<lowervalue>Arterial</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>hard:circle</pointsymbol>
<pointsize>11</pointsize>
<pointsizeunits>pixels</pointsizeunits>
<rotationclassificationfieldname></rotationclassificationfieldname>
<scaleclassificationfieldname></scaleclassificationfieldname>
<symbolfieldname></symbolfieldname>
<outlinecolor red="154" blue="116" green="139"/>
<outlinestyle>DashDotDotLine</outlinestyle>
<outlinewidth>5</outlinewidth>
<fillcolor red="0" blue="0" green="0"/>
<fillpattern>NoBrush</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Highway</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>hard:circle</pointsymbol>
<pointsize>11</pointsize>
<pointsizeunits>pixels</pointsizeunits>
<rotationclassificationfieldname></rotationclassificationfieldname>
<scaleclassificationfieldname></scaleclassificationfieldname>
<symbolfieldname></symbolfieldname>
<outlinecolor red="94" blue="55" green="89"/>
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>7</outlinewidth>
<fillcolor red="0" blue="0" green="0"/>
<fillpattern>NoBrush</fillpattern>
<texturepath></texturepath>
</symbol>
</uniquevalue>
<customproperties/>
<displayfield>Name</displayfield>
<label>0</label>
<labelattributes>
<label fieldname="" text="Label"/>
<family fieldname="" name="Lucida Grande"/>
<size fieldname="" units="pt" value="12"/>
<bold fieldname="" on="0"/>
<italic fieldname="" on="0"/>
<underline fieldname="" on="0"/>
<strikeout fieldname="" on="0"/>
<color fieldname="" red="0" blue="0" green="0"/>
<x fieldname=""/>
<y fieldname=""/>
<offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
<angle fieldname="" value="0" auto="0"/>
<alignment fieldname="" value="center"/>
<buffercolor fieldname="" red="255" blue="255" green="255"/>
<buffersize fieldname="" units="pt" value="1"/>
<bufferenabled fieldname="" on=""/>
<multilineenabled fieldname="" on=""/>
<selectedonly on=""/>
</labelattributes>
<edittypes>
<edittype type="0" name="Name"/>
<edittype type="0" name="Value"/>
</edittypes>
<editform></editform>
<editforminit></editforminit>
<annotationform></annotationform>
<attributeactions/>
</qgis>
181 changes: 91 additions & 90 deletions tests/testdata/points.qml
View file
@@ -1,92 +1,93 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<id>points20080109122431720</id>
<datasource>/home/timlinux/dev/cpp/qgis/tests/testdata/points.shp</datasource>
<layername>Points</layername>
<srs>
<spatialrefsys>
<proj4>+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs</proj4>
<srsid>2585</srsid>
<srid>4326</srid>
<epsg>4326</epsg>
<description>WGS 84</description>
<projectionacronym>longlat</projectionacronym>
<ellipsoidacronym>WGS84</ellipsoidacronym>
<geographicflag>true</geographicflag>
</spatialrefsys>
</srs>
<transparencyLevelInt>255</transparencyLevelInt>
<provider>ogr</provider>
<encoding>System</encoding>
<classificationattribute>Importance</classificationattribute>
<classificationattribute>Heading</classificationattribute>
<classificationattribute>Class</classificationattribute>
<displayfield>Class</displayfield>
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<symbol>
<lowervalue>B52</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane.svg</pointsymbol>
<pointsize>11</pointsize>
<rotationclassificationfield>2</rotationclassificationfield>
<scaleclassificationfield>2</scaleclassificationfield>
<outlinecolor red="0" blue="0" green="0" />
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="176" blue="238" green="151" />
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Biplane</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane_orange.svg</pointsymbol>
<pointsize>18</pointsize>
<rotationclassificationfield>1</rotationclassificationfield>
<scaleclassificationfield>2</scaleclassificationfield>
<outlinecolor red="0" blue="0" green="0" />
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="216" blue="24" green="135" />
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Jet</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/home/timlinux/apps/share/qgis/svg/gpsicons/plane.svg</pointsymbol>
<pointsize>11</pointsize>
<rotationclassificationfield>1</rotationclassificationfield>
<scaleclassificationfield>2</scaleclassificationfield>
<outlinecolor red="0" blue="0" green="0" />
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="167" blue="179" green="107" />
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
</uniquevalue>
<labelattributes>
<label field="" text="Label" />
<family field="" name="Lucida Grande" />
<size field="" units="pt" value="12" />
<bold field="" on="0" />
<italic field="" on="0" />
<underline field="" on="0" />
<color field="" red="0" blue="0" green="0" />
<x field="" />
<y field="" />
<offset x="0" y="0" yfield="-1" xfield="-1" units="pt" />
<angle field="" value="0" />
<alignment field="-1" value="center" />
<buffercolor field="" red="255" blue="255" green="255" />
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
<qgis version="1.9.90-Alpha" minimumScale="1" maximumScale="1e+08" minLabelScale="1" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" scaleBasedLabelVisibilityFlag="0">
<transparencyLevelInt>255</transparencyLevelInt>
<classificationattribute>Importance</classificationattribute>
<classificationattribute>Heading</classificationattribute>
<classificationattribute>Class</classificationattribute>
<uniquevalue>
<classificationfield>Class</classificationfield>
<symbol>
<lowervalue>B52</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/gpsicons/plane.svg</pointsymbol>
<pointsize>11</pointsize>
<pointsizeunits>pixels</pointsizeunits>
<rotationclassificationfieldname>Importance</rotationclassificationfieldname>
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
<symbolfieldname></symbolfieldname>
<outlinecolor red="0" blue="0" green="0"/>
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="176" blue="238" green="151"/>
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Biplane</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/gpsicons/plane_orange.svg</pointsymbol>
<pointsize>18</pointsize>
<pointsizeunits>pixels</pointsizeunits>
<rotationclassificationfieldname>Heading</rotationclassificationfieldname>
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
<symbolfieldname></symbolfieldname>
<outlinecolor red="0" blue="0" green="0"/>
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="216" blue="24" green="135"/>
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
<symbol>
<lowervalue>Jet</lowervalue>
<uppervalue></uppervalue>
<label></label>
<pointsymbol>svg:/gpsicons/plane.svg</pointsymbol>
<pointsize>11</pointsize>
<pointsizeunits>pixels</pointsizeunits>
<rotationclassificationfieldname>Heading</rotationclassificationfieldname>
<scaleclassificationfieldname>Importance</scaleclassificationfieldname>
<symbolfieldname></symbolfieldname>
<outlinecolor red="0" blue="0" green="0"/>
<outlinestyle>SolidLine</outlinestyle>
<outlinewidth>1</outlinewidth>
<fillcolor red="167" blue="179" green="107"/>
<fillpattern>SolidPattern</fillpattern>
<texturepath></texturepath>
</symbol>
</uniquevalue>
<customproperties/>
<displayfield>Class</displayfield>
<label>0</label>
<labelattributes>
<label fieldname="" text="Label"/>
<family fieldname="" name="Lucida Grande"/>
<size fieldname="" units="pt" value="12"/>
<bold fieldname="" on="0"/>
<italic fieldname="" on="0"/>
<underline fieldname="" on="0"/>
<strikeout fieldname="" on="0"/>
<color fieldname="" red="0" blue="0" green="0"/>
<x fieldname=""/>
<y fieldname=""/>
<offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
<angle fieldname="" value="0" auto="0"/>
<alignment fieldname="" value="center"/>
<buffercolor fieldname="" red="255" blue="255" green="255"/>
<buffersize fieldname="" units="pt" value="1"/>
<bufferenabled fieldname="" on=""/>
<multilineenabled fieldname="" on=""/>
<selectedonly on=""/>
</labelattributes>
<edittypes>
<edittype type="0" name="Class"/>
<edittype type="0" name="Heading"/>
<edittype type="0" name="Importance"/>
</edittypes>
<editform></editform>
<editforminit></editforminit>
<annotationform></annotationform>
<attributeactions/>
</qgis>

0 comments on commit 8ddf119

Please sign in to comment.