X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=8c581bfc1df8e904ccb41bd2b724b26b3c3ae7d5;hb=4a979ddae8aa6b3556f24e8b961f7787c4b40cbe;hp=957aaf87a56d27b70fb622fccfb45ad07b990d3d;hpb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 957aaf8..8c581bf 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -35,6 +35,7 @@
 #include "mathconstants.h"
 #include "painter.h"
 #include "structs.h"
+#include "utils.h"
 
 
 #define BACKGROUND_MAX_SIZE	512
@@ -77,8 +78,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 #endif
 #else
 	Line * line = new Line;//(Vector(5, 5), Vector(50, 40), &document);
-	line->p1 = Vector(5, 5);
-	line->p2 = Vector(50, 40);
+	line->p[0] = Vector(5, 5);
+	line->p[1] = Vector(50, 40);
 	line->type = OTLine;
 	line->thickness = 2.0;
 	line->style = LSDash;
@@ -264,24 +265,6 @@ zero; so we do another modulus operation on the result to achieve this.
 }
 
 
-void DrawingView::AddNewObjectToDocument(Object * object)
-{
-	if (object)
-	{
-//		object->Reparent(&document);
-//		document.Add(object);
-		update();
-	}
-//printf("DrawingView::AddNewObjectToDocument(). object=%08X\n", object);
-}
-
-
-void DrawingView::HandleActionUpdate(void)
-{
-	update();
-}
-
-
 void DrawingView::SetCurrentLayer(int layer)
 {
 	Global::currentLayer = layer;
@@ -322,74 +305,96 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
 	painter.DrawLine(0, -16384, 0, 16384);
 	painter.DrawLine(-16384, 0, 16384, 0);
 
-	// The top level document takes care of rendering for us...
-//	document.Draw(&painter);
-	// Not any more it doesn't...
-	RenderObjects(&painter, &document);
+	// Do object rendering...
+	RenderObjects(&painter, document.objects);
 
-#if 0
-	if (toolAction)
+	// Do tool rendering, if any...
+	if (Global::tool)
 	{
 		painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine));
 		painter.DrawCrosshair(oldPoint);
-		toolAction->Draw(&painter);
+		ToolDraw(&painter);
 	}
-#endif
 
-#if 1
+	// Do selection rectangle rendering, if any
 	if (Global::selectionInProgress)
 	{
 		painter.SetPen(QPen(QColor(255, 127, 0, 255)));
 		painter.SetBrush(QBrush(QColor(255, 127, 0, 100)));
 		painter.DrawRect(Global::selection);
 	}
-#endif
+
+	if (!informativeText.isEmpty())
+		painter.DrawInformativeText(informativeText);
 }
 
 
