Segmentize curved geometries for rendering, but keep the original geometry in the feature. Use the original geometry for drawing vertex markers

mhugent · mhugent · commit 5b97c03799fd · 2015-09-01T10:01:40.000+02:00
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -33,6 +33,7 @@
 #include "qgseffectstack.h"
 #include "qgspainteffectregistry.h"
 #include "qgswkbptr.h"
+#include "qgspointv2.h"
 
 #include <QDomElement>
 #include <QDomDocument>
@@ -278,12 +279,16 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
 {
   QgsSymbolV2::SymbolType symbolType = symbol->type();
 
+
   const QgsGeometry* geom = feature.constGeometry();
   if ( !geom || !geom->geometry() )
   {
     return;
   }
 
+  const QgsGeometry* segmentizedGeometry = geom;
+  bool deleteSegmentizedGeometry = false;
+
   //convert curve types to normal point/line/polygon ones
   switch ( QgsWKBTypes::flatType( geom->geometry()->wkbType() ) )
   {
@@ -298,14 +303,14 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
       {
         return;
       }
-      feature.setGeometry( new QgsGeometry( g ) );
-      geom = feature.constGeometry();
+      segmentizedGeometry = new QgsGeometry( g );
+      deleteSegmentizedGeometry = true;
     }
     default:
       break;
   }
 
-  switch ( QgsWKBTypes::flatType( geom->geometry()->wkbType() ) )
+  switch ( QgsWKBTypes::flatType( segmentizedGeometry->geometry()->wkbType() ) )
   {
     case QgsWKBTypes::Point:
     {
@@ -315,11 +320,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
         break;
       }
       QPointF pt;
-      _getPoint( pt, context, geom->asWkb() );
+      _getPoint( pt, context, segmentizedGeometry->asWkb() );
       (( QgsMarkerSymbolV2* )symbol )->renderPoint( pt, &feature, context, layer, selected );
-
-      //if ( drawVertexMarker )
-      //  renderVertexMarker( pt, context );
     }
     break;
     case QgsWKBTypes::LineString:
@@ -330,11 +332,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
         break;
       }
       QPolygonF pts;
-      _getLineString( pts, context, geom->asWkb(), symbol->clipFeaturesToExtent() );
+      _getLineString( pts, context, segmentizedGeometry->asWkb(), symbol->clipFeaturesToExtent() );
       (( QgsLineSymbolV2* )symbol )->renderPolyline( pts, &feature, context, layer, selected );
-
-      if ( drawVertexMarker )
-        renderVertexMarkerPolyline( pts, context );
     }
     break;
     case QgsWKBTypes::Polygon:
@@ -346,11 +345,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
       }
       QPolygonF pts;
       QList<QPolygonF> holes;
-      _getPolygon( pts, holes, context, geom->asWkb(), symbol->clipFeaturesToExtent() );
+      _getPolygon( pts, holes, context, segmentizedGeometry->asWkb(), symbol->clipFeaturesToExtent() );
       (( QgsFillSymbolV2* )symbol )->renderPolygon( pts, ( holes.count() ? &holes : NULL ), &feature, context, layer, selected );
-
-      if ( drawVertexMarker )
-        renderVertexMarkerPolygon( pts, ( holes.count() ? &holes : NULL ), context );
     }
     break;
 
@@ -362,7 +358,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
         break;
       }
 
-      QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );
+      QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );
       unsigned int num;
       wkbPtr >> num;
       const unsigned char* ptr = wkbPtr;
@@ -372,9 +368,6 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
       {
         ptr = QgsConstWkbPtr( _getPoint( pt, context, ptr ) );
         (( QgsMarkerSymbolV2* )symbol )->renderPoint( pt, &feature, context, layer, selected );
-
-        //if ( drawVertexMarker )
-        //  renderVertexMarker( pt, context );
       }
     }
     break;
@@ -388,7 +381,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
         break;
       }
 
-      QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );
+      QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );
       unsigned int num;
       wkbPtr >> num;
       const unsigned char* ptr = wkbPtr;
@@ -398,9 +391,6 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
       {
         ptr = QgsConstWkbPtr( _getLineString( pts, context, ptr, symbol->clipFeaturesToExtent() ) );
         (( QgsLineSymbolV2* )symbol )->renderPolyline( pts, &feature, context, layer, selected );
-
-        if ( drawVertexMarker )
-          renderVertexMarkerPolyline( pts, context );
       }
     }
     break;
@@ -414,7 +404,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
         break;
       }
 
-      QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );
+      QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );
       unsigned int num;
       wkbPtr >> num;
       const unsigned char* ptr = wkbPtr;
@@ -425,15 +415,39 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
       {
         ptr = _getPolygon( pts, holes, context, ptr, symbol->clipFeaturesToExtent() );
         (( QgsFillSymbolV2* )symbol )->renderPolygon( pts, ( holes.count() ? &holes : NULL ), &feature, context, layer, selected );
-
-        if ( drawVertexMarker )
-          renderVertexMarkerPolygon( pts, ( holes.count() ? &holes : NULL ), context );
       }
       break;
     }
     default:
       QgsDebugMsg( QString( "feature %1: unsupported wkb type 0x%2 for rendering" ).arg( feature.id() ).arg( geom->wkbType(), 0, 16 ) );
   }
