X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=2a5ed33eaef1a0f200b223d9145c1076d386d33b;hb=631fbe38f52222a65f1c3bcefb11a616d6806dd6;hp=c0d2c4d2300843e80aaaee7a2b8b55e52b037a2f;hpb=83e22355362af43b5beaafbccf101fa8b35bb12f;p=architektonas diff --git a/src/painter.cpp b/src/painter.cpp index c0d2c4d..2a5ed33 100644 --- a/src/painter.cpp +++ b/src/painter.cpp @@ -5,7 +5,7 @@ // (C) 2011 Underground Software // See the README and GPLv3 files for licensing and warranty information // -// JLH = James L. Hammons +// JLH = James Hammons // // WHO WHEN WHAT // --- ---------- ------------------------------------------------------------ @@ -27,10 +27,12 @@ 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 @@ -38,6 +40,7 @@ Vector Painter::CartesianToQtCoords(Vector v) return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom)); } + Vector Painter::QtToCartesianCoords(Vector v) { // Convert screen location, with inverted Y-axis coordinates, to regular @@ -66,6 +69,7 @@ The way we calculate the Cartesian to Qt shows the 2nd (origin is cartesian) to */ } + void Painter::SetRenderHint(int hint) { if (!painter) @@ -74,6 +78,7 @@ void Painter::SetRenderHint(int hint) painter->setRenderHint((QPainter::RenderHint)hint); } + void Painter::SetBrush(QBrush brush) { if (!painter) @@ -82,6 +87,7 @@ void Painter::SetBrush(QBrush brush) painter->setBrush(brush); } + void Painter::SetFont(QFont font) { if (!painter) @@ -90,6 +96,7 @@ void Painter::SetFont(QFont font) painter->setFont(font); } + void Painter::SetPen(QPen pen) { if (!painter) @@ -98,8 +105,12 @@ void Painter::SetPen(QPen pen) painter->setPen(pen); } -void Painter::DrawAngledText(Vector center, double angle, QString text) + +void Painter::DrawAngledText(Vector center, double angle, QString text, double size) { + if (!painter) + return; + // Strategy: Since Qt doesn't have any rotated text drawing functions, // we instead translate the origin to the center of the text to be drawn and // then rotate the frame to the desired angle. @@ -108,30 +119,42 @@ void Painter::DrawAngledText(Vector center, double angle, QString text) // We may need this stuff... If dimension text is large enough. // int textWidth = QFontMetrics(painter->font()).width(text); // int textHeight = QFontMetrics(painter->font()).height(); - QRectF textBox(-100, -100, 200, 200); // x, y, w, h; x/y = upper left corner +// NOTE: SCREEN_ZOOM is a kludge to make things look right at screen resolution... +// QRectF textBox(-100.0 * zoom * SCREEN_ZOOM, -100.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM); // x, y, w, h; x/y = upper left corner + QRectF textBox(-100.0 * zoom * size, -100.0 * zoom * size, 200.0 * zoom * size, 200.0 * zoom * size); // x, y, w, h; x/y = upper left corner // This is in pixels. Might not render correctly at all zoom levels. // 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. // If zoomable, this is incorrect: - int yOffset = -12; + // (Added zoom, so this is correct now :-) +// float yOffset = -12.0 * zoom * SCREEN_ZOOM; + float yOffset = -12.0 * zoom * size; // Fix text so it isn't upside down... if ((angle > PI * 0.5) && (angle < PI * 1.5)) { angle += PI; - yOffset = 12; +// yOffset = 12.0 * zoom * SCREEN_ZOOM; + yOffset = 12.0 * zoom * size; } +#if 0 + Vector offset = CartesianToQtCoords(Vector(0, yOffset)); + textBox.translate(offset.x, offset.y); +#else textBox.translate(0, yOffset); +#endif painter->save(); painter->translate(center.x, center.y); // Angles are backwards in the Qt coord system, so we flip ours... painter->rotate(-angle * RADIANS_TO_DEGREES); +//Need to fix this so the text scales as well... painter->drawText(textBox, Qt::AlignCenter, text); painter->restore(); } + void Painter::DrawArc(Vector center, double radius, double startAngle, double span) { center = CartesianToQtCoords(center); @@ -144,6 +167,7 @@ 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) { // Need to multiply scalar quantities by the zoom factor as well... @@ -151,14 +175,17 @@ void Painter::DrawEllipse(Vector center, double axis1, double 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->setBrush(Qt::NoBrush); painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0); } + void Painter::DrawLine(int x1, int y1, int x2, int y2) { if (!painter) @@ -169,6 +196,7 @@ 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) @@ -179,6 +207,7 @@ void Painter::DrawLine(Vector v1, Vector v2) painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); } + void Painter::DrawPoint(int x, int y) { if (!painter) @@ -188,6 +217,7 @@ void Painter::DrawPoint(int x, int y) painter->drawPoint(v.x, v.y); } + void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY) { if (!painter) @@ -196,6 +226,19 @@ void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY) painter->drawRoundedRect(rect, radiusX, radiusY); } + +void Painter::DrawRect(QRectF rect) +{ + if (!painter) + return; + + Vector v1 = CartesianToQtCoords(Vector(rect.x(), rect.y())); + Vector v2 = CartesianToQtCoords(Vector(rect.right(), rect.bottom())); + QRectF screenRect(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); + painter->drawRect(screenRect); +} + + void Painter::DrawText(QRectF rect, int type, QString text) { if (!painter) @@ -204,3 +247,34 @@ 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) +{ + QPolygonF arrow; + + // We draw the arrowhead aligned along the line from tail to head + double angle = Vector(head - tail).Angle(); + double orthoAngle = angle + (PI / 2.0); + Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); + Vector unit = Vector(head - tail).Unit(); + +#if 0 +// NOTE: SCREEN_ZOOM is a kludge to make things look right at scale... + Point p1 = head - (unit * 9.0 * SCREEN_ZOOM); + Point p2 = p1 + (orthogonal * 3.0 * SCREEN_ZOOM); + Point p3 = p1 - (orthogonal * 3.0 * SCREEN_ZOOM); +#else + Point p1 = head - (unit * 9.0 * size); + Point p2 = p1 + (orthogonal * 3.0 * size); + Point p3 = p1 - (orthogonal * 3.0 * size); +#endif + + Point p4 = CartesianToQtCoords(head); + Point p5 = CartesianToQtCoords(p2); + Point p6 = CartesianToQtCoords(p3); + + arrow << QPointF(p4.x, p4.y) << QPointF(p5.x, p5.y) << QPointF(p6.x, p6.y); + + painter->drawPolygon(arrow); +} +