[QGIS Commit] r13418 - in trunk/qgis: python/core src/core src/core/composer

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-05-04 04:48:43 -0400 (Tue, 04 May 2010)
New Revision: 13418

Modified:
   trunk/qgis/python/core/qgsrendercontext.sip
   trunk/qgis/src/core/composer/qgscomposermap.cpp
   trunk/qgis/src/core/qgsrendercontext.cpp
   trunk/qgis/src/core/qgsrendercontext.h
Log:
Do not force vector output by default (use only in composer map), enable setting of the flag


Modified: trunk/qgis/python/core/qgsrendercontext.sip
===================================================================
--- trunk/qgis/python/core/qgsrendercontext.sip	2010-05-03 21:02:05 UTC (rev 13417)
+++ trunk/qgis/python/core/qgsrendercontext.sip	2010-05-04 08:48:43 UTC (rev 13418)
@@ -47,6 +47,8 @@
   void setRasterScaleFactor(double factor);
   void setRendererScale( double scale );
   void setPainter(QPainter* p);
+  //! Added in QGIS v1.5
+  void setForceVectorOutput( bool force );
   //! Added in QGIS v1.4
   void setLabelingEngine(QgsLabelingEngineInterface* iface);
 };

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2010-05-03 21:02:05 UTC (rev 13417)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2010-05-04 08:48:43 UTC (rev 13418)
@@ -142,6 +142,9 @@
     theRendererContext->setRenderingStopped( false );
   }
 
+  // force vector output (no caching of marker images etc.)
+  theRendererContext->setForceVectorOutput( true );
+
   //force composer map scale for scale dependent visibility
   double bk_scale = theMapRenderer.scale();
   theMapRenderer.setScale( scale() );

Modified: trunk/qgis/src/core/qgsrendercontext.cpp
===================================================================
--- trunk/qgis/src/core/qgsrendercontext.cpp	2010-05-03 21:02:05 UTC (rev 13417)
+++ trunk/qgis/src/core/qgsrendercontext.cpp	2010-05-04 08:48:43 UTC (rev 13418)
@@ -22,7 +22,7 @@
     : mPainter( 0 ),
     mCoordTransform( 0 ),
     mDrawEditingInformation( false ),
-    mForceVectorOutput( true ),
+    mForceVectorOutput( false ),
     mRenderingStopped( false ),
     mScaleFactor( 1.0 ),
     mRasterScaleFactor( 1.0 ),

Modified: trunk/qgis/src/core/qgsrendercontext.h
===================================================================
--- trunk/qgis/src/core/qgsrendercontext.h	2010-05-03 21:02:05 UTC (rev 13417)
+++ trunk/qgis/src/core/qgsrendercontext.h	2010-05-04 08:48:43 UTC (rev 13418)
@@ -75,6 +75,8 @@
     void setRasterScaleFactor( double factor ) {mRasterScaleFactor = factor;}
     void setRendererScale( double scale ) {mRendererScale = scale;}
     void setPainter( QPainter* p ) {mPainter = p;}
+    //! Added in QGIS v1.5
+    void setForceVectorOutput( bool force ) {mForceVectorOutput = force;}
     //! Added in QGIS v1.4
     void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = iface; }