Fixes to accomodate object connections.

[architektonas] / src / line.cpp

diff --git a/src/line.cpp b/src/line.cpp
index 739842bbe9bd811d510cc0d071e81cead1c5dd58..244af94a8e0d887fa855b73d8e7c204fcd4309ea 100644 (file)
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -32,6 +32,9 @@ Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint(
 
 Line::~Line()
 {
+// Taking care of connections should be done by the Container, as we don't know
+// anything about any other object connected to this one.
+#if 0
        // If there are any attached Dimensions, we must set the attachment points
        // to NULL since they will no longer be valid.
        if (attachedDimension)
@@ -42,6 +45,7 @@ Line::~Line()
        // IT WOULD BE NICE to have any object points attached to this line automagically
        // connect to this dimension object at this point, instead of just becoming
        // detached.
+#endif
 }
 
 /*virtual*/ void Line::Draw(Painter * painter)
@@ -123,6 +127,7 @@ TODO: Make Dimension preview with modifier keys for showing on other side
                // (Priorities are taken care of in HitTest()...)
                if (hitLine)
                {
+#if 0
                        if (attachedDimension == NULL)
                        {
                                // How to get this object into the top level container???
@@ -142,6 +147,26 @@ a dimension only) Draw() function... :-/
                                // If there's one already there, tell it to flip sides...
                                attachedDimension->FlipSides();
                        }
+#else
+                       // New approach here: We look for connected objects.
+                       Object * attachedDimension = FindAttachedDimension();
+
+                       if (attachedDimension)
+                       {
+                               // If there's an attached Dimension, tell it to switch sides...
+                               ((Dimension *)attachedDimension)->FlipSides();
+                       }
+                       else
+                       {
+                               // Otherwise, we make a new one and attach it here.
+                               attachedDimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this);
+                               connected.push_back(Connection(attachedDimension, 0));
+                               connected.push_back(Connection(attachedDimension, 1.0));
+
+                               if (parent != NULL)
+                                       parent->Add(attachedDimension);
+                       }
+#endif
 
                        return true;
                }
@@ -372,6 +397,7 @@ about keeping track of old states...
        return 0;
 }
 
+
 #if 0
 void Line::SetDimensionOnPoint1(Dimension * dimension)
 {
@@ -394,23 +420,71 @@ void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
        // If they don't pass one in, create it for the caller.
        if (dimension == NULL)
        {
-               dimension = new Dimension(&position, &endpoint, DTLinear, this);
+printf("Line::SetDimensionOnLine(): Creating new dimension...\n");
+//             dimension = new Dimension(position, endpoint, DTLinear, this);
+               dimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this);
 
                if (parent)
+{
+printf("Line::SetDimensionOnLine(): Adding to parent...\n");
                        parent->Add(dimension);
+}
+       }
+       else
+       {
+               dimension->Connect(this, 0);
+               dimension->Connect(this, 1.0);
        }
 
-       attachedDimension = dimension;
+       // Make sure the Dimension is connected to us...
+#if 0
+       connected.push_back(Connection(dimension, 0));
+       connected.push_back(Connection(dimension, 1.0));
+#else
+       Connect(dimension, 0);
+       Connect(dimension, 1.0);
+#endif
 
+//     attachedDimension = dimension;
+
+#if 0
        // After we set the points here, we don't have to care about them anymore.
        if (dimension)
        {
                dimension->SetPoint1(&position);
                dimension->SetPoint2(&endpoint);
        }
+#endif
 }
 #endif
 
+
+Object * Line::FindAttachedDimension(void)
+{
+       // Is there anything connected to this line? If not, return NULL
+       if (connected.size() < 2)
+               return NULL;
+
+       // Otherwise, we have to search our objects to see if there's a likely
+       // candidate. In this case, we're looking for a pointer to the same object
+       // with a parameter of 0 and 1 respectively. This is O((n^2)/2).
+       for(uint i=0; i<connected.size(); i++)
+       {
+               for(uint j=i+1; j<connected.size(); j++)
+               {
+printf("Line: connected[i]=%X, connected[j]=%X, connected[i].t=%lf, connected[j].t=%lf\n", connected[i].object, connected[j].object, connected[i].t, connected[j].t);
+                       if ((connected[i].object == connected[j].object)
+                               && ((connected[i].t == 0 && connected[j].t == 1.0)
+                               || (connected[i].t == 1.0 && connected[j].t == 0)))
+                               return connected[i].object;
+               }
+       }
+
+       // Didn't find anything, so return NULL
+       return NULL;
+}
+
+
 bool Line::HitTest(Point point)
 {
        SaveState();
@@ -600,3 +674,25 @@ you then *definitely* do not want them to have the same reference number.
        return new Line(position, endpoint, parent);
 }
 
+
+/*virtual*/ Vector Line::GetPointAtParameter(double parameter)
+{
+       if (parameter <= 0)
+               return position;
+       else if (parameter >= 1.0)
+               return endpoint;
+
+       // Our parameter lies between zero and one, so calculate it!
+       Vector v(endpoint, position);
+       double length = v.Magnitude();
+       // We scale the magnitude of v so that it lies between 0 and 1...
+       // By multiplying the parameter by the magnitude, we obtain the point we
+       // want. No scaling necessary as it's inherent in the approach!
+       double spotOnLength = length * parameter;
+
+       // To get our point, we use the initial point of the line and add in our
+       // scaled point.
+       Vector result = position + (v * spotOnLength);
+       return result;
+}
+