X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=853d3502690a494afdeb3635925d275fa087e6c8;hb=1d17841ed1d003060250dc2ef8dd6785fa02a07f;hp=08068119afde63c7ccd3b5b0eb263b3ab774663a;hpb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index 0806811..853d350 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -16,25 +16,21 @@
 #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 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
@@ -48,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
@@ -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)
@@ -139,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 > QTR_TAU) && (angle < THREE_QTR_TAU))
 	{
 		angle += HALF_TAU;
-		yOffset = 12.0 * Global::zoom * size;
+//		yOffset = 12.0 * Global::zoom * size;
+		yOffset = 8.0 * Global::zoom * size;
 	}
 
 	textBox.translate(0, yOffset);
@@ -158,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).
@@ -170,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);
@@ -182,6 +172,22 @@ 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)
 {
@@ -198,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)
@@ -209,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)
@@ -223,6 +227,18 @@ 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)
+{
+	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!
@@ -237,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)
@@ -245,13 +260,8 @@ 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));
@@ -263,9 +273,8 @@ void Painter::DrawRectCorners(Rect rect)
 	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!
@@ -295,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)
@@ -319,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)
@@ -330,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)
@@ -341,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)
 {
@@ -351,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)
 {
@@ -361,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)
@@ -376,7 +395,6 @@ void Painter::DrawPaddedRect(QRectF rect)
 	painter->drawRect(screenRect);
 }
 
-
 void Painter::DrawRect(QRectF rect)
 {
 	if (!painter)
@@ -388,7 +406,6 @@ void Painter::DrawRect(QRectF rect)
 	painter->drawRect(screenRect);
 }
 
-
 void Painter::DrawText(QRectF rect, int type, QString text)
 {
 	if (!painter)
@@ -397,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)
@@ -424,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)
 {
@@ -436,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)
@@ -450,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);
 }
-