-void DrawingView::RenderObjects(Painter * painter, Container * c)
+//
+// Renders objects in the passed in vector
+//
+void DrawingView::RenderObjects(Painter * painter, std::vector<void *> & v)
 {
 	std::vector<void *>::iterator i;
 
-	for(i=c->objects.begin(); i!=c->objects.end(); i++)
+	for(i=v.begin(); i!=v.end(); i++)
 	{
 		Object * obj = (Object *)(*i);
 		float scaledThickness = Global::scale * obj->thickness;
-		painter->SetPen(obj->color, Global::zoom * scaledThickness, obj->style);
-		painter->SetBrush(obj->color);
 
-		if (obj->selected || obj->hovered)
-			painter->SetPen(0xFF0000, Global::zoom * scaledThickness, LSDash);
+		if ((Global::tool == TTRotate) && ctrlDown && obj->selected)
+		{
+			painter->SetPen(0x00FF00, 2.0, LSSolid);
+		}
+		else
+		{
+			painter->SetPen(obj->color, Global::zoom * scaledThickness, obj->style);
+			painter->SetBrush(obj->color);
+
+			if (obj->selected || obj->hitObject)
+				painter->SetPen(0xFF0000, Global::zoom * scaledThickness, LSDash);
+		}
 
 		switch (obj->type)
 		{
 		case OTLine:
-		{
-			Line * l = (Line *)obj;
-			painter->DrawLine(l->p1, l->p2);
+			painter->DrawLine(obj->p[0], obj->p[1]);
+
+			if (obj->hitPoint[0])
+				painter->DrawHandle(obj->p[0]);
+
+			if (obj->hitPoint[1])
+				painter->DrawHandle(obj->p[1]);
+
 			break;
-		}
 		case OTCircle:
-		{
-			Circle * ci = (Circle *)obj;
 			painter->SetBrush(QBrush(Qt::NoBrush));
-			painter->DrawEllipse(ci->p1, ci->radius, ci->radius);
+			painter->DrawEllipse(obj->p[0], obj->radius[0], obj->radius[0]);
+
+			if (obj->hitPoint[0])
+				painter->DrawHandle(obj->p[0]);
+
 			break;
-		}
 		case OTArc:
-		{
-			Arc * a = (Arc *)obj;
-			painter->DrawArc(a->p1, a->radius, a->angle1, a->angle2);
+			painter->DrawArc(obj->p[0], obj->radius[0], obj->angle[0], obj->angle[1]);
+
+			if (obj->hitPoint[0])
+				painter->DrawHandle(obj->p[0]);
+
+			if (obj->hitPoint[1])
+				painter->DrawHandle(obj->p[0] + (Vector(cos(obj->angle[0]), sin(obj->angle[0])) * obj->radius[0]));
+
+			if (obj->hitPoint[2])
+				painter->DrawHandle(obj->p[0] + (Vector(cos(obj->angle[0] + obj->angle[1]), sin(obj->angle[0] + obj->angle[1])) * obj->radius[0]));
+
 			break;
-		}
 		case OTDimension:
 		{
 			Dimension * d = (Dimension *)obj;
 
-			Vector v(d->p1, d->p2);
+			Vector v(d->p[0], d->p[1]);
 			double angle = v.Angle();
 			Vector unit = v.Unit();
-			Vector linePt1 = d->p1, linePt2 = d->p2;
+			Vector linePt1 = d->p[0], linePt2 = d->p[1];
 			Vector ortho;
 			double x1, y1, length;
 
@@ -397,41 +402,41 @@ void DrawingView::RenderObjects(Painter * painter, Container * c)
 			{
 				if ((angle < 0) || (angle > PI))
 				{
-					x1 = (d->p1.x > d->p2.x ? d->p1.x : d->p2.x);
-					y1 = (d->p1.y > d->p2.y ? d->p1.y : d->p2.y);
+					x1 = (d->p[0].x > d->p[1].x ? d->p[0].x : d->p[1].x);
+					y1 = (d->p[0].y > d->p[1].y ? d->p[0].y : d->p[1].y);
 					ortho = Vector(1.0, 0);
 					angle = PI3_OVER_2;
 				}
 				else
 				{
-					x1 = (d->p1.x > d->p2.x ? d->p2.x : d->p1.x);
-					y1 = (d->p1.y > d->p2.y ? d->p2.y : d->p1.y);
+					x1 = (d->p[0].x > d->p[1].x ? d->p[1].x : d->p[0].x);
+					y1 = (d->p[0].y > d->p[1].y ? d->p[1].y : d->p[0].y);
 					ortho = Vector(-1.0, 0);
 					angle = PI_OVER_2;
 				}
 
 				linePt1.x = linePt2.x = x1;
-				length = fabs(d->p1.y - d->p2.y);
+				length = fabs(d->p[0].y - d->p[1].y);
 			}
 			else if (d->subtype == DTLinearHorz)
 			{
 				if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
 				{
-					x1 = (d->p1.x > d->p2.x ? d->p1.x : d->p2.x);
-					y1 = (d->p1.y > d->p2.y ? d->p1.y : d->p2.y);
+					x1 = (d->p[0].x > d->p[1].x ? d->p[0].x : d->p[1].x);
+					y1 = (d->p[0].y > d->p[1].y ? d->p[0].y : d->p[1].y);
 					ortho = Vector(0, 1.0);
 					angle = 0;
 				}
 				else
 				{
-					x1 = (d->p1.x > d->p2.x ? d->p2.x : d->p1.x);
-					y1 = (d->p1.y > d->p2.y ? d->p2.y : d->p1.y);
+					x1 = (d->p[0].x > d->p[1].x ? d->p[1].x : d->p[0].x);
+					y1 = (d->p[0].y > d->p[1].y ? d->p[1].y : d->p[0].y);
 					ortho = Vector(0, -1.0);
 					angle = PI;
 				}
 
 				linePt1.y = linePt2.y = y1;
-				length = fabs(d->p1.x - d->p2.x);
+				length = fabs(d->p[0].x - d->p[1].x);
 			}
 			else if (d->subtype == DTLinear)
 			{
@@ -446,8 +451,8 @@ void DrawingView::RenderObjects(Painter * painter, Container * c)
 			Point p2 = linePt2 + (ortho * 10.0 * scaledThickness);
 			Point p3 = linePt1 + (ortho * 16.0 * scaledThickness);
 			Point p4 = linePt2 + (ortho * 16.0 * scaledThickness);
-			Point p5 = d->p1 + (ortho * 4.0 * scaledThickness);
-			Point p6 = d->p2 + (ortho * 4.0 * scaledThickness);
+			Point p5 = d->p[0] + (ortho * 4.0 * scaledThickness);
+			Point p6 = d->p[1] + (ortho * 4.0 * scaledThickness);
 
 		/*
 		The numbers hardcoded into here, what are they?
@@ -462,8 +467,8 @@ void DrawingView::RenderObjects(Painter * painter, Container * c)
 			double t = Geometry::ParameterOfLineAndPoint(linePt1, linePt2, linePt2 - (unit * 9.0 * scaledThickness));
 		//printf("Dimension::Draw(): t = %lf\n", t);
 
-		// On the screen, it's acting like this is actually 58%...
-		// This is correct, we want it to happen at > 50%
+			// On the screen, it's acting like this is actually 58%...
+			// This is correct, we want it to happen at > 50%
 			if (t > 0.58)
 			{
 				// Draw main dimension line + arrowheads
@@ -512,7 +517,7 @@ void DrawingView::RenderObjects(Painter * painter, Container * c)
 		case OTText:
 		{
 			Text * t = (Text *)obj;
-			painter->DrawTextObject(t->p1, t->s.c_str(), scaledThickness);
+			painter->DrawTextObject(t->p[0], t->s.c_str(), scaledThickness);
 			break;
 		}
 		default:
@@ -522,34 +527,6 @@ void DrawingView::RenderObjects(Painter * painter, Container * c)
 }
 
 
-void DrawingView::DeleteSelectedItems(void)
-{
-	std::vector<void *>::iterator i = document.objects.begin();
-
-	while (i != document.objects.end())
-	{
-		Object * obj = (Object *)(*i);
-
-		if (obj->selected)
-		{
-			delete obj;
-			document.objects.erase(i);
-		}
-		else
-			i++;
-	}
-}
-
-
-void DrawingView::ClearSelection(void)
-{
-	std::vector<void *>::iterator i;
-
-	for(i=document.objects.begin(); i!=document.objects.end(); i++)
-		((Object *)(*i))->selected = false;
-}
-
-
 void DrawingView::AddHoveredToSelection(void)
 {
 	std::vector<void *>::iterator i;
@@ -564,10 +541,10 @@ void DrawingView::AddHoveredToSelection(void)
 
 void DrawingView::GetSelection(std::vector<void *> & v)
 {
-	v.empty();
+	v.clear();
 	std::vector<void *>::iterator i;
 
-	for(i=v.begin(); i!=v.end(); i++)
+	for(i=document.objects.begin(); i!=document.objects.end(); i++)
 	{
 		if (((Object *)(*i))->selected)
 			v.push_back(*i);
@@ -577,13 +554,16 @@ void DrawingView::GetSelection(std::vector<void *> & v)
 
 void DrawingView::GetHovered(std::vector<void *> & v)
 {
-	v.empty();
+	v.clear();
 	std::vector<void *>::iterator i;
 
-	for(i=v.begin(); i!=v.end(); i++)
+	for(i=document.objects.begin(); i!=document.objects.end(); i++)
 	{
 		if (((Object *)(*i))->hovered)
+//		{
+//printf("GetHovered: adding object (%X) to hover... hp1=%s, hp2=%s, hl=%s\n", (*i), (((Line *)(*i))->hitPoint[0] ? "true" : "false"), (((Line *)(*i))->hitPoint[1] ? "true" : "false"), (((Line *)(*i))->hitObject ? "true" : "false"));
 			v.push_back(*i);
+//		}
 	}
 }
 
@@ -595,383 +575,675 @@ void DrawingView::resizeEvent(QResizeEvent * /*event*/)
 }
 
 
-void DrawingView::mousePressEvent(QMouseEvent * event)
+void DrawingView::ToolHandler(int mode, Point p)
 {
-	if (event->button() == Qt::LeftButton)
-	{
-		Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
-//		collided = document.Collided(point);
-		collided = false;
+	if (Global::tool == TTLine)
+		LineHandler(mode, p);
+	else if (Global::tool == TTCircle)
+		CircleHandler(mode, p);
+	else if (Global::tool == TTArc)
+		ArcHandler(mode, p);
+	else if (Global::tool == TTRotate)
+		RotateHandler(mode, p);
+	else if (Global::tool == TTMirror)
+		MirrorHandler(mode, p);
+}
 
-		// Do an update if collided with at least *one* object in the document
-//		if (collided)
-//			update();
-		// Actually, we already know what we're going to click on as all the collision
-		// detection already happened in the mouse move function...!
-//printf("MouseDown: ctrl=%s, numHovered=%i\n", (ctrlDown ? "DOWN" : "up"), numHovered);
 
-#if 0
-		if (toolAction)
+void DrawingView::ToolDraw(Painter * painter)
+{
+	if (Global::tool == TTLine)
+	{
+		if (Global::toolState == TSNone)
 		{
-			if (Global::snapToGrid)
-				point = Global::SnapPointToGrid(point);
-
-			// We always snap to object points, and they take precendence over
-			// grid points...
-			if (Global::snapPointIsValid)
-				point = Global::snapPoint;
-
-			toolAction->MouseDown(point);
+			painter->DrawHandle(toolPoint[0]);
 		}
-#else
-		if (Global::tool)
+		else if ((Global::toolState == TSPoint2) && shiftDown)
 		{
-			return;
+			painter->DrawHandle(toolPoint[1]);
 		}
-#endif
-
-		if (!ctrlDown)
-			ClearSelection();
-
-		if (numHovered > 0)
-			AddHoveredToSelection();
-
-#if 1
-		// Didn't hit any object and not using a tool, so do a selection rectangle
-		if (!(numHovered || Global::tool))
+		else
 		{
-			Global::selectionInProgress = true;
-			Global::selection.setTopLeft(QPointF(point.x, point.y));
-			Global::selection.setBottomRight(QPointF(point.x, point.y));
+			painter->DrawLine(toolPoint[0], toolPoint[1]);
+			painter->DrawHandle(toolPoint[1]);
+
+			Vector v(toolPoint[0], toolPoint[1]);
+			double absAngle = v.Angle() * RADIANS_TO_DEGREES;
+			double absLength = v.Magnitude();
+			QString text = tr("Length: %1 in.\n") + QChar(0x2221) + tr(": %2");
+			informativeText = text.arg(absLength).arg(absAngle);
 		}
-#endif
 	}
-	else if (event->button() == Qt::MiddleButton)
+	else if (Global::tool == TTCircle)
 	{
-		scrollDrag = true;
-		oldPoint = Vector(event->x(), event->y());
-		// Should also change the mouse pointer as well...
-		setCursor(Qt::SizeAllCursor);
+		if (Global::toolState == TSNone)
+		{
+			painter->DrawHandle(toolPoint[0]);
+		}
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+		{
+			painter->DrawHandle(toolPoint[1]);
+		}
+		else
+		{
+			double length = Vector::Magnitude(toolPoint[0], toolPoint[1]);
+//			painter->DrawLine(toolPoint[0], toolPoint[1]);
+//			painter->DrawHandle(toolPoint[1]);
+			painter->SetBrush(QBrush(Qt::NoBrush));
+			painter->DrawEllipse(toolPoint[0], length, length);
+			QString text = tr("Radius: %1 in.");//\n") + QChar(0x2221) + tr(": %2");
+			informativeText = text.arg(length);//.arg(absAngle);
+		}
 	}
-}
-
-
-void DrawingView::mouseMoveEvent(QMouseEvent * event)
-{
-	Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
-	Global::selection.setBottomRight(QPointF(point.x, point.y));
-	// Only needs to be done here, as mouse down is always preceded by movement
-	Global::snapPointIsValid = false;
-
-	// Scrolling...
-	if (event->buttons() & Qt::MiddleButton)
+	else if (Global::tool == TTArc)
 	{
-		point = Vector(event->x(), event->y());
-		// Since we're using Qt coords for scrolling, we have to adjust them here to
-		// conform to Cartesian coords, since the origin is using Cartesian. :-)
-		Vector delta(oldPoint, point);
-		delta /= Global::zoom;
-		delta.y = -delta.y;
-		Global::origin -= delta;
-
-		UpdateGridBackground();
-		update();
-		oldPoint = point;
-		return;
-	}
+		if (Global::toolState == TSNone)
+		{
+			painter->DrawHandle(toolPoint[0]);
+		}
+		else if (Global::toolState == TSPoint2)
+		{
+			double length = Vector::Magnitude(toolPoint[0], toolPoint[1]);
+			painter->SetBrush(QBrush(Qt::NoBrush));
+			painter->DrawEllipse(toolPoint[0], length, length);
+			painter->DrawLine(toolPoint[0], toolPoint[1]);
+			painter->DrawHandle(toolPoint[1]);
+			QString text = tr("Radius: %1 in.");
+			informativeText = text.arg(length);
+		}
+		else if (Global::toolState == TSPoint3)
+		{
+			double angle = Vector::Angle(toolPoint[0], toolPoint[2]);
+			painter->DrawLine(toolPoint[0], toolPoint[2]);
+			painter->SetBrush(QBrush(Qt::NoBrush));
+			painter->DrawEllipse(toolPoint[0], toolPoint[1].x, toolPoint[1].x);
+			painter->DrawHandle(toolPoint[0] + (Vector(cos(angle), sin(angle)) * toolPoint[1].x));
+			QString text = tr("Angle start: %1") + QChar(0x00B0);
+			informativeText = text.arg(RADIANS_TO_DEGREES * angle);
+		}
+		else
+		{
+			double angle = Vector::Angle(toolPoint[0], toolPoint[3]);
+			double span = angle - toolPoint[2].x;
 
-#if 1
-	// Grid processing... (only snap here is left button is down)
-	if ((event->buttons() & Qt::LeftButton) && Global::snapToGrid)
-	{
-		point = SnapPointToGrid(point);
-	}
+			if (span < 0)
+				span += PI_TIMES_2;
 
-	// Snap points on objects always take precedence over the grid, whether
-	// dragging an object or not...
-//thisnowok
-	if (Global::snapPointIsValid)
-	{
-// Uncommenting this causes the cursor to become unresponsive after the first
-// object is added.
-//		point = Global::snapPoint;
+			painter->DrawLine(toolPoint[0], toolPoint[3]);
+			painter->SetBrush(QBrush(Qt::NoBrush));
+			painter->DrawEllipse(toolPoint[0], toolPoint[1].x, toolPoint[1].x);
+			painter->SetPen(0xFF00FF, 2.0, LSSolid);
+			painter->DrawArc(toolPoint[0], toolPoint[1].x, toolPoint[2].x, span);
+			painter->DrawHandle(toolPoint[0] + (Vector(cos(angle), sin(angle)) * toolPoint[1].x));
+			QString text = tr("Arc span: %1") + QChar(0x00B0);
+			informativeText = text.arg(RADIANS_TO_DEGREES * span);
+		}
 	}
-#endif
-
-	// Do checking here to see if object can be selected or not
-	if (Global::selectionInProgress)
+	else if (Global::tool == TTRotate)
 	{
-		std::vector<void *>::iterator i;
-//		QRectF bounds;
-		numSelected = 0;
-
-		for(i=document.objects.begin(); i!=document.objects.end(); i++)
+		if ((Global::toolState == TSNone) || (Global::toolState == TSPoint1))
+			painter->DrawHandle(toolPoint[0]);
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+			painter->DrawHandle(toolPoint[1]);
+		else
 		{
-			Object * obj = (Object *)(*i);
-			obj->selected = false;
-//			QRectF extents;
+			if (toolPoint[0] == toolPoint[1])
+				return;
 
-			switch (obj->type)
-			{
-			case OTLine:
+			painter->DrawLine(toolPoint[0], toolPoint[1]);
+			// Likely we need a tool container for this... (now we do!)
+#if 0
+			if (ctrlDown)
 			{
-				Line * l = (Line *)obj;
+				painter->SetPen(0x00FF00, 2.0, LSSolid);
+				overrideColor = true;
+			}
+
+			RenderObjects(painter, toolObjects);
+			overrideColor = false;
+#endif
 
-				if (Global::selection.contains(l->p1.x, l->p1.y) && Global::selection.contains(l->p2.x, l->p2.y))
-					l->selected = true;
+			double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES;
+			QString text = QChar(0x2221) + QObject::tr(": %1");
+			informativeText = text.arg(absAngle);
 
-				break;
-			}
-			case OTCircle:
+			if (ctrlDown)
+				informativeText += " (Copy)";
+		}
+	}
+	else if (Global::tool == TTMirror)
+	{
+		if ((Global::toolState == TSNone) || (Global::toolState == TSPoint1))
+			painter->DrawHandle(toolPoint[0]);
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+			painter->DrawHandle(toolPoint[1]);
+		else
+		{
+			if (toolPoint[0] == toolPoint[1])
+				return;
+			
+			Point mirrorPoint = toolPoint[0] + Vector(toolPoint[1], toolPoint[0]);
+//			painter->DrawLine(toolPoint[0], toolPoint[1]);
+			painter->DrawLine(mirrorPoint, toolPoint[1]);
+			// Likely we need a tool container for this... (now we do!)
+#if 0
+			if (ctrlDown)
 			{
-				Circle * c = (Circle *)obj;
+				painter->SetPen(0x00FF00, 2.0, LSSolid);
+				overrideColor = true;
+			}
 
-				if (Global::selection.contains(c->p1.x - c->radius, c->p1.y - c->radius) && Global::selection.contains(c->p1.x + c->radius, c->p1.y + c->radius))
-					c->selected = true;
+			RenderObjects(painter, toolObjects);
+			overrideColor = false;
+#endif
 
-				break;
-			}
-			case OTArc:
-			{
-				Arc * a = (Arc *)obj;
+			double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES;
 
-	double start = a->angle1;
-	double end = start + a->angle2;
-	QPointF p1(cos(start), sin(start));
-	QPointF p2(cos(end), sin(end));
-	QRectF bounds(p1, p2);
+			if (absAngle > 180.0)
+				absAngle -= 180.0;
 
-#if 1
-	// Swap X/Y coordinates if they're backwards...
-	if (bounds.left() > bounds.right())
-	{
-		double temp = bounds.left();
-		bounds.setLeft(bounds.right());
-		bounds.setRight(temp);
-	}
+			QString text = QChar(0x2221) + QObject::tr(": %1");
+			informativeText = text.arg(absAngle);
 
-	if (bounds.bottom() > bounds.top())
-	{
-		double temp = bounds.bottom();
-		bounds.setBottom(bounds.top());
-		bounds.setTop(temp);
+			if (ctrlDown)
+				informativeText += " (Copy)";
+		}
 	}
-#else
-	// Doesn't work as advertised! For shame!
-	bounds = bounds.normalized();
-#endif
+}
 
-	// If the end of the arc is before the beginning, add 360 degrees to it
-	if (end < start)
-		end += 2.0 * PI;
 
-	// Adjust the bounds depending on which axes are crossed
-	if ((start < PI_OVER_2) && (end > PI_OVER_2))
-		bounds.setTop(1.0);
+void DrawingView::LineHandler(int mode, Point p)
+{
+	switch (mode)
+	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
 
-	if ((start < PI) && (end > PI))
-		bounds.setLeft(-1.0);
+		break;
+	case ToolMouseMove:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
 
-	if ((start < (PI + PI_OVER_2)) && (end > (PI + PI_OVER_2)))
-		bounds.setBottom(-1.0);
+		break;
+	case ToolMouseUp:
+		if (Global::toolState == TSNone)
+		{
+			Global::toolState = TSPoint2;
+			// Prevent spurious line from drawing...
+			toolPoint[1] = toolPoint[0];
+		}
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+		{
+			// Key override is telling us to make a new line, not continue the
+			// previous one.
+			toolPoint[0] = toolPoint[1];
+		}
+		else
+		{
+			Line * l = new Line(toolPoint[0], toolPoint[1]);
+			document.objects.push_back(l);
+			toolPoint[0] = toolPoint[1];
+		}
+	}
+}
 
-	if ((start < (2.0 * PI)) && (end > (2.0 * PI)))
-		bounds.setRight(1.0);
 
-	if ((start < ((2.0 * PI) + PI_OVER_2)) && (end > ((2.0 * PI) + PI_OVER_2)))
-		bounds.setTop(1.0);
+void DrawingView::CircleHandler(int mode, Point p)
+{
+	switch (mode)
+	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
 
-	if ((start < (3.0 * PI)) && (end > (3.0 * PI)))
-		bounds.setLeft(-1.0);
+		break;
+	case ToolMouseMove:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
 
-	if ((start < ((3.0 * PI) + PI_OVER_2)) && (end > ((3.0 * PI) + PI_OVER_2)))
-		bounds.setBottom(-1.0);
+		break;
+	case ToolMouseUp:
+		if (Global::toolState == TSNone)
+		{
+			Global::toolState = TSPoint2;
+			// Prevent spurious line from drawing...
+			toolPoint[1] = toolPoint[0];
+		}
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+		{
+			// Key override is telling us to make a new line, not continue the
+			// previous one.
+			toolPoint[0] = toolPoint[1];
+		}
+		else
+		{
+			double length = Vector::Magnitude(toolPoint[0], toolPoint[1]);
+			Circle * c = new Circle(toolPoint[0], length);
+			document.objects.push_back(c);
+			toolPoint[0] = toolPoint[1];
+			Global::toolState = TSNone;
+		}
+	}
+}
 
-	bounds.setTopLeft(QPointF(bounds.left() * a->radius, bounds.top() * a->radius));
-	bounds.setBottomRight(QPointF(bounds.right() * a->radius, bounds.bottom() * a->radius));
-	bounds.translate(a->p1.x, a->p1.y);
 
-				if (Global::selection.contains(bounds))
-					a->selected = true;
+void DrawingView::ArcHandler(int mode, Point p)
+{
+	switch (mode)
+	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else if (Global::toolState == TSPoint2)
+			toolPoint[1] = p;
+		else if (Global::toolState == TSPoint3)
+			toolPoint[2] = p;
+		else
+			toolPoint[3] = p;
+
+		break;
+	case ToolMouseMove:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else if (Global::toolState == TSPoint2)
+			toolPoint[1] = p;
+		else if (Global::toolState == TSPoint3)
+			toolPoint[2] = p;
+		else
+			toolPoint[3] = p;
 
-				break;
-			}
-			default:
-				break;
+		break;
+	case ToolMouseUp:
+		if (Global::toolState == TSNone)
+		{
+			// Prevent spurious line from drawing...
+			toolPoint[1] = toolPoint[0];
+			Global::toolState = TSPoint2;
+		}
+		else if (Global::toolState == TSPoint2)
+		{
+			if (shiftDown)
+			{
+				// Key override is telling us to start circle at new center, not
+				// continue the current one.
+				toolPoint[0] = toolPoint[1];
+				return;
 			}
 
-			if (obj->selected)
-				numSelected++;
+			// Set the radius in toolPoint[1].x
+			toolPoint[1].x = Vector::Magnitude(toolPoint[0], toolPoint[1]);
+			Global::toolState = TSPoint3;
+		}
+		else if (Global::toolState == TSPoint3)
+		{
+			// Set the angle in toolPoint[2].x
+			toolPoint[2].x = Vector::Angle(toolPoint[0], toolPoint[2]);
+			Global::toolState = TSPoint4;
+		}
+		else
+		{
+			double endAngle = Vector::Angle(toolPoint[0], toolPoint[3]);
+			double span = endAngle - toolPoint[2].x;
+
+			if (span < 0)
+				span += PI_TIMES_2;
+
+			Arc * arc = new Arc(toolPoint[0], toolPoint[1].x, toolPoint[2].x, span);
+			document.objects.push_back(arc);
+			Global::toolState = TSNone;
 		}
 	}
+}
 
-//	oldPoint = point;
-//we should keep track of the last point here and only pass this down *if* the point
-//changed...
 
-#if 0
-	// This returns true if we've moved over an object...
-	if (document.PointerMoved(point)) // <-- This
-	// This is where the object would do automagic dragging & shit. Since we don't
-	// do that anymore, we need a strategy to handle it.
+void DrawingView::RotateHandler(int mode, Point p)
+{
+	switch (mode)
 	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+		{
+			toolPoint[0] = p;
+			SavePointsFrom(select, toolScratch);
+			Global::toolState = TSPoint1;
+		}
+		else if (Global::toolState == TSPoint1)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
 
-/*
-Now objects handle mouse move snapping as well. The code below mainly works only
-for tools; we need to fix it so that objects work as well...
+		break;
+	case ToolMouseMove:
+		if ((Global::toolState == TSPoint1) || (Global::toolState == TSNone))
+			toolPoint[0] = p;
+		else if (Global::toolState == TSPoint2)
+		{
+			toolPoint[1] = p;
 
-There's a problem with the object point snapping in that it's dependent on the
-order of the objects in the document. Most likely this is because it counts the
-selected object last and thus fucks up the algorithm. Need to fix this...
+			if (shiftDown)
+				return;
 
+			double angle = Vector(toolPoint[0], toolPoint[1]).Angle();
+			std::vector<void *>::iterator j = select.begin();
+			std::vector<Object>::iterator i = toolScratch.begin();
 
-*/
-		// Do object snapping here. Grid snapping on mouse down is done in the
-		// objects themselves, only because we have to hit test the raw point,
-		// not the snapped point. There has to be a better way...!
-		if (document.penultimateObjectHovered)
-		{
-			// Two objects are hovered, see if we have an intersection point
-			if ((document.lastObjectHovered->type == OTLine) && (document.penultimateObjectHovered->type == OTLine))
+			for(; i!=toolScratch.end(); i++, j++)
 			{
-				double t;
-				int n = Geometry::Intersects((Line *)document.lastObjectHovered, (Line *)document.penultimateObjectHovered, &t);
-
-				if (n == 1)
+				Object obj = *i;
+				Point p1 = Geometry::RotatePointAroundPoint(obj.p[0], toolPoint[0], angle);
+				Point p2 = Geometry::RotatePointAroundPoint(obj.p[1], toolPoint[0], angle);
+				Object * obj2 = (Object *)(*j);
+				obj2->p[0] = p1;
+				obj2->p[1] = p2;
+
+				if (obj.type == OTArc)
 				{
-					Global::snapPoint = document.lastObjectHovered->GetPointAtParameter(t);
-					Global::snapPointIsValid = true;
+					obj2->angle[0] = obj.angle[0] + angle;
+
+					if (obj2->angle[0] > PI_TIMES_2)
+						obj2->angle[0] -= PI_TIMES_2;
 				}
 			}
-			else if ((document.lastObjectHovered->type == OTCircle) && (document.penultimateObjectHovered->type == OTCircle))
+		}
+
+		break;
+	case ToolMouseUp:
+		if (Global::toolState == TSPoint1)
+		{
+			Global::toolState = TSPoint2;
+			// Prevent spurious line from drawing...
+			toolPoint[1] = toolPoint[0];
+		}
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+		{
+			// Key override is telling us to make a new line, not continue the
+			// previous one.
+			toolPoint[0] = toolPoint[1];
+		}
+		else
+		{
+			// Either we're finished with our rotate, or we're stamping a copy.
+			if (ctrlDown)
 			{
-				Point p1, p2;
-				int n = Geometry::Intersects((Circle *)document.lastObjectHovered, (Circle *)document.penultimateObjectHovered, 0, 0, 0, 0, &p1, &p2);
+				// Stamp a copy of the selection at the current rotation & bail
+				std::vector<void *> temp;
+				CopyObjects(select, temp);
+				ClearSelected(temp);
+				AddObjectsTo(document.objects, temp);
+				RestorePointsTo(select, toolScratch);
+				return;
+			}
 
-				if (n == 1)
-				{
-					Global::snapPoint = p1;
-					Global::snapPointIsValid = true;
-				}
-				else if (n == 2)
-				{
-					double d1 = Vector(point, p1).Magnitude();
-					double d2 = Vector(point, p2).Magnitude();
+			toolPoint[0] = p;
+			Global::toolState = TSPoint1;
+			SavePointsFrom(select, toolScratch);
+		}
 
-					if (d1 < d2)
-						Global::snapPoint = p1;
-					else
-						Global::snapPoint = p2;
+		break;
+	case ToolKeyDown:
+		// Reset the selection if shift held down...
+		if (shiftDown)
+			RestorePointsTo(select, toolScratch);
+
+		break;
+	case ToolKeyUp:
+		// Reset selection when key is let up
+		if (!shiftDown)
+			RotateHandler(ToolMouseMove, toolPoint[1]);
+
+		break;
+	case ToolCleanup:
+		RestorePointsTo(select, toolScratch);
+	}
+}
 
-					Global::snapPointIsValid = true;
+
+void DrawingView::MirrorHandler(int mode, Point p)
+{
+	switch (mode)
+	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+		{
+			toolPoint[0] = p;
+			SavePointsFrom(select, toolScratch);
+			Global::toolState = TSPoint1;
+		}
+		else if (Global::toolState == TSPoint1)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
+
+		break;
+	case ToolMouseMove:
+		if ((Global::toolState == TSPoint1) || (Global::toolState == TSNone))
+			toolPoint[0] = p;
+		else if (Global::toolState == TSPoint2)
+		{
+			toolPoint[1] = p;
+
+			if (shiftDown)
+				return;
+
+			double angle = Vector(toolPoint[0], toolPoint[1]).Angle();
+			std::vector<void *>::iterator j = select.begin();
+			std::vector<Object>::iterator i = toolScratch.begin();
+
+			for(; i!=toolScratch.end(); i++, j++)
+			{
+				Object obj = *i;
+				Point p1 = Geometry::MirrorPointAroundLine(obj.p[0], toolPoint[0], toolPoint[1]);
+				Point p2 = Geometry::MirrorPointAroundLine(obj.p[1], toolPoint[0], toolPoint[1]);
+				Object * obj2 = (Object *)(*j);
+				obj2->p[0] = p1;
+				obj2->p[1] = p2;
+
+				if (obj.type == OTArc)
+				{
+					// This is 2*mirror angle - obj angle - obj span
+					obj2->angle[0] = (2.0 * angle) - obj.angle[0] - obj.angle[1];
+
+					if (obj2->angle[0] > PI_TIMES_2)
+						obj2->angle[0] -= PI_TIMES_2;
 				}
 			}
 		}
-//		else
-//		{
-			// Otherwise, it was a single object hovered...
-//		}
-	}
 
-	if (toolAction)
-	{
-		if (Global::snapToGrid)
-			point = Global::SnapPointToGrid(point);
+		break;
+	case ToolMouseUp:
+		if (Global::toolState == TSPoint1)
+		{
+			Global::toolState = TSPoint2;
+			// Prevent spurious line from drawing...
+			toolPoint[1] = toolPoint[0];
+		}
+		else if ((Global::toolState == TSPoint2) && shiftDown)
+		{
+			// Key override is telling us to make a new line, not continue the
+			// previous one.
+			toolPoint[0] = toolPoint[1];
+		}
+		else
+		{
+			// Either we're finished with our rotate, or we're stamping a copy.
+			if (ctrlDown)
+			{
+				// Stamp a copy of the selection at the current rotation & bail
+				std::vector<void *> temp;
+				CopyObjects(select, temp);
+				ClearSelected(temp);
+				AddObjectsTo(document.objects, temp);
+				RestorePointsTo(select, toolScratch);
+				return;
+			}
 
-		// We always snap to object points, and they take precendence over
-		// grid points...
-		if (Global::snapPointIsValid)
-			point = Global::snapPoint;
+			toolPoint[0] = p;
+			Global::toolState = TSPoint1;
+			SavePointsFrom(select, toolScratch);
+		}
 
-		toolAction->MouseMoved(point);
+		break;
+	case ToolKeyDown:
+		// Reset the selection if shift held down...
+		if (shiftDown)
+			RestorePointsTo(select, toolScratch);
+
+		break;
+	case ToolKeyUp:
+		// Reset selection when key is let up
+		if (!shiftDown)
+			MirrorHandler(ToolMouseMove, toolPoint[1]);
+
+		break;
+	case ToolCleanup:
+		RestorePointsTo(select, toolScratch);
 	}
-#endif
-	bool needUpdate = false;
+}
 
