From 309259a0e4cbee262e381a77ec09e9ab840a8755 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 10 Feb 2020 16:34:50 +0200 Subject: [PATCH] Approximation scale on curved path - Draw vs. Detail. Closes smart-pattern/valentina#8. --- src/libs/vlayout/vabstractpiece.cpp | 2 +- src/test/ValentinaTest/share/DP_6/output.json | 30 +++++ .../output.json | 44 +++++++- .../output.json | 40 +++++++ .../DP_6_hem_by_intersection/output.json | 40 +++++++ .../share/DP_6_hem_by_length/output.json | 40 +++++++ .../output.json | 40 +++++++ .../output.json | 40 +++++++ .../share/Issue_298_case1/output.json | 15 +++ .../share/Issue_298_case2/output.json | 10 ++ .../share/Issue_548_case1/input.json | 34 ++++++ .../share/Issue_548_case1/output.json | 44 ++++++++ .../ValentinaTest/share/Issue_620/output.json | 20 ++++ .../ValentinaTest/share/Issue_627/output.json | 10 ++ .../ValentinaTest/share/Issue_642/output.json | 40 +++++++ .../ValentinaTest/share/Issue_646/output.json | 30 +++++ .../ValentinaTest/share/Issue_687/output.json | 26 +++-- .../output.json | 10 ++ .../Issue_767_Fabric_TopCollar/output.json | 58 +++++++++- .../share/Issue_880_Detail/output.json | 20 ++++ .../share/Issue_880_Detail_1/output.json | 5 + .../share/Issue_883_ledge/output.json | 10 ++ .../share/Issue_883_prong/output.json | 10 ++ .../share/Issue_923_test1/output.json | 98 ++++++++++++++++- .../share/Issue_923_test1_1/output.json | 93 +++++++++++++++- .../share/Issue_923_test2/output.json | 98 ++++++++++++++++- .../share/Issue_923_test2_2/output.json | 88 ++++++++++++++- .../share/Issue_923_test3/output.json | 98 ++++++++++++++++- .../share/Issue_923_test3_3/output.json | 93 +++++++++++++++- .../share/Issue_923_test4/output.json | 98 ++++++++++++++++- .../share/Issue_923_test4_4/output.json | 88 ++++++++++++++- .../share/Issue_923_test5/output.json | 98 ++++++++++++++++- .../share/Issue_923_test5_5/output.json | 93 +++++++++++++++- .../share/Issue_923_test6/output.json | 98 ++++++++++++++++- .../share/Issue_923_test6_6/output.json | 88 ++++++++++++++- .../share/Issue_923_test7_1/output.json | 98 ++++++++++++++++- .../share/Issue_923_test7_2/output.json | 103 +++++++++++++++++- .../share/Issue_923_test7_3/output.json | 103 +++++++++++++++++- .../share/Issue_937_case_1a/output.json | 49 ++++++++- .../share/Issue_937_case_3/output.json | 15 +++ .../share/Issue_937_case_4/output.json | 55 ++++++++++ src/test/ValentinaTest/share/doll/output.json | 40 +++++++ .../share/loop_by_intersection/output.json | 15 +++ .../loop_start_point_on_line/output.json | 50 +++++++++ .../share/seamtest1_by_angle/output.json | 70 ++++++++++++ .../share/seamtest1_by_angle_2/output.json | 70 ++++++++++++ .../output.json | 70 ++++++++++++ .../output.json | 75 +++++++++++++ .../seamtest1_by_intersection/output.json | 70 ++++++++++++ .../output.json | 70 ++++++++++++ .../output.json | 75 +++++++++++++ .../ValentinaTest/share/seamtest2/output.json | 5 + .../ValentinaTest/share/seamtest3/output.json | 25 +++++ src/test/ValentinaTest/share/test_data.qrc | 2 + src/test/ValentinaTest/tst_vabstractpiece.cpp | 39 +------ src/test/ValentinaTest/tst_vabstractpiece.h | 3 - 56 files changed, 2736 insertions(+), 115 deletions(-) create mode 100644 src/test/ValentinaTest/share/Issue_548_case1/input.json create mode 100644 src/test/ValentinaTest/share/Issue_548_case1/output.json diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index f9a19a408..649a4af02 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -1591,7 +1591,7 @@ bool VAbstractPiece::IsAllowanceValid(const QVector &base, const QVecto //--------------------------------------------------------------------------------------------------------------------- bool VAbstractPiece::IsEkvPointOnLine(const QPointF &iPoint, const QPointF &prevPoint, const QPointF &nextPoint) { - return VGObject::IsPointOnLineviaPDP(iPoint, prevPoint, nextPoint); + return VGObject::IsPointOnLineviaPDP(iPoint, prevPoint, nextPoint, accuracyPointOnLine/4.); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/test/ValentinaTest/share/DP_6/output.json b/src/test/ValentinaTest/share/DP_6/output.json index 257edd3b3..5b5005334 100644 --- a/src/test/ValentinaTest/share/DP_6/output.json +++ b/src/test/ValentinaTest/share/DP_6/output.json @@ -90,16 +90,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -190,11 +205,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json index 3b4a7bfd7..35cd3b2d3 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json @@ -7,14 +7,19 @@ }, { "type": "QPointF", - "x": 2013.6741619166505, - "y": 3107.177904893293 + "x": 2022.7551360150967, + "y": 3107.491870978859 }, { "type": "QPointF", "x": 1997.303734527605, "y": 3106.611912858666 }, + { + "type": "QPointF", + "x": 1980.4332947144517, + "y": 3104.9259742893705 + }, { "type": "QPointF", "x": 1964.1663907800346, @@ -70,6 +75,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -250,16 +260,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -350,11 +375,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json index f92f73131..c7ab68373 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json @@ -5,6 +5,11 @@ "x": 1984.9598604245455, "y": 3105.37833426348 }, + { + "type": "QPointF", + "x": 1980.460653502646, + "y": 3104.734721364734 + }, { "type": "QPointF", "x": 1964.2273050875103, @@ -60,6 +65,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -240,16 +250,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -340,11 +365,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json index f92f73131..c7ab68373 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json @@ -5,6 +5,11 @@ "x": 1984.9598604245455, "y": 3105.37833426348 }, + { + "type": "QPointF", + "x": 1980.460653502646, + "y": 3104.734721364734 + }, { "type": "QPointF", "x": 1964.2273050875103, @@ -60,6 +65,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -240,16 +250,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -340,11 +365,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json index f92f73131..c7ab68373 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json @@ -5,6 +5,11 @@ "x": 1984.9598604245455, "y": 3105.37833426348 }, + { + "type": "QPointF", + "x": 1980.460653502646, + "y": 3104.734721364734 + }, { "type": "QPointF", "x": 1964.2273050875103, @@ -60,6 +65,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -240,16 +250,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -340,11 +365,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json index f92f73131..c7ab68373 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json @@ -5,6 +5,11 @@ "x": 1984.9598604245455, "y": 3105.37833426348 }, + { + "type": "QPointF", + "x": 1980.460653502646, + "y": 3104.734721364734 + }, { "type": "QPointF", "x": 1964.2273050875103, @@ -60,6 +65,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -240,16 +250,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -340,11 +365,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json index f92f73131..c7ab68373 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json @@ -5,6 +5,11 @@ "x": 1984.9598604245455, "y": 3105.37833426348 }, + { + "type": "QPointF", + "x": 1980.460653502646, + "y": 3104.734721364734 + }, { "type": "QPointF", "x": 1964.2273050875103, @@ -60,6 +65,11 @@ "x": 1828.0836807590824, "y": 3029.6509944986296 }, + { + "type": "QPointF", + "x": 1817.4235118214906, + "y": 3017.918878796319 + }, { "type": "QPointF", "x": 1807.2123162125029, @@ -240,16 +250,31 @@ "x": 2588.205536403821, "y": 873.9831623550268 }, + { + "type": "QPointF", + "x": 2582.147933534884, + "y": 902.9327107340721 + }, { "type": "QPointF", "x": 2577.3549162322406, "y": 929.9783055160012 }, + { + "type": "QPointF", + "x": 2574.9359093349476, + "y": 950.0790856521529 + }, { "type": "QPointF", "x": 2574.164253819351, "y": 962.3733430936679 }, + { + "type": "QPointF", + "x": 2574.1822325731414, + "y": 973.9366119022862 + }, { "type": "QPointF", "x": 2575.0488997085126, @@ -340,11 +365,26 @@ "x": 2656.7190457653896, "y": 1644.7881065067997 }, + { + "type": "QPointF", + "x": 2655.688340739313, + "y": 1707.7165018577969 + }, + { + "type": "QPointF", + "x": 2655.778424569198, + "y": 1721.9946692493584 + }, { "type": "QPointF", "x": 2655.953419573936, "y": 1725.9272724148993 }, + { + "type": "QPointF", + "x": 2658.466647261672, + "y": 1750.5777590538032 + }, { "type": "QPointF", "x": 2666.203519317364, diff --git a/src/test/ValentinaTest/share/Issue_298_case1/output.json b/src/test/ValentinaTest/share/Issue_298_case1/output.json index e2fe0f7ec..1a44b8e0a 100644 --- a/src/test/ValentinaTest/share/Issue_298_case1/output.json +++ b/src/test/ValentinaTest/share/Issue_298_case1/output.json @@ -50,11 +50,21 @@ "x": 1105.0685270464996, "y": 289.3397503891491 }, + { + "type": "QPointF", + "x": 1095.5657115675733, + "y": 314.29722092044074 + }, { "type": "QPointF", "x": 1086.9081516638566, "y": 339.5670119653025 }, + { + "type": "QPointF", + "x": 1079.05719443133, + "y": 365.14954287895875 + }, { "type": "QPointF", "x": 1071.9609663888264, @@ -95,6 +105,11 @@ "x": 1033.1771512850767, "y": 737.9466090605974 }, + { + "type": "QPointF", + "x": 1032.63006888955, + "y": 796.5212904492478 + }, { "type": "QPointF", "x": 1032.8958610586492, diff --git a/src/test/ValentinaTest/share/Issue_298_case2/output.json b/src/test/ValentinaTest/share/Issue_298_case2/output.json index 8eabf3ca5..40091947c 100644 --- a/src/test/ValentinaTest/share/Issue_298_case2/output.json +++ b/src/test/ValentinaTest/share/Issue_298_case2/output.json @@ -50,11 +50,21 @@ "x": 967.1743443953217, "y": 1376.5955539727704 }, + { + "type": "QPointF", + "x": 961.0174119331466, + "y": 1405.5735214303666 + }, { "type": "QPointF", "x": 954.0443121744452, "y": 1434.3811384277756 }, + { + "type": "QPointF", + "x": 946.2045616347446, + "y": 1463.0019319630142 + }, { "type": "QPointF", "x": 937.4479321212875, diff --git a/src/test/ValentinaTest/share/Issue_548_case1/input.json b/src/test/ValentinaTest/share/Issue_548_case1/input.json new file mode 100644 index 000000000..3f07d5679 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_548_case1/input.json @@ -0,0 +1,34 @@ +{ + "vector": [ + { + "type": "VSAPoint", + "x": 99.86433649395012, + "y": 10.166060970128015 + }, + { + "type": "VSAPoint", + "x": 236.976230899601, + "y": 65.89294600598842 + }, + { + "type": "VSAPoint", + "x": 198.9294347511521, + "y": 172.04822599160408 + }, + { + "type": "VSAPoint", + "x": 260.3187756756982, + "y": 75.38014122578073 + }, + { + "type": "VSAPoint", + "x": 324.5363299638826, + "y": 101.48031496062993 + }, + { + "type": "VSAPoint", + "x": 29.858267716535437, + "y": 300.8503937007874 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_548_case1/output.json b/src/test/ValentinaTest/share/Issue_548_case1/output.json new file mode 100644 index 000000000..042cd5f37 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_548_case1/output.json @@ -0,0 +1,44 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 91.92618851342023, + "y": -5.2995763213857 + }, + { + "type": "QPointF", + "x": 251.31850377736984, + "y": 59.482821054254934 + }, + { + "type": "QPointF", + "x": 243.98034017738885, + "y": 79.95720760961254 + }, + { + "type": "QPointF", + "x": 255.82062825950885, + "y": 61.31263585275079 + }, + { + "type": "QPointF", + "x": 348.4782707269195, + "y": 98.97181787964888 + }, + { + "type": "QPointF", + "x": 29.78045942584839, + "y": 314.5929172205191 + }, + { + "type": "QPointF", + "x": 17.016714467558195, + "y": 305.7450353602103 + }, + { + "type": "QPointF", + "x": 91.92618851342023, + "y": -5.2995763213857 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_620/output.json b/src/test/ValentinaTest/share/Issue_620/output.json index 6f3ceb7f5..dc69dd45e 100644 --- a/src/test/ValentinaTest/share/Issue_620/output.json +++ b/src/test/ValentinaTest/share/Issue_620/output.json @@ -55,16 +55,31 @@ "x": 80.49778754648116, "y": 366.38376506330246 }, + { + "type": "QPointF", + "x": 86.65517350144363, + "y": 348.15360873209465 + }, { "type": "QPointF", "x": 92.69483546961426, "y": 327.287500697207 }, + { + "type": "QPointF", + "x": 98.70826602690417, + "y": 303.30523970278495 + }, { "type": "QPointF", "x": 101.73836126698214, "y": 289.83563666815587 }, + { + "type": "QPointF", + "x": 100.33414592841483, + "y": 265.38578532087524 + }, { "type": "QPointF", "x": 96.68026149584162, @@ -115,6 +130,11 @@ "x": 38.84006150425045, "y": 44.71818577337716 }, + { + "type": "QPointF", + "x": 33.04808995751456, + "y": 41.35409816534657 + }, { "type": "QPointF", "x": 30, diff --git a/src/test/ValentinaTest/share/Issue_627/output.json b/src/test/ValentinaTest/share/Issue_627/output.json index 345131744..67a6a8529 100644 --- a/src/test/ValentinaTest/share/Issue_627/output.json +++ b/src/test/ValentinaTest/share/Issue_627/output.json @@ -10,11 +10,21 @@ "x": 11781.326946495077, "y": -3500.819302857501 }, + { + "type": "QPointF", + "x": 11867.565752333256, + "y": -3648.313692662954 + }, { "type": "QPointF", "x": 11962.607394275858, "y": -3812.6942063012807 }, + { + "type": "QPointF", + "x": 12058.712075176787, + "y": -3980.708890064595 + }, { "type": "QPointF", "x": 12156.626721853161, diff --git a/src/test/ValentinaTest/share/Issue_642/output.json b/src/test/ValentinaTest/share/Issue_642/output.json index 35512b799..4f8a336c9 100644 --- a/src/test/ValentinaTest/share/Issue_642/output.json +++ b/src/test/ValentinaTest/share/Issue_642/output.json @@ -5,6 +5,11 @@ "x": 2555.3185623162503, "y": 1775.3963972608776 }, + { + "type": "QPointF", + "x": 2533.485416834573, + "y": 1654.1970986177237 + }, { "type": "QPointF", "x": 2498.6589620048717, @@ -55,11 +60,21 @@ "x": 2433.366052691387, "y": 812.4523812904079 }, + { + "type": "QPointF", + "x": 2431.5695587510604, + "y": 650.3610960850071 + }, { "type": "QPointF", "x": 2430.8388882820395, "y": 551.3113535235193 }, + { + "type": "QPointF", + "x": 2521.617659898581, + "y": 672.6447005214233 + }, { "type": "QPointF", "x": 2528.097570000204, @@ -100,11 +115,21 @@ "x": 2651.457513977499, "y": 754.2498813699515 }, + { + "type": "QPointF", + "x": 2661.906602177309, + "y": 755.9323325983764 + }, { "type": "QPointF", "x": 2669.4674223109832, "y": 756.929551265488 }, + { + "type": "QPointF", + "x": 2684.6734555828325, + "y": 758.0191371470853 + }, { "type": "QPointF", "x": 2699.354023450933, @@ -140,11 +165,26 @@ "x": 2776.8774375508683, "y": 730.2726803766734 }, + { + "type": "QPointF", + "x": 2787.7151087388283, + "y": 721.3927793437276 + }, + { + "type": "QPointF", + "x": 2795.1934418373985, + "y": 714.0407970608541 + }, { "type": "QPointF", "x": 2797.520564686708, "y": 711.5183868986292 }, + { + "type": "QPointF", + "x": 2797.565477459869, + "y": 778.3077483501366 + }, { "type": "QPointF", "x": 2798.0441679430687, diff --git a/src/test/ValentinaTest/share/Issue_646/output.json b/src/test/ValentinaTest/share/Issue_646/output.json index f4943b6b0..419ceadc7 100644 --- a/src/test/ValentinaTest/share/Issue_646/output.json +++ b/src/test/ValentinaTest/share/Issue_646/output.json @@ -65,6 +65,16 @@ "x": 1163.0590153626633, "y": 1425.1699495236505 }, + { + "type": "QPointF", + "x": 1116.2932350829396, + "y": 1427.2879226859707 + }, + { + "type": "QPointF", + "x": 1041.7895077573253, + "y": 1429.6401613199018 + }, { "type": "QPointF", "x": 963.7205338463195, @@ -100,6 +110,11 @@ "x": 724.6693192587568, "y": 1465.7538024321 }, + { + "type": "QPointF", + "x": 702.3758460326873, + "y": 1472.8321997422458 + }, { "type": "QPointF", "x": 674.507015051664, @@ -300,11 +315,21 @@ "x": 443.88487919288957, "y": 508.7712150476781 }, + { + "type": "QPointF", + "x": 468.38014199619704, + "y": 519.3218805863685 + }, { "type": "QPointF", "x": 492.51986728337727, "y": 528.7584613476225 }, + { + "type": "QPointF", + "x": 516.1750084818626, + "y": 537.1126962804666 + }, { "type": "QPointF", "x": 539.1179506668893, @@ -485,6 +510,11 @@ "x": 1377.236522737057, "y": 1123.259918081096 }, + { + "type": "QPointF", + "x": 1385.7580931557095, + "y": 1150.8527362570703 + }, { "type": "QPointF", "x": 1391.2039211231315, diff --git a/src/test/ValentinaTest/share/Issue_687/output.json b/src/test/ValentinaTest/share/Issue_687/output.json index 2889abb40..73682f49c 100644 --- a/src/test/ValentinaTest/share/Issue_687/output.json +++ b/src/test/ValentinaTest/share/Issue_687/output.json @@ -17,13 +17,18 @@ }, { "type": "QPointF", - "x": -3876.0515684243296, - "y": 2358.8604343036523 + "x": -3876.0446530393638, + "y": 2359.095557392497 }, { "type": "QPointF", - "x": -3887.519966140116, - "y": 2176.021591116069 + "x": -3877.0256700548975, + "y": 2346.0091958370685 + }, + { + "type": "QPointF", + "x": -3887.5213753572352, + "y": 2176.0030663771568 }, { "type": "QPointF", @@ -57,13 +62,18 @@ }, { "type": "QPointF", - "x": -3964.5576295754886, - "y": 1507.571162997499 + "x": -3964.604131215331, + "y": 1507.33080031766 }, { "type": "QPointF", - "x": -3979.0441459679337, - "y": 1445.460405256037 + "x": -3971.664775737262, + "y": 1475.1815581746987 + }, + { + "type": "QPointF", + "x": -3978.9721167358434, + "y": 1445.713792454936 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json b/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json index 967d1828f..421fa891e 100644 --- a/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json +++ b/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json @@ -50,11 +50,21 @@ "x": -2630.998136859894, "y": -1293.181377633793 }, + { + "type": "QPointF", + "x": -2569.0225895032195, + "y": -1408.5260880216772 + }, { "type": "QPointF", "x": -2526.849928551443, "y": -1488.355444332595 }, + { + "type": "QPointF", + "x": -2479.8121574130614, + "y": -1565.5597316038543 + }, { "type": "QPointF", "x": -2412.4420763178637, diff --git a/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json b/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json index 72c9a46f7..1a53379f0 100644 --- a/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json +++ b/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json @@ -10,11 +10,21 @@ "x": -2875.7046555981224, "y": -988.8731803000138 }, + { + "type": "QPointF", + "x": -2869.739250762179, + "y": -995.9600608912989 + }, { "type": "QPointF", "x": -2852.0350888381663, "y": -1018.3579525133645 }, + { + "type": "QPointF", + "x": -2833.9930313450013, + "y": -1042.8247879674811 + }, { "type": "QPointF", "x": -2815.748622160777, @@ -25,6 +35,16 @@ "x": -2787.870476959194, "y": -1111.6511542550961 }, + { + "type": "QPointF", + "x": -2749.4633571785607, + "y": -1174.8146938194466 + }, + { + "type": "QPointF", + "x": -2735.5637236706502, + "y": -1198.8327987897178 + }, { "type": "QPointF", "x": -2709.3301962544565, @@ -35,11 +55,21 @@ "x": -2667.6149920549974, "y": -1314.1248163522016 }, + { + "type": "QPointF", + "x": -2603.3069903623764, + "y": -1428.3146294524863 + }, { "type": "QPointF", "x": -2559.715942701951, "y": -1507.0184550978506 }, + { + "type": "QPointF", + "x": -2514.227494607453, + "y": -1585.119667187254 + }, { "type": "QPointF", "x": -2449.617126109764, @@ -50,6 +80,16 @@ "x": -2409.3711773734785, "y": -1770.3047741440118 }, + { + "type": "QPointF", + "x": -2384.8455511324228, + "y": -1816.2158396365535 + }, + { + "type": "QPointF", + "x": -2372.014802888763, + "y": -1839.0924384195434 + }, { "type": "QPointF", "x": -2337.6122325791366, @@ -70,6 +110,11 @@ "x": -2290.1400263694263, "y": -2006.9106828448225 }, + { + "type": "QPointF", + "x": -2279.89681138735, + "y": -2033.636101836302 + }, { "type": "QPointF", "x": -2276.421885057862, @@ -127,13 +172,18 @@ }, { "type": "QPointF", - "x": -2301.606136488925, - "y": -1403.8559499643816 + "x": -2301.7153187062654, + "y": -1403.6917863837464 }, { "type": "QPointF", - "x": -2327.21952402004, - "y": -1360.591763582004 + "x": -2314.9930909411037, + "y": -1382.127871817989 + }, + { + "type": "QPointF", + "x": -2327.125511964018, + "y": -1360.771748417655 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_880_Detail/output.json b/src/test/ValentinaTest/share/Issue_880_Detail/output.json index d574ef4a3..5601bab9d 100644 --- a/src/test/ValentinaTest/share/Issue_880_Detail/output.json +++ b/src/test/ValentinaTest/share/Issue_880_Detail/output.json @@ -10,6 +10,11 @@ "x": 173.0793708392803, "y": 1567.494455438128 }, + { + "type": "QPointF", + "x": 155.04852197223198, + "y": 1457.1320947077754 + }, { "type": "QPointF", "x": 137.97710473815312, @@ -200,6 +205,11 @@ "x": 775.6443207612276, "y": -96.11131999552904 }, + { + "type": "QPointF", + "x": 804.6599580426928, + "y": -43.46259731691744 + }, { "type": "QPointF", "x": 834.3104997062314, @@ -220,6 +230,11 @@ "x": 896.0956388425119, "y": 107.64709808599238 }, + { + "type": "QPointF", + "x": 909.1935793406782, + "y": 123.99650588254744 + }, { "type": "QPointF", "x": 923.186035221142, @@ -300,6 +315,11 @@ "x": 874.9207445088272, "y": 1052.5483850157796 }, + { + "type": "QPointF", + "x": 872.9674776789623, + "y": 1106.266056241682 + }, { "type": "QPointF", "x": 871.8649319396666, diff --git a/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json b/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json index 1cb4aab4b..1b31fc83a 100644 --- a/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json +++ b/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json @@ -315,6 +315,11 @@ "x": 775.7129148747653, "y": 1141.1721677964533 }, + { + "type": "QPointF", + "x": 774.4165452653767, + "y": 1197.5233022801074 + }, { "type": "QPointF", "x": 773.9475654146959, diff --git a/src/test/ValentinaTest/share/Issue_883_ledge/output.json b/src/test/ValentinaTest/share/Issue_883_ledge/output.json index aeef26cc0..7b850cfb4 100644 --- a/src/test/ValentinaTest/share/Issue_883_ledge/output.json +++ b/src/test/ValentinaTest/share/Issue_883_ledge/output.json @@ -35,6 +35,11 @@ "x": 1112.978768668652, "y": -970.8708818236878 }, + { + "type": "QPointF", + "x": 1127.5834903182104, + "y": -1058.1767531327619 + }, { "type": "QPointF", "x": 1149.5459641167045, @@ -50,6 +55,11 @@ "x": 1176.5244363705685, "y": -1307.6563001159316 }, + { + "type": "QPointF", + "x": 1195.269438012279, + "y": -1378.6789451473478 + }, { "type": "QPointF", "x": 1214.661499217333, diff --git a/src/test/ValentinaTest/share/Issue_883_prong/output.json b/src/test/ValentinaTest/share/Issue_883_prong/output.json index d501d9274..98f355b31 100644 --- a/src/test/ValentinaTest/share/Issue_883_prong/output.json +++ b/src/test/ValentinaTest/share/Issue_883_prong/output.json @@ -35,6 +35,11 @@ "x": 1112.978768668652, "y": -970.8708818236878 }, + { + "type": "QPointF", + "x": 1127.5834903182104, + "y": -1058.1767531327619 + }, { "type": "QPointF", "x": 1149.5459641167045, @@ -50,6 +55,11 @@ "x": 1176.5244363705685, "y": -1307.6563001159316 }, + { + "type": "QPointF", + "x": 1195.269438012279, + "y": -1378.6789451473478 + }, { "type": "QPointF", "x": 1214.661499217333, diff --git a/src/test/ValentinaTest/share/Issue_923_test1/output.json b/src/test/ValentinaTest/share/Issue_923_test1/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 3f0cc1c75..718f46e5c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json @@ -37,8 +37,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -100,31 +100,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -132,24 +182,59 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 dcae2eb12..47142d0c3 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,19 +187,49 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -814.7149606299213, diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 a12c50066..7f76024df 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,24 +187,59 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, diff --git a/src/test/ValentinaTest/share/Issue_923_test4/output.json b/src/test/ValentinaTest/share/Issue_923_test4/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 8e5a4e41b..31f2a5a22 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json @@ -37,8 +37,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -100,31 +100,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -132,14 +182,44 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, + { + "type": "QPointF", + "x": -799.6540182965299, + "y": 375.86453190867064 + }, { "type": "QPointF", "x": -807.3585969245805, diff --git a/src/test/ValentinaTest/share/Issue_923_test5/output.json b/src/test/ValentinaTest/share/Issue_923_test5/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 f9f3c95d8..8890c4742 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,24 +187,59 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index ce9aead9e..090b9889c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -105,31 +105,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -137,29 +187,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, 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 a9f8fad39..c9409bf35 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json @@ -37,8 +37,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -100,31 +100,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -132,19 +182,49 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -814.7149606299213, 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 cf24c1470..fad0cf5d6 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -45,31 +45,81 @@ "x": -251.05534306180104, "y": 356.3979584259171 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -77,29 +127,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, @@ -142,8 +232,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "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 838693309..a3a2ba1ae 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -15,6 +15,11 @@ "x": -196.73040945651604, "y": 111.99504529263494 }, + { + "type": "QPointF", + "x": -202.58871262669427, + "y": 128.53121708773386 + }, { "type": "QPointF", "x": -214.84435298014208, @@ -50,31 +55,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -82,29 +137,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, @@ -147,8 +242,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "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 28044c3b3..5c68e9293 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -32,8 +32,8 @@ }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -652.0000133582188, + "y": -80.53001488530833 }, { "type": "QPointF", @@ -60,6 +60,11 @@ "x": -196.73040945651604, "y": 111.99504529263494 }, + { + "type": "QPointF", + "x": -202.58871262669427, + "y": 128.53121708773386 + }, { "type": "QPointF", "x": -214.84435298014208, @@ -95,31 +100,81 @@ "x": -247.36754301589642, "y": 354.40670968863236 }, + { + "type": "QPointF", + "x": -268.81339627908176, + "y": 365.98652087653426 + }, { "type": "QPointF", "x": -274.5095925153328, "y": 368.5444651427917 }, + { + "type": "QPointF", + "x": -280.43082717423164, + "y": 370.73899686729357 + }, + { + "type": "QPointF", + "x": -287.39383270204445, + "y": 372.87515785586334 + }, { "type": "QPointF", "x": -295.7605238049826, "y": 375.0706690235611 }, + { + "type": "QPointF", + "x": -309.89377622824026, + "y": 377.93937224400145 + }, { "type": "QPointF", "x": -324.3767295101649, "y": 380.2653300530379 }, + { + "type": "QPointF", + "x": -340.2009018235332, + "y": 382.3115147150371 + }, + { + "type": "QPointF", + "x": -357.3015804224907, + "y": 384.10843195749214 + }, { "type": "QPointF", "x": -375.5837936477569, "y": 385.67430269319027 }, + { + "type": "QPointF", + "x": -394.93507981176816, + "y": 387.02124656268006 + }, + { + "type": "QPointF", + "x": -414.7876067251059, + "y": 388.13579550460213 + }, { "type": "QPointF", "x": -457.7859582653625, "y": 389.818484035946 }, + { + "type": "QPointF", + "x": -502.9230721502445, + "y": 390.728524359008 + }, + { + "type": "QPointF", + "x": -549.0970864147907, + "y": 390.9068680348474 + }, { "type": "QPointF", "x": -595.1846601171007, @@ -127,29 +182,69 @@ }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -640.0561486385066, + "y": 389.208081776043 + }, + { + "type": "QPointF", + "x": -682.5877079123347, + "y": 387.3931112039713 + }, + { + "type": "QPointF", + "x": -722.1497906411519, + "y": 384.93382569436017 + }, + { + "type": "QPointF", + "x": -740.1638197010636, + "y": 383.4834023373132 + }, + { + "type": "QPointF", + "x": -756.9739837313467, + "y": 381.8746246893899 }, { "type": "QPointF", "x": -772.4984867981542, "y": 380.09530156453326 }, + { + "type": "QPointF", + "x": -786.7031623321698, + "y": 378.11617548261546 + }, { "type": "QPointF", "x": -799.6540182965299, "y": 375.86453190867064 }, + { + "type": "QPointF", + "x": -810.1810632465665, + "y": 373.5624561175904 + }, { "type": "QPointF", "x": -818.0929557813755, "y": 371.2795759163598 }, + { + "type": "QPointF", + "x": -823.6929755287612, + "y": 369.27180555079025 + }, { "type": "QPointF", "x": -829.5753368833404, "y": 366.62694879394627 }, + { + "type": "QPointF", + "x": -835.8151397150936, + "y": 362.8920896668543 + }, { "type": "QPointF", "x": -838.7026077978918, diff --git a/src/test/ValentinaTest/share/Issue_937_case_1a/output.json b/src/test/ValentinaTest/share/Issue_937_case_1a/output.json index 6f7cf7ef8..b80bb28d3 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_1a/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_1a/output.json @@ -30,6 +30,11 @@ "x": 1723.5137525631783, "y": 269.88882003708585 }, + { + "type": "QPointF", + "x": 1739.655927690695, + "y": 262.03592436304467 + }, { "type": "QPointF", "x": 1755.2977021921959, @@ -45,11 +50,21 @@ "x": 1797.7637952365174, "y": 226.14503156279258 }, + { + "type": "QPointF", + "x": 1816.1141828457614, + "y": 212.3887020561369 + }, { "type": "QPointF", "x": 1821.1582741564016, "y": 207.9156854487886 }, + { + "type": "QPointF", + "x": 1829.8906021517287, + "y": 197.95711777636723 + }, { "type": "QPointF", "x": 1850.2268389063556, @@ -117,8 +132,13 @@ }, { "type": "QPointF", - "x": 2043.7098515215694, - "y": -231.38670020515815 + "x": 2043.8408021651217, + "y": -231.36182837730803 + }, + { + "type": "QPointF", + "x": 2048.5472886712973, + "y": -256.8983432709658 }, { "type": "QPointF", @@ -130,6 +150,11 @@ "x": 2096.2010430479354, "y": -305.76697662558325 }, + { + "type": "QPointF", + "x": 2118.596734377698, + "y": -285.25948496501354 + }, { "type": "QPointF", "x": 2128.851320460309, @@ -195,11 +220,21 @@ "x": 2413.959562148755, "y": -27.960630211024366 }, + { + "type": "QPointF", + "x": 2427.335223757793, + "y": -2.67894722422675 + }, { "type": "QPointF", "x": 2441.7439264606173, "y": 22.874874343832474 }, + { + "type": "QPointF", + "x": 2457.1503265783167, + "y": 48.500299616965826 + }, { "type": "QPointF", "x": 2473.5562132949735, @@ -225,6 +260,11 @@ "x": 2549.188990792927, "y": 173.2323949516483 }, + { + "type": "QPointF", + "x": 2570.686181649168, + "y": 196.7162157025718 + }, { "type": "QPointF", "x": 2580.973552524787, @@ -245,6 +285,11 @@ "x": 2626.565617205801, "y": 240.40258220841326 }, + { + "type": "QPointF", + "x": 2647.6100143431113, + "y": 253.25938675280184 + }, { "type": "QPointF", "x": 2663.251788844662, diff --git a/src/test/ValentinaTest/share/Issue_937_case_3/output.json b/src/test/ValentinaTest/share/Issue_937_case_3/output.json index e45409d39..04a469c02 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_3/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_3/output.json @@ -45,6 +45,11 @@ "x": 1719.8423430919697, "y": 355.26966708945173 }, + { + "type": "QPointF", + "x": 1735.830074328751, + "y": 406.3526919039369 + }, { "type": "QPointF", "x": 1745.9721284748487, @@ -70,11 +75,21 @@ "x": 1562.3105514164024, "y": 621.2039304577579 }, + { + "type": "QPointF", + "x": 1516.4712487217967, + "y": 626.2373299747532 + }, { "type": "QPointF", "x": 1468.9776219120495, "y": 630.6195769132337 }, + { + "type": "QPointF", + "x": 1419.7878643019553, + "y": 634.2923264024466 + }, { "type": "QPointF", "x": 1369.087082921325, diff --git a/src/test/ValentinaTest/share/Issue_937_case_4/output.json b/src/test/ValentinaTest/share/Issue_937_case_4/output.json index 4a1de5fb8..616848f3e 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_4/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_4/output.json @@ -30,6 +30,11 @@ "x": 759.9293060888347, "y": 232.30867461856374 }, + { + "type": "QPointF", + "x": 746.1600690743035, + "y": 266.23587963672844 + }, { "type": "QPointF", "x": 733.4323484087254, @@ -55,6 +60,11 @@ "x": 662.0805212563046, "y": 544.5379089718689 }, + { + "type": "QPointF", + "x": 647.6716988290344, + "y": 607.684038352516 + }, { "type": "QPointF", "x": 640.3151871775024, @@ -65,36 +75,71 @@ "x": 588.6191706314672, "y": 783.4666770047555 }, + { + "type": "QPointF", + "x": 553.7430819638216, + "y": 773.3391047211275 + }, { "type": "QPointF", "x": 536.5230035915121, "y": 768.9827589077273 }, + { + "type": "QPointF", + "x": 517.7599295500714, + "y": 764.9770018198446 + }, { "type": "QPointF", "x": 497.21152337683196, "y": 761.3144560580386 }, + { + "type": "QPointF", + "x": 475.1473257603545, + "y": 758.0936978954314 + }, { "type": "QPointF", "x": 451.8125365609943, "y": 755.3923021708632 }, + { + "type": "QPointF", + "x": 427.4354375247862, + "y": 753.2735533181055 + }, { "type": "QPointF", "x": 402.23266399544076, "y": 751.7904388092944 }, + { + "type": "QPointF", + "x": 376.4130294147269, + "y": 750.9879873001996 + }, { "type": "QPointF", "x": 350.18037103111203, "y": 750.9045390779345 }, + { + "type": "QPointF", + "x": 323.7357236608624, + "y": 751.5722731960818 + }, { "type": "QPointF", "x": 297.2790165853582, "y": 753.0171628544194 }, + { + "type": "QPointF", + "x": 271.0104065427002, + "y": 755.2584367611878 + }, { "type": "QPointF", "x": 245.13129173514196, @@ -105,6 +150,11 @@ "x": 219.8449847321186, "y": 762.1667326004041 }, + { + "type": "QPointF", + "x": 194.84886055128482, + "y": 766.9234796677907 + }, { "type": "QPointF", "x": 172.37135866473753, @@ -115,6 +165,11 @@ "x": 111.81637543478814, "y": 630.6138011943216 }, + { + "type": "QPointF", + "x": 111.02764436246161, + "y": 609.1257495754658 + }, { "type": "QPointF", "x": 109.20376434093394, diff --git a/src/test/ValentinaTest/share/doll/output.json b/src/test/ValentinaTest/share/doll/output.json index 4bd12ccb7..0bedf284f 100644 --- a/src/test/ValentinaTest/share/doll/output.json +++ b/src/test/ValentinaTest/share/doll/output.json @@ -40,16 +40,31 @@ "x": 168.6915298388583, "y": 355.2833437350711 }, + { + "type": "QPointF", + "x": 182.57176177093885, + "y": 307.54028260167195 + }, { "type": "QPointF", "x": 183.22877397002802, "y": 304.74101381048894 }, + { + "type": "QPointF", + "x": 180.64445450073126, + "y": 302.93068035793937 + }, { "type": "QPointF", "x": 176.4964093006996, "y": 300.8845392057267 }, + { + "type": "QPointF", + "x": 170.84634888385776, + "y": 298.8837744576332 + }, { "type": "QPointF", "x": 164.0909826454473, @@ -95,11 +110,26 @@ "x": 325.80435893876364, "y": 76.06748949606039 }, + { + "type": "QPointF", + "x": 330.9882848734929, + "y": 102.87077188278467 + }, + { + "type": "QPointF", + "x": 331.48273454480426, + "y": 104.45283583549359 + }, { "type": "QPointF", "x": 332.2173315417802, "y": 105.88700933180093 }, + { + "type": "QPointF", + "x": 333.82899906607446, + "y": 107.61626386412401 + }, { "type": "QPointF", "x": 336.9203884569167, @@ -135,11 +165,21 @@ "x": 391.6997948509762, "y": 600.6931653543307 }, + { + "type": "QPointF", + "x": 391.35317542637785, + "y": 603.7434162907966 + }, { "type": "QPointF", "x": 390.36466617897366, "y": 625.3100352443169 }, + { + "type": "QPointF", + "x": 389.4864776516507, + "y": 676.9988962460882 + }, { "type": "QPointF", "x": 388.8749425918069, diff --git a/src/test/ValentinaTest/share/loop_by_intersection/output.json b/src/test/ValentinaTest/share/loop_by_intersection/output.json index e32c54fb0..831721c92 100644 --- a/src/test/ValentinaTest/share/loop_by_intersection/output.json +++ b/src/test/ValentinaTest/share/loop_by_intersection/output.json @@ -60,6 +60,11 @@ "x": -60.80620147593467, "y": -133.0993042749749 }, + { + "type": "QPointF", + "x": -40.04869153447004, + "y": -135.96128224479537 + }, { "type": "QPointF", "x": -20.056865818653897, @@ -230,6 +235,11 @@ "x": -21.71602430535394, "y": 217.6499571283396 }, + { + "type": "QPointF", + "x": -41.91154810502328, + "y": 215.74491326868818 + }, { "type": "QPointF", "x": -60.80620147594401, @@ -275,6 +285,11 @@ "x": -200.60450650590764, "y": 129.98174424304221 }, + { + "type": "QPointF", + "x": -212.66678998411973, + "y": 109.88068204433232 + }, { "type": "QPointF", "x": -214.69613672918854, diff --git a/src/test/ValentinaTest/share/loop_start_point_on_line/output.json b/src/test/ValentinaTest/share/loop_start_point_on_line/output.json index 7616a0518..4dd4400af 100644 --- a/src/test/ValentinaTest/share/loop_start_point_on_line/output.json +++ b/src/test/ValentinaTest/share/loop_start_point_on_line/output.json @@ -15,6 +15,11 @@ "x": -2082.437616769119, "y": -1220.0101487988097 }, + { + "type": "QPointF", + "x": -2056.8141936259476, + "y": -1225.6770902684877 + }, { "type": "QPointF", "x": -2029.2249477701505, @@ -105,6 +110,16 @@ "x": -1616.263360186903, "y": -1172.06412296872 }, + { + "type": "QPointF", + "x": -1592.433553865018, + "y": -1150.9286376239052 + }, + { + "type": "QPointF", + "x": -1581.1249477487709, + "y": -1139.9848040550612 + }, { "type": "QPointF", "x": -1574.7272893318411, @@ -135,11 +150,21 @@ "x": -1522.4036091395494, "y": -1046.252179826669 }, + { + "type": "QPointF", + "x": -1514.5717321017187, + "y": -1025.9222563900455 + }, { "type": "QPointF", "x": -1507.4683782139964, "y": -1004.8046200871603 }, + { + "type": "QPointF", + "x": -1501.0852301488674, + "y": -983.0130006883825 + }, { "type": "QPointF", "x": -1495.376021554108, @@ -160,6 +185,11 @@ "x": -1477.3721976018426, "y": -833.9326365783504 }, + { + "type": "QPointF", + "x": -1476.7146436911478, + "y": -809.9932106818161 + }, { "type": "QPointF", "x": -1476.767245881819, @@ -205,6 +235,11 @@ "x": -1566.1548356341827, "y": -467.3584741326522 }, + { + "type": "QPointF", + "x": -1589.3590438113763, + "y": -407.6118309532849 + }, { "type": "QPointF", "x": -1598.609971168324, @@ -240,6 +275,11 @@ "x": -1903.184757419558, "y": -229.6579756354422 }, + { + "type": "QPointF", + "x": -1911.2442785982337, + "y": -219.72673844199227 + }, { "type": "QPointF", "x": -1918.7301892347405, @@ -260,6 +300,16 @@ "x": -1974.0904588850167, "y": -114.14038731710832 }, + { + "type": "QPointF", + "x": -1984.5634596707787, + "y": -98.8935172003726 + }, + { + "type": "QPointF", + "x": -1990.4276010223648, + "y": -91.09922907737571 + }, { "type": "QPointF", "x": -1997.2051328041664, diff --git a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json index c52fe5ffd..cc7d2f408 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -125,11 +130,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -140,16 +155,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -180,21 +210,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json index 6a6b0e3a0..2692f47df 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json @@ -45,11 +45,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -60,16 +70,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -100,21 +125,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.0444208482252, "y": 705.3744462055462 }, + { + "type": "QPointF", + "x": 1111.3488014116294, + "y": 705.7937559506272 + }, { "type": "QPointF", "x": 1290.4028062852726, @@ -155,6 +220,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, diff --git a/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json b/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json index abf992f9a..bab7a2661 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -140,11 +145,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -155,16 +170,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -195,21 +225,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json index 38dc75215..a59c56474 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -65,6 +70,11 @@ "x": 288.203122586733, "y": -71.06974867341756 }, + { + "type": "QPointF", + "x": 301.89505943185964, + "y": -82.52353546533966 + }, { "type": "QPointF", "x": 308.85408734019427, @@ -135,11 +145,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -150,16 +170,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -190,21 +225,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json index f68975c00..d4323059c 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -130,11 +135,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -145,16 +160,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -185,21 +215,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json b/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json index d91d9c711..3803b3f9d 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -130,11 +135,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -145,16 +160,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -185,21 +215,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json index ce0968ff2..6a4d6dc9a 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json @@ -30,6 +30,11 @@ "x": 148.42595722778273, "y": -10.854963023883784 }, + { + "type": "QPointF", + "x": 167.5566961450379, + "y": -15.490385095876569 + }, { "type": "QPointF", "x": 186.61281642420556, @@ -60,6 +65,11 @@ "x": 273.5285590176657, "y": -60.62398316233916 }, + { + "type": "QPointF", + "x": 284.4390076163078, + "y": -68.44485122652873 + }, { "type": "QPointF", "x": 284.5734311894893, @@ -125,11 +135,21 @@ "x": 1010.891548127259, "y": 494.7652903217379 }, + { + "type": "QPointF", + "x": 1006.8300406648392, + "y": 516.1171535751373 + }, { "type": "QPointF", "x": 1004.1409514475167, "y": 534.3338730421456 }, + { + "type": "QPointF", + "x": 1002.5429209641059, + "y": 549.6340874837038 + }, { "type": "QPointF", "x": 1001.8096437359794, @@ -140,16 +160,31 @@ "x": 1001.632561636562, "y": 577.0190278199144 }, + { + "type": "QPointF", + "x": 1002.5982079396683, + "y": 593.4977885619218 + }, { "type": "QPointF", "x": 1003.1926540422378, "y": 599.1363247745379 }, + { + "type": "QPointF", + "x": 1004.4715714217981, + "y": 605.7139974891637 + }, { "type": "QPointF", "x": 1006.6672239434022, "y": 613.5972045855956 }, + { + "type": "QPointF", + "x": 1010.1411052399322, + "y": 623.2360341722922 + }, { "type": "QPointF", "x": 1014.8474980040493, @@ -180,21 +215,61 @@ "x": 1051.171411576988, "y": 682.3761985416603 }, + { + "type": "QPointF", + "x": 1060.1878101895825, + "y": 689.4651444417038 + }, + { + "type": "QPointF", + "x": 1066.6143341082677, + "y": 693.625487703081 + }, { "type": "QPointF", "x": 1070.1212524493003, "y": 695.6022659553572 }, + { + "type": "QPointF", + "x": 1074.3830151134664, + "y": 697.7096649640414 + }, + { + "type": "QPointF", + "x": 1078.7265805419665, + "y": 699.565875909043 + }, + { + "type": "QPointF", + "x": 1083.206554246492, + "y": 701.1878034134409 + }, { "type": "QPointF", "x": 1087.891993301369, "y": 702.5858632116882 }, + { + "type": "QPointF", + "x": 1092.8646688655851, + "y": 703.7605199081748 + }, + { + "type": "QPointF", + "x": 1098.2162239125396, + "y": 704.699271425244 + }, { "type": "QPointF", "x": 1104.502219000503, "y": 705.4274804063973 }, + { + "type": "QPointF", + "x": 1110.9097384210777, + "y": 705.8266456692913 + }, { "type": "QPointF", "x": 1290.2822996456107, diff --git a/src/test/ValentinaTest/share/seamtest2/output.json b/src/test/ValentinaTest/share/seamtest2/output.json index e43edac37..df135143a 100644 --- a/src/test/ValentinaTest/share/seamtest2/output.json +++ b/src/test/ValentinaTest/share/seamtest2/output.json @@ -85,6 +85,11 @@ "x": 209.5774971397173, "y": 213.23886816257252 }, + { + "type": "QPointF", + "x": 197.93811921404816, + "y": 198.6726417606856 + }, { "type": "QPointF", "x": 195.60872712150552, diff --git a/src/test/ValentinaTest/share/seamtest3/output.json b/src/test/ValentinaTest/share/seamtest3/output.json index 4fbdd9443..4c0b4c602 100644 --- a/src/test/ValentinaTest/share/seamtest3/output.json +++ b/src/test/ValentinaTest/share/seamtest3/output.json @@ -115,21 +115,41 @@ "x": 297.94225297413215, "y": 150.9565650350354 }, + { + "type": "QPointF", + "x": 296.9126887137917, + "y": 147.81469899066454 + }, { "type": "QPointF", "x": 295.9596189912135, "y": 146.7730393764622 }, + { + "type": "QPointF", + "x": 294.21114346945865, + "y": 146.12370067508155 + }, { "type": "QPointF", "x": 290.48115362247165, "y": 145.59912885424706 }, + { + "type": "QPointF", + "x": 285.00652997672506, + "y": 145.7209025858372 + }, { "type": "QPointF", "x": 278.36163578883384, "y": 146.69497061341855 }, + { + "type": "QPointF", + "x": 271.1464199066293, + "y": 148.48706670167468 + }, { "type": "QPointF", "x": 264.11356456471754, @@ -140,6 +160,11 @@ "x": 254.1976334991026, "y": 155.20769360077045 }, + { + "type": "QPointF", + "x": 247.5665032053911, + "y": 159.21880811798434 + }, { "type": "QPointF", "x": 246.2542887728834, diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index 525224876..b471baf6c 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -113,5 +113,7 @@ Issue_937_case_1a/output.json Issue_604/input.json Issue_604/output.json + Issue_548_case1/input.json + Issue_548_case1/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 852d625e2..eceed700c 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -133,9 +133,10 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data() // Files: Steampunk_trousers.val and marie.vit // Actually buggy detail see in file src/app/share/collection/bugs/Steampunk_trousers_issue_#548.val // Code should clean loops in path. - QTest::newRow("Issue 548. Case1") << InputPointsIssue548Case1() - << 11.338582677165354 // seam allowance width (0.3 cm) - << OutputPointsIssue548Case1(); + ASSERT_TEST_CASE("Issue 548. Case1", + QStringLiteral("://Issue_548_case1/input.json"), + QStringLiteral("://Issue_548_case1/output.json"), + 11.338582677165354 /*seam allowance width (0.3 cm)*/); // Disabled due to "undefined behavior" problem #if !defined(Q_OS_WIN) && !defined(Q_CC_CLANG) && !defined(Q_PROCESSOR_X86_64) @@ -1266,38 +1267,6 @@ void TST_VAbstractPiece::Case5() const QVERIFY(qFuzzyIsNull(result)); } -//--------------------------------------------------------------------------------------------------------------------- -QVector TST_VAbstractPiece::InputPointsIssue548Case1() const -{ - QVector points; - - points += VSAPoint(236.97989607468364, 65.89325192030674); - points += VSAPoint(198.93409106041895, 172.04876297154925); - points += VSAPoint(260.32251114299453, 75.38027418944861); - points += VSAPoint(324.54110236213444, 101.48031496062993); - points += VSAPoint(29.858267716535437, 300.85039370078744); - points += VSAPoint(99.86433649395013, 10.166060970128015); - - return points; -} - -//--------------------------------------------------------------------------------------------------------------------- -QVector TST_VAbstractPiece::OutputPointsIssue548Case1() const -{ - QVector points; - - points += QPointF(251.32210577118798, 59.48301432799721); - points += QPointF(243.9841262159756, 79.95746530820585); - points += QPointF(255.82424817748586, 61.31279754390509); - points += QPointF(348.48337789725855, 98.9717841021069); - points += QPointF(29.780382054543473, 314.59289909613994); - points += QPointF(17.01672179602679, 305.7450049304056); - points += QPointF(91.92616539550944, -5.299480329501037); - points += QPointF(251.32210577118798, 59.48301432799721); - - return points; -} - //--------------------------------------------------------------------------------------------------------------------- QVector TST_VAbstractPiece::InputPointsIssue548Case2() const { diff --git a/src/test/ValentinaTest/tst_vabstractpiece.h b/src/test/ValentinaTest/tst_vabstractpiece.h index 005f2820e..c1f08294b 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.h +++ b/src/test/ValentinaTest/tst_vabstractpiece.h @@ -68,9 +68,6 @@ private: void Case4() const; void Case5() const; - QVector InputPointsIssue548Case1() const; - QVector OutputPointsIssue548Case1() const; - QVector InputPointsIssue548Case2() const; QVector OutputPointsIssue548Case2() const;