palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-30 04:11:32 +02:00
Code Issues Projects Releases Wiki Activity

Refactor method VGObject::IsPointOnLineSegment.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-10-19 19:50:00 +03:00
parent dd0025456b
commit f0035e1f65
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libs/vgeometry/vgobject.cpp
View file

@ -456,21 +456,8 @@ bool VGObject::IsPointOnLineSegment(const QPointF &t, const QPointF &p1, const Q
{ {
auto InsideRange = [](qreal p1, qreal p2, qreal t) auto InsideRange = [](qreal p1, qreal p2, qreal t)
{ {
if (not ( (p1 <= t && t <= p2) || (p2 <= t && t <= p1) )) return not ( not ((p1 <= t && t <= p2) || (p2 <= t && t <= p1))
{ && not (qAbs(p1 - t) <= accuracyPointOnLine) && not (qAbs(p2 - t) <= accuracyPointOnLine));
if (VFuzzyComparePossibleNulls(p1, p2))
{// vertical line or horizontal line
if (not (qAbs(p1 - t) <= accuracyPointOnLine))
{
return false;// point not in range
}
}
else if (not (qAbs(p1 - t) <= accuracyPointOnLine) && not (qAbs(p2 - t) <= accuracyPointOnLine))
{
return false;// point not in range
}
}
return true;// point in range
}; };
if (not InsideRange(p1.x(), p2.x(), t.x())) if (not InsideRange(p1.x(), p2.x(), t.x()))