X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.cpp;h=db2a2085d42bd730048aa536a3d31ffebe1320cc;hb=6ce9d9112c232f02b2be6cbdedbeb89c28bc713a;hp=2b49ff8d08e3d7564c5ae2c9c37ad223ec901188;hpb=3047a65eb459ddb4a85e1a694aa2b2491437472e;p=architektonas

diff --git a/src/dimension.cpp b/src/dimension.cpp
index 2b49ff8..db2a208 100644
--- a/src/dimension.cpp
+++ b/src/dimension.cpp
@@ -92,10 +92,14 @@ I believe they are pixels.
 
 	// Calculate whether or not the arrowheads are too crowded to put inside
 	// the extension lines. 9.0 is the length of the arrowhead.
-	double t = Vector::Parameter(position, endpoint, endpoint - (unit * 9.0 * size));
+//	double t = Vector::Parameter(position, endpoint, endpoint - (unit * 9.0 * size));
+	double t = Vector::Parameter(position, endpoint, position + (unit * 9.0 * size));
+//	double t = Vector::Parameter(endpoint, position, position + (unit * 9.0 * size));
 //printf("Dimension::Draw(): t = %lf\n", t);
 
-	if (t > 0.42)
+// On the screen, it's acting like this is actually 58%...
+// This is correct, we want it to happen at > 50%
+	if (t > 0.58)
 	{
 		// Draw main dimension line + arrowheads
 		painter->DrawLine(p1, p2);
@@ -104,6 +108,7 @@ I believe they are pixels.
 	}
 	else
 	{
+		// Draw outside arrowheads
 		Point p7 = p1 - (unit * 9.0 * size);
 		Point p8 = p2 + (unit * 9.0 * size);
 		painter->DrawArrowhead(p1, p7, size);
@@ -116,7 +121,27 @@ I believe they are pixels.
 	painter->SetFont(QFont("Arial", 8.0 * Painter::zoom * size));
 	Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0);
 	Point ctr = p2 + v1;
+
+#if 0
 	QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude());
+#else
+	QString dimText;
+	double length = Vector(endpoint - position).Magnitude();
+
+	if (length < 12.0)
+		dimText = QString("%1\"").arg(length);
+	else
+	{
+		double feet = (double)((int)length / 12);
+		double inches = length - (feet * 12.0);
+
+		if (inches == 0)
+			dimText = QString("%1'").arg(feet);
+		else
+			dimText = QString("%1' %2\"").arg(feet).arg(inches);
+	}
+#endif
+
 	painter->DrawAngledText(ctr, angle, dimText, size);
 }
 
@@ -316,7 +341,26 @@ about keeping track of old states...
 
 /*virtual*/ void Dimension::Enumerate(FILE * file)
 {
-	fprintf(file, "DIMENSION (%lf,%lf) (%lf,%lf) %i\n", position.x, position.y, endpoint.x, endpoint.y, type);
+	fprintf(file, "DIMENSION %i (%lf,%lf) (%lf,%lf) %i\n", layer, position.x, position.y, endpoint.x, endpoint.y, type);
+}
+
+
+/*virtual*/ Object * Dimension::Copy(void)
+{
+#warning "!!! This doesn't take care of attached Dimensions !!!"
+/*
+This is a real problem. While having a pointer in the Dimension to this line's points
+is fast & easy, it creates a huge problem when trying to replicate an object like this.
+
+Maybe a way to fix that then, is to have reference numbers instead of pointers. That
+way, if you copy them, ... you might still have problems. Because you can't be sure if
+a copy will be persistant or not, you then *definitely* do not want them to have the
+same reference number.
+*/
+
+	Dimension * d = new Dimension(position, endpoint, dimensionType, parent);
+	d->size = size;
+	return d;
 }