X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=35528faf9887ce5930306cb6f6d2c26465392c9a;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=bdac361f59b64d7f68b2aca874ac169c0d92837d;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index bdac361..35528fa 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -13,16 +13,14 @@
 //
 
 #include "painter.h"
-
-#include "mathconstants.h"
-//#include "object.h"
 #include "global.h"
+#include "mathconstants.h"
 
 
 // Set class variable defaults
-Vector Painter::origin(-10.0, -10.0);
-double Painter::zoom = 1.0;
-Vector Painter::screenSize(200.0, 200.0);
+//Vector Painter::origin(-10.0, -10.0);
+//double Painter::zoom = 1.0;
+//Vector Painter::screenSize(200.0, 200.0);
 
 
 Painter::Painter(QPainter * p/*= NULL*/): painter(p)
@@ -39,7 +37,7 @@ Vector Painter::CartesianToQtCoords(Vector v)
 {
 	// Convert regular Cartesian coordinates to the inverted Y-axis Qt coordinates
 	// at the current origin and zoom level.
-	return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom));
+	return Vector((v.x - Global::origin.x) * Global::zoom, Global::screenSize.y - ((v.y - Global::origin.y) * Global::zoom));
 }
 
 
@@ -47,7 +45,7 @@ Vector Painter::QtToCartesianCoords(Vector v)
 {
 	// Convert screen location, with inverted Y-axis coordinates, to regular
 	// Cartesian coordinates at the current zoom level.
-	return Vector((v.x / zoom) + origin.x, ((screenSize.y - v.y) / zoom) + origin.y);
+	return Vector((v.x / Global::zoom) + Global::origin.x, ((Global::screenSize.y - v.y) / Global::zoom) + Global::origin.y);
 /*
 How to do it:
 
@@ -121,19 +119,19 @@ void Painter::DrawAngledText(Vector center, double angle, QString text, double s
 	// 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.0 * zoom * size, -100.0 * zoom * size, 200.0 * zoom * size, 200.0 * zoom * size);	// x, y, w, h; x/y = upper left corner
+	QRectF textBox(-100.0 * Global::zoom * size, -100.0 * Global::zoom * size, 200.0 * Global::zoom * size, 200.0 * Global::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.
-	float yOffset = -12.0 * zoom * size;
+	float yOffset = -12.0 * Global::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 * size;
+		yOffset = 12.0 * Global::zoom * size;
 	}
 
 	textBox.translate(0, yOffset);
@@ -151,7 +149,7 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp
 {
 	center = CartesianToQtCoords(center);
 	// Need to multiply scalar quantities by the zoom factor as well...
-	radius *= zoom;
+	radius *= Global::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);
@@ -164,7 +162,7 @@ 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);
+	painter->drawEllipse(QPointF(center.x, center.y), axis1 * Global::zoom, axis2 * Global::zoom);
 }
 
 
@@ -337,8 +335,8 @@ void Painter::DrawCrosshair(Vector point)
 		return;
 
 	Vector screenPoint = CartesianToQtCoords(point);
-	painter->drawLine(0, screenPoint.y, screenSize.x, screenPoint.y);
-	painter->drawLine(screenPoint.x, 0, screenPoint.x, screenSize.y);
+	painter->drawLine(0, screenPoint.y, Global::screenSize.x, screenPoint.y);
+	painter->drawLine(screenPoint.x, 0, screenPoint.x, Global::screenSize.y);
 }