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

Merge with feature. Fixed wrong calulation tool True darts.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-02-22 11:02:24 +02:00
commit 228c90c6ab
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -1,4 +1,5 @@
# Version 0.4.3 # Version 0.4.3
- Fixed wrong calculation tool True darts.
- [#405] Fixed crash after deleting first pattern piece in the list. - [#405] Fixed crash after deleting first pattern piece in the list.
# Version 0.4.2 February 17, 2016 # Version 0.4.2 February 17, 2016

9
src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
View File

@ -66,14 +66,9 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin
const qreal degrees = d2d3.angleTo(d2d1); const qreal degrees = d2d3.angleTo(d2d1);
QLineF d2blP2(dartP2, baseLineP2); QLineF d2blP2(dartP2, baseLineP2);
d2blP2.setAngle(d2d3.angle()+degrees); d2blP2.setAngle(d2blP2.angle()+degrees);
const QPointF bP2Temp = d2blP2.p2();
const QLineF bP1bP2Temp(baseLineP1, bP2Temp); if (QLineF(baseLineP1, d2blP2.p2()).intersect(d2d1, &p1) == QLineF::NoIntersection)
const QLineF::IntersectType res = bP1bP2Temp.intersect(d2d1, &p1);
if (res == QLineF::NoIntersection)
{ {
p1 = QPointF(0, 0); p1 = QPointF(0, 0);
p2 = QPointF(0, 0); p2 = QPointF(0, 0);