X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=8fe59ab9ad64720bd06d901b662d602ccf052c2c;hb=fc498c685147e3173130e2df8953cc52705553e9;hp=2a0c60060869deed8771872a1fd4c06b3af97407;hpb=3b9b56d429a8a8733c8195e41f9b5e525b9b730d;p=architektonas diff --git a/src/painter.cpp b/src/painter.cpp index 2a0c600..8fe59ab 100644 --- a/src/painter.cpp +++ b/src/painter.cpp @@ -135,6 +135,8 @@ void Painter::DrawAngledText(Vector center, double angle, QString text) 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; 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); @@ -144,8 +146,17 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp 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, axis2); + painter->drawEllipse(QPointF(center.x, center.y), axis1 * zoom, axis2 * zoom); +} + +// 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::DrawHandle(Vector center) +{ + center = CartesianToQtCoords(center); + painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0); } void Painter::DrawLine(int x1, int y1, int x2, int y2) @@ -192,4 +203,3 @@ void Painter::DrawText(QRectF rect, int type, QString text) painter->drawText(rect, (Qt::AlignmentFlag)type, text); } -