+
+  if ( drawVertexMarker )
+  {
+    const QgsCoordinateTransform* ct = context.coordinateTransform();
+    const QgsMapToPixel& mtp = context.mapToPixel();
+
+    QgsPointV2 vertexPoint;
+    QgsVertexId vertexId;
+    double z;
+    QPointF mapPoint;
+    while ( geom->geometry()->nextVertex( vertexId, vertexPoint ) )
+    {
+      //transform
+      mapPoint.setX( vertexPoint.x() ); mapPoint.setY( vertexPoint.y() ); z = vertexPoint.z();
+      mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );
+      if ( ct )
+      {
+        ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );
+      }
+      renderVertexMarker( mapPoint, context );
+    }
+  }
+
+  if ( deleteSegmentizedGeometry )
+  {
+    delete segmentizedGeometry;
+  }
 }
 
 QString QgsFeatureRendererV2::dump() const

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#include "qgseffectstack.h"`
`34`	`34`	`#include "qgspainteffectregistry.h"`
`35`	`35`	`#include "qgswkbptr.h"`
	`36`	`+#include "qgspointv2.h"`
`36`	`37`
`37`	`38`	`#include <QDomElement>`
`38`	`39`	`#include <QDomDocument>`
`@@ -278,12 +279,16 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`278`	`279`	`{`
`279`	`280`	`QgsSymbolV2::SymbolType symbolType = symbol->type();`
`280`	`281`
	`282`	`+`
`281`	`283`	`const QgsGeometry* geom = feature.constGeometry();`
`282`	`284`	`if ( !geom \|\| !geom->geometry() )`
`283`	`285`	`{`
`284`	`286`	`return;`
`285`	`287`	`}`
`286`	`288`
	`289`	`+ const QgsGeometry* segmentizedGeometry = geom;`
	`290`	`+ bool deleteSegmentizedGeometry = false;`
	`291`	`+`
`287`	`292`	`//convert curve types to normal point/line/polygon ones`
`288`	`293`	`switch ( QgsWKBTypes::flatType( geom->geometry()->wkbType() ) )`
`289`	`294`	`{`
`@@ -298,14 +303,14 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`298`	`303`	`{`
`299`	`304`	`return;`
`300`	`305`	`}`
`301`		`- feature.setGeometry( new QgsGeometry( g ) );`
`302`		`- geom = feature.constGeometry();`
	`306`	`+ segmentizedGeometry = new QgsGeometry( g );`
	`307`	`+ deleteSegmentizedGeometry = true;`
`303`	`308`	`}`
`304`	`309`	`default:`
`305`	`310`	`break;`
`306`	`311`	`}`
`307`	`312`
`308`		`- switch ( QgsWKBTypes::flatType( geom->geometry()->wkbType() ) )`
	`313`	`+ switch ( QgsWKBTypes::flatType( segmentizedGeometry->geometry()->wkbType() ) )`
`309`	`314`	`{`
`310`	`315`	`case QgsWKBTypes::Point:`
`311`	`316`	`{`
`@@ -315,11 +320,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`315`	`320`	`break;`
`316`	`321`	`}`
`317`	`322`	`QPointF pt;`
`318`		`- _getPoint( pt, context, geom->asWkb() );`
	`323`	`+ _getPoint( pt, context, segmentizedGeometry->asWkb() );`
`319`	`324`	`(( QgsMarkerSymbolV2* )symbol )->renderPoint( pt, &feature, context, layer, selected );`
`320`		`-`
`321`		`- //if ( drawVertexMarker )`
`322`		`- // renderVertexMarker( pt, context );`
`323`	`325`	`}`
`324`	`326`	`break;`
`325`	`327`	`case QgsWKBTypes::LineString:`
`@@ -330,11 +332,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`330`	`332`	`break;`
`331`	`333`	`}`
`332`	`334`	`QPolygonF pts;`
`333`		`- _getLineString( pts, context, geom->asWkb(), symbol->clipFeaturesToExtent() );`
	`335`	`+ _getLineString( pts, context, segmentizedGeometry->asWkb(), symbol->clipFeaturesToExtent() );`
`334`	`336`	`(( QgsLineSymbolV2* )symbol )->renderPolyline( pts, &feature, context, layer, selected );`
`335`		`-`
`336`		`- if ( drawVertexMarker )`
`337`		`- renderVertexMarkerPolyline( pts, context );`
`338`	`337`	`}`
`339`	`338`	`break;`
`340`	`339`	`case QgsWKBTypes::Polygon:`
`@@ -346,11 +345,8 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`346`	`345`	`}`
`347`	`346`	`QPolygonF pts;`
`348`	`347`	`QList<QPolygonF> holes;`
`349`		`- _getPolygon( pts, holes, context, geom->asWkb(), symbol->clipFeaturesToExtent() );`
	`348`	`+ _getPolygon( pts, holes, context, segmentizedGeometry->asWkb(), symbol->clipFeaturesToExtent() );`
