X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=853d3502690a494afdeb3635925d275fa087e6c8;hb=742d2aa9bb46bce4f690474fa22f5980e175e55e;hp=5bd5ae412eb7681f78d133e7f170b4bb4e733da5;hpb=e06428cc60e07d9ef33af8b559d60f23894130fb;p=architektonas diff --git a/src/painter.cpp b/src/painter.cpp index 5bd5ae4..853d350 100644 --- a/src/painter.cpp +++ b/src/painter.cpp @@ -16,31 +16,21 @@ #include "global.h" #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) { } - 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)); } - Vector Painter::QtToCartesianCoords(Vector v) { // Convert screen location, with inverted Y-axis coordinates, to regular @@ -54,12 +44,12 @@ origin is -10, -10 and zoom level is 2 (200%) 1st, invert the Y: 10, 10 -> 10, 90 2nd, add origin: 10, 90 -> 0, 80 (no, not right--err, yes, it is) -3rd, aply zoom: 0, 80 -> 0, 40 +3rd, apply zoom: 0, 80 -> 0, 40 or, is it: 1st, invert the Y: 10, 10 -> 10, 90 -2nd, aply zoom: 10, 90 -> 5, 45 +2nd, apply zoom: 10, 90 -> 5, 45 3rd, add origin: 5, 45 -> -5, 35 it depends on whether or not origin is in Qt coords or cartesian. If Qt, then the 1st @@ -69,7 +59,6 @@ The way we calculate the Cartesian to Qt shows the 2nd (origin is cartesian) to */ } - void Painter::SetRenderHint(int hint) { if (!painter) @@ -78,7 +67,6 @@ void Painter::SetRenderHint(int hint) painter->setRenderHint((QPainter::RenderHint)hint); } - void Painter::SetPen(QPen pen) { if (!painter) @@ -87,7 +75,6 @@ void Painter::SetPen(QPen pen) painter->setPen(pen); } - void Painter::SetPen(uint32_t color, float size/*= 0*/, int style/*= 0*/) { if (!painter) @@ -98,7 +85,6 @@ void Painter::SetPen(uint32_t color, float size/*= 0*/, int style/*= 0*/) size, (Qt::PenStyle)style)); } - void Painter::SetBrush(QBrush brush) { if (!painter) @@ -107,7 +93,6 @@ void Painter::SetBrush(QBrush brush) painter->setBrush(brush); } - void Painter::SetBrush(uint32_t color) { if (!painter) @@ -116,7 +101,6 @@ void Painter::SetBrush(uint32_t color) painter->setBrush(QBrush(QColor(color >> 16, (color >> 8) & 0xFF, color & 0xFF, 255))); } - void Painter::SetFont(QFont font) { if (!painter) @@ -125,7 +109,6 @@ void Painter::SetFont(QFont font) painter->setFont(font); } - void Painter::DrawAngledText(Vector center, double angle, QString text, double size) { if (!painter) @@ -145,13 +128,15 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s // 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. - float yOffset = -12.0 * Global::zoom * size; +// float yOffset = -12.0 * Global::zoom * size; + float yOffset = -8.0 * Global::zoom * size; // Fix text so it isn't upside down... - if ((angle > PI * 0.5) && (angle < PI * 1.5)) + if ((angle > QTR_TAU) && (angle < THREE_QTR_TAU)) { - angle += PI; - yOffset = 12.0 * Global::zoom * size; + angle += HALF_TAU; +// yOffset = 12.0 * Global::zoom * size; + yOffset = 8.0 * Global::zoom * size; } textBox.translate(0, yOffset); @@ -164,7 +149,6 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s painter->restore(); } - // // Draw angled text. Draws text using point p as the upper left corner. // Size is point size, angle is in radians (defaults to 0). @@ -176,7 +160,7 @@ void Painter::DrawTextObject(Point p, QString text, double size, double angle/*= p = CartesianToQtCoords(p); painter->setFont(QFont("Arial", Global::zoom * size)); - int textWidth = QFontMetrics(painter->font()).width(text); + int textWidth = QFontMetrics(painter->font()).horizontalAdvance(text); int textHeight = QFontMetrics(painter->font()).height(); QRectF textBox(0, 0, textWidth, textHeight); @@ -188,9 +172,28 @@ void Painter::DrawTextObject(Point p, QString text, double size, double angle/*= painter->restore(); } +// +// Return the non-rotated rectangle containing the extents of the text in +// Cartesian coordiates (starting from <0, 0>, the lower left hand side) +// +Rect Painter::MeasureTextObject(QString text, double size) +{ + if (!painter) + return Rect(); + + painter->setFont(QFont("Arial", Global::zoom * size)); + int textWidth = QFontMetrics(painter->font()).horizontalAdvance(text); + int textHeight = QFontMetrics(painter->font()).height(); + Point measured((double)textWidth / Global::zoom, (double)textHeight / Global::zoom); + + return Rect(Point(0, 0), measured); +} 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; @@ -201,36 +204,91 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp painter->drawArc(rectangle, angle1, angle2); } - 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); } - // 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) { + 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), 4.0, 4.0); } +// 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) +{ + 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; + + Vector v1 = CartesianToQtCoords(Vector(rect.l, rect.t)); + Vector v2 = CartesianToQtCoords(Vector(rect.r, rect.b)); + 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 + (PI / 2.0); + double orthoAngle = -angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(cos(-angle), sin(-angle)); @@ -246,17 +304,19 @@ void Painter::DrawArrowHandle(Vector center, double angle) painter->drawPolygon(arrow); } - // 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::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 + (PI / 2.0); + double orthoAngle = -angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(cos(-angle), sin(-angle)); @@ -267,7 +327,6 @@ void Painter::DrawArrowToLineHandle(Vector center, double angle) painter->drawLine(p2.x, p2.y, p3.x, p3.y); } - void Painter::DrawLine(int x1, int y1, int x2, int y2) { if (!painter) @@ -278,7 +337,6 @@ void Painter::DrawLine(int x1, int y1, int x2, int y2) painter->drawLine(v1.x, v1.y, v2.x, v2.y); } - void Painter::DrawLine(Vector v1, Vector v2) { if (!painter) @@ -289,6 +347,21 @@ void Painter::DrawLine(Vector v1, Vector v2) painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); } +void Painter::DrawHLine(double ypos) +{ + double width = Global::screenSize.x / Global::zoom; + Vector v1 = CartesianToQtCoords(Vector(Global::origin.x, ypos)); + Vector v2 = CartesianToQtCoords(Vector(Global::origin.x + width, ypos)); + painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); +} + +void Painter::DrawVLine(double xpos) +{ + double height = Global::screenSize.y / Global::zoom; + Vector v1 = CartesianToQtCoords(Vector(xpos, Global::origin.y)); + Vector v2 = CartesianToQtCoords(Vector(xpos, Global::origin.y + height)); + painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); +} void Painter::DrawPoint(int x, int y) { @@ -299,7 +372,6 @@ void Painter::DrawPoint(int x, int y) painter->drawPoint(v.x, v.y); } - // The rect passed in is in Qt coordinates... void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY) { @@ -309,7 +381,6 @@ void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY) painter->drawRoundedRect(rect, radiusX, radiusY); } - // The rect passed in is in Cartesian but we want to pad it by a set number of // pixels (currently set at 8), so the pad looks the same regardless of zoom. void Painter::DrawPaddedRect(QRectF rect) @@ -324,7 +395,6 @@ void Painter::DrawPaddedRect(QRectF rect) painter->drawRect(screenRect); } - void Painter::DrawRect(QRectF rect) { if (!painter) @@ -336,7 +406,6 @@ void Painter::DrawRect(QRectF rect) painter->drawRect(screenRect); } - void Painter::DrawText(QRectF rect, int type, QString text) { if (!painter) @@ -345,7 +414,6 @@ void Painter::DrawText(QRectF rect, int type, QString text) painter->drawText(rect, (Qt::AlignmentFlag)type, text); } - void Painter::DrawArrowhead(Vector head, Vector tail, double size) { if (!painter) @@ -355,7 +423,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 + (PI / 2.0); + double orthoAngle = angle + QTR_TAU; Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); Vector unit = Vector(head - tail).Unit(); @@ -372,7 +440,6 @@ void Painter::DrawArrowhead(Vector head, Vector tail, double size) painter->drawPolygon(arrow); } - // Point is given in Cartesian coordinates void Painter::DrawCrosshair(Vector point) { @@ -384,9 +451,11 @@ void Painter::DrawCrosshair(Vector point) painter->drawLine(screenPoint.x, 0, screenPoint.x, Global::screenSize.y); } - 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); @@ -395,11 +464,10 @@ 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)); painter->setPen(pen); painter->drawText(bounds, Qt::AlignVCenter, text); } -