Skip to content

Commit 1f2cc3d

Browse files
nyalldawsonnyalldawson
committedFeb 14, 2016
Revert deprecation of QgsSymbolV2Utils::encode/decodeOutputUnit
...as it causes circular dependancies. Defer to 3.0 when we can move QgsSymbolV2::OutputUnit to QgsUnitTypes
1 parent 9a081df commit 1f2cc3d

18 files changed

+142
-131
lines changed
 

‎python/core/qgsunittypes.sip

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,5 @@ class QgsUnitTypes
113113
*/
114114
static double fromUnitToUnitFactor( AreaUnit fromUnit, AreaUnit toUnit );
115115

116-
/** Encodes a symbol unit to a string.
117-
* @param unit unit to encode
118-
* @returns encoded string
119-
* @see decodeSymbolUnit()
120-
*/
121-
static QString encodeUnit( QgsSymbolV2::OutputUnit unit );
122-
123-
/** Decodes a symbol unit from a string.
124-
* @param string string to decode
125-
* @param ok optional boolean, will be set to true if string was converted successfully
126-
* @returns decoded units
127-
* @see encodeUnit()
128-
*/
129-
static QgsSymbolV2::OutputUnit decodeSymbolUnit( const QString& string, bool *ok = 0 );
130-
131116
};
132117

‎python/core/symbology-ng/qgssymbollayerv2utils.sip

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ class QgsSymbolLayerV2Utils
5151
static QString encodeSldRealVector( const QVector<qreal>& v );
5252
static QVector<qreal> decodeSldRealVector( const QString& s );
5353

54-
//! @deprecated use QgsUnitTypes::encodeUnit() instead
55-
static QString encodeOutputUnit( QgsSymbolV2::OutputUnit unit ) /Deprecated/;
56-
//! @deprecated use QgsUnitTypes::decodeSymbolUnit() instead
57-
static QgsSymbolV2::OutputUnit decodeOutputUnit( const QString& str ) /Deprecated/;
54+
static QString encodeOutputUnit( QgsSymbolV2::OutputUnit unit );
55+
static QgsSymbolV2::OutputUnit decodeOutputUnit( const QString& str );
5856

5957
static QString encodeSldUom( QgsSymbolV2::OutputUnit unit, double *scaleFactor );
6058
static QgsSymbolV2::OutputUnit decodeSldUom( const QString& str, double *scaleFactor );

‎src/app/qgsdecorationitem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ void QgsDecorationItem::projectRead()
6767
QgsDebugMsg( "Entered" );
6868
mEnabled = QgsProject::instance()->readBoolEntry( mNameConfig, "/Enabled", false );
6969
mPlacement = static_cast< Placement >( QgsProject::instance()->readNumEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) ) );
70-
mMarginUnit = QgsUnitTypes::decodeSymbolUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) ) );
70+
mMarginUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) ) );
7171
}
7272

7373
void QgsDecorationItem::saveToProject()
7474
{
7575
QgsDebugMsg( "Entered" );
7676
QgsProject::instance()->writeEntry( mNameConfig, "/Enabled", mEnabled );
7777
QgsProject::instance()->writeEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) );
78-
QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) );
78+
QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) );
7979
}
8080

8181
void QgsDecorationItem::setName( const char *name )

‎src/core/effects/qgsgloweffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ QgsStringMap QgsGlowEffect::properties() const
124124
props.insert( "transparency", QString::number( mTransparency ) );
125125
props.insert( "blur_level", QString::number( mBlurLevel ) );
126126
props.insert( "spread", QString::number( mSpread ) );
127-
props.insert( "spread_unit", QgsUnitTypes::encodeUnit( mSpreadUnit ) );
127+
props.insert( "spread_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mSpreadUnit ) );
128128
props.insert( "spread_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mSpreadMapUnitScale ) );
129129
props.insert( "color_type", QString::number( static_cast< int >( mColorType ) ) );
130130
props.insert( "single_color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
@@ -162,7 +162,7 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props )
162162
{
163163
mSpread = spread;
164164
}
165-
mSpreadUnit = QgsUnitTypes::decodeSymbolUnit( props.value( "spread_unit" ) );
165+
mSpreadUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "spread_unit" ) );
166166
mSpreadMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "spread_unit_scale" ) );
167167
QgsGlowEffect::GlowColorType type = static_cast< QgsGlowEffect::GlowColorType >( props.value( "color_type" ).toInt( &ok ) );
168168
if ( ok )