-	// Don't do this kind of checking unless we're not doing a selection rectangle!
-	// Hmm, lines don't stay selected if globally selected... !!! FIX !!! [DONE]
-	// it's because there were extra state variables, the hit* vars...
-	if (!Global::selectionInProgress)
-	{
-	std::vector<void *>::iterator i;
-	numHovered = 0;
 
-	for(i=document.objects.begin(); i!=document.objects.end(); i++)
+void DrawingView::mousePressEvent(QMouseEvent * event)
+{
+	if (event->button() == Qt::LeftButton)
 	{
-		Object * obj = (Object *)(*i);
-//		obj->selected = false;
+		Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
 
-		switch (obj->type)
+		// Handle tool processing, if any
+		if (Global::tool)
 		{
-		case OTLine:
+			if (Global::snapToGrid)
+				point = SnapPointToGrid(point);
+
+			//Also, may want to figure out if hovering over a snap point on an object,
+			//snap to grid if not.
+			// Snap to object point if valid...
+//			if (Global::snapPointIsValid)
+//				point = Global::snapPoint;
+			
+			ToolHandler(ToolMouseDown, point);
+			return;
+		}
+
+		// Clear the selection only if CTRL isn't being held on click
+		if (!ctrlDown)
+			ClearSelected(document.objects);
+//			ClearSelection();
+
+		// If any objects are being hovered on click, add them to the selection
+		// & return
+		if (numHovered > 0)
 		{
-			Line * l = (Line *)obj;
+			AddHoveredToSelection();
+			update();	// needed??
+			GetHovered(hover);	// prolly needed
 
-//	bool hitPoint1, hitPoint2, hitLine;
-	l->hitPoint[0] = l->hitPoint[1] = l->hitObject = false;
-	Vector lineSegment = l->p2 - l->p1;
-	Vector v1 = point - l->p1;
-	Vector v2 = point - l->p2;
-	double t = Geometry::ParameterOfLineAndPoint(l->p1, l->p2, point);
-	double distance;
-
-	if (t < 0.0)
-		distance = v1.Magnitude();
-	else if (t > 1.0)
-		distance = v2.Magnitude();
-	else
-		// distance = ?Det?(ls, v1) / |ls|
-		distance = fabs((lineSegment.x * v1.y - v1.x * lineSegment.y)
-			/ lineSegment.Magnitude());
+			// Needed for grab & moving objects
+			// We do it *after*... why? (doesn't seem to confer any advantage...)
+			if (Global::snapToGrid)
+				oldPoint = SnapPointToGrid(point);
+
+			return;
+		}
+
+		// Didn't hit any object and not using a tool, so do a selection rectangle
+		Global::selectionInProgress = true;
+		Global::selection.setTopLeft(QPointF(point.x, point.y));
+		Global::selection.setBottomRight(QPointF(point.x, point.y));
+	}
+	else if (event->button() == Qt::MiddleButton)
+	{
+		scrollDrag = true;
+		oldPoint = Vector(event->x(), event->y());
+		// Should also change the mouse pointer as well...
+		setCursor(Qt::SizeAllCursor);
+	}
+}
+
+
+void DrawingView::mouseMoveEvent(QMouseEvent * event)
+{
+	Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
+	Global::selection.setBottomRight(QPointF(point.x, point.y));
+	// Only needs to be done here, as mouse down is always preceded by movement
+	Global::snapPointIsValid = false;
 
-	if ((v1.Magnitude() * Global::zoom) < 8.0)
+	// Scrolling...
+	if (event->buttons() & Qt::MiddleButton)
 	{
-		l->hitPoint[0] = true;
-//		snapPoint = l->p1;
-//		snapPointIsValid = true;
+		point = Vector(event->x(), event->y());
+		// Since we're using Qt coords for scrolling, we have to adjust them here to
+		// conform to Cartesian coords, since the origin is using Cartesian. :-)
+		Vector delta(oldPoint, point);
+		delta /= Global::zoom;
+		delta.y = -delta.y;
+		Global::origin -= delta;
+
+		UpdateGridBackground();
+		update();
+		oldPoint = point;
+		return;
 	}
-	else if ((v2.Magnitude() * Global::zoom) < 8.0)
+
+	// If we're doing a selection rect, see if any objects are engulfed by it
+	// (implies left mouse button held down)
+	if (Global::selectionInProgress)
 	{
-		l->hitPoint[1] = true;
-//		snapPoint = l->p2;
-//		snapPointIsValid = true;
+		CheckObjectBounds();
+		update();
+		return;
 	}
-	else if ((distance * Global::zoom) < 5.0)
-		l->hitObject = true;
 
-	bool oldHovered = l->hovered;
-	l->hovered = (l->hitPoint[0] || l->hitPoint[1] || l->hitObject ? true : false);
+	// Handle object movement (left button down & over an object)
+	if ((event->buttons() & Qt::LeftButton) && numHovered && !Global::tool)
+	{
+		if (Global::snapToGrid)
+			point = SnapPointToGrid(point);
 
-	if (oldHovered != l->hovered)
-		needUpdate = true;
+		HandleObjectMovement(point);
+		update();
+		oldPoint = point;
+		return;
+	}
 
-			break;
-		}
-		case OTCircle:
-		{
-			Circle * c = (Circle *)obj;
+	// Do object hit testing...
+	bool needUpdate = HitTestObjects(point);
 
+	// Check for multi-hover...
+	if (numHovered > 1)
+	{
+		GetHovered(hover);
 
-			break;
-		}
-		default:
-			break;
-		}
+		double t, u;
+		int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u);
 
