X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=8fe59ab9ad64720bd06d901b662d602ccf052c2c;hb=fc498c685147e3173130e2df8953cc52705553e9;hp=8e664d21b4fdc54a50d30bd347b6d5fff46f1df1;hpb=43cc5bc5121cd05dc8696d653369c756950f3fba;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index 8e664d2..8fe59ab 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -38,7 +38,7 @@ Vector Painter::CartesianToQtCoords(Vector v)
 	return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom));
 }
 
-Vector Painter::QtCoordsToCartesian(Vector v)
+Vector Painter::QtToCartesianCoords(Vector v)
 {
 	// Convert screen location, with inverted Y-axis coordinates, to regular
 	// Cartesian coordinates at the current zoom level.
@@ -100,6 +100,9 @@ void Painter::SetPen(QPen pen)
 
 void Painter::DrawAngledText(Vector center, double angle, QString text)
 {
+	// 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.
 	center = CartesianToQtCoords(center);
 
 	// We may need this stuff... If dimension text is large enough.
@@ -107,17 +110,13 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 //	int textHeight = QFontMetrics(painter->font()).height();
 	QRectF textBox(-100, -100, 200, 200);	// x, y, w, h; x/y = upper left corner
 
-	// Some things to note here: if angle > 90 degrees, then we need to take the negative
-	// of the angle for our text.
-	painter->save();
-	painter->translate(center.x, center.y);
 	// 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;
 
-	//Fix text so it isn't upside down...
+	// Fix text so it isn't upside down...
 	if ((angle > PI * 0.5) && (angle < PI * 1.5))
 	{
 		angle += PI;
@@ -125,7 +124,9 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 	}
 
 	textBox.translate(0, yOffset);
-	// Angles are backwards in the Qt coord system...
+	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);
 	painter->drawText(textBox, Qt::AlignCenter, text);
 	painter->restore();
@@ -134,6 +135,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,8 +146,17 @@ 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, 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)
+{
+	center = CartesianToQtCoords(center);
+	painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0);
 }
 
 void Painter::DrawLine(int x1, int y1, int x2, int y2)
@@ -191,4 +203,3 @@ void Painter::DrawText(QRectF rect, int type, QString text)
 
 	painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
-