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

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 7b49323..8c581bf 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -585,6 +585,8 @@ void DrawingView::ToolHandler(int mode, Point p)
 		ArcHandler(mode, p);
 	else if (Global::tool == TTRotate)
 		RotateHandler(mode, p);
+	else if (Global::tool == TTMirror)
+		MirrorHandler(mode, p);
 }
 
 
@@ -687,7 +689,7 @@ void DrawingView::ToolDraw(Painter * painter)
 		{
 			if (toolPoint[0] == toolPoint[1])
 				return;
-			
+
 			painter->DrawLine(toolPoint[0], toolPoint[1]);
 			// Likely we need a tool container for this... (now we do!)
 #if 0
@@ -702,14 +704,49 @@ void DrawingView::ToolDraw(Painter * painter)
 #endif
 
 			double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES;
-
 			QString text = QChar(0x2221) + QObject::tr(": %1");
 			informativeText = text.arg(absAngle);
 
 			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)
+			{
+				painter->SetPen(0x00FF00, 2.0, LSSolid);
+				overrideColor = true;
+			}
+
+			RenderObjects(painter, toolObjects);
+			overrideColor = false;
+#endif
 
-//			painter->DrawInformativeText(text);
+			double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES;
+
+			if (absAngle > 180.0)
+				absAngle -= 180.0;
+
+			QString text = QChar(0x2221) + QObject::tr(": %1");
+			informativeText = text.arg(absAngle);
+
+			if (ctrlDown)
+				informativeText += " (Copy)";
 		}
 	}
 }
@@ -970,6 +1007,109 @@ void DrawingView::RotateHandler(int mode, Point p)
 }
 
 
+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;
+				}
+			}
+		}
+
+		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;
+			}
+
+			toolPoint[0] = p;
+			Global::toolState = TSPoint1;
+			SavePointsFrom(select, toolScratch);
+		}
+
+		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);
+	}
+}
+
+
 void DrawingView::mousePressEvent(QMouseEvent * event)
 {
 	if (event->button() == Qt::LeftButton)
@@ -1076,6 +1216,21 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 	// Do object hit testing...
 	bool needUpdate = HitTestObjects(point);
 
+	// Check for multi-hover...
+	if (numHovered > 1)
+	{
+		GetHovered(hover);
+
+		double t, u;
+		int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u);
+
+		if (numIntersecting > 0)
+		{
+			QString text = tr("Intersection t=%1, u=%2");
+			informativeText = text.arg(t).arg(u);
+		}
+	}
+
 	// Do tool handling, if any are active...
 	if (Global::tool)
 	{