X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcircle.cpp;h=d8a2e5d61bda7faa31c349546a7b94c79d0771c1;hb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;hp=909d30416bac3676beaf8d6d8cbe905184f04eb7;hpb=eb711912d64f17cf9c18c74c4d78d9867bd066ad;p=architektonas

diff --git a/src/circle.cpp b/src/circle.cpp
index 909d304..d8a2e5d 100644
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -16,6 +16,7 @@
 #include "circle.h"
 
 #include <QtGui>
+#include "geometry.h"
 #include "painter.h"
 
 
@@ -59,7 +60,7 @@ Circle::~Circle()
 	{
 		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)));
@@ -71,6 +72,9 @@ Circle::~Circle()
 		pen = QPen(QColor(0x00, 0x5F, 0xDF));
 		painter->SetPen(pen);
 		painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+		painter->DrawInformativeText(text);
+#endif
 	}
 }
 
@@ -83,10 +87,19 @@ Circle::~Circle()
 
 /*virtual*/ bool Circle::Collided(Vector point)
 {
+	// Someone told us to fuck off, so we'll fuck off. :-)
+	if (ignoreClicks)
+		return false;
+
 	// We can assume this, since this is a mouse down event here.
 	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;
 
@@ -210,7 +223,7 @@ bool Circle::HitStateChanged(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);
 }
 
 
@@ -229,3 +242,32 @@ same reference number.
 	return new Circle(position, radius, parent);
 }
 
+
+/*virtual*/ void Circle::Rotate(Point point, double angle)
+{
+	Point c1 = Geometry::RotatePointAroundPoint(position, point, angle);
+	position = c1;
+}
+
+
+/*virtual*/ void Circle::Mirror(Point p1, Point p2)
+{
+	Point c1 = Geometry::MirrorPointAroundLine(position, p1, p2);
+//	return new Circle(c1, radius);
+	position = c1;
+}
+
+
+/*virtual*/ void Circle::Save(void)
+{
+	Object::Save();
+	oldRadius2 = radius;
+}
+
+
+/*virtual*/ void Circle::Restore(void)
+{
+	Object::Restore();
+	radius = oldRadius2;
+}
+