Skip to content
Permalink
Browse files
Fixed renderer tests to actually show some output, they still fail du… 
…e different units.

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

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

3 tests/src/core/testqgsrenderers.cpp
View file
@@ -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
4 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>
@@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
@@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<symbol>
<lowervalue>0.999</lowervalue>
<uppervalue>1.333</uppervalue>
@@ -88,5 +87,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 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>
@@ -56,5 +55,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<classificationfield>Name</classificationfield>
<symbol>
<lowervalue>Arterial</lowervalue>
<uppervalue></uppervalue>
@@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 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>
@@ -90,5 +89,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>2</classificationfield>
<classificationfield>Importance</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
@@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -25,7 +24,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>2</classificationfield>
<classificationfield>Importance</classificationfield>
<symbol>
<lowervalue>0.999</lowervalue>
<uppervalue>7.333</uppervalue>
@@ -89,5 +88,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 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>
@@ -58,5 +57,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -26,7 +25,7 @@
<label>0</label>
<attributeactions/>
<uniquevalue>
<classificationfield>0</classificationfield>
<classificationfield>Class</classificationfield>
<symbol>
<lowervalue>B52</lowervalue>
<uppervalue></uppervalue>
@@ -90,5 +89,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 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>
@@ -73,5 +72,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
@@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<graduatedsymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<symbol>
<lowervalue>6.999</lowervalue>
<uppervalue>11.333</uppervalue>
@@ -88,5 +87,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
4 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>
@@ -56,5 +55,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>
6 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>
@@ -24,7 +23,7 @@
<label>0</label>
<attributeactions/>
<continuoussymbol>
<classificationfield>1</classificationfield>
<classificationfield>Value</classificationfield>
<polygonoutline>1</polygonoutline>
<lowestsymbol>
<symbol>
@@ -78,5 +77,4 @@
<buffersize field="" units="pt" value="1" />
<bufferenabled field="" on="" />
</labelattributes>
</maplayer>
</qgis>

0 comments on commit c15e6c0

Please sign in to comment.