Added preliminary circle-to-circle intersection code.

[architektonas] / src / drawingview.cpp

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 62f240a1c931a32c5b49f4cf77e79f872c89136c..5ae9c9a9081e5ccf121c82958eac22e6634d6400 100644 (file)
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -1302,8 +1302,12 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
        {
                GetHovered(hover);
 
-               double t, u;
-               int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u);
+//             double t, u;
+//             int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u);
+               Geometry::Intersects((Object *)hover[0], (Object *)hover[1]);
+               int numIntersecting = Global::numIntersectParams;
+               double t = Global::intersectParam[0];
+               double u = Global::intersectParam[1];
 
                if (numIntersecting > 0)
                {
@@ -1315,6 +1319,18 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
                        hoveringIntersection = true;
                        intersectionPoint = v1;
                }
+
+               numIntersecting = Global::numIntersectPoints;
+
+               if (numIntersecting > 0)
+               {
+                       Vector v1 = Global::intersectPoint[0];
+                       QString text = tr("Intersection <%1, %2>");
+                       informativeText = text.arg(v1.x).arg(v1.y);
+
+                       hoveringIntersection = true;
+                       intersectionPoint = v1;
+               }
        }
 
        // Do tool handling, if any are active...