Skip to content

Commit cbab57d

Browse files
mhugentmhugent
committedMar 31, 2013
Clean legacy code in ellipse symbol layer
·
ltr-3_40archive/master_2
1 parent 0c08088 commit cbab57d

File tree

3 files changed

+4
-78
lines changed

3 files changed

+4
-78
lines changed
 

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,42 +24,21 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
2424
void setSymbolName( const QString& name );
2525
QString symbolName() const;
2626

27-
void setSymbolNameField( const QString& field );
28-
const QString& symbolNameField() const;
29-
3027
void setSymbolWidth( double w );
3128
double symbolWidth() const;
3229

33-
void setWidthField( const QString& field );
34-
const QString& widthField() const;
35-
3630
void setSymbolHeight( double h );
3731
double symbolHeight() const;
3832

39-
void setHeightField( const QString& field );
40-
const QString& heightField() const;
41-
42-
void setRotationField( const QString& field );
43-
const QString& rotationField() const;
44-
4533
void setOutlineWidth( double w );
4634
double outlineWidth() const;
4735

48-
void setOutlineWidthField( const QString& field );
49-
const QString& outlineWidthField() const;
50-
5136
void setFillColor( const QColor& c );
5237
QColor fillColor() const;
5338

54-
void setFillColorField( const QString& field );
55-
const QString& fillColorField() const;
56-
5739
void setOutlineColor( const QColor& c );
5840
QColor outlineColor() const;
5941

60-
void setOutlineColorField( const QString& field );
61-
const QString& outlineColorField() const;
62-
6342
QSet<QString> usedAttributes() const;
6443

6544
};

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2(): mSymbolName( "circle" ), mSy
3636
mBrush.setStyle( Qt::SolidPattern );
3737

3838
mAngle = 0;
39-
mWidthIndex = -1;
40-
mHeightIndex = -1;
41-
mRotationIndex = -1;
42-
mOutlineWidthIndex = -1;
43-
mFillColorIndex = -1;
44-
mOutlineColorIndex = -1;
45-
mSymbolNameIndex = -1;
4639
}
4740

4841
QgsEllipseSymbolLayerV2::~QgsEllipseSymbolLayerV2()
@@ -270,16 +263,16 @@ void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &el
270263
QString angleFunc = props.value( "angle", "" );
271264
if ( angleFunc.isEmpty() ) // symbol has no angle set
272265
{
273-
if ( !mRotationField.isEmpty() )
274-
angleFunc = mRotationField;
266+
if ( mRotationExpression )
267+
angleFunc = mRotationExpression->dump();
275268
else if ( !doubleNear( mAngle, 0.0 ) )
276269
angleFunc = QString::number( mAngle );
277270
}
278-
else if ( !mRotationField.isEmpty() )
271+
else if ( mRotationExpression )
279272
{
280273
// the symbol has an angle and the symbol layer have a rotation
281274
// property set
282-
angleFunc = QString( "%1 + %2" ).arg( angleFunc ).arg( mRotationField );
275+
angleFunc = QString( "%1 + %2" ).arg( angleFunc ).arg( mRotationExpression->dump() );
283276
}
284277
else if ( !doubleNear( mAngle, 0.0 ) )
285278
{
@@ -355,20 +348,13 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const
355348
map["symbol_name"] = mSymbolName;
356349
map["symbol_width"] = QString::number( mSymbolWidth );
357350
map["symbol_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolWidthUnit );
358-
map["width_field"] = mWidthField;
359351
map["symbol_height"] = QString::number( mSymbolHeight );
360352
map["symbol_height_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolHeightUnit );
361-
map["height_field"] = mHeightField;
362353
map["angle"] = QString::number( mAngle );
363-
map["rotation_field"] = mRotationField;
364354
map["outline_width"] = QString::number( mOutlineWidth );
365355
map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
366-
map["outline_width_field"] = mOutlineWidthField;
367356
map["fill_color"] = QgsSymbolLayerV2Utils::encodeColor( mFillColor );
368-
map["fill_color_field"] = mFillColorField;
369357
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
370-
map["outline_color_field"] = mOutlineColorField;
371-
map["symbol_name_field"] = mSymbolNameField;
372358

373359
//data defined properties
374360
if ( mWidthExpression )

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,42 +43,21 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
4343
void setSymbolName( const QString& name ) { mSymbolName = name; }
4444
QString symbolName() const { return mSymbolName; }
4545

46-
void setSymbolNameField( const QString& field ) { mSymbolNameField = field; }
47-
const QString& symbolNameField() const { return mSymbolNameField; }
48-
4946
void setSymbolWidth( double w ) { mSymbolWidth = w; }
5047
double symbolWidth() const { return mSymbolWidth; }
5148

52-
void setWidthField( const QString& field ) { mWidthField = field; }
53-
const QString& widthField() const { return mWidthField; }
54-
5549
void setSymbolHeight( double h ) { mSymbolHeight = h; }
5650
double symbolHeight() const { return mSymbolHeight; }
5751

58-
void setHeightField( const QString& field ) { mHeightField = field; }
59-
const QString& heightField() const { return mHeightField; }
60-
61-
void setRotationField( const QString& field ) { mRotationField = field; }
62-
const QString& rotationField() const { return mRotationField; }
63-
6452
void setOutlineWidth( double w ) { mOutlineWidth = w; }
6553
double outlineWidth() const { return mOutlineWidth; }
6654

67-
void setOutlineWidthField( const QString& field ) { mOutlineWidthField = field; }
68-
const QString& outlineWidthField() const { return mOutlineWidthField; }
69-
7055
void setFillColor( const QColor& c ) { mFillColor = c;}
7156
QColor fillColor() const { return mFillColor; }
7257

73-
void setFillColorField( const QString& field ) { mFillColorField = field; }
74-
const QString& fillColorField() const { return mFillColorField; }
75-
7658
void setOutlineColor( const QColor& c ) { mOutlineColor = c; }
7759
QColor outlineColor() const { return mOutlineColor; }
7860

79-
void setOutlineColorField( const QString& field ) { mOutlineColorField = field; }
80-
const QString& outlineColorField() const { return mOutlineColorField; }
81-
8261
QSet<QString> usedAttributes() const;
8362

8463
void setSymbolWidthUnit( QgsSymbolV2::OutputUnit unit ) { mSymbolWidthUnit = unit; }
@@ -111,14 +90,6 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
11190
QgsSymbolV2::OutputUnit mOutlineWidthUnit;
11291

11392
//data defined property fields
114-
QString mWidthField;
115-
QString mHeightField;
116-
QString mRotationField;
117-
QString mOutlineWidthField;
118-
QString mFillColorField;
119-
QString mOutlineColorField;
120-
QString mSymbolNameField;
121-
12293
QgsExpression* mWidthExpression;
12394
QgsExpression* mHeightExpression;
12495
QgsExpression* mRotationExpression;
@@ -127,16 +98,6 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
12798
QgsExpression* mOutlineColorExpression;
12899
QgsExpression* mSymbolNameExpression;
129100

130-
//field indices for data defined properties
131-
//resolved in startRender method
132-
int mWidthIndex;
133-
int mHeightIndex;
134-
int mRotationIndex;
135-
int mOutlineWidthIndex;
136-
int mFillColorIndex;
137-
int mOutlineColorIndex;
138-
int mSymbolNameIndex;
139-
140101
QPainterPath mPainterPath;
141102

142103
QPen mPen;

0 commit comments

Comments
 (0)
Please sign in to comment.