diff --git a/ChangeLog.txt b/ChangeLog.txt index 1a9f6e1af..26c0ceab2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ # Version 0.7.45 (unreleased) - Fix incorrect seam allowance for angle type second edge right angle. - Fix regression with country flags. +- Fix bug in seam allowance. # Version 0.7.44 Feb 9, 2021 - Placeholder %size% has incorrect value. diff --git a/src/app/share/collection/bugs/smart_pattern_#36.val b/src/app/share/collection/bugs/smart_pattern_#36.val index 8b8188aff..1b3691a36 100644 --- a/src/app/share/collection/bugs/smart_pattern_#36.val +++ b/src/app/share/collection/bugs/smart_pattern_#36.val @@ -17,7 +17,7 @@ smart_pattern_#36.vit - + diff --git a/src/libs/vgeometry/vgeometrydef.h b/src/libs/vgeometry/vgeometrydef.h index bd533ae30..fc59a9a36 100644 --- a/src/libs/vgeometry/vgeometrydef.h +++ b/src/libs/vgeometry/vgeometrydef.h @@ -97,7 +97,7 @@ private: }; Q_DECLARE_METATYPE(VLayoutPassmark) -constexpr qreal accuracyPointOnLine = (0.117/*mm*/ / 25.4) * PrintDPI; +constexpr qreal accuracyPointOnLine = (0.126/*mm*/ / 25.4) * PrintDPI; Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2, qreal accuracy = accuracyPointOnLine); diff --git a/src/test/ValentinaTest/share/DP_6/output.json b/src/test/ValentinaTest/share/DP_6/output.json index 5b5005334..1687c20f1 100644 --- a/src/test/ValentinaTest/share/DP_6/output.json +++ b/src/test/ValentinaTest/share/DP_6/output.json @@ -210,11 +210,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 35cd3b2d3..e58994553 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 @@ -380,11 +380,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 c7ab68373..9f9c2f886 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 @@ -370,11 +370,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 c7ab68373..9f9c2f886 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 @@ -370,11 +370,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 c7ab68373..9f9c2f886 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 @@ -370,11 +370,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 c7ab68373..9f9c2f886 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 @@ -370,11 +370,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 c7ab68373..9f9c2f886 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 @@ -370,11 +370,6 @@ "x": 2655.688340739313, "y": 1707.7165018577969 }, - { - "type": "QPointF", - "x": 2655.778424569198, - "y": 1721.9946692493584 - }, { "type": "QPointF", "x": 2655.953419573936, 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 b80bb28d3..4dbc8b3a5 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_1a/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_1a/output.json @@ -262,18 +262,13 @@ }, { "type": "QPointF", - "x": 2570.686181649168, - "y": 196.7162157025718 + "x": 2570.3339930185716, + "y": 196.33148010029032 }, { "type": "QPointF", - "x": 2580.973552524787, - "y": 207.2276391804366 - }, - { - "type": "QPointF", - "x": 2586.793533689666, - "y": 212.3887020561312 + "x": 2587.447320552787, + "y": 212.87881200409126 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/panties_case1/input.json b/src/test/ValentinaTest/share/panties_case1/input.json new file mode 100644 index 000000000..4bbbca53f --- /dev/null +++ b/src/test/ValentinaTest/share/panties_case1/input.json @@ -0,0 +1,225 @@ +{ + "vector": [ + { + "saAfter": 37.795275590551185, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1754.6061049829982, + "y": 531.4354372476321 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1755.035021219421, + "y": 531.2296740038928 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1731.1558631613466, + "y": 543.8819183739275 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1708.0908414518603, + "y": 557.5077911434734 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1685.9636931635305, + "y": 572.2153875573874 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1664.8981553689239, + "y": 588.1128028605269 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1645.0179651406086, + "y": 605.3081322977491 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1635.6181662479514, + "y": 614.4871302890493 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1612.1619789843503, + "y": 637.7149723258838 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1577.5244421457328, + "y": 672.4383426796408 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1555.5074604530087, + "y": 696.1033753389547 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1534.9631921103587, + "y": 720.6133615365002 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1516.4064019514353, + "y": 746.3440293025127 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1504.1930150056392, + "y": 766.7278202251852 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1496.8878205955218, + "y": 780.8609103128873 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1490.3690509502655, + "y": 795.5105178097137 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1484.701051674077, + "y": 810.7236087194435 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1482.2456692913386, + "y": 818.5825511811023 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1482.2456692913386, + "y": 818.5825511811023 + }, + { + "saAfter": 0, + "type": "VSAPoint", + "x": 1367.9527559055118, + "y": 818.5825511811023 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 0, + "type": "VSAPoint", + "x": 1367.9527537469328, + "y": 77.79514960629922 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1379.291336424098, + "y": 77.795149526357 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1379.291336424098, + "y": 77.795149526357 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1390.7358254826636, + "y": 78.30256515119021 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1467.6848567918119, + "y": 80.06906329632852 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1539.2428521556708, + "y": 80.2803785523032 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1620.6791099016023, + "y": 78.6263876191475 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1674.2918946312718, + "y": 75.9509162231673 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1674.2918946312718, + "y": 75.9509162231673 + } + ] +} diff --git a/src/test/ValentinaTest/share/panties_case1/output.json b/src/test/ValentinaTest/share/panties_case1/output.json new file mode 100644 index 000000000..7ff3a3c62 --- /dev/null +++ b/src/test/ValentinaTest/share/panties_case1/output.json @@ -0,0 +1,119 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 1786.0710599536046, + "y": 557.5240420963199 + }, + { + "type": "QPointF", + "x": 1749.6370245691528, + "y": 576.8618185344574 + }, + { + "type": "QPointF", + "x": 1728.1778640671305, + "y": 589.53901409164 + }, + { + "type": "QPointF", + "x": 1707.8277589214797, + "y": 603.0654355519599 + }, + { + "type": "QPointF", + "x": 1688.670698833411, + "y": 617.5225903218325 + }, + { + "type": "QPointF", + "x": 1670.606812298871, + "y": 633.1469116341913 + }, + { + "type": "QPointF", + "x": 1638.7562352935086, + "y": 664.5706679662566 + }, + { + "type": "QPointF", + "x": 1604.747593949502, + "y": 698.6645894751346 + }, + { + "type": "QPointF", + "x": 1583.844987053996, + "y": 721.1318323402373 + }, + { + "type": "QPointF", + "x": 1564.8129664801063, + "y": 743.8376573322635 + }, + { + "type": "QPointF", + "x": 1548.001349773686, + "y": 767.1484842790478 + }, + { + "type": "QPointF", + "x": 1537.2236773815769, + "y": 785.1361089771601 + }, + { + "type": "QPointF", + "x": 1530.96996819389, + "y": 797.234929401359 + }, + { + "type": "QPointF", + "x": 1525.37666027745, + "y": 809.8047500951102 + }, + { + "type": "QPointF", + "x": 1522.1062814637592, + "y": 818.5825511811023 + }, + { + "type": "QPointF", + "x": 1522.1062814637592, + "y": 845.0392440944881 + }, + { + "type": "QPointF", + "x": 1367.3858268487456, + "y": 845.0392440944881 + }, + { + "type": "QPointF", + "x": 1367.3858245359263, + "y": 51.31926950196146 + }, + { + "type": "QPointF", + "x": 1468.027554616979, + "y": 53.613267032547995 + }, + { + "type": "QPointF", + "x": 1539.013269415257, + "y": 53.82289230805872 + }, + { + "type": "QPointF", + "x": 1619.7509698318393, + "y": 52.1830892504392 + }, + { + "type": "QPointF", + "x": 1696.2923013503678, + "y": 48.363400642197 + }, + { + "type": "QPointF", + "x": 1786.0710599536046, + "y": 557.5240420963199 + } + ] +} diff --git a/src/test/ValentinaTest/share/panties_case2/input.json b/src/test/ValentinaTest/share/panties_case2/input.json new file mode 100644 index 000000000..5151c9f70 --- /dev/null +++ b/src/test/ValentinaTest/share/panties_case2/input.json @@ -0,0 +1,225 @@ +{ + "vector": [ + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1482.2456692913386, + "y": 818.5825511811023 + }, + { + "saAfter": 0, + "type": "VSAPoint", + "x": 1367.9527559055118, + "y": 818.5825511811023 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 0, + "type": "VSAPoint", + "x": 1367.9527537469328, + "y": 77.79514960629922 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1379.291336424098, + "y": 77.795149526357 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1379.291336424098, + "y": 77.795149526357 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1390.7358254826636, + "y": 78.30256515119021 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1467.6848567918119, + "y": 80.06906329632852 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1539.2428521556708, + "y": 80.2803785523032 + }, + { + "angle": 6, + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1620.6791099016023, + "y": 78.6263876191475 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1674.2918946312718, + "y": 75.9509162231673 + }, + { + "saAfter": 26.45669291338583, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1674.2918946312718, + "y": 75.9509162231673 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1754.6061049829982, + "y": 531.4354372476321 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 26.45669291338583, + "type": "VSAPoint", + "x": 1755.035021219421, + "y": 531.2296740038928 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1731.1558631613466, + "y": 543.8819183739275 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1708.0908414518603, + "y": 557.5077911434734 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1685.9636931635305, + "y": 572.2153875573874 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1664.8981553689239, + "y": 588.1128028605269 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1645.0179651406086, + "y": 605.3081322977491 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1635.6181662479514, + "y": 614.4871302890493 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1612.1619789843503, + "y": 637.7149723258838 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1577.5244421457328, + "y": 672.4383426796408 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1555.5074604530087, + "y": 696.1033753389547 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1534.9631921103587, + "y": 720.6133615365002 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1516.4064019514353, + "y": 746.3440293025127 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1504.1930150056392, + "y": 766.7278202251852 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1496.8878205955218, + "y": 780.8609103128873 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1490.3690509502655, + "y": 795.5105178097137 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1484.701051674077, + "y": 810.7236087194435 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 1482.2456692913386, + "y": 818.5825511811023 + } + ] +} diff --git a/src/test/ValentinaTest/share/panties_case2/output.json b/src/test/ValentinaTest/share/panties_case2/output.json new file mode 100644 index 000000000..4d08316a8 --- /dev/null +++ b/src/test/ValentinaTest/share/panties_case2/output.json @@ -0,0 +1,119 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 1367.3858268487456, + "y": 845.0392440944881 + }, + { + "type": "QPointF", + "x": 1367.3858245359263, + "y": 51.31926950196146 + }, + { + "type": "QPointF", + "x": 1468.027554616979, + "y": 53.613267032547995 + }, + { + "type": "QPointF", + "x": 1539.013269415257, + "y": 53.82289230805872 + }, + { + "type": "QPointF", + "x": 1619.7509698318393, + "y": 52.1830892504392 + }, + { + "type": "QPointF", + "x": 1696.2923013503678, + "y": 48.363400642197 + }, + { + "type": "QPointF", + "x": 1786.0710599536046, + "y": 557.5240420963199 + }, + { + "type": "QPointF", + "x": 1749.6370245691528, + "y": 576.8618185344574 + }, + { + "type": "QPointF", + "x": 1728.1778640671305, + "y": 589.53901409164 + }, + { + "type": "QPointF", + "x": 1707.8277589214797, + "y": 603.0654355519599 + }, + { + "type": "QPointF", + "x": 1688.670698833411, + "y": 617.5225903218325 + }, + { + "type": "QPointF", + "x": 1670.606812298871, + "y": 633.1469116341913 + }, + { + "type": "QPointF", + "x": 1638.7562352935086, + "y": 664.5706679662566 + }, + { + "type": "QPointF", + "x": 1604.747593949502, + "y": 698.6645894751346 + }, + { + "type": "QPointF", + "x": 1583.844987053996, + "y": 721.1318323402373 + }, + { + "type": "QPointF", + "x": 1564.8129664801063, + "y": 743.8376573322635 + }, + { + "type": "QPointF", + "x": 1548.001349773686, + "y": 767.1484842790478 + }, + { + "type": "QPointF", + "x": 1537.2236773815769, + "y": 785.1361089771601 + }, + { + "type": "QPointF", + "x": 1530.96996819389, + "y": 797.234929401359 + }, + { + "type": "QPointF", + "x": 1525.37666027745, + "y": 809.8047500951102 + }, + { + "type": "QPointF", + "x": 1522.1062814637592, + "y": 818.5825511811023 + }, + { + "type": "QPointF", + "x": 1522.1062814637592, + "y": 845.0392440944881 + }, + { + "type": "QPointF", + "x": 1367.3858268487456, + "y": 845.0392440944881 + } + ] +} diff --git a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json index cc7d2f408..a52ae008e 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json @@ -220,11 +220,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, 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 2692f47df..869ca88a2 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json @@ -135,11 +135,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, 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 bab7a2661..b93e8ff38 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 @@ -235,11 +235,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, 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 a59c56474..1ff3aaa38 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 @@ -235,11 +235,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, diff --git a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json index d4323059c..70cde564a 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json @@ -225,11 +225,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, 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 3803b3f9d..6ac8f2b7a 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 @@ -225,11 +225,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, 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 6a4d6dc9a..fc277af66 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 @@ -225,11 +225,6 @@ "x": 1066.6143341082677, "y": 693.625487703081 }, - { - "type": "QPointF", - "x": 1070.1212524493003, - "y": 695.6022659553572 - }, { "type": "QPointF", "x": 1074.3830151134664, diff --git a/src/test/ValentinaTest/share/smart_pattern_#36/input.json b/src/test/ValentinaTest/share/smart_pattern_#36/input.json index 84a1732e2..6e2bee37f 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#36/input.json +++ b/src/test/ValentinaTest/share/smart_pattern_#36/input.json @@ -10,6 +10,12 @@ "x": -188.23334010667102, "y": 21597.251791493014 }, + { + "angle": 6, + "type": "VSAPoint", + "x": -188.0288159203024, + "y": 21597.69546369572 + }, { "angle": 6, "type": "VSAPoint", @@ -246,6 +252,21 @@ "x": 30, "y": 22311.722834645672 }, + { + "type": "VSAPoint", + "x": 29.26377334895059, + "y": 22341.839586718215 + }, + { + "type": "VSAPoint", + "x": 29.26377334895059, + "y": 22341.839586718215 + }, + { + "type": "VSAPoint", + "x": 29.26377334895059, + "y": 22341.839586718215 + }, { "angle": 6, "type": "VSAPoint", @@ -276,21 +297,6 @@ "x": 21.970984779797945, "y": 22564.876825218627 }, - { - "type": "VSAPoint", - "x": 20.500199521052405, - "y": 22612.757327074407 - }, - { - "type": "VSAPoint", - "x": 20.500199521052405, - "y": 22612.757327074407 - }, - { - "type": "VSAPoint", - "x": 20.500199521052405, - "y": 22612.757327074407 - }, { "angle": 6, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/smart_pattern_#36/output.json b/src/test/ValentinaTest/share/smart_pattern_#36/output.json index 9bfd97b5c..c37c36ed6 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#36/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#36/output.json @@ -2,8 +2,23 @@ "vector": [ { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -215.6414755238939, + "y": 21610.019843083213 + }, + { + "type": "QPointF", + "x": -185.4416809267488, + "y": 21596.600628239823 + }, + { + "type": "QPointF", + "x": -215.87209587564425, + "y": 21609.478265010075 + }, + { + "type": "QPointF", + "x": -218.99406907567914, + "y": 21602.146768820647 }, { "type": "QPointF", @@ -37,18 +52,13 @@ }, { "type": "QPointF", - "x": -195.24307496050506, - "y": 21510.16982087991 + "x": -194.6943396034587, + "y": 21509.57098131993 }, { "type": "QPointF", - "x": -185.01522722202466, - "y": 21502.508262941858 - }, - { - "type": "QPointF", - "x": -120.2863407065389, - "y": 21459.613160579218 + "x": -120.43942238262103, + "y": 21459.383110402876 }, { "type": "QPointF", @@ -137,8 +147,8 @@ }, { "type": "QPointF", - "x": 52.18502491930136, - "y": 22057.388558001505 + "x": 52.19222150972855, + "y": 22057.617067328072 }, { "type": "QPointF", @@ -167,8 +177,8 @@ }, { "type": "QPointF", - "x": 52.185024919301355, - "y": 22566.05711128984 + "x": 52.17437373208378, + "y": 22566.285485665663 }, { "type": "QPointF", @@ -320,11 +330,6 @@ "x": -166.93463706180071, "y": 22895.847269707778 }, - { - "type": "QPointF", - "x": -159.24892241489266, - "y": 22870.977686051203 - }, { "type": "QPointF", "x": -153.4650960199354, @@ -430,11 +435,6 @@ "x": -153.4650960199354, "y": 21771.864614006427 }, - { - "type": "QPointF", - "x": -159.33558439851828, - "y": 21752.182578074156 - }, { "type": "QPointF", "x": -166.9346370618007, @@ -447,13 +447,13 @@ }, { "type": "QPointF", - "x": -202.6152214315237, - "y": 21637.97693416576 + "x": -202.58580499399324, + "y": 21638.045386629867 }, { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -215.6414755238939, + "y": 21610.019843083213 } ] } diff --git a/src/test/ValentinaTest/share/smart_pattern_#58/input.json b/src/test/ValentinaTest/share/smart_pattern_#58/input.json index d203778fe..7fbff83ca 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#58/input.json +++ b/src/test/ValentinaTest/share/smart_pattern_#58/input.json @@ -2,378 +2,504 @@ "vector": [ { "type": "VSAPoint", - "x": 231.4373260132128, - "y": 1778.5814173228348 + "x": 247.3228346456693, + "y": 1797.4790551181104 }, { "type": "VSAPoint", - "x": 278.28811792486107, - "y": 1510.10068637634 + "x": 294.56692913385825, + "y": 1526.744484718234 }, { "type": "VSAPoint", - "x": 294.44144427545694, - "y": 1507.6495640035857 + "x": 294.56692913385825, + "y": 1526.744484718234 }, { + "angle": 6, "type": "VSAPoint", - "x": 314.1269659888851, - "y": 1503.5492125764567 + "x": 297.78826667615306, + "y": 1526.2556756427075 }, { + "angle": 6, "type": "VSAPoint", - "x": 333.00728556677325, - "y": 1498.482931460618 + "x": 318.5060975402612, + "y": 1521.9403017050831 }, { + "angle": 6, "type": "VSAPoint", - "x": 351.09867959627206, - "y": 1492.4722175314846 + "x": 338.4399491985108, + "y": 1516.5913193530896 }, { + "angle": 6, "type": "VSAPoint", - "x": 368.4186960667595, - "y": 1485.5367395533972 + "x": 357.5961791656124, + "y": 1510.2268226147403 }, { + "angle": 6, "type": "VSAPoint", - "x": 384.9856837378738, - "y": 1477.6940146223433 + "x": 375.98114495627635, + "y": 1502.86490551805 }, { + "angle": 6, "type": "VSAPoint", - "x": 400.8181941459449, - "y": 1468.9592367784041 + "x": 393.6012040852129, + "y": 1494.5236620910327 }, { + "angle": 6, "type": "VSAPoint", - "x": 415.93431749889527, - "y": 1459.3453001893827 + "x": 410.4627140671324, + "y": 1485.221186361704 }, { + "angle": 6, "type": "VSAPoint", - "x": 430.35103211455817, - "y": 1448.863030046361 + "x": 426.5720324167454, + "y": 1474.975572358077 }, { + "angle": 6, "type": "VSAPoint", - "x": 444.0836493187042, - "y": 1437.521599021348 + "x": 441.9355166487622, + "y": 1463.804914108167 }, { + "angle": 6, "type": "VSAPoint", - "x": 457.14542004046064, - "y": 1425.329075271635 + "x": 456.5595242778931, + "y": 1451.7273056399881 }, { + "angle": 6, "type": "VSAPoint", - "x": 469.54733984197816, - "y": 1412.2930283139299 + "x": 470.4504128188486, + "y": 1438.7608409815548 }, { + "angle": 6, "type": "VSAPoint", - "x": 481.41282344527315, - "y": 1398.2857485794134 + "x": 483.6145397863388, + "y": 1424.9236141608817 }, { + "angle": 6, "type": "VSAPoint", - "x": 492.5547151481526, - "y": 1383.8143086488699 + "x": 496.05826269507435, + "y": 1410.2337192059833 }, { + "angle": 6, "type": "VSAPoint", - "x": 502.7806762003831, - "y": 1368.354315381568 + "x": 507.78793905976556, + "y": 1394.7092501448735 }, { + "angle": 6, "type": "VSAPoint", - "x": 512.7021925961178, - "y": 1351.8778241538607 + "x": 518.8099263951228, + "y": 1378.3683010055674 }, { + "angle": 6, "type": "VSAPoint", - "x": 521.8994317308129, - "y": 1334.755806229509 + "x": 529.1305822158562, + "y": 1361.2289658160792 }, { + "angle": 6, "type": "VSAPoint", - "x": 530.4649110715529, - "y": 1316.8507353993848 + "x": 538.7562640366766, + "y": 1343.309338604423 }, { + "angle": 6, "type": "VSAPoint", - "x": 538.4000910521302, - "y": 1298.1769788688134 + "x": 547.6933293722939, + "y": 1324.6275133986137 }, { + "angle": 6, "type": "VSAPoint", - "x": 545.7063359288908, - "y": 1278.750029508588 + "x": 555.9481357374189, + "y": 1305.2015842266655 }, { + "angle": 6, "type": "VSAPoint", - "x": 552.3851047281271, - "y": 1258.5863487419938 + "x": 563.5270406467614, + "y": 1285.0496451165927 }, { + "angle": 6, "type": "VSAPoint", - "x": 561.6218539603159, - "y": 1226.71900974186 + "x": 570.4364016150325, + "y": 1264.1897900964104 }, { "type": "VSAPoint", - "x": 1065.6617011589467, - "y": 1408.7816864056442 + "x": 574.1606905548133, + "y": 1251.340769819358 }, { "type": "VSAPoint", - "x": 1053.7610921605533, - "y": 1462.9515486776288 + "x": 574.1606905548133, + "y": 1251.340769819358 }, { "type": "VSAPoint", - "x": 1045.6861606944276, - "y": 1507.180805329162 + "x": 1043.6462437609543, + "y": 1420.9221966584219 }, { "type": "VSAPoint", - "x": 1039.4920283827717, - "y": 1549.9923080635576 + "x": 1043.6462437609543, + "y": 1420.9221966584219 }, { + "angle": 6, "type": "VSAPoint", - "x": 1035.1030651939789, - "y": 1591.4005848362904 + "x": 1035.2312855037069, + "y": 1459.225877577704 }, { + "angle": 6, "type": "VSAPoint", - "x": 1032.443659558613, - "y": 1631.4206168216922 + "x": 1027.0331905074174, + "y": 1504.129744460739 }, { + "angle": 6, "type": "VSAPoint", - "x": 1031.4382897156343, - "y": 1670.0678577282356 + "x": 1020.7375941575093, + "y": 1547.6425282999794 }, { + "angle": 6, "type": "VSAPoint", - "x": 1032.011602691146, - "y": 1707.358237104317 + "x": 1016.2716040932994, + "y": 1589.777525721534 }, { + "angle": 6, "type": "VSAPoint", - "x": 1034.0884973970792, - "y": 1743.3081444872419 + "x": 1013.5623279541039, + "y": 1630.5480333515106 }, { + "angle": 6, "type": "VSAPoint", - "x": 1037.5942072449768, - "y": 1777.934392204008 + "x": 1012.5368733792393, + "y": 1669.9673478160166 }, { + "angle": 6, "type": "VSAPoint", - "x": 1042.4543768508215, - "y": 1811.2541560476245 + "x": 1013.1223480080217, + "y": 1708.0487657411604 }, { + "angle": 6, "type": "VSAPoint", - "x": 1048.5951270419177, - "y": 1843.2848948211301 + "x": 1015.2458594797675, + "y": 1744.80558375305 }, { + "angle": 6, "type": "VSAPoint", - "x": 1055.9431026079276, - "y": 1874.0442516822304 + "x": 1018.8345154337933, + "y": 1780.2510984777941 }, { + "angle": 6, "type": "VSAPoint", - "x": 1064.4254981299555, - "y": 1903.5499420898432 + "x": 1023.815423509415, + "y": 1814.3986065414997 }, { + "angle": 6, "type": "VSAPoint", - "x": 1073.9700587286613, - "y": 1931.819634663438 + "x": 1030.1156913459495, + "y": 1847.2614045702749 }, { + "angle": 6, "type": "VSAPoint", - "x": 1084.5050545378274, - "y": 1958.8708321833387 + "x": 1037.6624265827127, + "y": 1878.8527891902281 }, { + "angle": 6, "type": "VSAPoint", - "x": 1095.9592298734308, - "y": 1984.720760099687 + "x": 1046.382736859021, + "y": 1909.1860570274675 }, { + "angle": 6, "type": "VSAPoint", - "x": 1108.2617301296443, - "y": 2009.3862692585317 + "x": 1056.2037298141906, + "y": 1938.2745047081007 }, { "type": "VSAPoint", - "x": 1121.342011098845, - "y": 2032.8837581844984 + "x": 1060.8693996697996, + "y": 1950.5615890831032 }, { "type": "VSAPoint", - "x": 1135.1297364563522, - "y": 2055.2291183870766 + "x": 1060.8693996697996, + "y": 1950.5615890831032 }, { "type": "VSAPoint", - "x": 1149.5546694683946, - "y": 2076.4377040809786 + "x": 1060.8693996697996, + "y": 1950.5615890831032 }, { + "angle": 6, "type": "VSAPoint", - "x": 1164.5465645811753, - "y": 2096.524325711441 + "x": 1067.0525130875385, + "y": 1966.131428858236 }, { + "angle": 6, "type": "VSAPoint", - "x": 1180.0350635466189, - "y": 2115.503265001873 + "x": 1078.8561943183804, + "y": 1992.7701261039808 }, { + "angle": 6, "type": "VSAPoint", - "x": 1195.9495993249827, - "y": 2133.388308066852 + "x": 1091.5418811460327, + "y": 2018.2038930714439 }, { + "angle": 6, "type": "VSAPoint", - "x": 1212.2193093724165, - "y": 2150.192792517222 + "x": 1105.0366812098123, + "y": 2042.4460263867327 }, { + "angle": 6, "type": "VSAPoint", - "x": 1228.7729582473444, - "y": 2165.929664410282 + "x": 1119.267702149035, + "y": 2065.5098226759555 }, { + "angle": 6, "type": "VSAPoint", - "x": 1245.5388678808974, - "y": 2180.6115413000603 + "x": 1134.1620516030175, + "y": 2087.4085785652205 }, { + "angle": 6, "type": "VSAPoint", - "x": 1262.444852398235, - "y": 2194.2507784151867 + "x": 1149.6468372110758, + "y": 2108.155590680636 }, { + "angle": 6, "type": "VSAPoint", - "x": 1279.467872304478, - "y": 2206.8964704281216 + "x": 1165.6491666125266, + "y": 2127.7641556483086 }, { + "angle": 6, "type": "VSAPoint", - "x": 1297.7306927357072, - "y": 2219.5481177526704 + "x": 1182.0961474466858, + "y": 2146.247570094348 }, { + "angle": 6, "type": "VSAPoint", - "x": 1290.6688688058985, - "y": 2265.114491714009 + "x": 1198.9148873528698, + "y": 2163.619130644861 }, { + "angle": 6, "type": "VSAPoint", - "x": 1279.8411584230082, - "y": 2348.340860262282 + "x": 1216.0324939703955, + "y": 2179.892133925956 }, { + "angle": 6, "type": "VSAPoint", - "x": 1269.2007054480705, - "y": 2445.1062634514115 + "x": 1233.3760749385788, + "y": 2195.0798765637414 }, { + "angle": 6, "type": "VSAPoint", - "x": 1259.2924779368475, - "y": 2550.4989183874577 + "x": 1250.872737896736, + "y": 2209.195655184325 }, { + "angle": 6, "type": "VSAPoint", - "x": 1250.6990229464336, - "y": 2659.330065143677 + "x": 1268.4495904841838, + "y": 2222.2527664138142 }, { "type": "VSAPoint", - "x": 1243.997919031011, - "y": 2766.4281622163053 + "x": 1277.244094488189, + "y": 2228.3451968503937 }, { "type": "VSAPoint", - "x": 1239.7744748167386, - "y": 2866.372200302109 + "x": 1277.244094488189, + "y": 2228.3451968503937 }, { "type": "VSAPoint", - "x": 1238.662527733217, - "y": 2933.4891450708683 + "x": 1277.244094488189, + "y": 2228.3451968503937 }, { + "angle": 6, "type": "VSAPoint", - "x": 1238.9261603693603, - "y": 2973.119458224285 + "x": 1271.9588830384628, + "y": 2262.447990091445 }, { + "angle": 6, "type": "VSAPoint", - "x": 1241.377182637957, - "y": 3040.6931546213623 + "x": 1261.101448249924, + "y": 2345.9028330125902 }, { + "angle": 6, "type": "VSAPoint", - "x": 1247.793904909571, - "y": 3148.2002648573434 + "x": 1250.4163709563645, + "y": 2443.039988555569 }, { + "angle": 6, "type": "VSAPoint", - "x": 1261.0603355784306, - "y": 3323.365351778843 + "x": 1240.4778420043203, + "y": 2548.729684381468 }, { + "angle": 6, "type": "VSAPoint", - "x": 1275.875018636029, - "y": 3507.686290864064 + "x": 1231.860052240328, + "y": 2657.842148151375 }, { + "angle": 6, "type": "VSAPoint", - "x": 1284.7791722332051, - "y": 3630.0820495612816 + "x": 1225.1371925109243, + "y": 2765.2476075263785 }, { + "angle": 6, "type": "VSAPoint", - "x": 1291.7477353338952, - "y": 3748.8886678968684 + "x": 1220.8834536626455, + "y": 2865.816290167567 }, { + "angle": 6, "type": "VSAPoint", - "x": 1294.9738206996367, - "y": 3833.719655751931 + "x": 1219.767482875249, + "y": 2933.1761050465484 }, { + "angle": 6, "type": "VSAPoint", - "x": 1296.0443480421582, - "y": 3887.8189099718516 + "x": 1220.030758030581, + "y": 2973.52370224905 }, { "type": "VSAPoint", - "x": 1296.4710249835694, - "y": 4004.723149606299 + "x": 1220.551181102362, + "y": 2991.8097637795277 }, { "type": "VSAPoint", - "x": 218.40944881889754, - "y": 4004.723149606299 + "x": 1220.551181102362, + "y": 2991.8097637795277 }, { "type": "VSAPoint", - "x": 218.40944881889763, - "y": 1778.581417322835 + "x": 1220.551181102362, + "y": 2991.8097637795277 }, { + "angle": 6, "type": "VSAPoint", - "x": 231.4373260132128, - "y": 1778.5814173228348 + "x": 1222.491963893705, + "y": 3041.378156244142 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1228.9297849855586, + "y": 3149.325295405348 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1242.2166449681567, + "y": 3324.7922499621873 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1257.0381248037838, + "y": 3509.2002740192374 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1265.9313376604825, + "y": 3631.4531243807824 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1272.8825040106944, + "y": 3749.9949053775285 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1276.089799507623, + "y": 3834.436912931008 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 1277.1503873849765, + "y": 3888.191689968952 + }, + { + "saAfter": 90.70866141732284, + "type": "VSAPoint", + "x": 1277.244094488189, + "y": 3914.0144881889764 + }, + { + "saAfter": 90.70866141732284, + "type": "VSAPoint", + "x": 1277.244094488189, + "y": 3914.0144881889764 + }, + { + "saAfter": 0, + "saBefore": 90.70866141732284, + "type": "VSAPoint", + "x": 218.9763779527559, + "y": 3914.0144881889764 + }, + { + "saBefore": 0, + "type": "VSAPoint", + "x": 218.9763779527559, + "y": 1797.4790551181104 } ] } diff --git a/src/test/ValentinaTest/share/smart_pattern_#58/output.json b/src/test/ValentinaTest/share/smart_pattern_#58/output.json index e645993f5..7094dc587 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#58/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#58/output.json @@ -2,353 +2,378 @@ "vector": [ { "type": "QPointF", - "x": 215.55181738075316, - "y": 1759.6837795275594 + "x": 231.4373260132128, + "y": 1778.5814173228348 }, { "type": "QPointF", - "x": 262.00930671586383, - "y": 1493.4568880344461 + "x": 278.28811792486107, + "y": 1510.10068637634 }, { "type": "QPointF", - "x": 291.09462187476083, - "y": 1489.043452364464 + "x": 294.44144427545694, + "y": 1507.6495640035857 }, { "type": "QPointF", - "x": 309.7478344375091, - "y": 1485.1581234478303 + "x": 314.1269659888851, + "y": 1503.5492125764567 }, { "type": "QPointF", - "x": 327.5746219350357, - "y": 1480.3745435681462 + "x": 333.00728556677325, + "y": 1498.482931460618 }, { "type": "QPointF", - "x": 344.60118002693173, - "y": 1474.717612448229 + "x": 351.09867959627206, + "y": 1492.4722175314846 }, { "type": "QPointF", - "x": 360.8562471772427, - "y": 1468.2085735887445 + "x": 368.4186960667595, + "y": 1485.5367395533972 }, { "type": "QPointF", - "x": 376.370163390527, - "y": 1460.8643671536574 + "x": 384.9856837378738, + "y": 1477.6940146223433 }, { "type": "QPointF", - "x": 391.17367422476445, - "y": 1452.6972871951 + "x": 400.8181941459449, + "y": 1468.9592367784041 }, { "type": "QPointF", - "x": 405.29660258104514, - "y": 1443.7150280206884 + "x": 415.93431749889527, + "y": 1459.3453001893827 }, { "type": "QPointF", - "x": 418.7665475803542, - "y": 1433.921145984555 + "x": 430.35103211455817, + "y": 1448.863030046361 }, { "type": "QPointF", - "x": 431.60777435951525, - "y": 1423.315892402708 + "x": 444.0836493187042, + "y": 1437.521599021348 }, { "type": "QPointF", - "x": 443.8404272620727, - "y": 1411.8973095617152 + "x": 457.14542004046064, + "y": 1425.329075271635 }, { "type": "QPointF", - "x": 455.3283556076691, - "y": 1399.821987695691 + "x": 469.54733984197816, + "y": 1412.2930283139299 }, { "type": "QPointF", - "x": 477.16092721702586, - "y": 1372.7974497744376 + "x": 481.41282344527315, + "y": 1398.2857485794134 }, { "type": "QPointF", - "x": 496.36686661014573, - "y": 1342.3534308035958 + "x": 492.5547151481526, + "y": 1383.8143086488699 }, { "type": "QPointF", - "x": 505.0425994249497, - "y": 1326.2022738545943 + "x": 502.7806762003831, + "y": 1368.354315381568 }, { "type": "QPointF", - "x": 513.1496326119415, - "y": 1309.2555277752656 + "x": 512.7021925961178, + "y": 1351.8778241538607 }, { "type": "QPointF", - "x": 527.9474906909386, - "y": 1272.2636557056294 + "x": 521.8994317308129, + "y": 1334.755806229509 }, { "type": "QPointF", - "x": 534.3338078412216, - "y": 1252.9829073875771 + "x": 530.4649110715529, + "y": 1316.8507353993848 }, { "type": "QPointF", - "x": 549.0830173658185, - "y": 1202.097249664362 + "x": 538.4000910521302, + "y": 1298.1769788688134 }, { "type": "QPointF", - "x": 1087.677158556939, - "y": 1396.6411761528666 + "x": 545.7063359288908, + "y": 1278.750029508588 }, { "type": "QPointF", - "x": 1072.2908988173997, - "y": 1466.6772197775535 + "x": 552.3851047281271, + "y": 1258.5863487419938 }, { "type": "QPointF", - "x": 1064.3391308814378, - "y": 1510.231866197585 + "x": 561.6218539603159, + "y": 1226.71900974186 }, { "type": "QPointF", - "x": 1058.246462608034, - "y": 1552.3420878271359 + "x": 1065.6617011589467, + "y": 1408.7816864056442 }, { "type": "QPointF", - "x": 1053.9345262946583, - "y": 1593.0236439510468 + "x": 1053.7610921605533, + "y": 1462.9515486776288 }, { "type": "QPointF", - "x": 1051.3249911631221, - "y": 1632.2932002918737 + "x": 1045.6861606944276, + "y": 1507.180805329162 }, { "type": "QPointF", - "x": 1050.3397060520292, - "y": 1670.1683676404546 + "x": 1039.4920283827717, + "y": 1549.9923080635576 }, { "type": "QPointF", - "x": 1050.900857374271, - "y": 1706.6677084675218 + "x": 1035.1030651939789, + "y": 1591.4005848362904 }, { "type": "QPointF", - "x": 1052.9311353143887, - "y": 1741.8107052214336 + "x": 1032.443659558613, + "y": 1631.4206168216922 }, { "type": "QPointF", - "x": 1056.3538990561485, - "y": 1775.617685930125 + "x": 1031.4382897156343, + "y": 1670.0678577282356 }, { "type": "QPointF", - "x": 1061.093330192228, - "y": 1808.109705553749 + "x": 1032.011602691146, + "y": 1707.358237104317 }, { "type": "QPointF", - "x": 1067.074562737886, - "y": 1839.3083850719854 + "x": 1034.0884973970792, + "y": 1743.3081444872419 }, { "type": "QPointF", - "x": 1074.2237786331425, - "y": 1869.2357141742327 + "x": 1037.5942072449768, + "y": 1777.934392204008 }, { "type": "QPointF", - "x": 1082.46825940089, - "y": 1897.9138271522188 + "x": 1042.4543768508215, + "y": 1811.2541560476245 }, { "type": "QPointF", - "x": 1091.736387643132, - "y": 1925.364764618775 + "x": 1048.5951270419177, + "y": 1843.2848948211301 }, { "type": "QPointF", - "x": 1101.9575959881163, - "y": 1951.6102355084413 + "x": 1055.9431026079276, + "y": 1874.0442516822304 }, { "type": "QPointF", - "x": 1113.0622654284812, - "y": 1976.671394095393 + "x": 1064.4254981299555, + "y": 1903.5499420898432 }, { "type": "QPointF", - "x": 1124.981579113256, - "y": 2000.5686454456195 + "x": 1073.9700587286613, + "y": 1931.819634663438 }, { "type": "QPointF", - "x": 1137.6473409879022, - "y": 2023.3214899823083 + "x": 1084.5050545378274, + "y": 1958.8708321833387 }, { "type": "QPointF", - "x": 1150.9917707636712, - "y": 2044.9484140982 + "x": 1095.9592298734308, + "y": 1984.720760099687 }, { "type": "QPointF", - "x": 1164.9472873337718, - "y": 2065.4668295967367 + "x": 1108.2617301296443, + "y": 2009.3862692585317 }, { "type": "QPointF", - "x": 1179.4462919512748, - "y": 2084.8930607422462 + "x": 1121.342011098845, + "y": 2032.8837581844984 }, { "type": "QPointF", - "x": 1194.4209604807113, - "y": 2103.2423743554377 + "x": 1135.1297364563522, + "y": 2055.2291183870766 }, { "type": "QPointF", - "x": 1209.8030512032797, - "y": 2120.529046039356 + "x": 1149.5546694683946, + "y": 2076.4377040809786 }, { "type": "QPointF", - "x": 1225.5237313919633, - "y": 2136.7664543895835 + "x": 1164.5465645811753, + "y": 2096.524325711441 }, { "type": "QPointF", - "x": 1241.5134225242932, - "y": 2151.967194894608 + "x": 1180.0350635466189, + "y": 2115.503265001873 }, { "type": "QPointF", - "x": 1257.5613187469414, - "y": 2166.020308732782 + "x": 1195.9495993249827, + "y": 2133.388308066852 }, { "type": "QPointF", - "x": 1290.643204117968, - "y": 2191.6489715000203 + "x": 1212.2193093724165, + "y": 2150.192792517222 }, { "type": "QPointF", - "x": 1318.2172909832254, - "y": 2210.751038654947 + "x": 1228.7729582473444, + "y": 2165.929664410282 }, { "type": "QPointF", - "x": 1309.3788545733341, - "y": 2267.7809933365734 + "x": 1245.5388678808974, + "y": 2180.6115413000603 }, { "type": "QPointF", - "x": 1298.5808685960924, - "y": 2350.778887511974 + "x": 1262.444852398235, + "y": 2194.2507784151867 }, { "type": "QPointF", - "x": 1287.9851186563023, - "y": 2447.1718226163307 + "x": 1279.467872304478, + "y": 2206.8964704281216 }, { "type": "QPointF", - "x": 1278.107153288197, - "y": 2552.26773315016 + "x": 1297.7306927357072, + "y": 2219.5481177526704 }, { "type": "QPointF", - "x": 1269.538022401012, - "y": 2660.8176180979776 + "x": 1290.6335829487807, + "y": 2265.342173482481 }, { "type": "QPointF", - "x": 1262.858673182873, - "y": 2767.6082753737733 + "x": 1279.8411584230082, + "y": 2348.340860262282 }, { "type": "QPointF", - "x": 1258.665502028198, - "y": 2866.9277448150037 + "x": 1269.2007054480705, + "y": 2445.1062634514115 }, { "type": "QPointF", - "x": 1257.5575725911851, - "y": 2933.802185095188 + "x": 1259.2924779368475, + "y": 2550.4989183874577 }, { "type": "QPointF", - "x": 1257.8215191610568, - "y": 2972.71401362399 + "x": 1250.6990229464336, + "y": 2659.330065143677 }, { "type": "QPointF", - "x": 1260.2624013822092, - "y": 3040.008152998583 + "x": 1243.997919031011, + "y": 2766.4281622163053 }, { "type": "QPointF", - "x": 1266.6579711735735, - "y": 3147.0743349177915 + "x": 1239.7744748167386, + "y": 2866.372200302109 }, { "type": "QPointF", - "x": 1294.7152632658247, - "y": 3506.214592345045 + "x": 1238.662527733217, + "y": 2933.4891450708683 }, { "type": "QPointF", - "x": 1303.627000733289, - "y": 3628.71089126524 + "x": 1238.9261603693603, + "y": 2973.119458224285 }, { "type": "QPointF", - "x": 1310.6129493305946, - "y": 3747.7821349782007 + "x": 1241.377182637957, + "y": 3040.6931546213623 }, { "type": "QPointF", - "x": 1313.8578079676856, - "y": 3833.0015059753864 + "x": 1247.793904909571, + "y": 3148.2002648573434 }, { "type": "QPointF", - "x": 1314.9382870193162, - "y": 3887.4450327608874 + "x": 1261.0603355784306, + "y": 3323.365351778843 }, { "type": "QPointF", - "x": 1315.4377612202204, - "y": 4023.6207874015745 + "x": 1275.875018636029, + "y": 3507.686290864064 }, { "type": "QPointF", - "x": 199.5118110236217, - "y": 4023.6207874015745 + "x": 1284.7791722332051, + "y": 3630.0820495612816 }, { "type": "QPointF", - "x": 199.51181102362204, - "y": 1759.6837795275596 + "x": 1291.7477353338952, + "y": 3748.8886678968684 }, { "type": "QPointF", - "x": 215.55181738075316, - "y": 1759.6837795275594 + "x": 1294.9738206996367, + "y": 3833.719655751931 + }, + { + "type": "QPointF", + "x": 1296.0443480421582, + "y": 3887.8189099718516 + }, + { + "type": "QPointF", + "x": 1296.4710249835694, + "y": 4004.723149606299 + }, + { + "type": "QPointF", + "x": 218.40944881889754, + "y": 4004.723149606299 + }, + { + "type": "QPointF", + "x": 218.40944881889763, + "y": 1778.581417322835 + }, + { + "type": "QPointF", + "x": 231.4373260132128, + "y": 1778.5814173228348 } ] } diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index cbf9210ea..83d363a08 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -123,5 +123,9 @@ 160-42_intersection/points.json busty/input.json busty/output.json + panties_case1/input.json + panties_case1/output.json + panties_case2/input.json + panties_case2/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 48ea40f01..4a2c4b1c3 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -1081,6 +1081,18 @@ void TST_VAbstractPiece::EquidistantAngleType_data() QStringLiteral("://busty/input.json"), QStringLiteral("://busty/output.json"), 0 /*seam allowance width*/); + + // See file src/app/share/collection/bugs/panties.val (private collection) + ASSERT_TEST_CASE("Panties. Piece Case 1", + QStringLiteral("://panties_case1/input.json"), + QStringLiteral("://panties_case1/output.json"), + 26.45669291338583 /*seam allowance width*/); + + // See file src/app/share/collection/bugs/panties.val (private collection) + ASSERT_TEST_CASE("Panties. Piece Case 2", + QStringLiteral("://panties_case2/input.json"), + QStringLiteral("://panties_case2/output.json"), + 26.45669291338583 /*seam allowance width*/); } //---------------------------------------------------------------------------------------------------------------------