Feature style for simple fill

mhugent · mhugent · commit 7fef39e6f649 · 2012-12-23T16:10:38.000+01:00
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -175,6 +175,17 @@ void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
   QgsSymbolLayerV2Utils::createDisplacementElement( doc, symbolizerElem, mOffset );
 }
 
+QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double widthScaleFactor ) const
+{
+  //brush
+  QString symbolStyle;
+  symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStyleBrush( mColor ) );
+  symbolStyle.append( ";" );
+  //pen
+  symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStylePen( mBorderWidth * widthScaleFactor, mBorderColor ) );
+  return symbolStyle;
+}
+
 QgsSymbolLayerV2* QgsSimpleFillSymbolLayerV2::createFromSld( QDomElement &element )
 {
   QgsDebugMsg( "Entered." );
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -57,6 +57,8 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2
 
     void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
 
+    QString ogrFeatureStyle( double widthScaleFactor ) const;
+
     Qt::BrushStyle brushStyle() const { return mBrushStyle; }
     void setBrushStyle( Qt::BrushStyle style ) { mBrushStyle = style; }
 
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2095,6 +2095,29 @@ void QgsSymbolLayerV2Utils::labelTextToSld( QDomDocument &doc, QDomElement &elem
   }
 }
 
+QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, const QColor& c )
+{
+  QString penStyle;
+  penStyle.append( "PEN(" );
+  penStyle.append( "c:" );
+  penStyle.append( c.name() );
+  penStyle.append( ",w:" );
+  //dxf driver writes ground units as mm? Should probably be changed in ogr
+  penStyle.append( QString::number( width ) );
+  penStyle.append( "mm" );
+  return penStyle;
+}
+
+QString QgsSymbolLayerV2Utils::ogrFeatureStyleBrush( const QColor& fillColor )
+{
+  QString brushStyle;
+  brushStyle.append( "BRUSH(" );
+  brushStyle.append( "fc:" );
+  brushStyle.append( fillColor.name() );
+  brushStyle.append( ")" );
+  return brushStyle;
+}
+
 void QgsSymbolLayerV2Utils::createGeometryElement( QDomDocument &doc, QDomElement &element, QString geomFunc )
 {
   if ( geomFunc.isEmpty() )
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h
@@ -164,6 +164,14 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
     static void labelTextToSld( QDomDocument &doc, QDomElement &element, QString label,
                                 QFont font, QColor color = QColor(), double size = -1 );
 
+    /**Create ogr feature style string for pen
+        @param width linewidth in mm
+        @param c line color*/
+    static QString ogrFeatureStylePen( double width, const QColor& c );
+    /**Create ogr feature syle string for brush
+        @param fillColr fill color*/
+    static QString ogrFeatureStyleBrush( const QColor& fillColr );
+
     static void createRotationElement( QDomDocument &doc, QDomElement &element, QString rotationFunc );
     static bool rotationFromSldElement( QDomElement &element, QString &rotationFunc );
 
