Added new toolbar icons, added arrowhead rendering to Painter class.

[architektonas] / src / painter.cpp

diff --git a/src/painter.cpp b/src/painter.cpp
index 0dfdf3c76471920a33ae7e679524f80bc8ebd73a..1bb2e6bb33845aa3a000d385fb811efedeb366d1 100644 (file)
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -111,7 +111,7 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
        // We may need this stuff... If dimension text is large enough.
 //     int textWidth = QFontMetrics(painter->font()).width(text);
 //     int textHeight = QFontMetrics(painter->font()).height();
-       QRectF textBox(-100, -100, 200, 200);   // x, y, w, h; x/y = upper left corner
+       QRectF textBox(-100 * zoom, -100 * zoom, 200 * zoom, 200 * zoom);       // x, y, w, h; x/y = upper left corner
 
        // This is in pixels. Might not render correctly at all zoom levels.
        // Need to figure out if dimensions are always rendered at one size regardless of zoom,
@@ -213,3 +213,27 @@ void Painter::DrawText(QRectF rect, int type, QString text)
 
        painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
+
+void Painter::DrawArrowhead(Vector head, Vector tail)
+{
+       QPolygonF arrow;
+
+       // We draw the arrowhead aligned along the line from tail to head
+       double angle = Vector(head - tail).Angle();
+       double orthoAngle = angle + (PI / 2.0);
+       Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
+       Vector unit = Vector(head - tail).Unit();
+
+       Point p1 = head - (unit * 9.0);
+       Point p2 = p1 + (orthogonal * 3.0);
+       Point p3 = p1 - (orthogonal * 3.0);
+
+       Point p4 = CartesianToQtCoords(head);
+       Point p5 = CartesianToQtCoords(p2);
+       Point p6 = CartesianToQtCoords(p3);
+
+       arrow << QPointF(p4.x, p4.y) << QPointF(p5.x, p5.y) << QPointF(p6.x, p6.y);
+
+       painter->drawPolygon(arrow);
+}
+