Optimize simple marker: do not construct/destruct "size" all the time

13% speedup when rendering 1m points from memory provider
qgis · Oct 3, 2014 · fbbea90 · fbbea90
1 parent 86015ea
commit fbbea90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -45,6 +45,8 @@ static void _fixQPictureDPI( QPainter* p )
            ( double )qt_defaultDpiY() / p->device()->logicalDpiY() );
 }
 
+const QString QgsSimpleMarkerSymbolLayerV2::EXPR_SIZE( "size" );
+
 //////
 
 QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QString name, QColor color, QColor borderColor, double size, double angle, QgsSymbolV2::ScaleMethod scaleMethod )
@@ -504,7 +506,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
     return;
   }
 
-  QgsExpression *sizeExpression = expression( "size" );
+  QgsExpression *sizeExpression = expression( EXPR_SIZE );
   bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale || sizeExpression;
 
   double scaledSize = mSize;

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -133,6 +133,8 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
     //Maximum width/height of cache image
     static const int mMaximumCacheWidth = 3000;
 
+    static const QString EXPR_SIZE;
+
   private:
     QgsExpression *mAngleExpression;
     QgsExpression *mNameExpression;