From e6881114143684d9f1bc61953d0595b91ffd882d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Feb 2016 10:55:08 +0200 Subject: [PATCH 1/3] Fixed wrong calculation tool True darts. --HG-- branch : feature --- .../drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 22fced903..fda610759 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -66,7 +66,7 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin const qreal degrees = d2d3.angleTo(d2d1); QLineF d2blP2(dartP2, baseLineP2); - d2blP2.setAngle(d2d3.angle()+degrees); + d2blP2.setAngle(d2blP2.angle()+degrees); const QPointF bP2Temp = d2blP2.p2(); const QLineF bP1bP2Temp(baseLineP1, bP2Temp); From 8f994f3de6f806888f64131be42f9f014e382417 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Feb 2016 10:58:16 +0200 Subject: [PATCH 2/3] Refactoring. --HG-- branch : feature --- .../drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index fda610759..8ca6f4c9a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -67,13 +67,8 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin QLineF d2blP2(dartP2, baseLineP2); d2blP2.setAngle(d2blP2.angle()+degrees); - const QPointF bP2Temp = d2blP2.p2(); - 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); From 6ebae79a92f44f0301141bdba67b9afdebfe7cf8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Feb 2016 10:59:53 +0200 Subject: [PATCH 3/3] Changelog. --HG-- branch : feature --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 2c08f4a50..18c04a6c8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -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