From bfe2cfb0e1e7eee8a27422b4511fb9e8d29b2d1b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 30 Mar 2021 20:21:42 +0300 Subject: [PATCH] Fix incorrect seam allowance. Closes #114 --- ChangeLog.txt | 1 + src/libs/vgeometry/vgeometrydef.h | 2 +- .../share/Issue_923_test1/output.json | 43 +++++----- .../share/Issue_923_test1_1/output.json | 45 +++++------ .../share/Issue_923_test2/output.json | 43 +++++----- .../share/Issue_923_test2_2/input.json | 4 +- .../share/Issue_923_test2_2/output.json | 62 +++++++------- .../share/Issue_923_test3/output.json | 43 +++++----- .../share/Issue_923_test3_3/output.json | 45 +++++------ .../share/Issue_923_test4/output.json | 43 +++++----- .../share/Issue_923_test4_4/output.json | 45 +++++------ .../share/Issue_923_test5/input.json | 4 +- .../share/Issue_923_test5/output.json | 43 +++++----- .../share/Issue_923_test5_5/input.json | 4 +- .../share/Issue_923_test5_5/output.json | 80 +++++++++++-------- .../share/Issue_923_test6/output.json | 43 +++++----- .../share/Issue_923_test6_6/output.json | 55 ++++++------- .../share/Issue_923_test7_1/output.json | 33 ++++---- .../share/Issue_923_test7_2/output.json | 33 ++++---- .../share/Issue_923_test7_3/output.json | 33 ++++---- .../share/smart_pattern_#99/output.json | 45 +++++------ src/test/ValentinaTest/tst_vabstractpiece.cpp | 2 +- 22 files changed, 346 insertions(+), 405 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 489c5acf3..675076e23 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,7 @@ - Incorrect duplication of a piece. Missing restoring pins. - [smart-pattern/valentina#112] Incorrect seam allowance. - [smart-pattern/valentina#113] Incorrect seam allowance. +- [smart-pattern/valentina#114] Incorrect seam allowance. # Version 0.7.45 Feb 26, 2021 - Fix incorrect seam allowance for angle type second edge right angle. diff --git a/src/libs/vgeometry/vgeometrydef.h b/src/libs/vgeometry/vgeometrydef.h index fc59a9a36..9c52c595b 100644 --- a/src/libs/vgeometry/vgeometrydef.h +++ b/src/libs/vgeometry/vgeometrydef.h @@ -97,7 +97,7 @@ private: }; Q_DECLARE_METATYPE(VLayoutPassmark) -constexpr qreal accuracyPointOnLine = (0.126/*mm*/ / 25.4) * PrintDPI; +constexpr qreal accuracyPointOnLine = (0.128/*mm*/ / 25.4) * PrintDPI; Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2, qreal accuracy = accuracyPointOnLine); diff --git a/src/test/ValentinaTest/share/Issue_923_test1/output.json b/src/test/ValentinaTest/share/Issue_923_test1/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json index 927e0b346..5d67403ad 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -48,17 +48,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -157,43 +157,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test2_2/input.json b/src/test/ValentinaTest/share/Issue_923_test2_2/input.json index 28ab6e9bb..3dedc917b 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/input.json @@ -1,7 +1,7 @@ { "vector": [ { - "angle": 3, + "angle": 1, "saAfter": 151.18110236220474, "saBefore": 37.795275590551185, "type": "VSAPoint", @@ -468,7 +468,7 @@ "y": 331.90352529002166 }, { - "angle": 3, + "angle": 1, "saAfter": 151.18110236220474, "saBefore": 37.795275590551185, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json index 55db89d3f..71edb7b5f 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json @@ -2,13 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -1086.319675233741, - "y": 603.286223243 + "x": -814.7149606299213, + "y": 372.2542552635805 }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -925.5802587835234, + "y": 240.26119236421624 + }, + { + "type": "QPointF", + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -48,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -157,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", @@ -222,13 +222,13 @@ }, { "type": "QPointF", - "x": -807.3585969245805, - "y": 374.1796788445591 + "x": -810.1810632465665, + "y": 373.5624561175904 }, { "type": "QPointF", - "x": -1086.319675233741, - "y": 603.286223243 + "x": -814.7149606299213, + "y": 372.2542552635805 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json index 5ccb7a046..9b6f4da36 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json @@ -12,8 +12,8 @@ }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4/output.json b/src/test/ValentinaTest/share/Issue_923_test4/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json index 55db89d3f..6feafaec9 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -48,17 +48,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -157,43 +157,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test5/input.json b/src/test/ValentinaTest/share/Issue_923_test5/input.json index 91f787aba..70c4f82ae 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/input.json @@ -1,7 +1,7 @@ { "vector": [ { - "angle": 5, + "angle": 4, "saAfter": 0, "saBefore": 37.795275590551185, "type": "VSAPoint", @@ -468,7 +468,7 @@ "y": 331.90352529002166 }, { - "angle": 5, + "angle": 4, "saAfter": 0, "saBefore": 37.795275590551185, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/Issue_923_test5/output.json b/src/test/ValentinaTest/share/Issue_923_test5/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test5_5/input.json b/src/test/ValentinaTest/share/Issue_923_test5_5/input.json index a6670382c..f592c08f7 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/input.json @@ -1,7 +1,7 @@ { "vector": [ { - "angle": 5, + "angle": 4, "saAfter": 151.18110236220474, "saBefore": 37.795275590551185, "type": "VSAPoint", @@ -468,7 +468,7 @@ "y": 331.90352529002166 }, { - "angle": 5, + "angle": 4, "saAfter": 151.18110236220474, "saBefore": 37.795275590551185, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json index 914c5d73a..f6882ee98 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json @@ -2,13 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -831.5531621884526, - "y": 27.90388512315623 + "x": -949.5679059514944, + "y": 269.4686510059864 }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -925.5802587835218, + "y": 240.2611923642134 + }, + { + "type": "QPointF", + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -42,23 +47,23 @@ }, { "type": "QPointF", - "x": -631.8008980267215, - "y": -91.35633060009326 + "x": -631.5852394687809, + "y": -90.99511806183605 }, { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -157,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", @@ -227,18 +227,28 @@ }, { "type": "QPointF", - "x": -814.7149606299213, - "y": 372.2542552635805 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -965.896062992126, - "y": 372.2542552635805 + "x": -823.6929755287612, + "y": 369.27180555079025 }, { "type": "QPointF", - "x": -831.5531621884526, - "y": 27.90388512315623 + "x": -829.5753368833404, + "y": 366.62694879394627 + }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, + { + "type": "QPointF", + "x": -949.5679059514944, + "y": 269.4686510059864 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index b3c98f8f3..4ab19c564 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -13,7 +13,7 @@ { "type": "QPointF", "x": -815.2818897637795, - "y": -46.697156391859295 + "y": -46.69715639185932 }, { "type": "QPointF", @@ -53,17 +53,17 @@ { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -162,43 +162,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json index 914c5d73a..3f9e74ba8 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -831.5531621884526, - "y": 27.90388512315623 + "x": -831.5531621884527, + "y": 27.903885123156257 }, { "type": "QPointF", - "x": -797.7132813112016, - "y": -48.52244559084083 + "x": -797.7132813112017, + "y": -48.52244559084082 }, { "type": "QPointF", @@ -43,22 +43,22 @@ { "type": "QPointF", "x": -631.8008980267215, - "y": -91.35633060009326 + "y": -91.35633060009329 }, { "type": "QPointF", "x": -616.3280202339708, - "y": -100.59426715699185 + "y": -100.59426715699189 }, { "type": "QPointF", "x": -594.0963839106636, - "y": -115.97215530775165 + "y": -115.9721553077516 }, { "type": "QPointF", - "x": -184.04865014874554, - "y": 76.19837439910722 + "x": -184.04865014874542, + "y": 76.19837439910728 }, { "type": "QPointF", @@ -157,43 +157,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", @@ -237,8 +232,8 @@ }, { "type": "QPointF", - "x": -831.5531621884526, - "y": 27.90388512315623 + "x": -831.5531621884527, + "y": 27.903885123156257 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json index ed21365e3..a5ba6f90e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -107,43 +107,38 @@ }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json index 986fd3723..9b5689717 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -112,43 +112,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json index d36efbda0..171b3ead6 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -157,43 +157,38 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -435.9520270040894, + "y": 389.07661798449516 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.15529936788164, + "y": 390.3673559353522 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.9503830211974, + "y": 390.90684349642925 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858704, + "y": 390.7329321107656 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582322, + "y": 389.87963542037477 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509004, + "y": 388.3781346110808 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/smart_pattern_#99/output.json b/src/test/ValentinaTest/share/smart_pattern_#99/output.json index e8a615d19..10b9bbe00 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#99/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#99/output.json @@ -47,8 +47,8 @@ }, { "type": "QPointF", - "x": 186.06814702527078, - "y": 217.44230267355644 + "x": 186.05638437375595, + "y": 217.45179989875413 }, { "type": "QPointF", @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 210.60586727103993, - "y": 200.97193709900534 + "x": 214.35663608521494, + "y": 199.4209961283468 }, { "type": "QPointF", - "x": 222.03055445161348, - "y": 196.7139895702384 + "x": 225.94358343752913, + "y": 195.5502751712512 }, { "type": "QPointF", - "x": 233.89457456941724, - "y": 193.60179993286891 + "x": 237.92331027067195, + "y": 192.82283444004733 }, { "type": "QPointF", @@ -182,13 +182,8 @@ }, { "type": "QPointF", - "x": 369.982180722541, - "y": 179.37377930160977 - }, - { - "type": "QPointF", - "x": 374.6890134539639, - "y": 175.54739778670276 + "x": 371.3330132939416, + "y": 177.8252966333725 }, { "type": "QPointF", @@ -197,8 +192,8 @@ }, { "type": "QPointF", - "x": 398.9256180190481, - "y": 162.99327226113368 + "x": 401.24232600874655, + "y": 162.09376642883635 }, { "type": "QPointF", @@ -247,13 +242,13 @@ }, { "type": "QPointF", - "x": 510.67904759033263, - "y": 180.57012994104807 + "x": 514.7022174780654, + "y": 185.19631333337082 }, { "type": "QPointF", - "x": 524.0023556963948, - "y": 196.43641192353618 + "x": 529.6792386289801, + "y": 203.52841021677506 }, { "type": "QPointF", @@ -267,8 +262,8 @@ }, { "type": "QPointF", - "x": 578.0175928754072, - "y": 272.3226478275148 + "x": 577.7959232247036, + "y": 271.8945967422089 }, { "type": "QPointF", @@ -522,8 +517,8 @@ }, { "type": "QPointF", - "x": 175.960729453766, - "y": 408.06485844817104 + "x": 176.04067717773808, + "y": 408.53669833403853 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index c852d7f3e..e7c31d568 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -341,7 +341,7 @@ void TST_VAbstractPiece::LayoutAllowanceRemoveLoop_data() QStringLiteral("://smart_pattern_#58/output.json"), 18.897637795275593 /*seam allowance width (0.5 cm)*/); - // See file src/app/share/collection/test/smart_pattern_#99.val + // See file src/app/share/collection/bugs/smart_pattern_#99.val ASSERT_TEST_CASE("Incorrect fix of distortion", QStringLiteral("://smart_pattern_#99/input.json"), QStringLiteral("://smart_pattern_#99/output.json"),