@@ -1296,13 +1296,9 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
1296
1296
break ;
1297
1297
}
1298
1298
}
1299
-
1300
- size = QgsSymbolLayerV2Utils::convertToPainterUnits ( context.renderContext (), size, mSizeUnit , mSizeMapUnitScale );
1301
- }
1302
- if ( mSizeUnit == QgsSymbolV2::MM )
1303
- {
1304
- size *= mmMapUnitScaleFactor;
1305
1299
}
1300
+
1301
+ size *= e.mapUnitScaleFactor ( e.symbologyScaleDenominator (), mSizeUnit , e.mapUnits () );
1306
1302
double halfSize = size / 2.0 ;
1307
1303
1308
1304
// outlineWidth
@@ -1313,10 +1309,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
1313
1309
context.setOriginalValueVariable ( mOutlineWidth );
1314
1310
outlineWidth = evaluateDataDefinedProperty ( QgsSymbolLayerV2::EXPR_OUTLINE_WIDTH, context, mOutlineWidth ).toDouble ();
1315
1311
}
1316
- if ( mSizeUnit == QgsSymbolV2::MM )
1317
- {
1318
- outlineWidth *= mmMapUnitScaleFactor;
1319
- }
1312
+ outlineWidth *= e.mapUnitScaleFactor ( e.symbologyScaleDenominator (), mSizeUnit , e.mapUnits () );
1320
1313
1321
1314
// color
1322
1315
QColor pc = mPen .color ();
@@ -1368,10 +1361,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
1368
1361
if ( angle )
1369
1362
off = _rotatedOffset ( off, angle );
1370
1363
1371
- if ( mSizeUnit == QgsSymbolV2::MM )
1372
- {
1373
- off *= mmMapUnitScaleFactor;
1374
- }
1364
+ off *= e.mapUnitScaleFactor ( e.symbologyScaleDenominator (), mSizeUnit , e.mapUnits () );
1375
1365
1376
1366
QTransform t;
1377
1367
t.translate ( shift.x () + offsetX, shift.y () + offsetY );
0 commit comments