Mirror tool now works successfully for all object types. :-D

[architektonas] / src / line.cpp

diff --git a/src/line.cpp b/src/line.cpp
index 37b43c8865cb86740da00abda5767ad562a512d7..b7abc9ad6bb62939cb9ddd5102a65d25d7bcadf3 100644 (file)
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -21,6 +21,7 @@
 #include <QtGui>
 #include "container.h"
 #include "dimension.h"
+#include "geometry.h"
 #include "mathconstants.h"
 #include "painter.h"
 
@@ -93,11 +94,9 @@ Line::~Line()
                double absAngle = (Vector(endpoint - position).Angle()) * RADIANS_TO_DEGREES;
                double absLength = Vector(position - endpoint).Magnitude();
 
-               QString text;
-
-               text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2");
+               QString text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2");
                text = text.arg(absLength).arg(absAngle);
-
+#if 0
                QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
                painter->SetPen(pen);
                painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
@@ -109,6 +108,9 @@ Line::~Line()
                pen = QPen(QColor(0x00, 0x5F, 0xDF));
                painter->SetPen(pen);
                painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+               painter->DrawInformativeText(text);
+#endif
        }
 }
 
@@ -121,6 +123,10 @@ Line::~Line()
 
 /*virtual*/ bool Line::Collided(Vector point)
 {
+       // Someone told us to fuck off, so we'll fuck off. :-)
+       if (ignoreClicks)
+               return false;
+
        // We can assume this, since this is a mouse down event here.
        objectWasDragged = false;
        HitTest(point);
@@ -444,7 +450,8 @@ the horizontal line or vertical line that intersects from the current mouse posi
        Vector lineSegment = endpoint - position;
        Vector v1 = point - position;
        Vector v2 = point - endpoint;
-       double t = Vector::Parameter(position, endpoint, point);
+//     double t = Vector::Parameter(position, endpoint, point);
+       double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point);
        double distance;
 
        // Geometric interpretation:
@@ -508,7 +515,7 @@ the horizontal line or vertical line that intersects from the current mouse posi
 
 /*virtual*/ void Line::Enumerate(FILE * file)
 {
-       fprintf(file, "LINE (%lf,%lf) (%lf,%lf)\n", position.x, position.y, endpoint.x, endpoint.y);
+       fprintf(file, "LINE %i (%lf,%lf) (%lf,%lf)\n", layer, position.x, position.y, endpoint.x, endpoint.y);
 }
 
 
@@ -574,6 +581,29 @@ same reference number.
 }
 
 
+/*virtual*/ void Line::Mirror(Point p1, Point p2)
+{
+       Point l1 = Geometry::MirrorPointAroundLine(position, p1, p2);
+       Point l2 = Geometry::MirrorPointAroundLine(endpoint, p1, p2);
+       position = l1;
+       endpoint = l2;
+}
+
+
+/*virtual*/ void Line::Save(void)
+{
+       Object::Save();
+       oldEndpoint = endpoint;
+}
+
+
+/*virtual*/ void Line::Restore(void)
+{
+       Object::Restore();
+       endpoint = oldEndpoint;
+}
+
+
 void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
 {
        // If they don't pass one in, create it for the caller.