X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;fp=src%2Fpainter.cpp;h=322e1508ebe7f5bd55172b93ecae6c591fc4a74f;hb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;hp=e20f3eeb2247c52c8bd84711dd9589cd430e6692;hpb=a3e939d9028531324be8ba2ec54eddca31342c19;p=architektonas diff --git a/src/painter.cpp b/src/painter.cpp index e20f3ee..322e150 100644 --- a/src/painter.cpp +++ b/src/painter.cpp @@ -16,17 +16,14 @@ #include "global.h" #include "mathconstants.h" - Painter::Painter(QPainter * p/*= NULL*/): painter(p) { } - Painter::~Painter() { } - Vector Painter::CartesianToQtCoords(Vector v) { // Convert regular Cartesian coordinates to the inverted Y-axis Qt @@ -34,7 +31,6 @@ Vector Painter::CartesianToQtCoords(Vector v) 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 @@ -63,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) @@ -72,7 +67,6 @@ void Painter::SetRenderHint(int hint) painter->setRenderHint((QPainter::RenderHint)hint); } - void Painter::SetPen(QPen pen) { if (!painter) @@ -81,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) @@ -92,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) @@ -101,7 +93,6 @@ void Painter::SetBrush(QBrush brush) painter->setBrush(brush); } - void Painter::SetBrush(uint32_t color) { if (!painter) @@ -110,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) @@ -119,7 +109,6 @@ void Painter::SetFont(QFont font) painter->setFont(font); } - void Painter::DrawAngledText(Vector center, double angle, QString text, double size) { if (!painter) @@ -160,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). @@ -172,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); @@ -184,7 +172,6 @@ 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) @@ -195,15 +182,13 @@ Rect Painter::MeasureTextObject(QString text, double size) return Rect(); 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(); - Point measured((double)textWidth / Global::zoom, (double)textHeight / Global::zoom);// = QtToCartesianCoords(Point(textWidth, textHeight)); -//printf("QFontMetrics w/h=%i/%i, measured=%lf/%lf\n", textWidth, textHeight, measured.x, measured.y); + 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) @@ -219,7 +204,6 @@ 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) @@ -230,7 +214,6 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2) 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) @@ -244,7 +227,6 @@ void Painter::DrawHandle(Vector center) 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) @@ -258,7 +240,6 @@ void Painter::DrawSmallHandle(Vector center) 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) @@ -272,7 +253,6 @@ void Painter::DrawCross(Vector point) 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) @@ -296,7 +276,6 @@ void Painter::DrawRectCorners(Rect rect) } - // 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) @@ -325,7 +304,6 @@ 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) @@ -349,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) @@ -360,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) @@ -371,7 +347,6 @@ 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; @@ -380,7 +355,6 @@ void Painter::DrawHLine(double 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; @@ -389,7 +363,6 @@ void Painter::DrawVLine(double xpos) painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y)); } - void Painter::DrawPoint(int x, int y) { if (!painter) @@ -399,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) { @@ -409,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) @@ -424,7 +395,6 @@ void Painter::DrawPaddedRect(QRectF rect) painter->drawRect(screenRect); } - void Painter::DrawRect(QRectF rect) { if (!painter) @@ -436,7 +406,6 @@ void Painter::DrawRect(QRectF rect) painter->drawRect(screenRect); } - void Painter::DrawText(QRectF rect, int type, QString text) { if (!painter) @@ -445,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) @@ -472,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) { @@ -484,7 +451,6 @@ void Painter::DrawCrosshair(Vector point) painter->drawLine(screenPoint.x, 0, screenPoint.x, Global::screenSize.y); } - void Painter::DrawInformativeText(QString text) { if (!painter) @@ -505,4 +471,3 @@ void Painter::DrawInformativeText(QString text) painter->setPen(pen); painter->drawText(bounds, Qt::AlignVCenter, text); } -