X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=f253bd9064ee17367a95b87b8e74991a7bbcf984;hb=ab604f6b520f16e24aa2611db856b13505e28686;hp=aeb764cc5781ff38364f7a99eb154c4898c360bd;hpb=06456047e6476969e45be5b1f31b8336ea74c45f;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index aeb764c..f253bd9 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -308,6 +308,9 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
 	// Do object rendering...
 	RenderObjects(&painter, document.objects);
 
+	if (!informativeText.isEmpty())
+		painter.DrawInformativeText(informativeText);
+
 	// Do tool rendering, if any...
 	if (Global::tool)
 	{
@@ -354,31 +357,26 @@ 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, 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->p[0], a->radius, a->angle1, a->angle2);
+			painter->DrawArc(obj->p[0], obj->radius[0], obj->angle[0], obj->angle[1]);
 			break;
-		}
 		case OTDimension:
 		{
 			Dimension * d = (Dimension *)obj;
@@ -707,7 +705,7 @@ void DrawingView::RotateHandler(int mode, Point p)
 			if (shiftDown)
 				return;
 
-			double angle = Vector(toolPoint[1], toolPoint[0]).Angle();
+			double angle = Vector(toolPoint[0], toolPoint[1]).Angle();
 			std::vector<void *>::iterator j = select.begin();
 			std::vector<Object>::iterator i = toolScratch.begin();
 
@@ -719,6 +717,14 @@ void DrawingView::RotateHandler(int mode, Point p)
 				Object * obj2 = (Object *)(*j);
 				obj2->p[0] = p1;
 				obj2->p[1] = p2;
+
+				if (obj.type == OTArc)
+				{
+					obj2->angle[0] = obj.angle[0] + angle;
+
+					if (obj2->angle[0] > PI_TIMES_2)
+						obj2->angle[0] -= PI_TIMES_2;
+				}
 			}
 		}
 
@@ -810,6 +816,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);
 
@@ -867,6 +874,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;
@@ -913,26 +923,26 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 		}
 
 		if (Global::selectionInProgress)
-		{
-			// Select all the stuff inside of selection
 			Global::selectionInProgress = false;
 
-			// Clear our vectors
-			select.clear();
-			hover.clear();
+		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);
-			}
+//			}
 		}
 	}
 	else if (event->button() == Qt::MiddleButton)
@@ -964,13 +974,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
 }
 
 
@@ -1013,6 +1021,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
@@ -1058,7 +1067,7 @@ void DrawingView::CheckObjectBounds(void)
 		{
 			Circle * c = (Circle *)obj;
 
-			if (Global::selection.contains(c->p[0].x - c->radius, c->p[0].y - c->radius) && Global::selection.contains(c->p[0].x + c->radius, c->p[0].y + c->radius))
+			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;
@@ -1067,8 +1076,8 @@ void DrawingView::CheckObjectBounds(void)
 		{
 			Arc * a = (Arc *)obj;
 
-			double start = a->angle1;
-			double end = start + a->angle2;
+			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);
@@ -1119,8 +1128,8 @@ void DrawingView::CheckObjectBounds(void)
 			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, bounds.top() * a->radius));
-			bounds.setBottomRight(QPointF(bounds.right() * a->radius, bounds.bottom() * a->radius));
+			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))
@@ -1152,13 +1161,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)
@@ -1171,34 +1179,34 @@ 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;
 		}
@@ -1219,10 +1227,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"));
@@ -1230,21 +1236,31 @@ 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;
-	}
 	default:
 		break;
 	}