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

diff --git a/src/dimension.cpp b/src/dimension.cpp
index 2d37eea..9c9e15c 100644
--- a/src/dimension.cpp
+++ b/src/dimension.cpp
@@ -27,6 +27,7 @@ Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/, Objec
 {
 	// We set the size to 1/4 base unit. Could be anything.
 	type = OTDimension;
+//	dimensionType = DTLinearHorz;
 }
 
 
@@ -62,31 +63,71 @@ all objects move as a unified whole.
 	// Draw an aligned dimension line
 	Vector v(position, endpoint);
 	double angle = v.Angle();
-	Vector orthogonal = Vector::Normal(position, endpoint);
+//	Vector orthogonal = Vector::Normal(position, endpoint);
 	Vector unit = v.Unit();
 	linePt1 = position, linePt2 = endpoint;
 
 // Horizontally aligned display
 #if 1
-	Vector /*pos = position, endp = endpoint,*/ ortho;
-	double y1;
+	Vector ortho;
+	double x1, y1, length;
 
-	if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+	if (dimensionType == DTLinearVert)
 	{
-		y1 = (position.y > endpoint.y ? position.y : endpoint.y);
-		ortho = Vector(0, 1.0);
-		angle = 0;
+		if ((angle < 0) || (angle > PI))
+	//	if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+		{
+			x1 = (position.x > endpoint.x ? position.x : endpoint.x);
+			y1 = (position.y > endpoint.y ? position.y : endpoint.y);
+			ortho = Vector(1.0, 0);
+	//		ortho = Vector(0, 1.0);
+			angle = PI3_OVER_2;
+	//		angle = 0;
+		}
+		else
+		{
+			x1 = (position.x > endpoint.x ? endpoint.x : position.x);
+			y1 = (position.y > endpoint.y ? endpoint.y : position.y);
+			ortho = Vector(-1.0, 0);
+	//		ortho = Vector(0, -1.0);
+			angle = PI_OVER_2;
+	//		angle = PI;
+		}
+
+		linePt1.x = linePt2.x = x1;
+		length = fabs(position.y - endpoint.y);
 	}
-	else
+	else if (dimensionType == DTLinearHorz)
+	{
+		if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+		{
+			x1 = (position.x > endpoint.x ? position.x : endpoint.x);
+			y1 = (position.y > endpoint.y ? position.y : endpoint.y);
+			ortho = Vector(0, 1.0);
+			angle = 0;
+		}
+		else
+		{
+			x1 = (position.x > endpoint.x ? endpoint.x : position.x);
+			y1 = (position.y > endpoint.y ? endpoint.y : position.y);
+			ortho = Vector(0, -1.0);
+			angle = PI;
+		}
+
+		linePt1.y = linePt2.y = y1;
+		length = fabs(position.x - endpoint.x);
+	}
+	else if (dimensionType == DTLinear)
 	{
-		y1 = (position.y > endpoint.y ? endpoint.y : position.y);
-		ortho = Vector(0, -1.0);
-		angle = PI;
+		angle = Vector(linePt1, linePt2).Angle();
+		ortho = Vector::Normal(linePt1, linePt2);
+		length = v.Magnitude();
 	}
 
-//	pos.y = endp.y = y1;
-	linePt1.y = linePt2.y = y1;
 	unit = Vector(linePt1, linePt2).Unit();
+//	angle = Vector(linePt1, linePt2).Angle();
+//	ortho = Vector::Normal(linePt1, linePt2);
+
 	Point p1 = linePt1 + (ortho * 10.0 * size);
 	Point p2 = linePt2 + (ortho * 10.0 * size);
 	Point p3 = linePt1 + (ortho * 16.0 * size);
@@ -141,19 +182,12 @@ I believe they are pixels.
 
 	// Draw length of dimension line...
 	painter->SetFont(QFont("Arial", 8.0 * Painter::zoom * size));
-#if 0
-	Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0);
-	Point ctr = p2 + v1;
-#else
 	Point ctr = p2 + (Vector(p2, p1) / 2.0);
-#endif
 
 #if 0
 	QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude());
 #else
 	QString dimText;
-//	double length = v.Magnitude();
-	double length = fabs(position.x - endpoint.x);
 
 	if (length < 12.0)
 		dimText = QString("%1\"").arg(length);
@@ -171,28 +205,19 @@ I believe they are pixels.
 
 	painter->DrawAngledText(ctr, angle, dimText, size);
 
-// 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);
-
-		Point p10 = p9 + (orthogonal * -7.0);
-		Point p11 = p10 + (unit * 7.0);
-		Point p12 = p11 + (orthogonal * 7.0);
-		Point p13 = p12 + (unit * -7.0);
-		painter->DrawLine(p10, p11);
-		painter->DrawLine(p11, p12);
-		painter->DrawLine(p12, p13);
-		painter->DrawLine(p13, p10);
-#else
+		Point hp1 = (p1 + p2) / 2.0;
+
 		if (hitFlipSwitch)
+		{
+			painter->SetPen(QPen(Qt::magenta, 1.0, Qt::SolidLine));
+			painter->SetBrush(QBrush(QColor(Qt::magenta)));
+			painter->DrawArrowHandle(hp1, ortho.Angle() + PI);
 			painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+		}
 
-		Point hp1 = (p1 + p2) / 2.0;
 		painter->DrawHandle(hp1);
-#endif
 	}
 }