Implement ogr style in simple line symbol layer

qgis · Dec 7, 2012 · ac2e77c · ac2e77c
1 parent b0b9098
commit ac2e77c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -69,6 +69,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
     , mLayer( NULL )
     , mGeom( NULL )
     , mError( NoError )
+    , mExportFeatureStyle( true )
 {
   QString vectorFileName = theVectorFileName;
   QString fileEncoding = theFileEncoding;
@@ -588,6 +589,8 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*
       }
       styleString.append( currentStyle );
     }
+
+    OGR_F_SetStyleString( poFeature, styleString.toLocal8Bit().data() );
   }
 
   // put the created feature to layer
@@ -747,7 +750,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
     {
       fet.clearAttributeMap();
     }
-    if ( !writer->addFeature( fet ) )
+    if ( !writer->addFeature( fet, layer->rendererV2() ) )
     {
       WriterError err = writer->hasError();
       if ( err != NoError && errorMessage )

diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -195,6 +195,22 @@ void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
   }
 }
 
+QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle() const
+{
+  QString symbolStyle;
+
+  //pen
+  symbolStyle.append( "PEN(" );
+  symbolStyle.append( "c:" );
+  symbolStyle.append( mPen.color().name() );
+  symbolStyle.append( ",w:" );
+  symbolStyle.append( QString::number( mPen.width() ) );
+  symbolStyle.append( "mm" );
+  symbolStyle.append( ")" );
+
+  return symbolStyle;
+}
+
 QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::createFromSld( QDomElement &element )
 {
   QgsDebugMsg( "Entered." );

diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.h b/src/core/symbology-ng/qgslinesymbollayerv2.h
@@ -56,6 +56,8 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
 
     void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
 
+    QString ogrFeatureStyle() const;
+
     // new stuff
 
     Qt::PenStyle penStyle() const { return mPenStyle; }

diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -332,6 +332,7 @@ QString QgsSymbolV2::ogrFeatureStyle() const
     }
     styleString.append( currentStyleString );
   }
+  return styleString;
 }
 
 QgsSymbolLayerV2List QgsSymbolV2::cloneLayers() const