- fix issue4819

vmora · m-kuhn · commit f04abe05a082 · 2013-07-18T16:19:53.000+02:00
- modify polygon render to exclude consectuvie points that are less than
  a pixel appart
- moved inner loop debug prints to level 3 and 4 since they where
  slowing down too much the code in debug
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -463,20 +463,20 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )
   {
     QgsPoint pp1 = p1, pp2 = p2;
 
-    QgsDebugMsg( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ) );
+    QgsDebugMsgLevel( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ), 3 );
     if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
     {
-      QgsDebugMsg( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ) );
-      QgsDebugMsg( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ) );
-      QgsDebugMsg( QString( "To   proj4 : %1" ).arg( mCoordTransform->destCRS().toProj4() ) );
+      QgsDebugMsgLevel( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ), 4 );
+      QgsDebugMsgLevel( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ), 4 );
+      QgsDebugMsgLevel( QString( "To   proj4 : %1" ).arg( mCoordTransform->destCRS().toProj4() ), 4 );
       pp1 = mCoordTransform->transform( p1 );
       pp2 = mCoordTransform->transform( p2 );
-      QgsDebugMsg( QString( "New points are %1 and %2, calculating..." ).arg( pp1.toString( 4 ) ).arg( pp2.toString( 4 ) ) );
+      QgsDebugMsgLevel( QString( "New points are %1 and %2, calculating..." ).arg( pp1.toString( 4 ) ).arg( pp2.toString( 4 ) ), 4 );
       result = computeDistanceBearing( pp1, pp2 );
     }
     else
     {
-      QgsDebugMsg( "Cartesian calculation on canvas coordinates" );
+      QgsDebugMsgLevel( "Cartesian calculation on canvas coordinates", 4 );
       result = sqrt(( p2.x() - p1.x() ) * ( p2.x() - p1.x() ) + ( p2.y() - p1.y() ) * ( p2.y() - p1.y() ) );
     }
   }
@@ -486,7 +486,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )
     QgsMessageLog::logMessage( QObject::tr( "Caught a coordinate system exception while trying to transform a point. Unable to calculate line length." ) );
     result = 0.0;
   }
-  QgsDebugMsg( QString( "The result was %1" ).arg( result ) );
+  QgsDebugMsgLevel( QString( "The result was %1" ).arg( result ), 3 );
   return result;
 }
 
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -100,14 +100,22 @@ void QgsHighlight::paintPolygon( QPainter *p, QgsPolygon polygon )
 
   for ( int i = 0; i < polygon.size(); i++ )
   {
-    QPolygonF ring( polygon[i].size() + 1 );
+    if ( polygon[i].empty() ) continue;
+
+    QPolygonF ring;
+    ring.reserve( polygon[i].size() + 1 );
 
     for ( int j = 0; j < polygon[i].size(); j++ )
     {
-      ring[ j ] = toCanvasCoordinates( polygon[i][j] ) - pos();
+      //adding point only if it is more than a pixel appart from the previous one
+      const QPointF cur = toCanvasCoordinates( polygon[i][j] ) - pos();
+      if ( 0 == j || std::abs( ring.back().x() - cur.x() ) > 1 || std::abs( ring.back().y() - cur.y() ) > 1 )
+      {
+        ring.push_back( cur );
+      }
     }
 
-    ring[ polygon[i].size()] = ring[ 0 ];
+    ring.push_back( ring[ 0 ] );
 
     path.addPolygon( ring );
   }

Original file line number	Diff line number	Diff line change
`@@ -463,20 +463,20 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )`
`463`	`463`	`{`
`464`	`464`	`QgsPoint pp1 = p1, pp2 = p2;`
`465`	`465`
`466`		`- QgsDebugMsg( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ) );`
	`466`	`+ QgsDebugMsgLevel( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ), 3 );`