‎src/core/effects/qgsshadoweffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ QgsStringMap QgsShadowEffect::properties() const
103103
props.insert( "blur_level", QString::number( mBlurLevel ) );
104104
props.insert( "offset_angle", QString::number( mOffsetAngle ) );
105105
props.insert( "offset_distance", QString::number( mOffsetDist ) );
106-
props.insert( "offset_unit", QgsUnitTypes::encodeUnit( mOffsetUnit ) );
106+
props.insert( "offset_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit ) );
107107
props.insert( "offset_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale ) );
108108
props.insert( "color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
109109
return props;
@@ -139,7 +139,7 @@ void QgsShadowEffect::readProperties( const QgsStringMap &props )
139139
{
140140
mOffsetDist = distance;
141141
}
142-
mOffsetUnit = QgsUnitTypes::decodeSymbolUnit( props.value( "offset_unit" ) );
142+
mOffsetUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "offset_unit" ) );
143143
mOffsetMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "offset_unit_scale" ) );
144144
if ( props.contains( "color" ) )
145145
{

‎src/core/effects/qgstransformeffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ QgsStringMap QgsTransformEffect::properties() const
7878
props.insert( "shear_y", QString::number( mShearY ) );
7979
props.insert( "translate_x", QString::number( mTranslateX ) );
8080
props.insert( "translate_y", QString::number( mTranslateY ) );
81-
props.insert( "translate_unit", QgsUnitTypes::encodeUnit( mTranslateUnit ) );
81+
props.insert( "translate_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mTranslateUnit ) );
8282
props.insert( "translate_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mTranslateMapUnitScale ) );
8383
props.insert( "enabled", mEnabled ? "1" : "0" );
8484
props.insert( "draw_mode", QString::number( int( mDrawMode ) ) );
@@ -96,7 +96,7 @@ void QgsTransformEffect::readProperties( const QgsStringMap &props )
9696
mRotation = props.value( "rotation", "0.0" ).toDouble();
9797
mTranslateX = props.value( "translate_x", "0.0" ).toDouble();
9898
mTranslateY = props.value( "translate_y", "0.0" ).toDouble();
99-
mTranslateUnit = QgsUnitTypes::decodeSymbolUnit( props.value( "translate_unit" ) );
99+
mTranslateUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "translate_unit" ) );
100100
mTranslateMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "translate_unit_scale" ) );
101101
}
102102

