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

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 8104f82..7b49323 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -323,6 +323,9 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
 		painter.SetBrush(QBrush(QColor(255, 127, 0, 100)));
 		painter.DrawRect(Global::selection);
 	}
+
+	if (!informativeText.isEmpty())
+		painter.DrawInformativeText(informativeText);
 }
 
 
@@ -354,31 +357,36 @@ void DrawingView::RenderObjects(Painter * painter, std::vector<void *> & v)
 		switch (obj->type)
 		{
 		case OTLine:
-		{
-			Line * l = (Line *)obj;
-			painter->DrawLine(l->p[0], l->p[1]);
+			painter->DrawLine(obj->p[0], obj->p[1]);
 
-			if (l->hitPoint[0])
-				painter->DrawHandle(l->p[0]);
+			if (obj->hitPoint[0])
+				painter->DrawHandle(obj->p[0]);
 
-			if (l->hitPoint[1])
-				painter->DrawHandle(l->p[1]);
+			if (obj->hitPoint[1])
+				painter->DrawHandle(obj->p[1]);
 
 			break;
-		}
 		case OTCircle:
-		{
-			Circle * ci = (Circle *)obj;
 			painter->SetBrush(QBrush(Qt::NoBrush));
-			painter->DrawEllipse(ci->p[0], ci->radius[0], ci->radius[0]);
+			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->p[0], a->radius[0], a->angle[0], a->angle[1]);
+			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;
@@ -571,6 +579,10 @@ void DrawingView::ToolHandler(int mode, Point p)
 {
 	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);
 }
@@ -597,8 +609,72 @@ void DrawingView::ToolDraw(Painter * painter)
 			double absAngle = v.Angle() * RADIANS_TO_DEGREES;
 			double absLength = v.Magnitude();
 			QString text = tr("Length: %1 in.\n") + QChar(0x2221) + tr(": %2");
-			text = text.arg(absLength).arg(absAngle);
-			painter->DrawInformativeText(text);
+			informativeText = text.arg(absLength).arg(absAngle);
+		}
+	}
+	else if (Global::tool == TTCircle)
+	{
+		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);
+		}
+	}
+	else if (Global::tool == TTArc)
+	{
+		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 (span < 0)
+				span += PI_TIMES_2;
+
+			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);
 		}
 	}
 	else if (Global::tool == TTRotate)
@@ -628,12 +704,12 @@ void DrawingView::ToolDraw(Painter * painter)
 			double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES;
 
 			QString text = QChar(0x2221) + QObject::tr(": %1");
-			text = text.arg(absAngle);
+			informativeText = text.arg(absAngle);
 
 			if (ctrlDown)
-				text += " (Copy)";
+				informativeText += " (Copy)";
 
-			painter->DrawInformativeText(text);
+//			painter->DrawInformativeText(text);
 		}
 	}
 }
@@ -680,6 +756,118 @@ void DrawingView::LineHandler(int mode, Point p)
 }
 
 
+void DrawingView::CircleHandler(int mode, Point p)
+{
+	switch (mode)
+	{
+	case ToolMouseDown:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
+
+		break;
+	case ToolMouseMove:
+		if (Global::toolState == TSNone)
+			toolPoint[0] = p;
+		else
+			toolPoint[1] = p;
+
+		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;
+		}
+	}
+}
+
+
+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;
+	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;
+			}
+
+			// 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;
+		}
+	}
+}
+
+
 void DrawingView::RotateHandler(int mode, Point p)
 {
 	switch (mode)
@@ -722,7 +910,6 @@ void DrawingView::RotateHandler(int mode, Point p)
 
 				if (obj.type == OTArc)
 				{
-//printf("Obj2->angle[0] = %f, obj.angle[0] = %f, angle = %f\n", obj2->angle[0], obj.angle[0], angle);
 					obj2->angle[0] = obj.angle[0] + angle;
 
 					if (obj2->angle[0] > PI_TIMES_2)
@@ -819,6 +1006,7 @@ void DrawingView::mousePressEvent(QMouseEvent * event)
 			GetHovered(hover);	// prolly needed
 
 			// Needed for grab & moving objects
+			// We do it *after*... why? (doesn't seem to confer any advantage...)
 			if (Global::snapToGrid)
 				oldPoint = SnapPointToGrid(point);
 
@@ -876,6 +1064,9 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 	// Handle object movement (left button down & over an object)
 	if ((event->buttons() & Qt::LeftButton) && numHovered && !Global::tool)
 	{
+		if (Global::snapToGrid)
+			point = SnapPointToGrid(point);
+
 		HandleObjectMovement(point);
 		update();
 		oldPoint = point;
@@ -924,7 +1115,8 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 		if (Global::selectionInProgress)
 			Global::selectionInProgress = false;
 
-// Should be we do this automagically? Hmm...
+		informativeText.clear();
+// Should we be doing this automagically? Hmm...
 		// Clear our vectors
 		select.clear();
 		hover.clear();
@@ -938,9 +1130,8 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 				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)
@@ -972,13 +1163,11 @@ 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
 }
 
 
@@ -1021,6 +1210,7 @@ void DrawingView::keyReleaseEvent(QKeyEvent * event)
 	}
 }
 
