#8725-R: define UseRenderingOptimization

Redefine RenderingPrintComposition to UseRenderingOptimization
qgis · Jan 15, 2014 · 0a970eb · 0a970eb
1 parent 10db577
commit 0a970eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -208,7 +208,7 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
          mComposition->plotStyle() == QgsComposition::Postscript )
     {
       //if outputing composer, disable optimisations like layer simplification
-      theRendererContext->setRenderingPrintComposition( true );
+      theRendererContext->setUseRenderingOptimization( false );
     }
 
     // force vector output (no caching of marker images etc.)

diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp
@@ -29,7 +29,7 @@ QgsRenderContext::QgsRenderContext()
     mRasterScaleFactor( 1.0 ),
     mRendererScale( 1.0 ),
     mLabelingEngine( NULL ),
-    mRenderingPrintComposition( false )
+    mUseRenderingOptimization( true )
 {
 
 }

diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h
@@ -95,9 +95,9 @@ class CORE_EXPORT QgsRenderContext
     //! Added in QGIS v2.0
     void setSelectionColor( const QColor& color ) { mSelectionColor = color; }
 
-    /**True if the rendering request comes from a print composition, false it comes from a normal window request */
-    void setRenderingPrintComposition( bool renderingPrintComposition ) { mRenderingPrintComposition = renderingPrintComposition; }
-    bool renderingPrintComposition( ) const { return mRenderingPrintComposition; }
+    /**Returns true if the rendering optimization (geometry simplification) can be executed*/
+    bool useRenderingOptimization() const { return mUseRenderingOptimization; }
+    void setUseRenderingOptimization( bool enabled ) { mUseRenderingOptimization = enabled; }
 
   private:
 
@@ -138,8 +138,8 @@ class CORE_EXPORT QgsRenderContext
     /** Color used for features that are marked as selected */
     QColor mSelectionColor;
 
-    /**True if the rendering request comes from a print composition, false it comes from a normal window request */
-    bool mRenderingPrintComposition;
+    /**True if the rendering optimization (geometry simplification) can be executed*/
+    bool mUseRenderingOptimization;
 };
 
 #endif
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -705,7 +705,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
   QgsFeatureIterator fit = QgsFeatureIterator();
 
   // Enable the simplification of the geometries (Using the current map2pixel context) before fetch the features.
-  if ( simplifyDrawingCanbeApplied( QgsVectorLayer::GeometrySimplification | QgsVectorLayer::EnvelopeSimplification ) && !( featureRequest.flags() & QgsFeatureRequest::NoGeometry ) && !rendererContext.renderingPrintComposition() )
+  if ( simplifyDrawingCanbeApplied( QgsVectorLayer::GeometrySimplification | QgsVectorLayer::EnvelopeSimplification ) && !( featureRequest.flags() & QgsFeatureRequest::NoGeometry ) )
   {
     QPainter* p = rendererContext.painter();
     float dpi = ( p->device()->logicalDpiX() + p->device()->logicalDpiY() ) / 2;
@@ -1250,7 +1250,7 @@ bool QgsVectorLayer::setSubsetString( QString subset )
 
 bool QgsVectorLayer::simplifyDrawingCanbeApplied( int simplifyHint ) const
 {
-  return mDataProvider && ( mSimplifyDrawingHints & simplifyHint ) && !mEditBuffer && ( !mCurrentRendererContext || !mCurrentRendererContext->renderingPrintComposition() );
+  return mDataProvider && ( mSimplifyDrawingHints & simplifyHint ) && !mEditBuffer && ( !mCurrentRendererContext || mCurrentRendererContext->useRenderingOptimization() );
 }
 
 QgsFeatureIterator QgsVectorLayer::getFeatures( const QgsFeatureRequest& request )