Export ogr feature style in mm for line width and in ground units for line pattern

mhugent · mhugent · commit f3bb53f89f0d · 2012-12-27T14:12:44.000+01:00
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -458,8 +458,10 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*
         {
             continue;
         }*/
-        double wScaleFactor = widthScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );
-        currentStyle = ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( wScaleFactor );//"@" + it.value();
+        double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );
+        double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );
+
+        currentStyle = ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( mmsf, musf );//"@" + it.value();
 
         if ( mSymbologyExport == FeatureSymbology )
         {
@@ -1214,12 +1216,15 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl,  const Qgs
   QgsSymbolV2List::iterator symbolIt = symbolList.begin();
   for ( ; symbolIt != symbolList.end(); ++symbolIt )
   {
+    double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), mapUnits );
+    double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), mapUnits );
+
     int nLevels = ( *symbolIt )->symbolLayerCount();
     for ( int i = 0; i < nLevels; ++i )
     {
       mSymbolLayerTable.insert(( *symbolIt )->symbolLayer( i ), QString::number( nTotalLevels ) );
       OGR_SM_AddStyle( styleManager, QString::number( nTotalLevels ).toLocal8Bit(),
-                       ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( widthScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), mapUnits ) ).toLocal8Bit() );
+                       ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( mmsf, musf ).toLocal8Bit() );
       ++nTotalLevels;
     }
   }
@@ -1325,6 +1330,9 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
         continue;
       }
 
+      double mmsf = mmScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(), mapUnits );
+      double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(), mapUnits );
+
       int llayer = item.layer();
       QList<QgsFeature>& featureList = levelIt.value();
       QList<QgsFeature>::iterator featureIt = featureList.begin();
@@ -1338,8 +1346,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
           continue;
         }
 
-        QString styleString = levelIt.key()->symbolLayer( llayer )->ogrFeatureStyle( widthScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(),
-                              mapUnits ) );
+        QString styleString = levelIt.key()->symbolLayer( llayer )->ogrFeatureStyle( mmsf, musf );
         if ( !styleString.isEmpty() )
         {
           OGR_F_SetStyleString( ogrFeature, styleString.toLocal8Bit().data() );
@@ -1363,7 +1370,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
   return ( nErrors > 0 ) ? QgsVectorFileWriter::ErrFeatureWriteFailed : QgsVectorFileWriter::NoError;
 }
 
-double QgsVectorFileWriter::widthScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
+double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
 {
   if ( symbolUnits == QgsSymbolV2::MM )
   {
@@ -1381,6 +1388,22 @@ double QgsVectorFileWriter::widthScaleFactor( double scaleDenominator, QgsSymbol
   return 1.0; //todo: map units
 }
 
+double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
+{
+  if ( symbolUnits == QgsSymbolV2::MapUnit )
+  {
+    return 1.0;
+  }
+  else
+  {
+    if ( symbolUnits == QgsSymbolV2::MM && mapUnits == QGis::Meters )
+    {
+      return scaleDenominator / 1000;
+    }
+  }
+  return 1.0;
+}
+
 QgsRenderContext QgsVectorFileWriter::renderContext() const
 {
   QgsRenderContext context;
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -203,7 +203,8 @@ class CORE_EXPORT QgsVectorFileWriter
 
     /**Writes features considering symbol level order*/
     WriterError exportFeaturesSymbolLevels( QgsVectorLayer* layer, const QgsCoordinateTransform* ct, QString* errorMessage = 0 );
-    double widthScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
+    double mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
+    double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
     QgsRenderContext renderContext() const;
     void startRender( QgsVectorLayer* vl ) const;
     void stopRender( QgsVectorLayer* vl ) const;
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -175,14 +175,14 @@ void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
   QgsSymbolLayerV2Utils::createDisplacementElement( doc, symbolizerElem, mOffset );
 }
 
-QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double widthScaleFactor ) const
+QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const
 {
   //brush
   QString symbolStyle;
   symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStyleBrush( mColor ) );
   symbolStyle.append( ";" );
   //pen
-  symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStylePen( mBorderWidth, widthScaleFactor, mBorderColor ) );
+  symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStylePen( mBorderWidth, mmScaleFactor, mapUnitScaleFactor, mBorderColor ) );
   return symbolStyle;
 }
 
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2
 
     void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
 