`350`	`349`	`(( QgsFillSymbolV2* )symbol )->renderPolygon( pts, ( holes.count() ? &holes : NULL ), &feature, context, layer, selected );`
`351`		`-`
`352`		`- if ( drawVertexMarker )`
`353`		`- renderVertexMarkerPolygon( pts, ( holes.count() ? &holes : NULL ), context );`
`354`	`350`	`}`
`355`	`351`	`break;`
`356`	`352`
`@@ -362,7 +358,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`362`	`358`	`break;`
`363`	`359`	`}`
`364`	`360`
`365`		`- QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );`
	`361`	`+ QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );`
`366`	`362`	`unsigned int num;`
`367`	`363`	`wkbPtr >> num;`
`368`	`364`	`const unsigned char* ptr = wkbPtr;`
`@@ -372,9 +368,6 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`372`	`368`	`{`
`373`	`369`	`ptr = QgsConstWkbPtr( _getPoint( pt, context, ptr ) );`
`374`	`370`	`(( QgsMarkerSymbolV2* )symbol )->renderPoint( pt, &feature, context, layer, selected );`
`375`		`-`
`376`		`- //if ( drawVertexMarker )`
`377`		`- // renderVertexMarker( pt, context );`
`378`	`371`	`}`
`379`	`372`	`}`
`380`	`373`	`break;`
`@@ -388,7 +381,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`388`	`381`	`break;`
`389`	`382`	`}`
`390`	`383`
`391`		`- QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );`
	`384`	`+ QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );`
`392`	`385`	`unsigned int num;`
`393`	`386`	`wkbPtr >> num;`
`394`	`387`	`const unsigned char* ptr = wkbPtr;`
`@@ -398,9 +391,6 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`398`	`391`	`{`
`399`	`392`	`ptr = QgsConstWkbPtr( _getLineString( pts, context, ptr, symbol->clipFeaturesToExtent() ) );`
`400`	`393`	`(( QgsLineSymbolV2* )symbol )->renderPolyline( pts, &feature, context, layer, selected );`
`401`		`-`
`402`		`- if ( drawVertexMarker )`
`403`		`- renderVertexMarkerPolyline( pts, context );`
`404`	`394`	`}`
`405`	`395`	`}`
`406`	`396`	`break;`
`@@ -414,7 +404,7 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`414`	`404`	`break;`
`415`	`405`	`}`
`416`	`406`
`417`		`- QgsConstWkbPtr wkbPtr( geom->asWkb() + 1 + sizeof( int ) );`
	`407`	`+ QgsConstWkbPtr wkbPtr( segmentizedGeometry->asWkb() + 1 + sizeof( int ) );`
`418`	`408`	`unsigned int num;`
`419`	`409`	`wkbPtr >> num;`
`420`	`410`	`const unsigned char* ptr = wkbPtr;`
`@@ -425,15 +415,39 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`425`	`415`	`{`
`426`	`416`	`ptr = _getPolygon( pts, holes, context, ptr, symbol->clipFeaturesToExtent() );`
`427`	`417`	`(( QgsFillSymbolV2* )symbol )->renderPolygon( pts, ( holes.count() ? &holes : NULL ), &feature, context, layer, selected );`
`428`		`-`
`429`		`- if ( drawVertexMarker )`
`430`		`- renderVertexMarkerPolygon( pts, ( holes.count() ? &holes : NULL ), context );`
`431`	`418`	`}`
`432`	`419`	`break;`
`433`	`420`	`}`
`434`	`421`	`default:`
`435`	`422`	`QgsDebugMsg( QString( "feature %1: unsupported wkb type 0x%2 for rendering" ).arg( feature.id() ).arg( geom->wkbType(), 0, 16 ) );`
`436`	`423`	`}`
	`424`	`+`
	`425`	`+ if ( drawVertexMarker )`
	`426`	`+ {`
	`427`	`+ const QgsCoordinateTransform* ct = context.coordinateTransform();`
	`428`	`+ const QgsMapToPixel& mtp = context.mapToPixel();`
	`429`	`+`
	`430`	`+ QgsPointV2 vertexPoint;`
	`431`	`+ QgsVertexId vertexId;`
	`432`	`+ double z;`
	`433`	`+ QPointF mapPoint;`
	`434`	`+ while ( geom->geometry()->nextVertex( vertexId, vertexPoint ) )`
	`435`	`+ {`
	`436`	`+ //transform`
	`437`	`+ mapPoint.setX( vertexPoint.x() ); mapPoint.setY( vertexPoint.y() ); z = vertexPoint.z();`
	`438`	`+ mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );`
	`439`	`+ if ( ct )`
	`440`	`+ {`
	`441`	`+ ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );`
	`442`	`+ }`
	`443`	`+ renderVertexMarker( mapPoint, context );`
	`444`	`+ }`
	`445`	`+ }`
	`446`	`+`
	`447`	`+ if ( deleteSegmentizedGeometry )`
	`448`	`+ {`
	`449`	`+ delete segmentizedGeometry;`
	`450`	`+ }`
`437`	`451`	`}`
`438`	`452`
`439`	`453`	`QString QgsFeatureRendererV2::dump() const`