aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When we search point of intersection curve and axis select the base point only at the end.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-07-24 16:36:17 +03:00
parent 6c5c4f671b
commit 816f9f02a3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/vgeometry/vabstractcurve.cpp
View File

@ -464,12 +464,6 @@ bool VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
{ {
SCASSERT(intersectionPoint != nullptr) SCASSERT(intersectionPoint != nullptr)
if (VAbstractCurve::IsPointOnCurve(curvePoints, point))
{
*intersectionPoint = point;
return true;
}
// Normalize an angle // Normalize an angle
{ {
QLineF line(QPointF(10,10), QPointF(100, 10)); QLineF line(QPointF(10,10), QPointF(100, 10));
@ -487,7 +481,7 @@ bool VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
axis = QLineF(point, VGObject::BuildRay(point, angle + 180, rec)); axis = QLineF(point, VGObject::BuildRay(point, angle + 180, rec));
points += VAbstractCurve::CurveIntersectLine(curvePoints, axis); points += VAbstractCurve::CurveIntersectLine(curvePoints, axis);
if (points.size() > 0) if (not points.isEmpty())
{ {
if (points.size() == 1) if (points.size() == 1)
{ {
@ -522,11 +516,26 @@ bool VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
*intersectionPoint = points.at(forward.first()); *intersectionPoint = points.at(forward.first());
return true; return true;
} }
else if (not backward.isEmpty())
if (not backward.isEmpty())
{ {
*intersectionPoint = points.at(backward.first()); *intersectionPoint = points.at(backward.first());
return true; return true;
} }
if (VAbstractCurve::IsPointOnCurve(curvePoints, point))
{
*intersectionPoint = point;
return true;
}
}
else
{
if (VAbstractCurve::IsPointOnCurve(curvePoints, point))
{
*intersectionPoint = point;
return true;
}
} }
return false; return false;