From e8bb4c2af36f038f52abc56842dc2c2e4bdcb104 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 6 Jan 2020 18:34:35 +0200 Subject: [PATCH] QLineF::IntersectType QLineF::intersect(const QLineF&, QPointF*) const' is deprecated: Use intersects() instead. --HG-- branch : release --- src/libs/qmuparser/qmuparser.cpp | 4 + src/libs/vgeometry/vabstractcurve.cpp | 5 ++ src/libs/vgeometry/vgobject.cpp | 28 ++++++ src/libs/vlayout/vabstractpiece.cpp | 87 +++++++++++++++++++ .../dialogs/tools/dialoglineintersect.cpp | 9 ++ .../tooldoublepoint/vtooltruedarts.cpp | 4 + .../toollinepoint/vtoollineintersectaxis.cpp | 5 ++ .../toolsinglepoint/vtoollineintersect.cpp | 5 ++ .../toolsinglepoint/vtooltriangle.cpp | 5 ++ .../visualization/line/vistoolheight.cpp | 5 ++ .../line/vistoollineintersect.cpp | 10 +++ .../line/vistoollineintersectaxis.cpp | 5 ++ .../line/vistoolpointofintersection.cpp | 5 ++ 13 files changed, 177 insertions(+) diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index f8ee6c27b..06e76cb19 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -105,7 +105,11 @@ qreal CSR(qreal length, qreal split, qreal arcLength) tmp.setAngle(tmp.angle()+angle*sign); QPointF crosPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const auto type = line.intersects(tmp, &crosPoint); +#else const auto type = line.intersect(tmp, &crosPoint); +#endif if (type == QLineF::NoIntersection) { return 0; diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp index e20feb0f2..b6691e81c 100644 --- a/src/libs/vgeometry/vabstractcurve.cpp +++ b/src/libs/vgeometry/vabstractcurve.cpp @@ -334,7 +334,12 @@ QVector VAbstractCurve::CurveIntersectLine(const QVector &poin for ( auto i = 0; i < points.count()-1; ++i ) { QPointF crosPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const auto type = line.intersects(QLineF(points.at(i), points.at(i+1)), &crosPoint); +#else const auto type = line.intersect(QLineF(points.at(i), points.at(i+1)), &crosPoint); +#endif + if ( type == QLineF::BoundedIntersection ) { intersections.append(crosPoint); diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp index bcc670e30..1c8c8ea03 100644 --- a/src/libs/vgeometry/vgobject.cpp +++ b/src/libs/vgeometry/vgobject.cpp @@ -299,22 +299,45 @@ QPointF VGObject::LineIntersectRect(const QRectF &rec, const QLineF &line) qreal x1, y1, x2, y2; rec.getCoords(&x1, &y1, &x2, &y2); QPointF point; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = line.intersects(QLineF(QPointF(x1, y1), QPointF(x1, y2)), &point); +#else QLineF::IntersectType type = line.intersect(QLineF(QPointF(x1, y1), QPointF(x1, y2)), &point); +#endif + if ( type == QLineF::BoundedIntersection ) { return point; } + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = line.intersects(QLineF(QPointF(x1, y1), QPointF(x2, y1)), &point); +#else type = line.intersect(QLineF(QPointF(x1, y1), QPointF(x2, y1)), &point); +#endif + if ( type == QLineF::BoundedIntersection ) { return point; } + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = line.intersects(QLineF(QPointF(x1, y2), QPointF(x2, y2)), &point); +#else type = line.intersect(QLineF(QPointF(x1, y2), QPointF(x2, y2)), &point); +#endif + if ( type == QLineF::BoundedIntersection ) { return point; } + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = line.intersects(QLineF(QPointF(x2, y1), QPointF(x2, y2)), &point); +#else type = line.intersect(QLineF(QPointF(x2, y1), QPointF(x2, y2)), &point); +#endif + if ( type == QLineF::BoundedIntersection ) { return point; @@ -426,7 +449,12 @@ QPointF VGObject::ClosestPoint(const QLineF &line, const QPointF &point) qreal y = b + point.y(); QLineF lin (point, QPointF(x, y)); QPointF p; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = line.intersects(lin, &p); +#else QLineF::IntersectType intersect = line.intersect(lin, &p); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { return p; diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index 68a1a306a..7c8b29268 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -207,7 +207,12 @@ QVector AngleByLength(QVector points, QPointF p2, const QLineF // We do not check intersection type because intersection must alwayse exist QPointF px; cutLine.setAngle(cutLine.angle()+90); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = QLineF(sp1, sp2).intersects(cutLine, &px); +#else QLineF::IntersectType type = QLineF(sp1, sp2).intersect(cutLine, &px); +#endif + if (type == QLineF::NoIntersection) { qDebug()<<"Couldn't find intersection with cut line."; @@ -215,7 +220,12 @@ QVector AngleByLength(QVector points, QPointF p2, const QLineF points.append(px); cutLine.setAngle(cutLine.angle()-180); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = QLineF(sp2, sp3).intersects(cutLine, &px); +#else type = QLineF(sp2, sp3).intersect(cutLine, &px); +#endif + if (type == QLineF::NoIntersection) { qDebug()<<"Couldn't find intersection with cut line."; @@ -286,7 +296,12 @@ QVector AngleByIntersection(const QVector &points, QPointF p1, QLineF edge2(p2, p3); QPointF px; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = edge2.intersects(bigLine1, &px); +#else QLineF::IntersectType type = edge2.intersect(bigLine1, &px); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -314,7 +329,12 @@ QVector AngleByIntersection(const QVector &points, QPointF p1, // Second point QLineF edge1(p1, p2); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = edge1.intersects(bigLine2, &px); +#else type = edge1.intersect(bigLine2, &px); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -351,14 +371,24 @@ QVector AngleByFirstSymmetry(const QVector &points, QPointF p1 QLineF sEdge(VPointF::FlipPF(axis, bigLine2.p1()), VPointF::FlipPF(axis, bigLine2.p2())); QPointF px1; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = sEdge.intersects(bigLine1, &px1); +#else QLineF::IntersectType type = sEdge.intersect(bigLine1, &px1); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); } QPointF px2; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = sEdge.intersects(bigLine2, &px2); +#else type = sEdge.intersect(bigLine2, &px2); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -411,14 +441,24 @@ QVector AngleBySecondSymmetry(const QVector &points, QPointF p QLineF sEdge(VPointF::FlipPF(axis, bigLine1.p1()), VPointF::FlipPF(axis, bigLine1.p2())); QPointF px1; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = sEdge.intersects(bigLine1, &px1); +#else QLineF::IntersectType type = sEdge.intersect(bigLine1, &px1); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); } QPointF px2; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + type = sEdge.intersects(bigLine2, &px2); +#else type = sEdge.intersect(bigLine2, &px2); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -474,7 +514,12 @@ QVector AngleByFirstRightAngle(const QVector &points, QPointF QLineF edge(p1, p2); QPointF px; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = edge.intersects(bigLine2, &px); +#else QLineF::IntersectType type = edge.intersect(bigLine2, &px); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -524,7 +569,12 @@ QVector AngleBySecondRightAngle(QVector points, QPointF p2, QP QLineF edge(p2, p3); QPointF px; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = edge.intersects(bigLine1, &px); +#else QLineF::IntersectType type = edge.intersect(bigLine1, &px); +#endif + if (type == QLineF::NoIntersection) { return AngleByLength(points, p2, bigLine1, sp2, bigLine2, p, width, needRollback); @@ -987,7 +1037,11 @@ QVector VAbstractPiece::Equidistant(QVector points, qreal wid const QLineF bigLine1 = ParallelLine(points.at(points.size()-2), points.at(0), width); QPointF px; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + edge.intersects(bigLine1, &px); +#else edge.intersect(bigLine1, &px); +#endif ekvPoints.removeLast(); @@ -1121,7 +1175,12 @@ QVector VAbstractPiece::CheckLoops(const QVector &points) // For closed path last point is equal to first. Using index of the first. pathClosed && jNext == count-1 ? AddUniqueIndex(0) : AddUniqueIndex(jNext); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType intersect = line1.intersects(line2, &crosPoint); +#else const QLineF::IntersectType intersect = line1.intersect(line2, &crosPoint); +#endif + if (intersect == QLineF::NoIntersection) { // According to the documentation QLineF::NoIntersection indicates that the lines do not intersect; // i.e. they are parallel. But parallel also mean they can be on the same line. @@ -1137,12 +1196,20 @@ QVector VAbstractPiece::CheckLoops(const QVector &points) tmpLine1.setAngle(tmpLine1.angle()+90); QPointF tmpCrosPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType tmpIntrs1 = tmpLine1.intersects(tmpLine2, &tmpCrosPoint); +#else const QLineF::IntersectType tmpIntrs1 = tmpLine1.intersect(tmpLine2, &tmpCrosPoint); +#endif tmpLine1 = line1; tmpLine2.setAngle(tmpLine2.angle()+90); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType tmpIntrs2 = tmpLine1.intersects(tmpLine2, &tmpCrosPoint); +#else const QLineF::IntersectType tmpIntrs2 = tmpLine1.intersect(tmpLine2, &tmpCrosPoint); +#endif if (tmpIntrs1 == QLineF::BoundedIntersection || tmpIntrs2 == QLineF::BoundedIntersection) { // Now we really sure that lines are on the same lines and have real intersections. @@ -1228,7 +1295,12 @@ QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoin } QPointF crosPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType type = bigLine1.intersects( bigLine2, &crosPoint ); +#else const QLineF::IntersectType type = bigLine1.intersect( bigLine2, &crosPoint ); +#endif + switch (type) {// There are at least three big cases case (QLineF::BoundedIntersection): @@ -1319,7 +1391,12 @@ QT_WARNING_POP const QLineF bigEdge = ParallelLine(p1Line1, p1Line2, localWidth ); QPointF px; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType type = bigEdge.intersects(line, &px); +#else const QLineF::IntersectType type = bigEdge.intersect(line, &px); +#endif + if (type != QLineF::BoundedIntersection) { if (line.length() < QLineF(p2Line1, px).length()) @@ -1507,7 +1584,12 @@ QVector VAbstractPiece::RollbackSeamAllowance(QVector points, { QLineF segment(points.at(i), points.at(i-1)); QPointF crosPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType type = cuttingEdge.intersects(segment, &crosPoint); +#else const QLineF::IntersectType type = cuttingEdge.intersect(segment, &crosPoint); +#endif + if (type != QLineF::NoIntersection && VGObject::IsPointOnLineSegment(crosPoint, segment.p1(), segment.p2()) && IsOutsidePoint(cuttingEdge.p2(), cuttingEdge.p1(), crosPoint)) @@ -1527,7 +1609,12 @@ QVector VAbstractPiece::RollbackSeamAllowance(QVector points, { QPointF crosPoint; QLineF secondLast(points.at(points.size()-2), points.at(points.size()-1)); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType type = secondLast.intersects(cuttingEdge, &crosPoint); +#else QLineF::IntersectType type = secondLast.intersect(cuttingEdge, &crosPoint); +#endif + if (type != QLineF::NoIntersection && IsOutsidePoint(secondLast.p1(), secondLast.p2(), crosPoint)) { points.append(crosPoint); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index a28588457..29f983840 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -227,7 +227,11 @@ void DialogLineIntersect::PointNameChanged() QLineF line1(static_cast(*p1Line1), static_cast(*p2Line1)); QLineF line2(static_cast(*p1Line2), static_cast(*p2Line2)); QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = line1.intersects(line2, &fPoint); +#else QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); +#endif flagError = not (set.size() < 3 || intersect == QLineF::NoIntersection); QColor color = flagError ? okColor : errorColor; @@ -269,7 +273,12 @@ bool DialogLineIntersect::CheckIntersecion() QLineF line1(static_cast(*p1L1), static_cast(*p2L1)); QLineF line2(static_cast(*p1L2), static_cast(*p2L2)); QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = line1.intersects(line2, &fPoint); +#else QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { return true; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 3835790da..ad8441e62 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -78,7 +78,11 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin QLineF d2blP2(dartP2, baseLineP2); d2blP2.setAngle(d2blP2.angle()+degrees); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + if (QLineF(baseLineP1, d2blP2.p2()).intersects(d2d1, &p1) == QLineF::NoIntersection) +#else if (QLineF(baseLineP1, d2blP2.p2()).intersect(d2d1, &p1) == QLineF::NoIntersection) +#endif { p1 = QPointF(0, 0); p2 = QPointF(0, 0); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index d83ddb585..2c9de8e5c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -179,7 +179,12 @@ bool VToolLineIntersectAxis::FindPoint(const QLineF &axis, const QLineF &line, Q SCASSERT(intersectionPoint != nullptr) QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = axis.intersects(line, &fPoint); +#else QLineF::IntersectType intersect = axis.intersect(line, &fPoint); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { if(VFuzzyComparePossibleNulls(axis.angle(), line.angle()) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 3723baac8..effd99740 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -140,7 +140,12 @@ VToolLineIntersect* VToolLineIntersect::Create(VToolLineIntersectInitData initDa QLineF line1(static_cast(*p1Line1), static_cast(*p2Line1)); QLineF line2(static_cast(*p1Line2), static_cast(*p2Line2)); QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QLineF::IntersectType intersect = line1.intersects(line2, &fPoint); +#else const QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); +#endif + if (intersect == QLineF::NoIntersection) { qWarning() << tr("Error calculating point '%1'. Lines (%2;%3) and (%4;%5) have no point of intersection") diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index c6ff4ae86..9baf18e53 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -200,7 +200,12 @@ bool VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, cons QLineF hypotenuse(firstPoint, secondPoint); QPointF startPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = axis.intersects(hypotenuse, &startPoint); +#else QLineF::IntersectType intersect = axis.intersect(hypotenuse, &startPoint); +#endif + if (intersect != QLineF::UnboundedIntersection && intersect != QLineF::BoundedIntersection) { return false; diff --git a/src/libs/vtools/visualization/line/vistoolheight.cpp b/src/libs/vtools/visualization/line/vistoolheight.cpp index 09ac1f6ef..1db72e474 100644 --- a/src/libs/vtools/visualization/line/vistoolheight.cpp +++ b/src/libs/vtools/visualization/line/vistoolheight.cpp @@ -116,7 +116,12 @@ void VisToolHeight::setLineP2Id(const quint32 &value) void VisToolHeight::ShowIntersection(const QLineF &height_line, const QLineF &base_line) { QPointF p; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = height_line.intersects(base_line, &p); +#else QLineF::IntersectType intersect = height_line.intersect(base_line, &p); +#endif + if (intersect == QLineF::UnboundedIntersection) { line_intersection->setVisible(true); diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.cpp b/src/libs/vtools/visualization/line/vistoollineintersect.cpp index f9bb17621..f17906906 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersect.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersect.cpp @@ -87,7 +87,12 @@ void VisToolLineIntersect::RefreshGeometry() QLineF l1(static_cast(*first), static_cast(*second)); QLineF l2(static_cast(*third), Visualization::scenePos); QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = l1.intersects(l2, &fPoint); +#else QLineF::IntersectType intersect = l1.intersect(l2, &fPoint); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { DrawPoint(point, fPoint, mainColor); @@ -103,7 +108,12 @@ void VisToolLineIntersect::RefreshGeometry() QLineF l1(static_cast(*first), static_cast(*second)); QLineF l2(static_cast(*third), static_cast(*forth)); QPointF fPoint; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = l1.intersects(l2, &fPoint); +#else QLineF::IntersectType intersect = l1.intersect(l2, &fPoint); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { DrawPoint(point, fPoint, mainColor); diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp index bc8f4c1eb..894c5c68b 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp @@ -138,7 +138,12 @@ void VisToolLineIntersectAxis::setAxisPointId(const quint32 &value) void VisToolLineIntersectAxis::ShowIntersection(const QLineF &axis_line, const QLineF &base_line) { QPointF p; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = axis_line.intersects(base_line, &p); +#else QLineF::IntersectType intersect = axis_line.intersect(base_line, &p); +#endif + if (intersect == QLineF::UnboundedIntersection) { line_intersection->setVisible(true); diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp index f9ab4273d..39eec28d5 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp @@ -97,7 +97,12 @@ void VisToolPointOfIntersection::setPoint2Id(const quint32 &value) void VisToolPointOfIntersection::ShowIntersection(const QLineF &axis1, const QLineF &axis2, const QColor &color) { QPointF p; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QLineF::IntersectType intersect = axis1.intersects(axis2, &p); +#else QLineF::IntersectType intersect = axis1.intersect(axis2, &p); +#endif + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { point->setVisible(true);