Feature #8725: Fix dpi bug

qgis · Oct 24, 2013 · 81afd87 · 81afd87
1 parent 40b5b1e
commit 81afd87
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -696,10 +696,13 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
   // Enable the simplification of the geometries before fetch the features using the current map2pixel context.
   if ( mSimplifyDrawing && !(featureRequest.flags() & QgsFeatureRequest::NoGeometry) )
   {
+    QPainter* p = rendererContext.painter();
+    float dpi = ( p->device()->logicalDpiX() + p->device()->logicalDpiY() ) / 2;
+
     featureRequest.setFlags( featureRequest.flags() | QgsFeatureRequest::SimplifyGeometries );
     featureRequest.setCoordinateTransform( rendererContext.coordinateTransform() );
     featureRequest.setMapToPixel( &rendererContext.mapToPixel() );
-    featureRequest.setMapToPixelTol( mSimplifyDrawingTol );
+    featureRequest.setMapToPixelTol( mSimplifyDrawingTol * 72.0f/dpi );
   }
 
   QgsFeatureIterator fit = getFeatures( featureRequest );

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -345,6 +345,9 @@ bool QgsOgrSimplifiedFeatureIterator::simplifyOgrGeometry( const QgsFeatureReque
   {
     OGRLineString* lineString = (OGRLineString*)geometry;
 
+    int numPoints = lineString->getNumPoints();
+    if ( (isaLinearRing && numPoints<=5) || (!isaLinearRing && numPoints<=2) ) return false;
+
     OGREnvelope env;
     geometry->getEnvelope(&env );
     QgsRectangle envelope( env.MinX, env.MinY, env.MaxX, env.MaxY );
@@ -384,8 +387,6 @@ bool QgsOgrSimplifiedFeatureIterator::simplifyOgrGeometry( const QgsFeatureReque
     else
     {
       QGis::GeometryType geometryType = isaLinearRing ? QGis::Polygon : QGis::Line;
-
-      int numPoints = lineString->getNumPoints();
       int numSimplifiedPoints = 0;
 
       OGRRawPoint* points = mallocPoints( numPoints );