X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=5ae9c9a9081e5ccf121c82958eac22e6634d6400;hb=6a7baa2814a8b4d0b93df776a4c99689bcfb3ffa;hp=62f240a1c931a32c5b49f4cf77e79f872c89136c;hpb=ff2a28347dc30eccc28e7cd7298cccde7aa49d2c;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 62f240a..5ae9c9a 100644 --- 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...