X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=2a5ed33eaef1a0f200b223d9145c1076d386d33b;hb=631fbe38f52222a65f1c3bcefb11a616d6806dd6;hp=73e5bf6e5fc539cca3984500d1822f9383fde030;hpb=7b7c8ec7d7f5379e09a8b7392f465f41639b0c79;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index 73e5bf6..2a5ed33 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -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,7 +105,8 @@ 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;
@@ -112,20 +120,23 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 //	int textWidth = QFontMetrics(painter->font()).width(text);
 //	int textHeight = QFontMetrics(painter->font()).height();
 // 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 * 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:
 	// (Added zoom, so this is correct now :-)
-	float yOffset = -12.0 * zoom * SCREEN_ZOOM;
+//	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.0 * zoom * SCREEN_ZOOM;
+//		yOffset = 12.0 * zoom * SCREEN_ZOOM;
+		yOffset = 12.0 * zoom * size;
 	}
 
 #if 0
@@ -143,6 +154,7 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 	painter->restore();
 }
 
+
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
 	center = CartesianToQtCoords(center);
@@ -155,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...
@@ -162,6 +175,7 @@ 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)
@@ -171,6 +185,7 @@ void Painter::DrawHandle(Vector center)
 	painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0);
 }
 
+
 void Painter::DrawLine(int x1, int y1, int x2, int y2)
 {
 	if (!painter)
@@ -181,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)
@@ -191,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)
@@ -200,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)
@@ -208,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)
@@ -216,7 +247,8 @@ void Painter::DrawText(QRectF rect, int type, QString text)
 	painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
 
-void Painter::DrawArrowhead(Vector head, Vector tail)
+
+void Painter::DrawArrowhead(Vector head, Vector tail, double size)
 {
 	QPolygonF arrow;
 
@@ -226,10 +258,16 @@ void Painter::DrawArrowhead(Vector head, Vector tail)
 	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);