Added vertical line to simple marker symbol layer.

wonder · wonder · commit 6a39ad81b31b · 2010-01-18T17:41:58.000Z
Added rotation for ellipse, cross and line markers. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12791 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -235,7 +235,11 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolV2RenderCon
   {
     double scaledSize = context.outputPixelSize( mSize );
     double half = scaledSize / 2.0;
-    // TODO: rotate
+    if ( mAngle != 0 )
+    {
+      p->save();
+      p->rotate( mAngle );
+    }
 
     if ( mName == "circle" )
     {
@@ -251,6 +255,13 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolV2RenderCon
       p->drawLine( QPointF( -half, -half ), QPointF( half,  half ) );
       p->drawLine( QPointF( -half,  half ), QPointF( half, -half ) );
     }
+    else if ( mName == "line" )
+    {
+      p->drawLine( QPointF( 0, -half ), QPointF( 0, half ) ); // vertical line
+    }
+
+    if ( mAngle != 0 )
+      p->restore();
   }
 
 }
@@ -327,7 +338,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
   }
 
   p->save();
-  QPointF outputOffset = QPointF(context.outputLineWidth( mOffset.x() ), context.outputLineWidth( mOffset.y() ) );
+  QPointF outputOffset = QPointF( context.outputLineWidth( mOffset.x() ), context.outputLineWidth( mOffset.y() ) );
   p->translate( point + outputOffset );
 
   if ( mAngle != 0 )
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -161,7 +161,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( QWidget*
   QSize size = lstNames->iconSize();
   QStringList names;
   names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"
-  << "equilateral_triangle" << "star" << "regular_star" << "arrow";
+  << "equilateral_triangle" << "star" << "regular_star" << "arrow" << "line";
   double markerSize = size.width() - 1; // keep some space around
   for ( int i = 0; i < names.count(); ++i )
   {

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,11 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolV2RenderCon`
`235`	`235`	`{`
`236`	`236`	`double scaledSize = context.outputPixelSize( mSize );`
`237`	`237`	`double half = scaledSize / 2.0;`
`238`		`- // TODO: rotate`
	`238`	`+ if ( mAngle != 0 )`
	`239`	`+ {`
	`240`	`+ p->save();`
	`241`	`+ p->rotate( mAngle );`
	`242`	`+ }`
`239`	`243`
`240`	`244`	`if ( mName == "circle" )`
`241`	`245`	`{`
`@@ -251,6 +255,13 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolV2RenderCon`
`251`	`255`	`p->drawLine( QPointF( -half, -half ), QPointF( half, half ) );`
`252`	`256`	`p->drawLine( QPointF( -half, half ), QPointF( half, -half ) );`
`253`	`257`	`}`
	`258`	`+ else if ( mName == "line" )`
	`259`	`+ {`
	`260`	`+ p->drawLine( QPointF( 0, -half ), QPointF( 0, half ) ); // vertical line`
	`261`	`+ }`
	`262`	`+`
	`263`	`+ if ( mAngle != 0 )`
	`264`	`+ p->restore();`
`254`	`265`	`}`
`255`	`266`
`256`	`267`	`}`
`@@ -327,7 +338,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re`
`327`	`338`	`}`
`328`	`339`
`329`	`340`	`p->save();`
`330`		`- QPointF outputOffset = QPointF(context.outputLineWidth( mOffset.x() ), context.outputLineWidth( mOffset.y() ) );`
	`341`	`+ QPointF outputOffset = QPointF( context.outputLineWidth( mOffset.x() ), context.outputLineWidth( mOffset.y() ) );`
`331`	`342`	`p->translate( point + outputOffset );`
`332`	`343`
`333`	`344`	`if ( mAngle != 0 )`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( QWidget*`
`161`	`161`	`QSize size = lstNames->iconSize();`
`162`	`162`	`QStringList names;`
`163`	`163`	`names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"`
`164`		`- << "equilateral_triangle" << "star" << "regular_star" << "arrow";`
	`164`	`+ << "equilateral_triangle" << "star" << "regular_star" << "arrow" << "line";`
`165`	`165`	`double markerSize = size.width() - 1; // keep some space around`
`166`	`166`	`for ( int i = 0; i < names.count(); ++i )`
`167`	`167`	`{`