X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Farc.cpp;h=e4a6b6f4788de7b89f1196fa75a8018217fad421;hb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;hp=030e293a70a20697f9575d893585894a71643e72;hpb=e8987f4028a1f9c0eeb33a45bd11b2e409b9c2c5;p=architektonas

diff --git a/src/arc.cpp b/src/arc.cpp
index 030e293..e4a6b6f 100644
--- a/src/arc.cpp
+++ b/src/arc.cpp
@@ -16,6 +16,7 @@
 #include "arc.h"
 
 #include <QtGui>
+#include "geometry.h"
 #include "mathconstants.h"
 #include "painter.h"
 
@@ -110,6 +111,7 @@ Arc::~Arc()
 			text = text.arg(radius, 0, 'd', 4).arg(radius / oldRadius * 100.0, 0, 'd', 0);
 		}
 
+#if 0
 		pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
 		painter->SetPen(pen);
 		painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
@@ -121,6 +123,9 @@ Arc::~Arc()
 		pen = QPen(QColor(0x00, 0x5F, 0xDF));
 		painter->SetPen(pen);
 		painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+		painter->DrawInformativeText(text);
+#endif
 	}
 }
 
@@ -147,6 +152,10 @@ Also: should put the snap logic into the Object base class (as a static method).
 
 /*virtual*/ bool Arc::Collided(Vector point)
 {
+	// Someone told us to fuck off, so we'll fuck off. :-)
+	if (ignoreClicks)
+		return false;
+
 	objectWasDragged = false;
 	bool hitSomething = HitTest(point);
 	draggingCenter = hitCenter;
@@ -427,7 +436,7 @@ bool Arc::HitStateChanged(void)
 
 /*virtual*/ void Arc::Enumerate(FILE * file)
 {
-	fprintf(file, "ARC (%lf,%lf) %lf, %lf, %lf\n", position.x, position.y, radius, startAngle, angleSpan);
+	fprintf(file, "ARC %i (%lf,%lf) %lf, %lf, %lf\n", layer, position.x, position.y, radius, startAngle, angleSpan);
 }
 
 
@@ -446,3 +455,45 @@ same reference number.
 	return new Arc(position, radius, startAngle, angleSpan, parent);
 }
 
+
+/*virtual*/ void Arc::Rotate(Point point, double angle)
+{
+	Point c1 = Geometry::RotatePointAroundPoint(position, point, angle);
+	Point ap1(cos(startAngle), sin(startAngle));
+	Point angleStartPoint = (ap1 * radius) + position;
+	Point c2 = Geometry::RotatePointAroundPoint(angleStartPoint, point, angle);
+
+	position = c1;
+	startAngle = Vector(c2, c1).Angle();
+}
+
+
+/*virtual*/ void Arc::Mirror(Point p1, Point p2)
+{
+	Point c1 = Geometry::MirrorPointAroundLine(position, p1, p2);
+	Point ap1(cos(startAngle + angleSpan), sin(startAngle + angleSpan));
+	Point angleEndPoint = (ap1 * radius) + position;
+	Point c2 = Geometry::MirrorPointAroundLine(angleEndPoint, p1, p2);
+
+	position = c1;
+	startAngle = Vector(c2, c1).Angle();
+}
+
+
+/*virtual*/ void Arc::Save(void)
+{
+	Object::Save();
+	oldRadius2 = radius;
+	oldStartAngle = startAngle;
+	oldAngleSpan = angleSpan;
+}
+
+
+/*virtual*/ void Arc::Restore(void)
+{
+	Object::Restore();
+	radius = oldRadius2;
+	startAngle = oldStartAngle;
+	angleSpan = oldAngleSpan;
+}
+