Skip to content

Commit d8c7a16

Browse files
author
wonder
committedMay 4, 2010
Do not force vector output by default (use only in composer map), enable setting of the flag
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13418 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed
 

‎python/core/qgsrendercontext.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ class QgsRenderContext
4747
void setRasterScaleFactor(double factor);
4848
void setRendererScale( double scale );
4949
void setPainter(QPainter* p);
50+
//! Added in QGIS v1.5
51+
void setForceVectorOutput( bool force );
5052
//! Added in QGIS v1.4
5153
void setLabelingEngine(QgsLabelingEngineInterface* iface);
5254
};

‎src/core/composer/qgscomposermap.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
142142
theRendererContext->setRenderingStopped( false );
143143
}
144144

145+
// force vector output (no caching of marker images etc.)
146+
theRendererContext->setForceVectorOutput( true );
147+
145148
//force composer map scale for scale dependent visibility
146149
double bk_scale = theMapRenderer.scale();
147150
theMapRenderer.setScale( scale() );

‎src/core/qgsrendercontext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ QgsRenderContext::QgsRenderContext()
2222
: mPainter( 0 ),
2323
mCoordTransform( 0 ),
2424
mDrawEditingInformation( false ),
25-
mForceVectorOutput( true ),
25+
mForceVectorOutput( false ),
2626
mRenderingStopped( false ),
2727
mScaleFactor( 1.0 ),
2828
mRasterScaleFactor( 1.0 ),

‎src/core/qgsrendercontext.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ class CORE_EXPORT QgsRenderContext
7575
void setRasterScaleFactor( double factor ) {mRasterScaleFactor = factor;}
7676
void setRendererScale( double scale ) {mRendererScale = scale;}
7777
void setPainter( QPainter* p ) {mPainter = p;}
78+
//! Added in QGIS v1.5
79+
void setForceVectorOutput( bool force ) {mForceVectorOutput = force;}
7880
//! Added in QGIS v1.4
7981
void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = iface; }
8082

0 commit comments

Comments
 (0)
Please sign in to comment.