-    QString ogrFeatureStyle( double widthScaleFactor ) const;
+    QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const;
 
     Qt::BrushStyle brushStyle() const { return mBrushStyle; }
     void setBrushStyle( Qt::BrushStyle style ) { mBrushStyle = style; }
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -195,17 +195,17 @@ void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
   }
 }
 
-QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double widthScaleFactor ) const
+QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const
 {
   if ( mUseCustomDashPattern )
   {
-    return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, widthScaleFactor,
+    return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, mmScaleFactor, mapUnitScaleFactor,
            mPen.color(), mPenJoinStyle,
            mPenCapStyle, mOffset, &mCustomDashVector );
   }
   else
   {
-    return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, widthScaleFactor, mPen.color(), mPenJoinStyle,
+    return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, mmScaleFactor, mapUnitScaleFactor, mPen.color(), mPenJoinStyle,
            mPenCapStyle, mOffset );
   }
 }
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.h b/src/core/symbology-ng/qgslinesymbollayerv2.h
@@ -56,7 +56,7 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
 
     void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
 
-    QString ogrFeatureStyle( double widthScaleFactor ) const;
+    QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const;
 
     // new stuff
 
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -54,7 +54,7 @@ class CORE_EXPORT QgsSymbolLayerV2
     virtual void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const
     { Q_UNUSED( props ); element.appendChild( doc.createComment( QString( "SymbolLayerV2 %1 not implemented yet" ).arg( layerType() ) ) ); }
 
-    virtual QString ogrFeatureStyle( double widthScaleFactor ) const { Q_UNUSED( widthScaleFactor ); return QString(); }
+    virtual QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const { Q_UNUSED( mmScaleFactor ); Q_UNUSED( mapUnitScaleFactor ); return QString(); }
 
     virtual QgsStringMap properties() const = 0;
 
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2095,7 +2095,7 @@ void QgsSymbolLayerV2Utils::labelTextToSld( QDomDocument &doc, QDomElement &elem
   }
 }
 
-QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthScaleFactor, const QColor& c,
+QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double mmScaleFactor, double mapUnitScaleFactor, const QColor& c,
     Qt::PenJoinStyle joinStyle,
     Qt::PenCapStyle capStyle,
     double offset,
@@ -2107,7 +2107,7 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca
   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 * widthScaleFactor ) );
+  penStyle.append( QString::number( width * mmScaleFactor ) );
   penStyle.append( "mm" );
 
   //dash dot vector
@@ -2121,8 +2121,8 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca
       {
         penStyle.append( " " );
       }
-      penStyle.append( QString::number( *pIt * widthScaleFactor ) );
-      penStyle.append( "mm" );
+      penStyle.append( QString::number( *pIt * mapUnitScaleFactor ) );
+      penStyle.append( "g" );
     }
     penStyle.append( "\"" );
   }
@@ -2161,8 +2161,8 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca
   if ( !doubleNear( offset, 0.0 ) )
   {
     penStyle.append( ",dp:" );
-    penStyle.append( QString::number( offset * widthScaleFactor ) );
-    penStyle.append( "mm" );
+    penStyle.append( QString::number( offset * mapUnitScaleFactor ) );
+    penStyle.append( "g" );
   }
 
   penStyle.append( ")" );
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h
@@ -167,7 +167,7 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
     /**Create ogr feature style string for pen
         @param width linewidth in mm
         @param c line color*/
