X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=73e5bf6e5fc539cca3984500d1822f9383fde030;hb=9d59b5831000704a1ed39c22a6043ba658993159;hp=2a0c60060869deed8771872a1fd4c06b3af97407;hpb=3b9b56d429a8a8733c8195e41f9b5e525b9b730d;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index 2a0c600..73e5bf6 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 <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  ------------------------------------------------------------
@@ -100,6 +100,9 @@ void Painter::SetPen(QPen pen)
 
 void Painter::DrawAngledText(Vector center, double angle, QString text)
 {
+	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,26 +111,34 @@ 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
 
 	// 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;
 
 	// 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;
 	}
 
+#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();
 }
@@ -135,6 +146,8 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
 	center = CartesianToQtCoords(center);
+	// Need to multiply scalar quantities by the zoom factor as well...
+	radius *= zoom;
 	QRectF rectangle(QPointF(center.x - radius, center.y - radius),
 		QPointF(center.x + radius, center.y + radius));
 	int angle1 = (int)(startAngle * RADIANS_TO_DEGREES * 16.0);
@@ -143,9 +156,19 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp
 }
 
 void Painter::DrawEllipse(Vector center, double axis1, double axis2)
+{
+	// Need to multiply scalar quantities by the zoom factor as well...
+	center = CartesianToQtCoords(center);
+	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->drawEllipse(QPointF(center.x, center.y), axis1, axis2);
+	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)
@@ -193,3 +216,27 @@ void Painter::DrawText(QRectF rect, int type, QString text)
 	painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
 
+void Painter::DrawArrowhead(Vector head, Vector tail)
+{
+	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();
+
+// 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);
+
+	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);
+}
+