X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcircle.cpp;h=e73bcdc9607fb6dd209a088e87bfb5d696062a35;hb=11cff81f10ccca1b31288fce04d696e715b922b0;hp=77ea95a6290e5ca87dbe8ba9477bac561fce7bef;hpb=89b8b0c60579d8ef0cf9a13521e7bf7c7864883f;p=architektonas

diff --git a/src/circle.cpp b/src/circle.cpp
index 77ea95a..e73bcdc 100644
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -53,6 +53,28 @@ Circle::~Circle()
 
 	if (state == OSSelected && draggingEdge && objectWasDragged)
 		painter->DrawHandle(dragPoint);
+
+	// If resizing the circle, draw an information panel showing the new radius.
+	if (draggingEdge)
+	{
+		QString text = QObject::tr("Radius: %1\nScale: %2%");
+		text = text.arg(radius, 0, 'd', 4).arg(radius / oldRadius * 100.0, 0, 'd', 0);
+#if 0
+		QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
+		painter->SetPen(pen);
+		painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
+		QRectF textRect(10.0, 10.0, 270.0, 70.0);	// x, y, w, h
+		painter->DrawRoundedRect(textRect, 7.0, 7.0);
+
+		textRect.setLeft(textRect.left() + 14);
+		painter->SetFont(*Object::font);
+		pen = QPen(QColor(0x00, 0x5F, 0xDF));
+		painter->SetPen(pen);
+		painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+		painter->DrawInformativeText(text);
+#endif
+	}
 }
 
 
@@ -68,6 +90,11 @@ Circle::~Circle()
 	objectWasDragged = false;
 	HitTest(point);
 
+	// Now that we've done our hit testing on the non-snapped point, snap it if
+	// necessary...
+	if (snapToGrid)
+		point = SnapPointToGrid(point);
+
 	draggingCenter = hitCenter;
 	draggingEdge = hitCircle;
 
@@ -76,6 +103,7 @@ Circle::~Circle()
 		dragPoint = point;
 		oldState = state;
 		state = OSSelected;
+		oldRadius = radius;
 		return true;
 	}
 
@@ -90,7 +118,8 @@ Circle::~Circle()
 	if (selectionInProgress)
 	{
 		// Check for whether or not the rect contains this circle
-		if (selection.normalized().contains(Extents()))
+//		if (selection.normalized().contains(Extents()))
+		if (selection.contains(Extents()))
 			state = OSSelected;
 		else
 			state = OSInactive;
@@ -100,9 +129,14 @@ Circle::~Circle()
 
 	// Hit test tells us what we hit (if anything) through boolean variables. It
 	// also tells us whether or not the state changed.
-	needUpdate = HitTest(point);
+	SaveHitState();
+	HitTest(point);
+	needUpdate = HitStateChanged();
 	objectWasDragged = (draggingEdge | draggingCenter);
 
+	if (objectWasDragged)
+		needUpdate = true;
+
 	if (draggingEdge)
 		radius = Vector::Magnitude(point, position);
 	else if (draggingCenter)
@@ -128,7 +162,7 @@ Circle::~Circle()
 
 /*virtual*/ bool Circle::HitTest(Point point)
 {
-	SaveState();
+//	SaveHitState();
 	hitCenter = hitCircle = false;
 	double length = Vector::Magnitude(position, point);
 //printf("Circle::length = %lf, radius = %lf\n", length, radius);
@@ -155,7 +189,8 @@ pointed at length with our on screen length.
 	else if ((fabs(length - radius) * Painter::zoom) < 2.0)
 		hitCircle = true;
 
-	return StateChanged();
+//	return HitStateChanged();
+	return (hitCenter || hitCircle ? true : false);
 }
 
 
@@ -165,14 +200,14 @@ pointed at length with our on screen length.
 }
 
 
-void Circle::SaveState(void)
+void Circle::SaveHitState(void)
 {
 	oldHitCenter = hitCenter;
 	oldHitCircle = hitCircle;
 }
 
 
-bool Circle::StateChanged(void)
+bool Circle::HitStateChanged(void)
 {
 	if ((hitCenter != oldHitCenter) || (hitCircle != oldHitCircle))
 		return true;
@@ -183,7 +218,7 @@ bool Circle::StateChanged(void)
 
 /*virtual*/ void Circle::Enumerate(FILE * file)
 {
-	fprintf(file, "CIRCLE (%lf,%lf) %lf\n", position.x, position.y, radius);
+	fprintf(file, "CIRCLE %i (%lf,%lf) %lf\n", layer, position.x, position.y, radius);
 }