Skip to content

Commit 45fcf55

Browse files
author
wonder
committed
Fixed conversions between V1 and V2 symbols: don't convert pixels<->mm anymore
git-svn-id: http://svn.osgeo.org/qgis/trunk@12766 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d2c979f commit 45fcf55

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/core/symbology-ng/qgssymbologyv2conversion.cpp

+6-10
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#include "qgsgraduatedsymbolrendererv2.h"
1616
#include "qgscategorizedsymbolrendererv2.h"
1717

18-
// some ad-hoc conversions
19-
#define MM2PIXELS(x) ((x)/0.26)
20-
#define PIXELS2MM(x) ((x)*0.26)
21-
2218

2319
QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
2420
{
@@ -27,7 +23,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
2723
case QGis::Point:
2824
{
2925
QgsMarkerSymbolLayerV2* sl = NULL;
30-
double size = MM2PIXELS( s->pointSize() );
26+
double size = s->pointSize();
3127
double angle = 0; // rotation only from classification field
3228
QString symbolName = s->pointSymbolName();
3329
if ( symbolName.startsWith( "hard:" ) )
@@ -52,7 +48,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
5248
case QGis::Line:
5349
{
5450
QColor color = s->color();
55-
double width = MM2PIXELS( s->lineWidth() );
51+
double width = s->lineWidth();
5652
Qt::PenStyle penStyle = s->pen().style();
5753
QgsLineSymbolLayerV2* sl = new QgsSimpleLineSymbolLayerV2( color, width, penStyle );
5854

@@ -67,7 +63,7 @@ QgsSymbolV2* QgsSymbologyV2Conversion::symbolV1toV2( const QgsSymbol* s )
6763
QColor borderColor = s->color();
6864
Qt::BrushStyle brushStyle = s->brush().style();
6965
Qt::PenStyle borderStyle = s->pen().style();
70-
double borderWidth = MM2PIXELS( s->lineWidth() );
66+
double borderWidth = s->lineWidth();
7167
QgsFillSymbolLayerV2* sl = new QgsSimpleFillSymbolLayerV2( color, brushStyle, borderColor, borderStyle, borderWidth );
7268

7369
QgsSymbolLayerV2List layers;
@@ -96,7 +92,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
9692
QgsSymbol* sOld = new QgsSymbol( QGis::Point );
9793
sOld->setFillColor( sl->color() );
9894
sOld->setFillStyle( Qt::SolidPattern );
99-
sOld->setPointSize( PIXELS2MM( msl->size() ) );
95+
sOld->setPointSize( msl->size() );
10096
if ( sl->layerType() == "SimpleMarker" )
10197
{
10298
QgsSimpleMarkerSymbolLayerV2* smsl = static_cast<QgsSimpleMarkerSymbolLayerV2*>( sl );
@@ -117,7 +113,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
117113
QgsLineSymbolLayerV2* lsl = static_cast<QgsLineSymbolLayerV2*>( sl );
118114
QgsSymbol* sOld = new QgsSymbol( QGis::Line );
119115
sOld->setColor( sl->color() );
120-
sOld->setLineWidth( PIXELS2MM( lsl->width() ) );
116+
sOld->setLineWidth( lsl->width() );
121117
if ( sl->layerType() == "SimpleLine" )
122118
{
123119
// add specific settings
@@ -136,7 +132,7 @@ QgsSymbol* QgsSymbologyV2Conversion::symbolV2toV1( QgsSymbolV2* s )
136132
// add specifc settings
137133
QgsSimpleFillSymbolLayerV2* sfsl = static_cast<QgsSimpleFillSymbolLayerV2*>( sl );
138134
sOld->setColor( sfsl->borderColor() );
139-
sOld->setLineWidth( PIXELS2MM( sfsl->borderWidth() ) );
135+
sOld->setLineWidth( sfsl->borderWidth() );
140136
sOld->setLineStyle( sfsl->borderStyle() );
141137
sOld->setFillStyle( sfsl->brushStyle() );
142138
}

0 commit comments

Comments
 (0)