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

diff --git a/src/line.cpp b/src/line.cpp
index e80e988..37b43c8 100644
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -123,11 +123,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 +213,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 +240,7 @@ a dimension only) Draw() function... :-/
 		{
 			oldState = state;
 			state = OSSelected;
-			oldPoint = endpoint; //maybe "position"?
+			oldPoint = endpoint;
 			draggingHandle2 = true;
 			return true;
 		}
@@ -253,12 +255,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;