fixes an issue introduced with #1449

qgis · Jun 14, 2014 · 703c3e7 · 703c3e7
1 parent b3cbefc
commit 703c3e7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -447,6 +447,13 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
       double scaledWidth = mWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mWidthUnit, mWidthMapUnitScale );  
 
       double dashWidthDiv = mPen.widthF();
+
+      if ( strokeWidthExpression )
+      {
+        dashWidthDiv = pen.widthF();
+        scaledWidth = pen.widthF();
+      }  
+
       //fix dash pattern width in Qt 4.8
       QStringList versionSplit = QString( qVersion() ).split( "." );
       if ( versionSplit.size() > 1
@@ -455,7 +462,6 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
       {
         dashWidthDiv = 1.0;
       }
-
 
     QVector<qreal> dashVector;
     QStringList dashList = dashPatternExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString().split( ";" );