Improve data defined rotation

Marco Hugentobler · Marco Hugentobler · commit b16f611cc4ee · 2011-06-10T23:59:04.000+02:00
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -4,14 +4,16 @@
 #include <QPainter>
 #include <QSet>
 
-QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2(): mSymbolName("circle"), mSymbolWidth(4), mSymbolHeight(3), mRotation(0), mFillColor( Qt::black ), mOutlineColor( Qt::white )
+QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2(): mSymbolName("circle"), mSymbolWidth(4), mSymbolHeight(3),
+mFillColor( Qt::black ), mOutlineColor( Qt::white ), mOutlineWidth( 0 )
 {
   mPen.setColor( mOutlineColor );
   mPen.setWidth( 1.0 );
   mPen.setJoinStyle( Qt::MiterJoin );
   mBrush.setColor( mFillColor );
   mBrush.setStyle( Qt::SolidPattern );
 
+  mAngle = 0;
   mWidthField.first = -1;
   mHeightField.first = -1;
   mRotationField.first = -1;
@@ -39,9 +41,9 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
   {
     layer->setSymbolHeight( properties["symbol_height"].toDouble() );
   }
-  if( properties.contains("rotation") )
+  if( properties.contains("angle") )
   {
-    layer->setRotation( properties["rotation"].toDouble() );
+    layer->setAngle( properties["angle"].toDouble() );
   }
   if( properties.contains( "outline_width" ) )
   {
@@ -117,22 +119,15 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend
     return;
   }
 
-  //priority for rotation: 1. data defined, 2. symbol layer rotation (mRotation), 3. symbol rotation (mAngle)
+  //priority for rotation: 1. data defined, 2. symbol layer rotation (mAngle)
   double rotation = 0.0;
-  if( mRotationField.first != -1 )
+  if( f && mRotationField.first != -1 )
   {
     rotation = f->attributeMap()[mRotationField.first].toDouble();
   }
-  else
+  else if( !doubleNear( mAngle, 0.0 ) )
   {
-    if( !doubleNear( mRotation, 0.0 ) )
-    {
-      rotation = mRotation;
-    }
-    else if( !doubleNear( mAngle, 0.0 ) )
-    {
-      rotation = mAngle;
-    }
+    rotation = mAngle;
   }
 
   QMatrix transform;
@@ -182,7 +177,7 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const
   map["symbol_height"] = QString::number( mSymbolHeight );
   map["height_index"] = QString::number( mHeightField.first );
   map["height_field"] = mHeightField.second;
-  map["rotation"] = QString::number( mRotation );
+  map["angle"] = QString::number( mAngle );
   map["rotation_index"] = QString::number( mRotationField.first );
   map["rotation_field"] = mRotationField.second;
   map["outline_width"] = QString::number( mOutlineWidth );
@@ -262,6 +257,10 @@ QSet<QString> QgsEllipseSymbolLayerV2::usedAttributes() const
   {
     dataDefinedAttributes.insert( mHeightField.second );
   }
+  if( mRotationField.first != -1 )
+  {
+    dataDefinedAttributes.insert( mRotationField.second );
+  }
   if( mOutlineWidthField.first != -1 )
   {
     dataDefinedAttributes.insert( mOutlineWidthField.second );
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.h b/src/core/symbology-ng/qgsellipsesymbollayerv2.h
@@ -35,9 +35,6 @@ class QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
     void setHeightField( int index, const QString& field );
     const QPair<int, QString>& heightField() const { return mHeightField; }
 
-    void setRotation( double r ){ mRotation = r; }
-    double rotation() const { return mRotation; }
-
     void setRotationField( int index, const QString& field );
     const QPair<int, QString>& rotationField() const { return mRotationField; }
 
@@ -65,7 +62,6 @@ class QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
     QString mSymbolName;
     double mSymbolWidth;
     double mSymbolHeight;
-    double mRotation;
     QColor mFillColor;
     QColor mOutlineColor;
     double mOutlineWidth;
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
@@ -41,7 +41,7 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
   mLayer = static_cast<QgsEllipseSymbolLayerV2*>( layer );
   mWidthSpinBox->setValue( mLayer->symbolWidth() );
   mHeightSpinBox->setValue( mLayer->symbolHeight() );
-  mRotationSpinBox->setValue( mLayer->rotation() );
+  mRotationSpinBox->setValue( mLayer->angle() );
   mOutlineWidthSpinBox->setValue( mLayer->outlineWidth() );
 
   QList<QListWidgetItem *> symbolItemList = mShapeListWidget->findItems( mLayer->symbolName(), Qt::MatchExactly );
@@ -122,7 +122,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mRotationSpinBox_valueChanged( double d )
 {
   if( mLayer )
   {
-    mLayer->setRotation( d );
+    mLayer->setAngle( d );
     emit changed();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,16 @@`
`4`	`4`	`#include <QPainter>`
`5`	`5`	`#include <QSet>`
`6`	`6`
`7`		`-QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2(): mSymbolName("circle"), mSymbolWidth(4), mSymbolHeight(3), mRotation(0), mFillColor( Qt::black ), mOutlineColor( Qt::white )`
	`7`	`+QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2(): mSymbolName("circle"), mSymbolWidth(4), mSymbolHeight(3),`
	`8`	`+mFillColor( Qt::black ), mOutlineColor( Qt::white ), mOutlineWidth( 0 )`
`8`	`9`	`{`
`9`	`10`	`mPen.setColor( mOutlineColor );`
`10`	`11`	`mPen.setWidth( 1.0 );`
`11`	`12`	`mPen.setJoinStyle( Qt::MiterJoin );`
`12`	`13`	`mBrush.setColor( mFillColor );`
`13`	`14`	`mBrush.setStyle( Qt::SolidPattern );`
`14`	`15`
	`16`	`+ mAngle = 0;`
`15`	`17`	`mWidthField.first = -1;`
`16`	`18`	`mHeightField.first = -1;`
`17`	`19`	`mRotationField.first = -1;`
`@@ -39,9 +41,9 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie`
`39`	`41`	`{`
`40`	`42`	`layer->setSymbolHeight( properties["symbol_height"].toDouble() );`
`41`	`43`	`}`
`42`		`- if( properties.contains("rotation") )`
	`44`	`+ if( properties.contains("angle") )`
`43`	`45`	`{`
`44`		`- layer->setRotation( properties["rotation"].toDouble() );`
	`46`	`+ layer->setAngle( properties["angle"].toDouble() );`
`45`	`47`	`}`
`46`	`48`	`if( properties.contains( "outline_width" ) )`
`47`	`49`	`{`
`@@ -117,22 +119,15 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend`
`117`	`119`	`return;`
`118`	`120`	`}`
`119`	`121`
`120`		`- //priority for rotation: 1. data defined, 2. symbol layer rotation (mRotation), 3. symbol rotation (mAngle)`
	`122`	`+ //priority for rotation: 1. data defined, 2. symbol layer rotation (mAngle)`
`121`	`123`	`double rotation = 0.0;`
`122`		`- if( mRotationField.first != -1 )`
	`124`	`+ if( f && mRotationField.first != -1 )`
`123`	`125`	`{`
`124`	`126`	`rotation = f->attributeMap()[mRotationField.first].toDouble();`
`125`	`127`	`}`
`126`		`- else`
	`128`	`+ else if( !doubleNear( mAngle, 0.0 ) )`
`127`	`129`	`{`
`128`		`- if( !doubleNear( mRotation, 0.0 ) )`
`129`		`- {`
`130`		`- rotation = mRotation;`
`131`		`- }`
`132`		`- else if( !doubleNear( mAngle, 0.0 ) )`
`133`		`- {`
`134`		`- rotation = mAngle;`
`135`		`- }`
	`130`	`+ rotation = mAngle;`
`136`	`131`	`}`
`137`	`132`
`138`	`133`	`QMatrix transform;`
`@@ -182,7 +177,7 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const`
`182`	`177`	`map["symbol_height"] = QString::number( mSymbolHeight );`
`183`	`178`	`map["height_index"] = QString::number( mHeightField.first );`
`184`	`179`	`map["height_field"] = mHeightField.second;`
`185`		`- map["rotation"] = QString::number( mRotation );`
	`180`	`+ map["angle"] = QString::number( mAngle );`
`186`	`181`	`map["rotation_index"] = QString::number( mRotationField.first );`
`187`	`182`	`map["rotation_field"] = mRotationField.second;`
`188`	`183`	`map["outline_width"] = QString::number( mOutlineWidth );`
`@@ -262,6 +257,10 @@ QSet<QString> QgsEllipseSymbolLayerV2::usedAttributes() const`
`262`	`257`	`{`
`263`	`258`	`dataDefinedAttributes.insert( mHeightField.second );`
`264`	`259`	`}`
	`260`	`+ if( mRotationField.first != -1 )`
	`261`	`+ {`
	`262`	`+ dataDefinedAttributes.insert( mRotationField.second );`
	`263`	`+ }`
`265`	`264`	`if( mOutlineWidthField.first != -1 )`
`266`	`265`	`{`
`267`	`266`	`dataDefinedAttributes.insert( mOutlineWidthField.second );`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )`
`41`	`41`	`mLayer = static_cast<QgsEllipseSymbolLayerV2*>( layer );`
`42`	`42`	`mWidthSpinBox->setValue( mLayer->symbolWidth() );`
`43`	`43`	`mHeightSpinBox->setValue( mLayer->symbolHeight() );`
`44`		`- mRotationSpinBox->setValue( mLayer->rotation() );`
	`44`	`+ mRotationSpinBox->setValue( mLayer->angle() );`
`45`	`45`	`mOutlineWidthSpinBox->setValue( mLayer->outlineWidth() );`
`46`	`46`
`47`	`47`	`QList<QListWidgetItem *> symbolItemList = mShapeListWidget->findItems( mLayer->symbolName(), Qt::MatchExactly );`
`@@ -122,7 +122,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mRotationSpinBox_valueChanged( double d )`
`122`	`122`	`{`
`123`	`123`	`if( mLayer )`
`124`	`124`	`{`
`125`		`- mLayer->setRotation( d );`
	`125`	`+ mLayer->setAngle( d );`
`126`	`126`	`emit changed();`
`127`	`127`	`}`
`128`	`128`	`}`