Skip to content

Commit

Permalink
Fixed renderer tests to actually show some output, they still fail du…
Browse files Browse the repository at this point in the history 
…e different units.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10027 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Jan 27, 2009
1 parent 6de7b0a commit 6f9b04e
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 55 deletions.
1 change: 1 addition & 0 deletions src/core/qgsvectorlayer.cpp
View file
Expand Up @@ -2324,6 +2324,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage

if ( !renderer )
{
errorMessage = tr("Unknown renderer");
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion tests/src/core/testqgsrenderers.cpp
View file
Expand Up @@ -193,9 +193,10 @@ bool TestQgsRenderers::setQml( QString theType )
}
QString myFileName = mTestDataDir + "points_" + theType + "_symbol.qml";
bool myStyleFlag = false;
mpPointsLayer->loadNamedStyle( myFileName, myStyleFlag );
QString error = mpPointsLayer->loadNamedStyle( myFileName, myStyleFlag );
if ( !myStyleFlag )
{
qDebug(error.toLocal8Bit().data());
return false;
}
else
Expand Down
4 changes: 1 addition & 3 deletions tests/testdata/lines.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<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>
Expand Down Expand Up @@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/lines_continuous_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<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>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
Expand Down Expand Up @@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/lines_graduated_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<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>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<symbol>
<lowervalue>0.999</lowervalue>
<uppervalue>1.333</uppervalue>
Expand Down Expand Up @@ -88,5 +87,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 changes: 1 addition & 3 deletions tests/testdata/lines_single_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<id>lines20080110101725388</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/lines.shp</datasource>
<layername>lines</layername>
Expand Down Expand Up @@ -56,5 +55,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/lines_uniquevalue_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
<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>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<classificationfield>Name</classificationfield>
<symbol>
<lowervalue>Arterial</lowervalue>
<uppervalue></uppervalue>
Expand Down Expand Up @@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 changes: 1 addition & 3 deletions tests/testdata/points.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<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>
Expand Down Expand Up @@ -90,5 +89,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/points_continuous_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<id>points20080103150949100</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
<layername>points</layername>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>2</classificationfield>
<classificationfield>Importance</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
Expand Down Expand Up @@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/points_graduated_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<id>points20080103150949100</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
<layername>points</layername>
Expand All @@ -25,7 +24,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>2</classificationfield>
<classificationfield>Importance</classificationfield>
<symbol>
<lowervalue>0.999</lowervalue>
<uppervalue>7.333</uppervalue>
Expand Down Expand Up @@ -89,5 +88,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 changes: 1 addition & 3 deletions tests/testdata/points_single_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<id>points20080103150949100</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
<layername>points</layername>
Expand Down Expand Up @@ -58,5 +57,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/points_uniquevalue_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
<id>points20080103150949100</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
<layername>points</layername>
Expand All @@ -26,7 +25,7 @@
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<classificationfield>Class</classificationfield>
<symbol>
<lowervalue>B52</lowervalue>
<uppervalue></uppervalue>
Expand Down Expand Up @@ -90,5 +89,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 changes: 1 addition & 3 deletions tests/testdata/polys.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<id>polys20080110101725465</id>
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
<layername>polys</layername>
Expand Down Expand Up @@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/polys_continuous_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<id>polys20080110101725465</id>
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
<layername>polys</layername>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
Expand Down Expand Up @@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/polys_graduated_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<id>polys20080110101725465</id>
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
<layername>polys</layername>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<symbol>
<lowervalue>6.999</lowervalue>
<uppervalue>11.333</uppervalue>
Expand Down Expand Up @@ -88,5 +87,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 changes: 1 addition & 3 deletions tests/testdata/polys_single_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<id>polys20080110101725465</id>
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/polys.shp</datasource>
<layername>polys</layername>
Expand Down Expand Up @@ -56,5 +55,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 changes: 2 additions & 4 deletions tests/testdata/polys_uniquevalue_symbol.qml
View file
@@ -1,6 +1,5 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="0.9.2-Ganymede" >
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
<id>polys20080110101725465</id>
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
<layername>polys</layername>
Expand All @@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
Expand Down Expand Up @@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>

0 comments on commit 6f9b04e

Please sign in to comment.