-		if (obj->hovered)
+		if (numIntersecting > 0)
 		{
-			numHovered++;
-//printf("MouseMove: OBJECT HOVERED (numHovered = %i)\n", numHovered);
+			QString text = tr("Intersection t=%1, u=%2");
+			informativeText = text.arg(t).arg(u);
 		}
 	}
+
+	// Do tool handling, if any are active...
+	if (Global::tool)
+	{
+		if (Global::snapToGrid)
+			point = SnapPointToGrid(point);
+
+		ToolHandler(ToolMouseMove, point);
 	}
-//printf("MouseMove: numHovered = %i\n", numHovered);
 
 	// This is used to draw the tool crosshair...
 	oldPoint = point;
 
-//	if (/*document.NeedsUpdate() ||*/ Global::selectionInProgress /*|| toolAction*/)
-	if (needUpdate || Global::selectionInProgress || Global::tool)
+	if (needUpdate || Global::tool)
 		update();
 }
 
@@ -980,43 +1252,41 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 {
 	if (event->button() == Qt::LeftButton)
 	{
-#if 0
-		document.PointerReleased();
-#endif
-
 //We need to update especially if nothing collided and the state needs to change. !!! FIX !!!
 //could set it up to use the document's update function (assumes that all object updates
 //are being reported correctly:
 //		if (document.NeedsUpdate())
+		// Do an update if collided with at least *one* object in the document
 //		if (collided)
-			update();	// Do an update if collided with at least *one* object in the document
+			update();
 
-#if 0
-		if (toolAction)
-			toolAction->MouseReleased();
-#endif
+		if (Global::tool)
+		{
+			Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
+			ToolHandler(ToolMouseUp, point);
+			return;
+		}
 
 		if (Global::selectionInProgress)
-		{
-			// Select all the stuff inside of selection
 			Global::selectionInProgress = false;
 
-			// Clear our vectors
-			select.empty();
-			hover.empty();
+		informativeText.clear();
+// Should we be doing this automagically? Hmm...
+		// Clear our vectors
+		select.clear();
+		hover.clear();
 
-			// Scoop 'em up
-			std::vector<void *>::iterator i;
+		// Scoop 'em up
+		std::vector<void *>::iterator i;
 
-			for(i=document.objects.begin(); i!=document.objects.end(); i++)
-			{
-				if (((Object *)(*i))->selected)
-					select.push_back(*i);
+		for(i=document.objects.begin(); i!=document.objects.end(); i++)
+		{
+			if (((Object *)(*i))->selected)
+				select.push_back(*i);
 
 //hmm, this is no good, too late to do any good :-P
-//				if ((*i)->hovered)
-//					hover.push_back(*i);
-			}
+//			if ((*i)->hovered)
+//				hover.push_back(*i);
 		}
 	}
 	else if (event->button() == Qt::MiddleButton)
@@ -1048,41 +1318,54 @@ void DrawingView::wheelEvent(QWheelEvent * event)
 		Global::zoom /= zoomFactor;
 	}
 
-#if 1
 //	Global::gridSpacing = gridPixels / Painter::zoom;
 //	UpdateGridBackground();
 	SetGridSize(Global::gridSpacing * Global::zoom);
 	update();
 //	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
-#endif
 }
 
 
 void DrawingView::keyPressEvent(QKeyEvent * event)
 {
-#if 0
-	if (toolAction)
-		toolAction->KeyDown(event->key());
-#endif
+	bool oldShift = shiftDown;
+	bool oldCtrl = ctrlDown;
+
 	if (event->key() == Qt::Key_Shift)
 		shiftDown = true;
 	else if (event->key() == Qt::Key_Control)
 		ctrlDown = true;
+
+	if ((oldShift != shiftDown) || (oldCtrl != ctrlDown))
+	{
+		if (Global::tool)
+			ToolHandler(ToolKeyDown, Point(0, 0));
+
+		update();
+	}
 }
 
 
 void DrawingView::keyReleaseEvent(QKeyEvent * event)
 {
-#if 0
-	if (toolAction)
-		toolAction->KeyReleased(event->key());
-#endif
+	bool oldShift = shiftDown;
+	bool oldCtrl = ctrlDown;
+
 	if (event->key() == Qt::Key_Shift)
 		shiftDown = false;
 	else if (event->key() == Qt::Key_Control)
 		ctrlDown = false;
+
+	if ((oldShift != shiftDown) || (oldCtrl != ctrlDown))
+	{
+		if (Global::tool)
+			ToolHandler(ToolKeyUp, Point(0, 0));
+
+		update();
+	}
 }
 
