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

Refactoring.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-05-25 15:51:44 +03:00
parent 1ba4725538
commit 99bb6bb983
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/vgeometry/vgobject.cpp
View File

@ -289,10 +289,10 @@ qint32 VGObject::LineIntersectCircle(const QPointF &center, qreal radius, const
qreal a = 0, b = 0, c = 0; qreal a = 0, b = 0, c = 0;
LineCoefficients(line, &a, &b, &c); LineCoefficients(line, &a, &b, &c);
// projection center of circle on to line // projection center of circle on to line
QPointF p = ClosestPoint (line, center); const QPointF p = ClosestPoint (line, center);
// how many solutions? // how many solutions?
qint32 flag = 0; qint32 flag = 0;
qreal d = QLineF (center, p).length(); const qreal d = QLineF (center, p).length();
if (qFuzzyCompare(d, radius)) if (qFuzzyCompare(d, radius))
{ {
flag = 1; flag = 1;
@ -309,8 +309,8 @@ qint32 VGObject::LineIntersectCircle(const QPointF &center, qreal radius, const
} }
} }
// find distance from projection to points of intersection // find distance from projection to points of intersection
qreal k = qSqrt (qAbs(radius * radius - d * d)); const qreal k = qSqrt (qAbs(radius * radius - d * d));
qreal t = QLineF (QPointF (0, 0), QPointF (b, - a)).length(); const qreal t = QLineF (QPointF (0, 0), QPointF (b, - a)).length();
// add to projection a vectors aimed to points of intersection // add to projection a vectors aimed to points of intersection
p1 = addVector (p, QPointF (0, 0), QPointF (- b, a), k / t); p1 = addVector (p, QPointF (0, 0), QPointF (- b, a), k / t);
p2 = addVector (p, QPointF (0, 0), QPointF (b, - a), k / t); p2 = addVector (p, QPointF (0, 0), QPointF (b, - a), k / t);