GUI functionality fixes.

[architektonas] / src / painter.cpp

diff --git a/src/painter.cpp b/src/painter.cpp
index 08068119afde63c7ccd3b5b0eb263b3ab774663a..6cb74eac9c3998fd5ebc51254fc3e69955b2d3b4 100644 (file)
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -29,8 +29,8 @@ Painter::~Painter()
 
 Vector Painter::CartesianToQtCoords(Vector v)
 {
-       // Convert regular Cartesian coordinates to the inverted Y-axis Qt coordinates
-       // at the current origin and zoom level.
+       // Convert regular Cartesian coordinates to the inverted Y-axis Qt
+       // coordinates at the current origin and zoom level.
        return Vector((v.x - Global::origin.x) * Global::zoom, Global::screenSize.y - ((v.y - Global::origin.y) * Global::zoom));
 }
 
@@ -139,13 +139,15 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s
        // 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 * Global::zoom * size;
+//     float yOffset = -12.0 * Global::zoom * size;
+       float yOffset = -8.0 * Global::zoom * size;
 
        // Fix text so it isn't upside down...
        if ((angle > QTR_TAU) && (angle < THREE_QTR_TAU))
        {
                angle += HALF_TAU;
-               yOffset = 12.0 * Global::zoom * size;
+//             yOffset = 12.0 * Global::zoom * size;
+               yOffset = 8.0 * Global::zoom * size;
        }
 
        textBox.translate(0, yOffset);
@@ -183,6 +185,25 @@ void Painter::DrawTextObject(Point p, QString text, double size, double angle/*=
 }
 
 
+//
+// Return the non-rotated rectangle containing the extents of the text in
+// Cartesian coordiates (starting from <0, 0>, the lower left hand side)
+//
+Rect Painter::MeasureTextObject(QString text, double size)
+{
+       if (!painter)
+               return Rect();
+
+       painter->setFont(QFont("Arial", Global::zoom * size));
+       int textWidth = QFontMetrics(painter->font()).width(text);
+       int textHeight = QFontMetrics(painter->font()).height();
+       Point measured((double)textWidth / Global::zoom, (double)textHeight / Global::zoom);// = QtToCartesianCoords(Point(textWidth, textHeight));
+//printf("QFontMetrics w/h=%i/%i, measured=%lf/%lf\n", textWidth, textHeight, measured.x, measured.y);
+
+       return Rect(Point(0, 0), measured);
+}
+
+
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
        if (!painter)
@@ -224,6 +245,20 @@ void Painter::DrawHandle(Vector center)
 }
 
 
+// This function is for drawing object handles without regard for zoom level;
+// we don't want our object handle size to depend on the zoom level!
+void Painter::DrawSmallHandle(Vector center)
+{
+       if (!painter)
+               return;
+
+       center = CartesianToQtCoords(center);
+       painter->setPen(QPen(Qt::red, 2.0, Qt::DotLine));
+       painter->setBrush(Qt::NoBrush);
+       painter->drawEllipse(QPointF(center.x, center.y), 2.0, 2.0);
+}
+
+
 // This function is for drawing feedback points without regard for zoom level;
 // we don't want our feedback point size to depend on the zoom level!
 void Painter::DrawCross(Vector point)
@@ -245,13 +280,8 @@ void Painter::DrawRectCorners(Rect rect)
        if (!painter)
                return;
 
-//     QRectF screenRect(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
-       
        Vector v1 = CartesianToQtCoords(Vector(rect.l, rect.t));
        Vector v2 = CartesianToQtCoords(Vector(rect.r, rect.b));
-//     QRectF screenRect(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
-//     screenRect.adjust(-8, 8, 8, -8);        // Left/top, right/bottom
-//     painter->drawRect(screenRect);
        v1 += Vector(-8.0, -8.0);
        v2 += Vector(+8.0, +8.0);
        painter->setPen(QPen(Qt::red, 2.0, Qt::DashLine));
@@ -263,7 +293,7 @@ void Painter::DrawRectCorners(Rect rect)
        painter->drawLine(v2.x, v2.y, v2.x, v2.y - 24);
        painter->drawLine(v1.x, v2.y, v1.x + 24, v2.y);
        painter->drawLine(v1.x, v2.y, v1.x, v2.y - 24);
-       
+
 }
 
 
@@ -450,7 +480,7 @@ void Painter::DrawInformativeText(QString text)
 
        QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
        painter->setPen(pen);
-       painter->setBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
+       painter->setBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0xD7)));
        painter->drawRoundedRect(textRect, 7.0, 7.0);
 
        pen = QPen(QColor(0x00, 0x5F, 0xDF));