-    static QString ogrFeatureStylePen( double width, double widthScaleFactor, const QColor& c,
+    static QString ogrFeatureStylePen( double width, double mmScaleFactor, double mapUnitsScaleFactor, const QColor& c,
                                        Qt::PenJoinStyle joinStyle = Qt::MiterJoin,
                                        Qt::PenCapStyle capStyle = Qt::FlatCap,
                                        double offset = 0.0,

Original file line number	Diff line number	Diff line change
`@@ -458,8 +458,10 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*`
`458`	`458`	`{`
`459`	`459`	`continue;`
`460`	`460`	`}*/`
`461`		`- double wScaleFactor = widthScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );`
`462`		`- currentStyle = ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( wScaleFactor );//"@" + it.value();`
	`461`	`+ double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );`
	`462`	`+ double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );`
	`463`	`+`
	`464`	`+ currentStyle = ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( mmsf, musf );//"@" + it.value();`
`463`	`465`
`464`	`466`	`if ( mSymbologyExport == FeatureSymbology )`
`465`	`467`	`{`
`@@ -1214,12 +1216,15 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl, const Qgs`
`1214`	`1216`	`QgsSymbolV2List::iterator symbolIt = symbolList.begin();`
`1215`	`1217`	`for ( ; symbolIt != symbolList.end(); ++symbolIt )`
`1216`	`1218`	`{`
	`1219`	`+ double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), mapUnits );`
	`1220`	`+ double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), mapUnits );`
	`1221`	`+`
`1217`	`1222`	`int nLevels = ( *symbolIt )->symbolLayerCount();`
`1218`	`1223`	`for ( int i = 0; i < nLevels; ++i )`
`1219`	`1224`	`{`
`1220`	`1225`	`mSymbolLayerTable.insert(( *symbolIt )->symbolLayer( i ), QString::number( nTotalLevels ) );`
`1221`	`1226`	`OGR_SM_AddStyle( styleManager, QString::number( nTotalLevels ).toLocal8Bit(),`
`1222`		`- ( symbolIt )->symbolLayer( i )->ogrFeatureStyle( widthScaleFactor( mSymbologyScaleDenominator, ( symbolIt )->outputUnit(), mapUnits ) ).toLocal8Bit() );`
	`1227`	`+ ( *symbolIt )->symbolLayer( i )->ogrFeatureStyle( mmsf, musf ).toLocal8Bit() );`
`1223`	`1228`	`++nTotalLevels;`
`1224`	`1229`	`}`
`1225`	`1230`	`}`
`@@ -1325,6 +1330,9 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels`
`1325`	`1330`	`continue;`
`1326`	`1331`	`}`
`1327`	`1332`
	`1333`	`+ double mmsf = mmScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(), mapUnits );`
	`1334`	`+ double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(), mapUnits );`
	`1335`	`+`
`1328`	`1336`	`int llayer = item.layer();`
`1329`	`1337`	`QList<QgsFeature>& featureList = levelIt.value();`
`1330`	`1338`	`QList<QgsFeature>::iterator featureIt = featureList.begin();`
`@@ -1338,8 +1346,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels`
`1338`	`1346`	`continue;`
`1339`	`1347`	`}`
`1340`	`1348`
`1341`		`- QString styleString = levelIt.key()->symbolLayer( llayer )->ogrFeatureStyle( widthScaleFactor( mSymbologyScaleDenominator, levelIt.key()->outputUnit(),`
`1342`		`- mapUnits ) );`
	`1349`	`+ QString styleString = levelIt.key()->symbolLayer( llayer )->ogrFeatureStyle( mmsf, musf );`
`1343`	`1350`	`if ( !styleString.isEmpty() )`
`1344`	`1351`	`{`
`1345`	`1352`	`OGR_F_SetStyleString( ogrFeature, styleString.toLocal8Bit().data() );`
`@@ -1363,7 +1370,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels`
`1363`	`1370`	`return ( nErrors > 0 ) ? QgsVectorFileWriter::ErrFeatureWriteFailed : QgsVectorFileWriter::NoError;`
`1364`	`1371`	`}`
`1365`	`1372`
`1366`		`-double QgsVectorFileWriter::widthScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )`
	`1373`	`+double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )`
`1367`	`1374`	`{`
`1368`	`1375`	`if ( symbolUnits == QgsSymbolV2::MM )`
`1369`	`1376`	`{`
`@@ -1381,6 +1388,22 @@ double QgsVectorFileWriter::widthScaleFactor( double scaleDenominator, QgsSymbol`
`1381`	`1388`	`return 1.0; //todo: map units`
`1382`	`1389`	`}`
`1383`	`1390`
	`1391`	`+double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )`
	`1392`	`+{`
	`1393`	`+ if ( symbolUnits == QgsSymbolV2::MapUnit )`
	`1394`	`+ {`
	`1395`	`+ return 1.0;`
	`1396`	`+ }`
	`1397`	`+ else`
	`1398`	`+ {`
	`1399`	`+ if ( symbolUnits == QgsSymbolV2::MM && mapUnits == QGis::Meters )`
	`1400`	`+ {`
	`1401`	`+ return scaleDenominator / 1000;`
	`1402`	`+ }`
	`1403`	`+ }`
	`1404`	`+ return 1.0;`
	`1405`	`+}`
	`1406`	`+`
`1384`	`1407`	`QgsRenderContext QgsVectorFileWriter::renderContext() const`
`1385`	`1408`	`{`
`1386`	`1409`	`QgsRenderContext context;`
Original file line number	Diff line number	Diff line change
`@@ -175,14 +175,14 @@ void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,`
`175`	`175`	`QgsSymbolLayerV2Utils::createDisplacementElement( doc, symbolizerElem, mOffset );`
`176`	`176`	`}`
`177`	`177`
`178`		`-QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double widthScaleFactor ) const`
	`178`	`+QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const`
`179`	`179`	`{`
`180`	`180`	`//brush`
`181`	`181`	`QString symbolStyle;`
`182`	`182`	`symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStyleBrush( mColor ) );`
`183`	`183`	`symbolStyle.append( ";" );`
`184`	`184`	`//pen`
`185`		`- symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStylePen( mBorderWidth, widthScaleFactor, mBorderColor ) );`
	`185`	`+ symbolStyle.append( QgsSymbolLayerV2Utils::ogrFeatureStylePen( mBorderWidth, mmScaleFactor, mapUnitScaleFactor, mBorderColor ) );`
`186`	`186`	`return symbolStyle;`
`187`	`187`	`}`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -195,17 +195,17 @@ void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
`198`		`-QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double widthScaleFactor ) const`
	`198`	`+QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const`
`199`	`199`	`{`
`200`	`200`	`if ( mUseCustomDashPattern )`
`201`	`201`	`{`
`202`		`- return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, widthScaleFactor,`
	`202`	`+ return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, mmScaleFactor, mapUnitScaleFactor,`
`203`	`203`	`mPen.color(), mPenJoinStyle,`
`204`	`204`	`mPenCapStyle, mOffset, &mCustomDashVector );`
`205`	`205`	`}`
`206`	`206`	`else`
`207`	`207`	`{`
`208`		`- return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, widthScaleFactor, mPen.color(), mPenJoinStyle,`
	`208`	`+ return QgsSymbolLayerV2Utils::ogrFeatureStylePen( mWidth, mmScaleFactor, mapUnitScaleFactor, mPen.color(), mPenJoinStyle,`
`209`	`209`	`mPenCapStyle, mOffset );`
`210`	`210`	`}`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2095,7 +2095,7 @@ void QgsSymbolLayerV2Utils::labelTextToSld( QDomDocument &doc, QDomElement &elem`
`2095`	`2095`	`}`
`2096`	`2096`	`}`
`2097`	`2097`
`2098`		`-QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthScaleFactor, const QColor& c,`
	`2098`	`+QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double mmScaleFactor, double mapUnitScaleFactor, const QColor& c,`
`2099`	`2099`	`Qt::PenJoinStyle joinStyle,`
`2100`	`2100`	`Qt::PenCapStyle capStyle,`
`2101`	`2101`	`double offset,`
`@@ -2107,7 +2107,7 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca`
`2107`	`2107`	`penStyle.append( c.name() );`
`2108`	`2108`	`penStyle.append( ",w:" );`
`2109`	`2109`	`//dxf driver writes ground units as mm? Should probably be changed in ogr`
`2110`		`- penStyle.append( QString::number( width * widthScaleFactor ) );`
	`2110`	`+ penStyle.append( QString::number( width * mmScaleFactor ) );`
`2111`	`2111`	`penStyle.append( "mm" );`
`2112`	`2112`
`2113`	`2113`	`//dash dot vector`
`@@ -2121,8 +2121,8 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca`
`2121`	`2121`	`{`
`2122`	`2122`	`penStyle.append( " " );`
`2123`	`2123`	`}`
`2124`		`- penStyle.append( QString::number( pIt widthScaleFactor ) );`
`2125`		`- penStyle.append( "mm" );`
	`2124`	`+ penStyle.append( QString::number( pIt mapUnitScaleFactor ) );`
	`2125`	`+ penStyle.append( "g" );`
`2126`	`2126`	`}`
`2127`	`2127`	`penStyle.append( "\"" );`
`2128`	`2128`	`}`
`@@ -2161,8 +2161,8 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double widthSca`
`2161`	`2161`	`if ( !doubleNear( offset, 0.0 ) )`
`2162`	`2162`	`{`
`2163`	`2163`	`penStyle.append( ",dp:" );`
`2164`		`- penStyle.append( QString::number( offset * widthScaleFactor ) );`
`2165`		`- penStyle.append( "mm" );`
	`2164`	`+ penStyle.append( QString::number( offset * mapUnitScaleFactor ) );`
	`2165`	`+ penStyle.append( "g" );`
`2166`	`2166`	`}`
`2167`	`2167`
`2168`	`2168`	`penStyle.append( ")" );`