Symbology-NG: support for 2.5D geometries - fix for #2200

wonder · wonder · commit cbef62fb785a · 2009-12-08T00:27:51.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12367 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -160,6 +160,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
   switch ( geom->wkbType() )
   {
     case QGis::WKBPoint:
+    case QGis::WKBPoint25D:
     {
       if ( symbolType != QgsSymbolV2::Marker )
       {
@@ -173,6 +174,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
     break;
 
     case QGis::WKBLineString:
+    case QGis::WKBLineString25D:
     {
       if ( symbolType != QgsSymbolV2::Line )
       {
@@ -186,6 +188,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
     break;
 
     case QGis::WKBPolygon:
+    case QGis::WKBPolygon25D:
     {
       if ( symbolType != QgsSymbolV2::Fill )
       {
@@ -200,6 +203,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
     break;
 
     case QGis::WKBMultiPoint:
+    case QGis::WKBMultiPoint25D:
     {
       if ( symbolType != QgsSymbolV2::Marker )
       {
@@ -221,6 +225,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
     break;
 
     case QGis::WKBMultiLineString:
+    case QGis::WKBMultiLineString25D:
     {
       if ( symbolType != QgsSymbolV2::Line )
       {
@@ -242,6 +247,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&
     break;
 
     case QGis::WKBMultiPolygon:
+    case QGis::WKBMultiPolygon25D:
     {
       if ( symbolType != QgsSymbolV2::Fill )
       {

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`160`	`160`	`switch ( geom->wkbType() )`
`161`	`161`	`{`
`162`	`162`	`case QGis::WKBPoint:`
	`163`	`+ case QGis::WKBPoint25D:`
`163`	`164`	`{`
`164`	`165`	`if ( symbolType != QgsSymbolV2::Marker )`
`165`	`166`	`{`
`@@ -173,6 +174,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`173`	`174`	`break;`
`174`	`175`
`175`	`176`	`case QGis::WKBLineString:`
	`177`	`+ case QGis::WKBLineString25D:`
`176`	`178`	`{`
`177`	`179`	`if ( symbolType != QgsSymbolV2::Line )`
`178`	`180`	`{`
`@@ -186,6 +188,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`186`	`188`	`break;`
`187`	`189`
`188`	`190`	`case QGis::WKBPolygon:`
	`191`	`+ case QGis::WKBPolygon25D:`
`189`	`192`	`{`
`190`	`193`	`if ( symbolType != QgsSymbolV2::Fill )`
`191`	`194`	`{`
`@@ -200,6 +203,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`200`	`203`	`break;`
`201`	`204`
`202`	`205`	`case QGis::WKBMultiPoint:`
	`206`	`+ case QGis::WKBMultiPoint25D:`
`203`	`207`	`{`
`204`	`208`	`if ( symbolType != QgsSymbolV2::Marker )`
`205`	`209`	`{`
`@@ -221,6 +225,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`221`	`225`	`break;`
`222`	`226`
`223`	`227`	`case QGis::WKBMultiLineString:`
	`228`	`+ case QGis::WKBMultiLineString25D:`
`224`	`229`	`{`
`225`	`230`	`if ( symbolType != QgsSymbolV2::Line )`
`226`	`231`	`{`
`@@ -242,6 +247,7 @@ void QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext&`
`242`	`247`	`break;`
`243`	`248`
`244`	`249`	`case QGis::WKBMultiPolygon:`
	`250`	`+ case QGis::WKBMultiPolygon25D:`
`245`	`251`	`{`
`246`	`252`	`if ( symbolType != QgsSymbolV2::Fill )`
`247`	`253`	`{`