QgsVertexMarker: added possibility to change color and pen width

wonder · wonder · commit e7d6fbaf4cc1 · 2007-04-20T10:11:08.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6901 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/gui/qgsvertexmarker.sip b/python/gui/qgsvertexmarker.sip
@@ -24,6 +24,10 @@ class QgsVertexMarker : QgsMapCanvasItem
     
     void setIconSize(int iconSize);
     
+    void setColor(const QColor& color);
+    
+    void setPenWidth(int width);
+    
     void paint(QPainter* p);
     
     QRectF boundingRect() const;
diff --git a/src/gui/qgsvertexmarker.cpp b/src/gui/qgsvertexmarker.cpp
@@ -24,6 +24,8 @@ QgsVertexMarker::QgsVertexMarker(QgsMapCanvas* mapCanvas)
 {
   mIconSize = 10;
   mIconType = ICON_X;
+  mColor = QColor(255,0,0);
+  mPenWidth = 1;
 }
 
 void QgsVertexMarker::setIconType(int type)
@@ -43,12 +45,24 @@ void QgsVertexMarker::setCenter(const QgsPoint& point)
    setPos(pt);
 }
 
+void QgsVertexMarker::setColor(const QColor& color)
+{
+  mColor = color;
+}
+
+void QgsVertexMarker::setPenWidth(int width)
+{
+  mPenWidth = width;
+}
 
 void QgsVertexMarker::paint(QPainter* p)
 {
   qreal s = (mIconSize - 1) / 2;
 
-  p->setPen(QColor(255,0,0));
+  QPen pen(mColor);
+  pen.setWidth(mPenWidth);
+  p->setPen(pen);
+  
   switch (mIconType)
   {
     case ICON_NONE:
@@ -76,7 +90,7 @@ void QgsVertexMarker::paint(QPainter* p)
 
 QRectF QgsVertexMarker::boundingRect() const
 {
-  qreal s = qreal(mIconSize + QPen(QColor(255,0,0)).width()) / 2.0;
+  qreal s = qreal(mIconSize + mPenWidth) / 2.0;
   return QRectF(-s,-s,2.0*s,2.0*s);
 }
 
diff --git a/src/gui/qgsvertexmarker.h b/src/gui/qgsvertexmarker.h
@@ -43,6 +43,10 @@ class GUI_EXPORT QgsVertexMarker : public QgsMapCanvasItem
     
     void setIconSize(int iconSize);
     
+    void setColor(const QColor& color);
+    
+    void setPenWidth(int width);
+    
     void paint(QPainter* p);
     
     QRectF boundingRect() const;
@@ -59,6 +63,12 @@ class GUI_EXPORT QgsVertexMarker : public QgsMapCanvasItem
 
     //! coordinates of the point in the center
     QgsPoint mCenter;
+    
+    //! color of the marker
+    QColor mColor;
+    
+    //! pen width
+    int mPenWidth;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ QgsVertexMarker::QgsVertexMarker(QgsMapCanvas* mapCanvas)`
`24`	`24`	`{`
`25`	`25`	`mIconSize = 10;`
`26`	`26`	`mIconType = ICON_X;`
	`27`	`+ mColor = QColor(255,0,0);`
	`28`	`+ mPenWidth = 1;`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`void QgsVertexMarker::setIconType(int type)`
`@@ -43,12 +45,24 @@ void QgsVertexMarker::setCenter(const QgsPoint& point)`
`43`	`45`	`setPos(pt);`
`44`	`46`	`}`
`45`	`47`
	`48`	`+void QgsVertexMarker::setColor(const QColor& color)`
	`49`	`+{`
	`50`	`+ mColor = color;`
	`51`	`+}`
	`52`	`+`
	`53`	`+void QgsVertexMarker::setPenWidth(int width)`
	`54`	`+{`
	`55`	`+ mPenWidth = width;`
	`56`	`+}`
`46`	`57`
`47`	`58`	`void QgsVertexMarker::paint(QPainter* p)`
`48`	`59`	`{`
`49`	`60`	`qreal s = (mIconSize - 1) / 2;`
`50`	`61`
`51`		`- p->setPen(QColor(255,0,0));`
	`62`	`+ QPen pen(mColor);`
	`63`	`+ pen.setWidth(mPenWidth);`
	`64`	`+ p->setPen(pen);`
	`65`	`+`
`52`	`66`	`switch (mIconType)`
`53`	`67`	`{`
`54`	`68`	`case ICON_NONE:`
`@@ -76,7 +90,7 @@ void QgsVertexMarker::paint(QPainter* p)`
`76`	`90`
`77`	`91`	`QRectF QgsVertexMarker::boundingRect() const`
`78`	`92`	`{`
`79`		`- qreal s = qreal(mIconSize + QPen(QColor(255,0,0)).width()) / 2.0;`
	`93`	`+ qreal s = qreal(mIconSize + mPenWidth) / 2.0;`
`80`	`94`	`return QRectF(-s,-s,2.0s,2.0s);`
`81`	`95`	`}`
`82`	`96`