Let subsymbols have their own units

qgis · Mar 13, 2013 · af1bde9 · af1bde9
1 parent 96a01e0
commit af1bde9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -1135,6 +1135,24 @@ QgsPointPatternFillSymbolLayer::~QgsPointPatternFillSymbolLayer()
 {
 }
 
+void QgsPointPatternFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+{
+  mDistanceXUnit = unit;
+  mDistanceYUnit = unit;
+  mDisplacementXUnit = unit;
+  mDisplacementYUnit = unit;
+}
+
+QgsSymbolV2::OutputUnit QgsPointPatternFillSymbolLayer::outputUnit() const
+{
+  QgsSymbolV2::OutputUnit unit = mDistanceXUnit;
+  if ( mDistanceYUnit != unit || mDisplacementXUnit != unit || mDisplacementYUnit != unit )
+  {
+    return QgsSymbolV2::Mixed;
+  }
+  return unit;
+}
+
 QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& properties )
 {
   QgsPointPatternFillSymbolLayer* layer = new QgsPointPatternFillSymbolLayer();
@@ -1215,7 +1233,6 @@ void QgsPointPatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& cont
     pointRenderContext.setMapToPixel( mtp );
     pointRenderContext.setForceVectorOutput( false );
 
-    mMarkerSymbol->setOutputUnit( context.outputUnit() );
     mMarkerSymbol->startRender( pointRenderContext );
 
     //render corner points

diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -309,6 +309,9 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer
     void setDisplacementYUnit( QgsSymbolV2::OutputUnit unit ) { mDisplacementYUnit = unit; }
     QgsSymbolV2::OutputUnit displacementYUnit() const { return mDisplacementYUnit; }
 
+    void setOutputUnit( QgsSymbolV2::OutputUnit unit );
+    QgsSymbolV2::OutputUnit outputUnit() const;
+
   protected:
     QgsMarkerSymbolV2* mMarkerSymbol;
     double mDistanceX;

diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -419,7 +419,6 @@ void QgsMarkerLineSymbolLayerV2::setColor( const QColor& color )
 void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
   mMarker->setAlpha( context.alpha() );
-  mMarker->setOutputUnit( context.outputUnit() );
 
   // if being rotated, it gets initialized with every line segment
   int hints = 0;