X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=08068119afde63c7ccd3b5b0eb263b3ab774663a;hb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;hp=e8aaba1cf04cc8f7602a9d587884c0309f0e7222;hpb=0fcc2d879e1e0ca17eeaceae2159f5143a06586f;p=architektonas diff --git a/src/painter.cpp b/src/painter.cpp index e8aaba1..0806811 100644 --- a/src/painter.cpp +++ b/src/painter.cpp @@ -17,12 +17,6 @@ #include "mathconstants.h" -// Set class variable defaults -//Vector Painter::origin(-10.0, -10.0); -//double Painter::zoom = 1.0; -//Vector Painter::screenSize(200.0, 200.0); - - Painter::Painter(QPainter * p/*= NULL*/): painter(p) { } @@ -148,19 +142,11 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s float yOffset = -12.0 * Global::zoom * size; // Fix text so it isn't upside down... -#if 0 - if ((angle > PI * 0.5) && (angle < PI * 1.5)) - { - angle += PI; - yOffset = 12.0 * Global::zoom * size; - } -#else if ((angle > QTR_TAU) && (angle < THREE_QTR_TAU)) { angle += HALF_TAU; yOffset = 12.0 * Global::zoom * size; } -#endif textBox.translate(0, yOffset); painter->save(); @@ -199,6 +185,9 @@ void Painter::DrawTextObject(Point p, QString text, double size, double angle/*= void Painter::DrawArc(Vector center, double radius, double startAngle, double span) { + if (!painter) + return; + center = CartesianToQtCoords(center); // Need to multiply scalar quantities by the zoom factor as well... radius *= Global::zoom; @@ -212,6 +201,9 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp void Painter::DrawEllipse(Vector center, double axis1, double axis2) { + if (!painter) + return; + // Need to multiply scalar quantities by the zoom factor as well... center = CartesianToQtCoords(center); painter->drawEllipse(QPointF(center.x, center.y), axis1 * Global::zoom, axis2 * Global::zoom); @@ -222,6 +214,9 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2) // we don't want our object handle size to depend on the zoom level! void Painter::DrawHandle(Vector center) { + if (!painter) + return; + center = CartesianToQtCoords(center); painter->setPen(QPen(Qt::red, 2.0, Qt::DotLine)); painter->setBrush(Qt::NoBrush); @@ -229,16 +224,62 @@ void Painter::DrawHandle(Vector center) } +// 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) +{ + if (!painter) + return; + + point = CartesianToQtCoords(point); + painter->setPen(QPen(Qt::red, 2.0, Qt::SolidLine)); + painter->drawLine(point.x - 8.0, point.y, point.x + 8.0, point.y); + painter->drawLine(point.x, point.y - 8.0, point.x, point.y + 8.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::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)); + painter->drawLine(v1.x, v1.y, v1.x + 24, v1.y); + painter->drawLine(v1.x, v1.y, v1.x, v1.y + 24); + painter->drawLine(v2.x, v1.y, v2.x - 24, v1.y); + painter->drawLine(v2.x, v1.y, v2.x, v1.y + 24); + painter->drawLine(v2.x, v2.y, v2.x - 24, v2.y); + 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); + +} + + // 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::DrawArrowHandle(Vector center, double angle) { + if (!painter) + return; + center = CartesianToQtCoords(center); QPolygonF arrow; // Since we're drawing directly on the screen, the Y is inverted. So we use // the mirror of the angle. - double orthoAngle = -angle + QTR_TAU;//(PI / 2.0); + double orthoAngle = -angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(cos(-angle), sin(-angle)); @@ -259,12 +300,15 @@ void Painter::DrawArrowHandle(Vector center, double angle) // we don't want our object handle size to depend on the zoom level! void Painter::DrawArrowToLineHandle(Vector center, double angle) { + if (!painter) + return; + DrawArrowHandle(center, angle); center = CartesianToQtCoords(center); // Since we're drawing directly on the screen, the Y is inverted. So we use // the mirror of the angle. - double orthoAngle = -angle + QTR_TAU;//(PI / 2.0); + double orthoAngle = -angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(cos(-angle), sin(-angle)); @@ -363,7 +407,7 @@ void Painter::DrawArrowhead(Vector head, Vector tail, double size) // We draw the arrowhead aligned along the line from tail to head double angle = Vector(head - tail).Angle(); - double orthoAngle = angle + QTR_TAU;//(PI / 2.0); + double orthoAngle = angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(head - tail).Unit(); @@ -395,6 +439,9 @@ void Painter::DrawCrosshair(Vector point) void Painter::DrawInformativeText(QString text) { + if (!painter) + return; + painter->setFont(*Global::font); QRectF bounds = painter->boundingRect(QRectF(), Qt::AlignVCenter, text); bounds.moveTo(17.0, 17.0);