marker data defined anchor fix, fixes #9579

qgis · May 19, 2014 · f470570 · f470570
1 parent a76ec72
commit f470570
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -292,6 +292,7 @@ QString QgsEllipseSymbolLayerV2::layerType() const
 
 void QgsEllipseSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
+  QgsMarkerSymbolLayerV2::startRender( context ); // get anchor point expressions
   if ( !context.feature() || !hasDataDefinedProperty() )
   {
     preparePath( mSymbolName, context );

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -1124,6 +1124,7 @@ QString QgsSvgMarkerSymbolLayerV2::layerType() const
 
 void QgsSvgMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
+  QgsMarkerSymbolLayerV2::startRender( context ); // get anchor point expressions
   mOrigSize = mSize; // save in case the size would be data defined
   Q_UNUSED( context );
   prepareExpressions( context.fields(), context.renderContext().rendererScale() );

diff --git a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp
@@ -102,12 +102,14 @@ QString QgsDataDefinedSymbolDialog::fileNameHelpText()
 
 QString QgsDataDefinedSymbolDialog::horizontalAnchorHelpText()
 {
-  return tr( "'left'|'center'|'right'" );
+  // Don't translate, localized keywords are not supported.
+  return "'left'|'center'|'right'";
 }
 
 QString QgsDataDefinedSymbolDialog::verticalAnchorHelpText()
 {
-  return tr( "'top'|'center'|'bottom'" );
+  // Don't translate, localized keywords are not supported.
+  return "'top'|'center'|'bottom'";
 }
 
 QString QgsDataDefinedSymbolDialog::gradientTypeHelpText()