`467`	`467`	`if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )`
`468`	`468`	`{`
`469`		`- QgsDebugMsg( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ) );`
`470`		`- QgsDebugMsg( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ) );`
`471`		`- QgsDebugMsg( QString( "To proj4 : %1" ).arg( mCoordTransform->destCRS().toProj4() ) );`
	`469`	`+ QgsDebugMsgLevel( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ), 4 );`
	`470`	`+ QgsDebugMsgLevel( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ), 4 );`
	`471`	`+ QgsDebugMsgLevel( QString( "To proj4 : %1" ).arg( mCoordTransform->destCRS().toProj4() ), 4 );`
`472`	`472`	`pp1 = mCoordTransform->transform( p1 );`
`473`	`473`	`pp2 = mCoordTransform->transform( p2 );`
`474`		`- QgsDebugMsg( QString( "New points are %1 and %2, calculating..." ).arg( pp1.toString( 4 ) ).arg( pp2.toString( 4 ) ) );`
	`474`	`+ QgsDebugMsgLevel( QString( "New points are %1 and %2, calculating..." ).arg( pp1.toString( 4 ) ).arg( pp2.toString( 4 ) ), 4 );`
`475`	`475`	`result = computeDistanceBearing( pp1, pp2 );`
`476`	`476`	`}`
`477`	`477`	`else`
`478`	`478`	`{`
`479`		`- QgsDebugMsg( "Cartesian calculation on canvas coordinates" );`
	`479`	`+ QgsDebugMsgLevel( "Cartesian calculation on canvas coordinates", 4 );`
`480`	`480`	`result = sqrt(( p2.x() - p1.x() ) * ( p2.x() - p1.x() ) + ( p2.y() - p1.y() ) * ( p2.y() - p1.y() ) );`
`481`	`481`	`}`
`482`	`482`	`}`
`@@ -486,7 +486,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )`
`486`	`486`	`QgsMessageLog::logMessage( QObject::tr( "Caught a coordinate system exception while trying to transform a point. Unable to calculate line length." ) );`
`487`	`487`	`result = 0.0;`
`488`	`488`	`}`
`489`		`- QgsDebugMsg( QString( "The result was %1" ).arg( result ) );`
	`489`	`+ QgsDebugMsgLevel( QString( "The result was %1" ).arg( result ), 3 );`
`490`	`490`	`return result;`
`491`	`491`	`}`
`492`	`492`
Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,22 @@ void QgsHighlight::paintPolygon( QPainter *p, QgsPolygon polygon )`
`100`	`100`
`101`	`101`	`for ( int i = 0; i < polygon.size(); i++ )`
`102`	`102`	`{`
`103`		`- QPolygonF ring( polygon[i].size() + 1 );`
	`103`	`+ if ( polygon[i].empty() ) continue;`
	`104`	`+`
	`105`	`+ QPolygonF ring;`
	`106`	`+ ring.reserve( polygon[i].size() + 1 );`
`104`	`107`
`105`	`108`	`for ( int j = 0; j < polygon[i].size(); j++ )`
`106`	`109`	`{`
`107`		`- ring[ j ] = toCanvasCoordinates( polygon[i][j] ) - pos();`
	`110`	`+ //adding point only if it is more than a pixel appart from the previous one`
	`111`	`+ const QPointF cur = toCanvasCoordinates( polygon[i][j] ) - pos();`
	`112`	`+ if ( 0 == j \|\| std::abs( ring.back().x() - cur.x() ) > 1 \|\| std::abs( ring.back().y() - cur.y() ) > 1 )`
	`113`	`+ {`
	`114`	`+ ring.push_back( cur );`
	`115`	`+ }`
`108`	`116`	`}`
`109`	`117`
`110`		`- ring[ polygon[i].size()] = ring[ 0 ];`
	`118`	`+ ring.push_back( ring[ 0 ] );`
`111`	`119`
`112`	`120`	`path.addPolygon( ring );`
`113`	`121`	`}`