From: Shamus Hammons Date: Thu, 23 Apr 2020 17:22:12 +0000 (-0500) Subject: Add small handle rendering, make Informative Text backgrnd more opaque. X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=architektonas;a=commitdiff_plain;h=a6e76b6a748a350bda067a99672f9dcca626d872 Add small handle rendering, make Informative Text backgrnd more opaque. --- diff --git a/src/painter.cpp b/src/painter.cpp index df1d7d5..16edb26 100644 --- 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)); } @@ -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)); diff --git a/src/painter.h b/src/painter.h index 5b11e25..98c81f3 100644 --- a/src/painter.h +++ b/src/painter.h @@ -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);