+
 //
 // 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
@@ -1160,13 +1350,12 @@ bool DrawingView::HitTestObjects(Point point)
 		{
 		case OTLine:
 		{
-			Line * l = (Line *)obj;
-			bool oldHP0 = l->hitPoint[0], oldHP1 = l->hitPoint[1], oldHO = l->hitObject;
-			l->hitPoint[0] = l->hitPoint[1] = l->hitObject = false;
-			Vector lineSegment = l->p[1] - l->p[0];
-			Vector v1 = point - l->p[0];
-			Vector v2 = point - l->p[1];
-			double t = Geometry::ParameterOfLineAndPoint(l->p[0], l->p[1], point);
+			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)
@@ -1179,34 +1368,71 @@ bool DrawingView::HitTestObjects(Point point)
 					/ lineSegment.Magnitude());
 
 			if ((v1.Magnitude() * Global::zoom) < 8.0)
-			{
-				l->hitPoint[0] = true;
-//		snapPoint = l->p1;
-//		snapPointIsValid = true;
-			}
+				obj->hitPoint[0] = true;
 			else if ((v2.Magnitude() * Global::zoom) < 8.0)
-			{
-				l->hitPoint[1] = true;
-//		snapPoint = l->p2;
-//		snapPointIsValid = true;
-			}
+				obj->hitPoint[1] = true;
 			else if ((distance * Global::zoom) < 5.0)
-				l->hitObject = true;
+				obj->hitObject = true;
 
-//			bool oldHovered = l->hovered;
-			l->hovered = (l->hitPoint[0] || l->hitPoint[1] || l->hitObject ? true : false);
-//			l->hovered = l->hitObject;
+			obj->hovered = (obj->hitPoint[0] || obj->hitPoint[1] || obj->hitObject ? true : false);
 
-//			if (oldHovered != l->hovered)
-			if ((oldHP0 != l->hitPoint[0]) || (oldHP1 != l->hitPoint[1]) || (oldHO != l->hitObject))
+			if ((oldHP0 != obj->hitPoint[0]) || (oldHP1 != obj->hitPoint[1]) || (oldHO != obj->hitObject))
 				needUpdate = true;
 
 			break;
 		}
 		case OTCircle:
 		{
-			Circle * c = (Circle *)obj;
+			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;
 		}
@@ -1227,10 +1453,8 @@ bool DrawingView::HitTestObjects(Point point)
 
 void DrawingView::HandleObjectMovement(Point point)
 {
-	if (Global::snapToGrid)
-		point = SnapPointToGrid(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"));
@@ -1238,21 +1462,99 @@ void DrawingView::HandleObjectMovement(Point point)
 	switch (obj->type)
 	{
 	case OTLine:
-	{
-		Line * l = (Line *)obj;
+		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;
+		}
 
-		if (l->hitPoint[0])
-			l->p[0] = point;
-		else if (l->hitPoint[1])
-			l->p[1] = point;
-		else if (l->hitObject)
+		break;
+	case OTCircle:
+		if (obj->hitPoint[0])
+			obj->p[0] = point;
+		else if (obj->hitObject)
 		{
-			l->p[0] += delta;
-			l->p[1] += delta;
+//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;
 	}