]> Shamusworld >> Repos - architektonas/commitdiff
Add small handle rendering, make Informative Text backgrnd more opaque.
authorShamus Hammons <jlhamm@acm.org>
Thu, 23 Apr 2020 17:22:12 +0000 (12:22 -0500)
committerShamus Hammons <jlhamm@acm.org>
Thu, 23 Apr 2020 17:22:12 +0000 (12:22 -0500)
src/painter.cpp
src/painter.h

index df1d7d5d1c548a6cfe8014300485362d6f02bce8..16edb26e580c7aae7f42086abe2479182f134471 100644 (file)
@@ -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));
 }
 
@@ -243,6 +243,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)
@@ -277,7 +291,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);
-       
+
 }
 
 
@@ -464,7 +478,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));
index 5b11e25aadead93a1c418627fe3abbe50e02b332..98c81f3a7e6297955d73f6438044cd1d757ddd01 100644 (file)
@@ -26,6 +26,7 @@ class Painter
                void DrawArc(Vector, double, double, double);
                void DrawEllipse(Vector, double, double);
                void DrawHandle(Vector);
+               void DrawSmallHandle(Vector);
                void DrawCross(Vector);
                void DrawRectCorners(Rect);
                void DrawArrowHandle(Vector, double);