X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;fp=src%2Fpainter.cpp;h=869843933fd7f9726554dff7ba0c5c280499de2e;hb=0bd89e9489fa52f92545a7e94c4a31e863a5f898;hp=e2a457a5499a3cff2ba5732e9cc399080c57986a;hpb=3fe885b75511c9fbfe18a5c509260e83bb7ac136;p=ttedit

diff --git a/src/painter.cpp b/src/painter.cpp
index e2a457a..8698439 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -8,7 +8,7 @@
 // JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
-// ---  ----------  ------------------------------------------------------------
+// ---  ----------  -----------------------------------------------------------
 // JLH  09/20/2011  Created this file
 //
 
@@ -148,11 +148,19 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s
 	float yOffset = -12.0 * Global::zoom * size;
 
 	// Fix text so it isn't upside down...
+#if 0
 	if ((angle > PI * 0.5) && (angle < PI * 1.5))
 	{
 		angle += PI;
 		yOffset = 12.0 * Global::zoom * size;
 	}
+#else
+	if ((angle > QTR_TAU) && (angle < THREE_QTR_TAU))
+	{
+		angle += HALF_TAU;
+		yOffset = 12.0 * Global::zoom * size;
+	}
+#endif
 
 	textBox.translate(0, yOffset);
 	painter->save();
@@ -230,7 +238,11 @@ void Painter::DrawArrowHandle(Vector center, double angle)
 
 	// Since we're drawing directly on the screen, the Y is inverted. So we use
 	// the mirror of the angle.
+#if 0
 	double orthoAngle = -angle + (PI / 2.0);
+#else
+	double orthoAngle = -angle + QTR_TAU;
+#endif
 	Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
 	Vector unit = Vector(cos(-angle), sin(-angle));
 
@@ -256,7 +268,11 @@ void Painter::DrawArrowToLineHandle(Vector center, double angle)
 
 	// Since we're drawing directly on the screen, the Y is inverted. So we use
 	// the mirror of the angle.
+#if 0
 	double orthoAngle = -angle + (PI / 2.0);
+#else
+	double orthoAngle = -angle + QTR_TAU;
+#endif
 	Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
 	Vector unit = Vector(cos(-angle), sin(-angle));
 
@@ -366,7 +382,11 @@ void Painter::DrawArrowhead(Vector head, Vector tail, double size)
 
 	// We draw the arrowhead aligned along the line from tail to head
 	double angle = Vector(head - tail).Angle();
+#if 0
 	double orthoAngle = angle + (PI / 2.0);
+#else
+	double orthoAngle = angle + QTR_TAU;
+#endif
 	Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
 	Vector unit = Vector(head - tail).Unit();