+
 //
 // This looks strange, but it's really quite simple: We want a point that's
 // more than half-way to the next grid point to snap there while conversely we
@@ -1102,3 +1385,414 @@ Point DrawingView::SnapPointToGrid(Point point)
 	return point;
 }
 
+
+void DrawingView::CheckObjectBounds(void)
+{
+	std::vector<void *>::iterator i;
+	numSelected = 0;
+
+	for(i=document.objects.begin(); i!=document.objects.end(); i++)
+	{
+		Object * obj = (Object *)(*i);
+		obj->selected = false;
+
+		switch (obj->type)
+		{
+		case OTLine:
+		{
+			Line * l = (Line *)obj;
+
+			if (Global::selection.contains(l->p[0].x, l->p[0].y) && Global::selection.contains(l->p[1].x, l->p[1].y))
+				l->selected = true;
+
+			break;
+		}
+		case OTCircle:
+		{
+			Circle * c = (Circle *)obj;
+
+			if (Global::selection.contains(c->p[0].x - c->radius[0], c->p[0].y - c->radius[0]) && Global::selection.contains(c->p[0].x + c->radius[0], c->p[0].y + c->radius[0]))
+				c->selected = true;
+
+			break;
+		}
+		case OTArc:
+		{
+			Arc * a = (Arc *)obj;
+
+			double start = a->angle[0];
+			double end = start + a->angle[1];
+			QPointF p1(cos(start), sin(start));
+			QPointF p2(cos(end), sin(end));
+			QRectF bounds(p1, p2);
+
+#if 1
+			// Swap X/Y coordinates if they're backwards...
+			if (bounds.left() > bounds.right())
+			{
+				double temp = bounds.left();
+				bounds.setLeft(bounds.right());
+				bounds.setRight(temp);
+			}
+
+			if (bounds.bottom() > bounds.top())
+			{
+				double temp = bounds.bottom();
+				bounds.setBottom(bounds.top());
+				bounds.setTop(temp);
+			}
+#else
+			// Doesn't work as advertised! For shame!
+			bounds = bounds.normalized();
+#endif
+
+			// If the end of the arc is before the beginning, add 360 degrees to it
+			if (end < start)
+				end += 2.0 * PI;
+
+			// Adjust the bounds depending on which axes are crossed
+			if ((start < PI_OVER_2) && (end > PI_OVER_2))
+				bounds.setTop(1.0);
+
+			if ((start < PI) && (end > PI))
+				bounds.setLeft(-1.0);
+
+			if ((start < (PI + PI_OVER_2)) && (end > (PI + PI_OVER_2)))
+				bounds.setBottom(-1.0);
+
+			if ((start < (2.0 * PI)) && (end > (2.0 * PI)))
+				bounds.setRight(1.0);
+
+			if ((start < ((2.0 * PI) + PI_OVER_2)) && (end > ((2.0 * PI) + PI_OVER_2)))
+				bounds.setTop(1.0);
+
+			if ((start < (3.0 * PI)) && (end > (3.0 * PI)))
+				bounds.setLeft(-1.0);
+
+			if ((start < ((3.0 * PI) + PI_OVER_2)) && (end > ((3.0 * PI) + PI_OVER_2)))
+				bounds.setBottom(-1.0);
+
+			bounds.setTopLeft(QPointF(bounds.left() * a->radius[0], bounds.top() * a->radius[0]));
+			bounds.setBottomRight(QPointF(bounds.right() * a->radius[0], bounds.bottom() * a->radius[0]));
+			bounds.translate(a->p[0].x, a->p[0].y);
+
+			if (Global::selection.contains(bounds))
+				a->selected = true;
+
+			break;
+		}
+		default:
+			break;
+		}
+
+		if (obj->selected)
+			numSelected++;
+	}
+}
+
+
+bool DrawingView::HitTestObjects(Point point)
+{
+	std::vector<void *>::iterator i;
+	numHovered = 0;
+	bool needUpdate = false;
+
+	for(i=document.objects.begin(); i!=document.objects.end(); i++)
+	{
+		Object * obj = (Object *)(*i);
+
+		switch (obj->type)
+		{
+		case OTLine:
+		{
+			bool oldHP0 = obj->hitPoint[0], oldHP1 = obj->hitPoint[1], oldHO = obj->hitObject;
+			obj->hitPoint[0] = obj->hitPoint[1] = obj->hitObject = false;
+			Vector lineSegment = obj->p[1] - obj->p[0];
+			Vector v1 = point - obj->p[0];
+			Vector v2 = point - obj->p[1];
+			double t = Geometry::ParameterOfLineAndPoint(obj->p[0], obj->p[1], point);
+			double distance;
+
+			if (t < 0.0)
+				distance = v1.Magnitude();
+			else if (t > 1.0)
+				distance = v2.Magnitude();
+			else
+				// distance = ?Det?(ls, v1) / |ls|
+				distance = fabs((lineSegment.x * v1.y - v1.x * lineSegment.y)
+					/ lineSegment.Magnitude());
+
+			if ((v1.Magnitude() * Global::zoom) < 8.0)
+				obj->hitPoint[0] = true;
+			else if ((v2.Magnitude() * Global::zoom) < 8.0)
+				obj->hitPoint[1] = true;
+			else if ((distance * Global::zoom) < 5.0)
+				obj->hitObject = true;
+
+			obj->hovered = (obj->hitPoint[0] || obj->hitPoint[1] || obj->hitObject ? true : false);
+
+			if ((oldHP0 != obj->hitPoint[0]) || (oldHP1 != obj->hitPoint[1]) || (oldHO != obj->hitObject))
+				needUpdate = true;
+
+			break;
+		}
+		case OTCircle:
+		{
+			bool oldHP = obj->hitPoint[0], oldHO = obj->hitObject;
+			obj->hitPoint[0] = obj->hitObject = false;
+			double length = Vector::Magnitude(obj->p[0], point);
+
+			if ((length * Global::zoom) < 8.0)
+				obj->hitPoint[0] = true;
+			else if ((fabs(length - obj->radius[0]) * Global::zoom) < 2.0)
+				obj->hitObject = true;
+
+			obj->hovered = (obj->hitPoint[0] || obj->hitObject ? true : false);
+
+			if ((oldHP != obj->hitPoint[0]) || (oldHO != obj->hitObject))
+				needUpdate = true;
+
+			break;
+		}
+		case OTArc:
+		{
+			bool oldHP0 = obj->hitPoint[0], oldHP1 = obj->hitPoint[1], oldHP2 = obj->hitPoint[2], oldHO = obj->hitObject;
+			obj->hitPoint[0] = obj->hitPoint[1] = obj->hitPoint[2] = obj->hitObject = false;
+			double length = Vector::Magnitude(obj->p[0], point);
+			double angle = Vector::Angle(obj->p[0], point);
+
+			// Make sure we get the angle in the correct spot
+			if (angle < obj->angle[0])
+				angle += PI_TIMES_2;
+
+			// Get the span that we're pointing at...
+			double span = angle - obj->angle[0];
+
+			// N.B.: Still need to hit test the arc start & arc span handles...
+			double spanAngle = obj->angle[0] + obj->angle[1];
+			Point handle1 = obj->p[0] + (Vector(cos(obj->angle[0]), sin(obj->angle[0])) * obj->radius[0]);
+			Point handle2 = obj->p[0] + (Vector(cos(spanAngle), sin(spanAngle)) * obj->radius[0]);
+			double length2 = Vector::Magnitude(point, handle1);
+			double length3 = Vector::Magnitude(point, handle2);
+
+			if ((length * Global::zoom) < 8.0)
+				obj->hitPoint[0] = true;
+			else if ((length2 * Global::zoom) < 8.0)
+				obj->hitPoint[1] = true;
+			else if ((length3 * Global::zoom) < 8.0)
+				obj->hitPoint[2] = true;
+			else if (((fabs(length - obj->radius[0]) * Global::zoom) < 2.0) && (span < obj->angle[1]))
+				obj->hitObject = true;
+
+			obj->hovered = (obj->hitPoint[0] || obj->hitPoint[1] || obj->hitPoint[2] || obj->hitObject ? true : false);
+
+			if ((oldHP0 != obj->hitPoint[0]) || (oldHP1 != obj->hitPoint[1]) || (oldHP2 != obj->hitPoint[2]) || (oldHO != obj->hitObject))
+				needUpdate = true;
+
+			break;
+		}
+		default:
+			break;
+		}
+
+		if (obj->hovered)
+//		{
+			numHovered++;
+//printf("MouseMove: OBJECT HOVERED (numHovered = %i)\n", numHovered);
+//		}
+	}
+
+	return needUpdate;
+}
+
+
+void DrawingView::HandleObjectMovement(Point point)
+{
+	Point delta = point - oldPoint;
+//printf("HOM: old = (%f,%f), new = (%f, %f), delta = (%f, %f)\n", oldPoint.x, oldPoint.y, point.x, point.y, delta.x, delta.y);
+	Object * obj = (Object *)hover[0];
+//printf("Object type = %i (size=%i), ", obj->type, hover.size());
+//printf("Object (%X) move: hp1=%s, hp2=%s, hl=%s\n", obj, (obj->hitPoint[0] ? "true" : "false"), (obj->hitPoint[1] ? "true" : "false"), (obj->hitObject ? "true" : "false"));
+
+	switch (obj->type)
+	{
+	case OTLine:
+		if (obj->hitPoint[0])
+			obj->p[0] = point;
+		else if (obj->hitPoint[1])
+			obj->p[1] = point;
+		else if (obj->hitObject)
+		{
+			obj->p[0] += delta;
+			obj->p[1] += delta;
+		}
+
+		break;
+	case OTCircle:
+		if (obj->hitPoint[0])
+			obj->p[0] = point;
+		else if (obj->hitObject)
+		{
+//this doesn't work. we need to save this on mouse down for this to work correctly!
+//			double oldRadius = obj->radius[0];
+			obj->radius[0] = Vector::Magnitude(obj->p[0], point);
+
+			QString text = QObject::tr("Radius: %1");//\nScale: %2%");
+			informativeText = text.arg(obj->radius[0], 0, 'd', 4);//.arg(obj->radius[0] / oldRadius * 100.0, 0, 'd', 0);
+		}
+
+		break;
+	case OTArc:
+		if (obj->hitPoint[0])
+			obj->p[0] = point;
+		else if (obj->hitPoint[1])
+		{
+			// Change the Arc's span (handle #1)
+			if (shiftDown)
+			{
+				double angle = Vector::Angle(obj->p[0], point);
+				double delta = angle - obj->angle[0];
+
+				if (delta < 0)
+					delta += PI_TIMES_2;
+
+				obj->angle[1] -= delta;
+				obj->angle[0] = angle;
+
+				if (obj->angle[1] < 0)
+					obj->angle[1] += PI_TIMES_2;
+
+				QString text = QObject::tr("Span: %1") + QChar(0x00B0) + QObject::tr("\n%2") + QChar(0x00B0) + QObject::tr(" - %3") + QChar(0x00B0);
+				informativeText = text.arg(obj->angle[1] * RADIANS_TO_DEGREES, 0, 'd', 4).arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 2).arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 2);
+				return;
+			}
+
+			double angle = Vector::Angle(obj->p[0], point);
+			obj->angle[0] = angle;
+			QString text = QObject::tr("Start angle: %1") + QChar(0x00B0);
+			informativeText = text.arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 4);
+		}
+		else if (obj->hitPoint[2])
+		{
+			// Change the Arc's span (handle #2)
+			if (shiftDown)
+			{
+				double angle = Vector::Angle(obj->p[0], point);
+				obj->angle[1] = angle - obj->angle[0];
+
+				if (obj->angle[1] < 0)
+					obj->angle[1] += PI_TIMES_2;
+
+				QString text = QObject::tr("Span: %1") + QChar(0x00B0) + QObject::tr("\n%2") + QChar(0x00B0) + QObject::tr(" - %3") + QChar(0x00B0);
+				informativeText = text.arg(obj->angle[1] * RADIANS_TO_DEGREES, 0, 'd', 4).arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 2).arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 2);
+				return;
+			}
+
+			double angle = Vector::Angle(obj->p[0], point);
+			obj->angle[0] = angle - obj->angle[1];
+
+			if (obj->angle[0] < 0)
+				obj->angle[0] += PI_TIMES_2;
+
+			QString text = QObject::tr("End angle: %1") + QChar(0x00B0);
+			informativeText = text.arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 4);
+		}
+		else if (obj->hitObject)
+		{
+			if (shiftDown)
+			{
+				return;
+			}
+
+			obj->radius[0] = Vector::Magnitude(obj->p[0], point);
+			QString text = QObject::tr("Radius: %1");
+			informativeText = text.arg(obj->radius[0], 0, 'd', 4);
+		}
+
+		break;
+	default:
+		break;
+	}
+}
+
+
+
+#if 0
+	// This returns true if we've moved over an object...
+	if (document.PointerMoved(point)) // <-- This
+	// This is where the object would do automagic dragging & shit. Since we don't
+	// do that anymore, we need a strategy to handle it.
+	{
+
+/*
+Now objects handle mouse move snapping as well. The code below mainly works only
+for tools; we need to fix it so that objects work as well...
+
+There's a problem with the object point snapping in that it's dependent on the
+order of the objects in the document. Most likely this is because it counts the
+selected object last and thus fucks up the algorithm. Need to fix this...
+
+
+*/
+		// Do object snapping here. Grid snapping on mouse down is done in the
+		// objects themselves, only because we have to hit test the raw point,
+		// not the snapped point. There has to be a better way...!
+		if (document.penultimateObjectHovered)
+		{
+			// Two objects are hovered, see if we have an intersection point
+			if ((document.lastObjectHovered->type == OTLine) && (document.penultimateObjectHovered->type == OTLine))
+			{
+				double t;
+				int n = Geometry::Intersects((Line *)document.lastObjectHovered, (Line *)document.penultimateObjectHovered, &t);
+
+				if (n == 1)
+				{
+					Global::snapPoint = document.lastObjectHovered->GetPointAtParameter(t);
+					Global::snapPointIsValid = true;
+				}
+			}
+			else if ((document.lastObjectHovered->type == OTCircle) && (document.penultimateObjectHovered->type == OTCircle))
+			{
+				Point p1, p2;
+				int n = Geometry::Intersects((Circle *)document.lastObjectHovered, (Circle *)document.penultimateObjectHovered, 0, 0, 0, 0, &p1, &p2);
+
+				if (n == 1)
+				{
+					Global::snapPoint = p1;
+					Global::snapPointIsValid = true;
+				}
+				else if (n == 2)
+				{
+					double d1 = Vector(point, p1).Magnitude();
+					double d2 = Vector(point, p2).Magnitude();
+
+					if (d1 < d2)
+						Global::snapPoint = p1;
+					else
+						Global::snapPoint = p2;
+
+					Global::snapPointIsValid = true;
+				}
+			}
+		}
+//		else
+//		{
+			// Otherwise, it was a single object hovered...
+//		}
+	}
+
+	if (toolAction)
+	{
+		if (Global::snapToGrid)
+			point = Global::SnapPointToGrid(point);
+
+		// We always snap to object points, and they take precendence over
+		// grid points...
+		if (Global::snapPointIsValid)
+			point = Global::snapPoint;
+
+		toolAction->MouseMoved(point);
+	}
+#else
+#endif
+