15
15
#include " qgsgraduatedsymbolrendererv2.h"
16
16
#include " qgscategorizedsymbolrendererv2.h"
17
17
18
- // some ad-hoc conversions
19
- #define MM2PIXELS (x ) ((x)/0.26 )
20
- #define PIXELS2MM (x ) ((x)*0.26 )
21
-
22
18
23
19
QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2 ( const QgsSymbol* s )
24
20
{
@@ -27,7 +23,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
27
23
case QGis::Point :
28
24
{
29
25
QgsMarkerSymbolLayerV2* sl = NULL ;
30
- double size = MM2PIXELS ( s->pointSize () );
26
+ double size = s->pointSize ();
31
27
double angle = 0 ; // rotation only from classification field
32
28
QString symbolName = s->pointSymbolName ();
33
29
if ( symbolName.startsWith ( " hard:" ) )
@@ -52,7 +48,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
52
48
case QGis::Line:
53
49
{
54
50
QColor color = s->color ();
55
- double width = MM2PIXELS ( s->lineWidth () );
51
+ double width = s->lineWidth ();
56
52
Qt::PenStyle penStyle = s->pen ().style ();
57
53
QgsLineSymbolLayerV2* sl = new QgsSimpleLineSymbolLayerV2 ( color, width, penStyle );
58
54
@@ -67,7 +63,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
67
63
QColor borderColor = s->color ();
68
64
Qt::BrushStyle brushStyle = s->brush ().style ();
69
65
Qt::PenStyle borderStyle = s->pen ().style ();
70
- double borderWidth = MM2PIXELS ( s->lineWidth () );
66
+ double borderWidth = s->lineWidth ();
71
67
QgsFillSymbolLayerV2* sl = new QgsSimpleFillSymbolLayerV2 ( color, brushStyle, borderColor, borderStyle, borderWidth );
72
68
73
69
QgsSymbolLayerV2List layers;
@@ -96,7 +92,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
96
92
QgsSymbol* sOld = new QgsSymbol ( QGis::Point );
97
93
sOld ->setFillColor ( sl->color () );
98
94
sOld ->setFillStyle ( Qt::SolidPattern );
99
- sOld ->setPointSize ( PIXELS2MM ( msl->size () ) );
95
+ sOld ->setPointSize ( msl->size () );
100
96
if ( sl->layerType () == " SimpleMarker" )
101
97
{
102
98
QgsSimpleMarkerSymbolLayerV2* smsl = static_cast <QgsSimpleMarkerSymbolLayerV2*>( sl );
@@ -117,7 +113,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
117
113
QgsLineSymbolLayerV2* lsl = static_cast <QgsLineSymbolLayerV2*>( sl );
118
114
QgsSymbol* sOld = new QgsSymbol ( QGis::Line );
119
115
sOld ->setColor ( sl->color () );
120
- sOld ->setLineWidth ( PIXELS2MM ( lsl->width () ) );
116
+ sOld ->setLineWidth ( lsl->width () );
121
117
if ( sl->layerType () == " SimpleLine" )
122
118
{
123
119
// add specific settings
@@ -136,7 +132,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
136
132
// add specifc settings
137
133
QgsSimpleFillSymbolLayerV2* sfsl = static_cast <QgsSimpleFillSymbolLayerV2*>( sl );
138
134
sOld ->setColor ( sfsl->borderColor () );
139
- sOld ->setLineWidth ( PIXELS2MM ( sfsl->borderWidth () ) );
135
+ sOld ->setLineWidth ( sfsl->borderWidth () );
140
136
sOld ->setLineStyle ( sfsl->borderStyle () );
141
137
sOld ->setFillStyle ( sfsl->brushStyle () );
142
138
}
0 commit comments