Added layer attribute to load/save code.

[architektonas] / src / dimension.cpp

diff --git a/src/dimension.cpp b/src/dimension.cpp
index 2a989dccec0de1b91fb3d68f8ab13e4d2ebbbcdf..83e657afcb62a1d2362f155a3120c4788ddfc040 100644 (file)
--- a/src/dimension.cpp
+++ b/src/dimension.cpp
@@ -108,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);
@@ -120,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);
 }
 
@@ -320,7 +341,7 @@ 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);
 }