Fix tool handling and circle highlighting.

[architektonas] / src / painter.cpp

diff --git a/src/painter.cpp b/src/painter.cpp
index 1bb2e6bb33845aa3a000d385fb811efedeb366d1..73e5bf6e5fc539cca3984500d1822f9383fde030 100644 (file)
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -111,20 +111,21 @@ 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 * zoom, -100 * zoom, 200 * zoom, 200 * zoom);       // x, y, w, h; x/y = upper left corner
+// NOTE: SCREEN_ZOOM is a kludge to make things look right at screen resolution...
+       QRectF textBox(-100.0 * zoom * SCREEN_ZOOM, -100.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_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,
        // or if they have a definite size, and are thus zoomable.
        // If zoomable, this is incorrect:
        // (Added zoom, so this is correct now :-)
-       int yOffset = -12 * zoom;
+       float yOffset = -12.0 * zoom * SCREEN_ZOOM;
 
        // Fix text so it isn't upside down...
        if ((angle > PI * 0.5) && (angle < PI * 1.5))
        {
                angle += PI;
-               yOffset = 12 * zoom;
+               yOffset = 12.0 * zoom * SCREEN_ZOOM;
        }
 
 #if 0
@@ -166,6 +167,7 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2)
 void Painter::DrawHandle(Vector center)
 {
        center = CartesianToQtCoords(center);
+       painter->setBrush(Qt::NoBrush);
        painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0);
 }
 
@@ -224,9 +226,10 @@ void Painter::DrawArrowhead(Vector head, Vector tail)
        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);
+// NOTE: SCREEN_ZOOM is a kludge to make things look right at scale...
+       Point p1 = head - (unit * 9.0 * SCREEN_ZOOM);
+       Point p2 = p1 + (orthogonal * 3.0 * SCREEN_ZOOM);
+       Point p3 = p1 - (orthogonal * 3.0 * SCREEN_ZOOM);
 
        Point p4 = CartesianToQtCoords(head);
        Point p5 = CartesianToQtCoords(p2);