X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fline.cpp;h=8425e62356e5062cee58b39a50da4793e0c11090;hb=a42277d4d950d32459b16b3ec8ee8287c9c0afab;hp=e80e988797c28004cd84d45c7ba76411bbad1049;hpb=eb711912d64f17cf9c18c74c4d78d9867bd066ad;p=architektonas

diff --git a/src/line.cpp b/src/line.cpp
index e80e988..8425e62 100644
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -93,11 +93,9 @@ Line::~Line()
 		double absAngle = (Vector(endpoint - position).Angle()) * RADIANS_TO_DEGREES;
 		double absLength = Vector(position - endpoint).Magnitude();
 
-		QString text;
-
-		text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2");
+		QString text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2");
 		text = text.arg(absLength).arg(absAngle);
-
+#if 0
 		QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
 		painter->SetPen(pen);
 		painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
@@ -109,6 +107,9 @@ Line::~Line()
 		pen = QPen(QColor(0x00, 0x5F, 0xDF));
 		painter->SetPen(pen);
 		painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+		painter->DrawInformativeText(text);
+#endif
 	}
 }
 
@@ -123,11 +124,15 @@ Line::~Line()
 {
 	// We can assume this, since this is a mouse down event here.
 	objectWasDragged = false;
-//	SaveHitState();
 	HitTest(point);
-//	return HitStateChanged();
+
+	// Now that we've done our hit testing on the non-snapped point, snap it if
+	// necessary...
+	if (snapToGrid)
+		point = SnapPointToGrid(point);
 
 // this is shite. this should be checked for in the Container, not here!
+#warning "!!! This should be checked for in Container, not here !!!"
 	// If we're part of a non-top-level container, send this signal to it
 	if (parent->type == OTContainer && !((Container *)parent)->isTopLevelContainer
 		&& (hitLine || hitPoint1 || hitPoint2))
@@ -209,28 +214,26 @@ a dimension only) Draw() function... :-/
 		}
 	}
 
-
 	if (state == OSInactive)
 	{
-//printf("Line: pp = %lf, length = %lf, distance = %lf\n", parameterizedPoint, lineSegment.Magnitude(), distance);
-//printf("      v1.Magnitude = %lf, v2.Magnitude = %lf\n", v1.Magnitude(), v2.Magnitude());
-//printf("      point = %lf,%lf,%lf; p1 = %lf,%lf,%lf; p2 = %lf,%lf,%lf\n", point.x, point.y, point.z, position.x, position.y, position.z, endpoint.x, endpoint.y, endpoint.z);
-//printf("      \n", );
 //How to translate this into pixels from Document space???
-//Maybe we need to pass a scaling factor in here from the caller? That would make sense, as
-//the caller knows about the zoom factor and all that good kinda crap
-//I think what's needed is an Object class variable/method that can be changed by the TLC and
-//called in derived classes to properly scale the location to the current zoom level. That *should* work.
-
-// ALSO: Need to code a global (read: Object class) variable that tells use whether a modifier
-//       key was pressed in addition to the mouse click, so we can do stuff like, say, hold
-//       down CTRL and be able to do multiple selecting of objects (in that case, we would
-//       keep the Object state from changing).
+//Maybe we need to pass a scaling factor in here from the caller? That would
+//make sense, as the caller knows about the zoom factor and all that good kinda
+//crap
+//I think what's needed is an Object class variable/method that can be changed
+//by the TLC and called in derived classes to properly scale the location to
+//the current zoom level. That *should* work.
+
+// ALSO: Need to code a global (read: Object class) variable that tells use
+//       whether a modifier key was pressed in addition to the mouse click, so
+//       we can do stuff like, say, hold down CTRL and be able to do multiple
+//       selecting of objects (in that case, we would keep the Object state
+//       from changing).
 		if (hitPoint1)
 		{
 			oldState = state;
 			state = OSSelected;
-			oldPoint = position; //maybe "position"?
+			oldPoint = position;
 			draggingHandle1 = true;
 			return true;
 		}
@@ -238,7 +241,7 @@ a dimension only) Draw() function... :-/
 		{
 			oldState = state;
 			state = OSSelected;
-			oldPoint = endpoint; //maybe "position"?
+			oldPoint = endpoint;
 			draggingHandle2 = true;
 			return true;
 		}
@@ -253,12 +256,6 @@ a dimension only) Draw() function... :-/
 	}
 	else if (state == OSSelected)
 	{
-		// Here we test for collision with handles as well! (SOON!) [I think it works...NOPE]
-/*
-Like so:
-		if (v1.Magnitude() < 2.0) // Handle #1
-		else if (v2.Magnitude() < 2.0) // Handle #2
-*/
 		if (hitLine)
 		{
 			oldState = state;
@@ -512,7 +509,7 @@ the horizontal line or vertical line that intersects from the current mouse posi
 
 /*virtual*/ void Line::Enumerate(FILE * file)
 {
-	fprintf(file, "LINE (%lf,%lf) (%lf,%lf)\n", position.x, position.y, endpoint.x, endpoint.y);
+	fprintf(file, "LINE %i (%lf,%lf) (%lf,%lf)\n", layer, position.x, position.y, endpoint.x, endpoint.y);
 }
 
 
@@ -578,6 +575,57 @@ same reference number.
 }
 
 
+/*virtual*/ Object * Line::Mirror(Vector p1, Vector p2)
+{
+#if 0
+	return NULL;
+
+double Vector::Parameter(Vector v1, Vector v2, Vector p)
+{
+	// Geometric interpretation:
+	// The parameterized point on the vector lineSegment is where the normal of
+	// the lineSegment to the point intersects lineSegment. If the pp < 0, then
+	// the perpendicular lies beyond the 1st endpoint. If pp > 1, then the
+	// perpendicular lies beyond the 2nd endpoint.
+
+	Vector lineSegment = v2 - v1;
+	double magnitude = lineSegment.Magnitude();
+	Vector pointSegment = p - v1;
+	double t = lineSegment.Dot(pointSegment) / (magnitude * magnitude);
+	return t;
+}
+
+
+// Return the normal to the linesegment formed by the passed in points.
+// (Not sure which is head or tail, or which hand the normal lies)
+/*static*/ Vector Vector::Normal(Vector v1, Vector v2)
+#endif
+
+	double t1 = Vector::Parameter(p1, p2, position);
+	double t2 = Vector::Parameter(p1, p2, endpoint);
+
+	Vector unit = Vector(p1, p2).Unit();
+	Vector v1 = unit * t1;
+	Vector v2 = unit * t2;
+
+//	Vector normal = Vector::Normal(p1, p2);
+	// Get the points normal to position & endpoint to the line passed in
+	// (these are tails)
+	Vector v3 = p1 + v1;
+	Vector v4 = p1 + v2;
+
+	// Make our mirrored vectors
+	Vector v5 = -(position - v3);
+	Vector v6 = -(endpoint - v4);
+
+	// Find the points
+	Vector v7 = v3 + v5;
+	Vector v8 = v4 + v6;
+
+	return new Line(v7, v8);
+}
+
+
 void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
 {
 	// If they don't pass one in, create it for the caller.