Skip to content

Commit dda2550

Browse files
committed
Merge pull request #1340 from manisandro/fix-10205
Fix issue 10205: size of markers in marker line broken
2 parents add7040 + 21249c3 commit dda2550

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

src/core/symbology-ng/qgslinesymbollayerv2.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -617,18 +617,6 @@ QgsSymbolLayerV2* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props
617617
rotate = ( props["rotate"] == "1" );
618618

619619
QgsMarkerLineSymbolLayerV2* x = new QgsMarkerLineSymbolLayerV2( rotate, interval );
620-
if ( props.contains( "width" ) )
621-
{
622-
x->setWidth( props["width"].toDouble() );
623-
}
624-
if ( props.contains( "width_unit" ) )
625-
{
626-
x->setWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["width_unit"] ) );
627-
}
628-
if ( props.contains( "width_map_unit_scale" ) )
629-
{
630-
x->setWidthMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["width_map_unit_scale"] ) );
631-
}
632620
if ( props.contains( "offset" ) )
633621
{
634622
x->setOffset( props["offset"].toDouble() );
@@ -1145,9 +1133,6 @@ QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const
11451133
map["rotate"] = ( mRotateMarker ? "1" : "0" );
11461134
map["interval"] = QString::number( mInterval );
11471135
map["offset"] = QString::number( mOffset );
1148-
map["width"] = QString::number( mWidth );
1149-
map["width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mWidthUnit );
1150-
map["width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mWidthMapUnitScale );
11511136
map["offset_along_line"] = QString::number( mOffsetAlongLine );
11521137
map["offset_along_line_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetAlongLineUnit );
11531138
map["offset_along_line_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetAlongLineMapUnitScale );
@@ -1195,9 +1180,6 @@ QgsSymbolLayerV2* QgsMarkerLineSymbolLayerV2::clone() const
11951180
x->setSubSymbol( mMarker->clone() );
11961181
x->setOffset( mOffset );
11971182
x->setPlacement( mPlacement );
1198-
x->setWidth( mWidth );
1199-
x->setWidthUnit( mWidthUnit );
1200-
x->setWidthMapUnitScale( mWidthMapUnitScale );
12011183
x->setOffsetUnit( mOffsetUnit );
12021184
x->setOffsetMapUnitScale( mOffsetMapUnitScale );
12031185
x->setIntervalUnit( mIntervalUnit );

0 commit comments

Comments
 (0)