‎src/core/qgspallabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4627,7 +4627,7 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
46274627
QgsStringMap map; // for SVG symbology marker
46284628
map["name"] = QgsSymbolLayerV2Utils::symbolNameToPath( tmpLyr.shapeSVGFile.trimmed() );
46294629
map["size"] = QString::number( sizeOut );
4630-
map["size_unit"] = QgsUnitTypes::encodeUnit(
4630+
map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit(
46314631
tmpLyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
46324632
map["angle"] = QString::number( 0.0 ); // angle is handled by this local painter
46334633

‎src/core/qgsunittypes.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@ double QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaUnit fromUnit, QgsU
462462
return 1.0;
463463
}
464464

465+
// enable for QGIS 3.0
466+
#if 0
467+
465468
QString QgsUnitTypes::encodeUnit( QgsSymbolV2::OutputUnit unit )
466469
{
467470
switch ( unit )
@@ -501,3 +504,5 @@ QgsSymbolV2::OutputUnit QgsUnitTypes::decodeSymbolUnit( const QString& string, b
501504
// millimeters are default
502505
return QgsSymbolV2::MM;
503506
}
507+
508+
#endif

‎src/core/qgsunittypes.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define QGSUNITTYPES_H
2020

2121
#include "qgis.h"
22-
#include "symbology-ng/qgssymbolv2.h"
2322

2423
/***************************************************************************
2524
* This class is considered CRITICAL and any change MUST be accompanied with
@@ -142,6 +141,8 @@ class CORE_EXPORT QgsUnitTypes
142141
*/
143142
static double fromUnitToUnitFactor( AreaUnit fromUnit, AreaUnit toUnit );
144143

144+
//TODO QGIS 3.0 - enable and move symbol units here! Otherwise creates circular dependancies...
145+
#if 0
145146
// SYMBOL UNITS
146147

147148
/** Encodes a symbol unit to a string.
@@ -158,6 +159,7 @@ class CORE_EXPORT QgsUnitTypes
158159
* @see encodeUnit()
159160
*/
160161
static QgsSymbolV2::OutputUnit decodeSymbolUnit( const QString& string, bool *ok = 0 );
162+
#endif
161163

162164
};
163165

‎src/core/symbology-ng/qgsellipsesymbollayerv2.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
6868
}
6969
if ( properties.contains( "symbol_width_unit" ) )
7070
{
71-
layer->setSymbolWidthUnit( QgsUnitTypes::decodeSymbolUnit( properties["symbol_width_unit"] ) );
71+
layer->setSymbolWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_width_unit"] ) );
7272
}
7373
if ( properties.contains( "symbol_width_map_unit_scale" ) )
7474
{
@@ -80,7 +80,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
8080
}
8181
if ( properties.contains( "symbol_height_unit" ) )
8282
{
83-
layer->setSymbolHeightUnit( QgsUnitTypes::decodeSymbolUnit( properties["symbol_height_unit"] ) );
83+
layer->setSymbolHeightUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_height_unit"] ) );
8484
}
8585
if ( properties.contains( "symbol_height_map_unit_scale" ) )
8686
{
@@ -108,11 +108,11 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
108108
}
109109
if ( properties.contains( "outline_width_unit" ) )
110110
{
111-
layer->setOutlineWidthUnit( QgsUnitTypes::decodeSymbolUnit( properties["outline_width_unit"] ) );
111+
layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
112112
}
113113
else if ( properties.contains( "line_width_unit" ) )
114114
{
115-
layer->setOutlineWidthUnit( QgsUnitTypes::decodeSymbolUnit( properties["line_width_unit"] ) );
115+
layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["line_width_unit"] ) );
116116
}
117117
if ( properties.contains( "outline_width_map_unit_scale" ) )
118118
{
@@ -141,7 +141,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
141141
}
142142
if ( properties.contains( "size_unit" ) )
143143
{
144-
layer->setSizeUnit( QgsUnitTypes::decodeSymbolUnit( properties["size_unit"] ) );
144+
layer->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["size_unit"] ) );
145145
}
146146
if ( properties.contains( "size_map_unit_scale" ) )
147147
{
@@ -153,7 +153,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
153153
}
154154
if ( properties.contains( "offset_unit" ) )
155155
{
156-
layer->setOffsetUnit( QgsUnitTypes::decodeSymbolUnit( properties["offset_unit"] ) );
156+
layer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
157157
}
158158
if ( properties.contains( "offset_map_unit_scale" ) )
159159
{
@@ -471,23 +471,23 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const
471471
QgsStringMap map;
472472
map["symbol_name"] = mSymbolName;
473473
map["symbol_width"] = QString::number( mSymbolWidth );
474-
map["symbol_width_unit"] = QgsUnitTypes::encodeUnit( mSymbolWidthUnit );
474+
map["symbol_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolWidthUnit );
475475
map["symbol_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolWidthMapUnitScale );
476476
map["symbol_height"] = QString::number( mSymbolHeight );
477-
map["symbol_height_unit"] = QgsUnitTypes::encodeUnit( mSymbolHeightUnit );
477+
map["symbol_height_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolHeightUnit );
478478
map["symbol_height_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolHeightMapUnitScale );
479479
map["angle"] = QString::number( mAngle );
480480
map["outline_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mOutlineStyle );
481481
map["outline_width"] = QString::number( mOutlineWidth );
482-
map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
482+
map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
483483
map["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
484484
map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
485485
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
486486
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
487-
map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
487+
map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
488488
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
489489
map["size"] = QString::number( mSize );
490-
map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
490+
map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
491491
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
492492
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
493493
map["vertical_anchor_point"] = QString::number( mVerticalAnchorPoint );

0 commit comments

Comments
 (0)