X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.cpp;h=2d37eeaed366815b282f70034ce78dfb3b838281;hb=771113b26ca27707c96fdcd80d79a08e40884268;hp=01d7ec3d9d1e601f6312b8172b977ba92539bc3e;hpb=31dd33b097661175a86b6799df525972055099fb;p=architektonas

diff --git a/src/dimension.cpp b/src/dimension.cpp
index 01d7ec3..2d37eea 100644
--- a/src/dimension.cpp
+++ b/src/dimension.cpp
@@ -29,15 +29,6 @@ Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/, Objec
 	type = OTDimension;
 }
 
-#if 0
-// This is bad, p1 & p2 could be NULL, causing much consternation...
-Dimension::Dimension(Connection p1, Connection p2, DimensionType dt/*= DTLinear*/, Object * p/*= NULL*/):
-	dragging(false), draggingHandle1(false), draggingHandle2(false),
-	length(0), dimensionType(dt), size(0.25)//, point1(p1), point2(p2)
-{
-	type = OTDimension;
-}
-#endif
 
 Dimension::~Dimension()
 {
@@ -183,6 +174,7 @@ I believe they are pixels.
 // need to make another handle drawing function in Painter, instead of this
 	if (hitLine)
 	{
+#if 0
 		Point p9 = ((position + endpoint) / 2.0) + (orthogonal * 14.0)
 		 + (unit * 7.0);
 
@@ -194,6 +186,13 @@ I believe they are pixels.
 		painter->DrawLine(p11, p12);
 		painter->DrawLine(p12, p13);
 		painter->DrawLine(p13, p10);
+#else
+		if (hitFlipSwitch)
+			painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+
+		Point hp1 = (p1 + p2) / 2.0;
+		painter->DrawHandle(hp1);
+#endif
 	}
 }
 
@@ -237,13 +236,20 @@ I believe they are pixels.
 		draggingHandle2 = true;
 		return true;
 	}
+	else if (hitFlipSwitch)
+	{
+		FlipSides();
+		hitFlipSwitch = hitLine = false;
+//		state = OSInactive;
+//		return true;
+	}
 
 	state = OSInactive;
 	return false;
 }
 
 
-/*virtual*/ void Dimension::PointerMoved(Vector point)
+/*virtual*/ bool Dimension::PointerMoved(Vector point)
 {
 	if (selectionInProgress)
 	{
@@ -254,13 +260,13 @@ I believe they are pixels.
 		else
 			state = OSInactive;
 
-		return;
+		return false;
 	}
 
 	// Hit test tells us what we hit (if anything) through boolean variables. (It
 	// also tells us whether or not the state changed. --not any more)
 	SaveHitState();
-	HitTest(point);
+	bool hovered = HitTest(point);
 	needUpdate = HitStateChanged();
 
 	objectWasDragged = (/*draggingLine |*/ draggingHandle1 | draggingHandle2);
@@ -278,6 +284,8 @@ I believe they are pixels.
 		oldPoint = point;
 		needUpdate = true;
 	}
+
+	return hovered;
 }
 
 
@@ -325,7 +333,8 @@ about keeping track of old states...
 
 /*virtual*/ bool Dimension::HitTest(Point point)
 {
-	Vector orthogonal = Vector::Normal(position, endpoint);
+//	Vector orthogonal = Vector::Normal(position, endpoint);
+	Vector orthogonal = Vector::Normal(linePt1, linePt2);
 	// Get our line parallel to our points
 #if 0
 	Point p1 = position + (orthogonal * 10.0 * size);
@@ -344,6 +353,7 @@ about keeping track of old states...
 //	double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point);
 	double t = Geometry::ParameterOfLineAndPoint(p1, p2, point);
 	double distance;
+	Point hFSPoint = Point((p1 + p2) / 2.0, point);
 
 	if (t < 0.0)
 		distance = v1.Magnitude();
@@ -362,7 +372,10 @@ about keeping track of old states...
 	else if ((distance * Painter::zoom) < 5.0)
 		hitLine = true;
 
-	return (hitPoint1 || hitPoint2 || hitLine ? true : false);
+	if ((hFSPoint.Magnitude() * Painter::zoom) < 8.0)
+		hitFlipSwitch = true;
+
+	return (hitPoint1 || hitPoint2 || hitLine || hitFlipSwitch ? true : false);
 }
 
 
@@ -371,12 +384,13 @@ void Dimension::SaveHitState(void)
 	oldHitPoint1 = hitPoint1;
 	oldHitPoint2 = hitPoint2;
 	oldHitLine = hitLine;
+	oldHitFlipSwitch = hitFlipSwitch;
 }
 
 
 bool Dimension::HitStateChanged(void)
 {
-	if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine))
+	if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine) || (hitFlipSwitch != oldHitFlipSwitch))
 		return true;
 
 	return false;