sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not force vector output by default (use only in composer map), enable setting of the flag

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13418 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2010-05-04 08:48:43 +00:00
parent c9d34fd8c7
commit 1981f60445
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsrendercontext.sip
View File

@ -47,6 +47,8 @@ class QgsRenderContext
void setRasterScaleFactor(double factor); void setRasterScaleFactor(double factor);
void setRendererScale( double scale ); void setRendererScale( double scale );
void setPainter(QPainter* p); void setPainter(QPainter* p);
//! Added in QGIS v1.5
void setForceVectorOutput( bool force );
//! Added in QGIS v1.4 //! Added in QGIS v1.4
void setLabelingEngine(QgsLabelingEngineInterface* iface); void setLabelingEngine(QgsLabelingEngineInterface* iface);
}; };

3
src/core/composer/qgscomposermap.cpp
View File

@ -142,6 +142,9 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
theRendererContext->setRenderingStopped( false ); theRendererContext->setRenderingStopped( false );
} }
// force vector output (no caching of marker images etc.)
theRendererContext->setForceVectorOutput( true );
//force composer map scale for scale dependent visibility //force composer map scale for scale dependent visibility
double bk_scale = theMapRenderer.scale(); double bk_scale = theMapRenderer.scale();
theMapRenderer.setScale( scale() ); theMapRenderer.setScale( scale() );

2
src/core/qgsrendercontext.cpp
View File

@ -22,7 +22,7 @@ QgsRenderContext::QgsRenderContext()
: mPainter( 0 ), : mPainter( 0 ),
mCoordTransform( 0 ), mCoordTransform( 0 ),
mDrawEditingInformation( false ), mDrawEditingInformation( false ),
mForceVectorOutput( true ), mForceVectorOutput( false ),
mRenderingStopped( false ), mRenderingStopped( false ),
mScaleFactor( 1.0 ), mScaleFactor( 1.0 ),
mRasterScaleFactor( 1.0 ), mRasterScaleFactor( 1.0 ),

2
src/core/qgsrendercontext.h
View File

@ -75,6 +75,8 @@ class CORE_EXPORT QgsRenderContext
void setRasterScaleFactor( double factor ) {mRasterScaleFactor = factor;} void setRasterScaleFactor( double factor ) {mRasterScaleFactor = factor;}
void setRendererScale( double scale ) {mRendererScale = scale;} void setRendererScale( double scale ) {mRendererScale = scale;}
void setPainter( QPainter* p ) {mPainter = p;} void setPainter( QPainter* p ) {mPainter = p;}
//! Added in QGIS v1.5
void setForceVectorOutput( bool force ) {mForceVectorOutput = force;}
//! Added in QGIS v1.4 //! Added in QGIS v1.4
void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = iface; } void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = iface; }