Lines respond to mouse movement, added Text rendering.

[architektonas] / src / painter.cpp

diff --git a/src/painter.cpp b/src/painter.cpp
index 4213261315b7aacb66a4e9420a98061cd6f350e1..61ee9b6c0ffa6f1e28a26231dc6ee118acd50d13 100644 (file)
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -13,15 +13,14 @@
 //
 
 #include "painter.h"
-
+#include "global.h"
 #include "mathconstants.h"
-#include "object.h"
 
 
 // Set class variable defaults
-Vector Painter::origin(-10.0, -10.0);
-double Painter::zoom = 1.0;
-Vector Painter::screenSize(200.0, 200.0);
+//Vector Painter::origin(-10.0, -10.0);
+//double Painter::zoom = 1.0;
+//Vector Painter::screenSize(200.0, 200.0);
 
 
 Painter::Painter(QPainter * p/*= NULL*/): painter(p)
@@ -38,7 +37,7 @@ Vector Painter::CartesianToQtCoords(Vector v)
 {
        // Convert regular Cartesian coordinates to the inverted Y-axis Qt coordinates
        // at the current origin and zoom level.
-       return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom));
+       return Vector((v.x - Global::origin.x) * Global::zoom, Global::screenSize.y - ((v.y - Global::origin.y) * Global::zoom));
 }
 
 
@@ -46,7 +45,7 @@ Vector Painter::QtToCartesianCoords(Vector v)
 {
        // Convert screen location, with inverted Y-axis coordinates, to regular
        // Cartesian coordinates at the current zoom level.
-       return Vector((v.x / zoom) + origin.x, ((screenSize.y - v.y) / zoom) + origin.y);
+       return Vector((v.x / Global::zoom) + Global::origin.x, ((Global::screenSize.y - v.y) / Global::zoom) + Global::origin.y);
 /*
 How to do it:
 
@@ -80,6 +79,26 @@ void Painter::SetRenderHint(int hint)
 }
 
 
+void Painter::SetPen(QPen pen)
+{
+       if (!painter)
+               return;
+
+       painter->setPen(pen);
+}
+
+
+void Painter::SetPen(uint32_t color, float size/*= 0*/, int style/*= 0*/)
+{
+       if (!painter)
+               return;
+
+       // We can cast style as Qt:PenStyle because they line up 1-to-1
+       painter->setPen(QPen(QColor(color >> 16, (color >> 8) & 0xFF, color & 0xFF, 255),
+               size, (Qt::PenStyle)style));
+}
+
+
 void Painter::SetBrush(QBrush brush)
 {
        if (!painter)
@@ -89,21 +108,21 @@ void Painter::SetBrush(QBrush brush)
 }
 
 
-void Painter::SetFont(QFont font)
+void Painter::SetBrush(uint32_t color)
 {
        if (!painter)
                return;
 
-       painter->setFont(font);
+       painter->setBrush(QBrush(QColor(color >> 16, (color >> 8) & 0xFF, color & 0xFF, 255)));
 }
 
 
-void Painter::SetPen(QPen pen)
+void Painter::SetFont(QFont font)
 {
        if (!painter)
                return;
 
-       painter->setPen(pen);
+       painter->setFont(font);
 }
 
 
@@ -120,19 +139,19 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s
        // 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.0 * zoom * size, -100.0 * zoom * size, 200.0 * zoom * size, 200.0 * zoom * size);   // x, y, w, h; x/y = upper left corner
+       QRectF textBox(-100.0 * Global::zoom * size, -100.0 * Global::zoom * size, 200.0 * Global::zoom * size, 200.0 * Global::zoom * size);   // 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, or if they have a definite size, and are thus
        // zoomable.
-       float yOffset = -12.0 * zoom * size;
+       float yOffset = -12.0 * Global::zoom * size;
 
        // Fix text so it isn't upside down...
        if ((angle > PI * 0.5) && (angle < PI * 1.5))
        {
                angle += PI;
-               yOffset = 12.0 * zoom * size;
+               yOffset = 12.0 * Global::zoom * size;
        }
 
        textBox.translate(0, yOffset);
@@ -146,11 +165,35 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s
 }
 
 
+//
+// Draw angled text. Draws text using point p as the upper left corner.
+// Size is point size, angle is in radians (defaults to 0).
+//
+void Painter::DrawTextObject(Point p, QString text, double size, double angle/*= 0*/)
+{
+       if (!painter)
+               return;
+
+       p = CartesianToQtCoords(p);
+       painter->setFont(QFont("Arial", Global::zoom * size));
+       int textWidth = QFontMetrics(painter->font()).width(text);
+       int textHeight = QFontMetrics(painter->font()).height();
+
+       QRectF textBox(0, 0, textWidth, textHeight);
+       painter->save();
+       painter->translate(p.x, p.y);
+       // Angles are backwards in the Qt coord system, so we flip ours...
+       painter->rotate(-angle * RADIANS_TO_DEGREES);
+       painter->drawText(textBox, Qt::AlignLeft | Qt::AlignTop , text);
+       painter->restore();
+}
+
+
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
        center = CartesianToQtCoords(center);
        // Need to multiply scalar quantities by the zoom factor as well...
-       radius *= zoom;
+       radius *= Global::zoom;
        QRectF rectangle(QPointF(center.x - radius, center.y - radius),
                QPointF(center.x + radius, center.y + radius));
        int angle1 = (int)(startAngle * RADIANS_TO_DEGREES * 16.0);
@@ -163,7 +206,7 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2)
 {
        // Need to multiply scalar quantities by the zoom factor as well...
        center = CartesianToQtCoords(center);
-       painter->drawEllipse(QPointF(center.x, center.y), axis1 * zoom, axis2 * zoom);
+       painter->drawEllipse(QPointF(center.x, center.y), axis1 * Global::zoom, axis2 * Global::zoom);
 }
 
 
@@ -336,14 +379,14 @@ void Painter::DrawCrosshair(Vector point)
                return;
 
        Vector screenPoint = CartesianToQtCoords(point);
-       painter->drawLine(0, screenPoint.y, screenSize.x, screenPoint.y);
-       painter->drawLine(screenPoint.x, 0, screenPoint.x, screenSize.y);
+       painter->drawLine(0, screenPoint.y, Global::screenSize.x, screenPoint.y);
+       painter->drawLine(screenPoint.x, 0, screenPoint.x, Global::screenSize.y);
 }
 
 
 void Painter::DrawInformativeText(QString text)
 {
-       painter->setFont(*Object::font);
+       painter->setFont(*Global::font);
        QRectF bounds = painter->boundingRect(QRectF(), Qt::AlignVCenter, text);
        bounds.moveTo(17.0, 17.0);
        QRectF textRect = bounds;