Merge with feature. Fixed wrong calulation tool True darts.
--HG-- branch : release
This commit is contained in:
commit
228c90c6ab
|
@ -1,4 +1,5 @@
|
|||
# Version 0.4.3
|
||||
- Fixed wrong calculation tool True darts.
|
||||
- [#405] Fixed crash after deleting first pattern piece in the list.
|
||||
|
||||
# Version 0.4.2 February 17, 2016
|
||||
|
|
|
@ -66,14 +66,9 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin
|
|||
const qreal degrees = d2d3.angleTo(d2d1);
|
||||
|
||||
QLineF d2blP2(dartP2, baseLineP2);
|
||||
d2blP2.setAngle(d2d3.angle()+degrees);
|
||||
const QPointF bP2Temp = d2blP2.p2();
|
||||
d2blP2.setAngle(d2blP2.angle()+degrees);
|
||||
|
||||
const QLineF bP1bP2Temp(baseLineP1, bP2Temp);
|
||||
|
||||
const QLineF::IntersectType res = bP1bP2Temp.intersect(d2d1, &p1);
|
||||
|
||||
if (res == QLineF::NoIntersection)
|
||||
if (QLineF(baseLineP1, d2blP2.p2()).intersect(d2d1, &p1) == QLineF::NoIntersection)
|
||||
{
|
||||
p1 = QPointF(0, 0);
|
||||
p2 = QPointF(0, 0);
|
||||
|
|
Loading…
Reference in New Issue
Block a user