From 3c27c3ee46517ad841b58a9e9dc0e691e25b16cc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 22 Jun 2021 19:04:01 +0300 Subject: [PATCH] Fix incorrect seam allowance. Closes #133 --- ChangeLog.txt | 1 + src/libs/vgeometry/vgeometrydef.h | 2 +- .../ValentinaTest/share/Issue_642/output.json | 5 - .../share/Issue_923_test1/output.json | 18 +- .../share/Issue_923_test1_1/output.json | 18 +- .../share/Issue_923_test2/output.json | 18 +- .../share/Issue_923_test2_2/output.json | 18 +- .../share/Issue_923_test3/output.json | 18 +- .../share/Issue_923_test3_3/output.json | 18 +- .../share/Issue_923_test4/output.json | 18 +- .../share/Issue_923_test4_4/output.json | 18 +- .../share/Issue_923_test5/output.json | 18 +- .../share/Issue_923_test5_5/output.json | 18 +- .../share/Issue_923_test6/output.json | 18 +- .../share/Issue_923_test6_6/output.json | 18 +- .../share/Issue_923_test7_1/output.json | 18 +- .../share/Issue_923_test7_2/output.json | 18 +- .../share/Issue_923_test7_3/output.json | 18 +- src/test/ValentinaTest/share/doll/output.json | 5 - .../share/loop_by_intersection/output.json | 12 +- .../loop_start_point_on_line/output.json | 22 +- .../share/seamtest1_by_angle/output.json | 10 - .../share/seamtest1_by_angle_2/output.json | 14 +- .../output.json | 10 - .../output.json | 10 - .../seamtest1_by_intersection/output.json | 10 - .../output.json | 10 - .../output.json | 19 +- .../smart_pattern_#120_piece_1/output.json | 5 - .../smart_pattern_#120_piece_2/output.json | 33 +- .../share/smart_pattern_#133/input.json | 286 ++++++++++++++++++ .../share/smart_pattern_#133/output.json | 144 +++++++++ .../share/smart_pattern_#36/input.json | 30 +- .../share/smart_pattern_#36/output.json | 45 ++- .../share/smart_pattern_#99/output.json | 270 ++++++++--------- src/test/ValentinaTest/share/test_data.qrc | 2 + src/test/ValentinaTest/tst_vabstractpiece.cpp | 6 + 37 files changed, 690 insertions(+), 531 deletions(-) create mode 100644 src/test/ValentinaTest/share/smart_pattern_#133/input.json create mode 100644 src/test/ValentinaTest/share/smart_pattern_#133/output.json diff --git a/ChangeLog.txt b/ChangeLog.txt index 75b1583cd..faed568f1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ # Valentina 0.7.48 (unreleased) - [smart-pattern/valentina#129] Incorrect behavior of empty arc and elliptical arc. - Parsing formulas with not canonical math symbols. +- [smart-pattern/valentina#133] Incorrect seam allowance. # Version 0.7.47 May 13, 2021 - [smart-pattern/valentina#118] Incorrect seam allowance. diff --git a/src/libs/vgeometry/vgeometrydef.h b/src/libs/vgeometry/vgeometrydef.h index f6329762b..75f2119cf 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.138/*mm*/ / 25.4) * PrintDPI; +constexpr qreal accuracyPointOnLine = (0.1555/*mm*/ / 25.4) * PrintDPI; Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2, qreal accuracy = accuracyPointOnLine); diff --git a/src/test/ValentinaTest/share/Issue_642/output.json b/src/test/ValentinaTest/share/Issue_642/output.json index 6506b435d..5f4c32f0e 100644 --- a/src/test/ValentinaTest/share/Issue_642/output.json +++ b/src/test/ValentinaTest/share/Issue_642/output.json @@ -170,11 +170,6 @@ "x": 2797.5081938293038, "y": 711.5320126236637 }, - { - "type": "QPointF", - "x": 2797.565477459869, - "y": 778.332404004272 - }, { "type": "QPointF", "x": 2798.0441679430687, diff --git a/src/test/ValentinaTest/share/Issue_923_test1/output.json b/src/test/ValentinaTest/share/Issue_923_test1/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json index 5d67403ad..4e430f2e4 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", 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 71edb7b5f..e5c388220 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json index 9b6f4da36..6c5d49e6d 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4/output.json b/src/test/ValentinaTest/share/Issue_923_test4/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json index 6feafaec9..7e60ea6ff 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test5/output.json b/src/test/ValentinaTest/share/Issue_923_test5/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", 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 f6882ee98..a84ce9e69 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index 4ab19c564..f47c8c892 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json index 3f9e74ba8..2f26e2a63 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", 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 a5ba6f90e..7d051d299 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -97,13 +97,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -142,13 +137,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "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 9b5689717..1f24dd696 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -102,13 +102,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -147,13 +142,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "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 171b3ead6..6b20ebe41 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/doll/output.json b/src/test/ValentinaTest/share/doll/output.json index c87cc2e59..69c139cbb 100644 --- a/src/test/ValentinaTest/share/doll/output.json +++ b/src/test/ValentinaTest/share/doll/output.json @@ -110,11 +110,6 @@ "x": 330.9882848734929, "y": 102.87077188278468 }, - { - "type": "QPointF", - "x": 331.48273454480426, - "y": 104.45283583549359 - }, { "type": "QPointF", "x": 332.2173315417802, diff --git a/src/test/ValentinaTest/share/loop_by_intersection/output.json b/src/test/ValentinaTest/share/loop_by_intersection/output.json index 831721c92..2e9573b39 100644 --- a/src/test/ValentinaTest/share/loop_by_intersection/output.json +++ b/src/test/ValentinaTest/share/loop_by_intersection/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -214.69613672918854, - "y": 105.50483675932705 + "x": -216.6438440863518, + "y": 101.30502907435505 }, { "type": "QPointF", - "x": -217.06541703221671, - "y": -20.396250591591283 + "x": -215.90873077439113, + "y": -22.890393162266093 }, { "type": "QPointF", @@ -292,8 +292,8 @@ }, { "type": "QPointF", - "x": -214.69613672918854, - "y": 105.50483675932705 + "x": -216.6438440863518, + "y": 101.30502907435505 } ] } 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 2d339d6fc..80052e138 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 @@ -17,18 +17,18 @@ }, { "type": "QPointF", - "x": -2083.1478929409827, - "y": -1220.0868889606825 + "x": -2082.7202896908407, + "y": -1220.2021340324343 }, { "type": "QPointF", - "x": -2056.8141936259476, - "y": -1225.6770902684877 + "x": -2057.1296527192585, + "y": -1225.0231603699012 }, { "type": "QPointF", - "x": -2029.2249477701505, - "y": -1230.8064422813395 + "x": -2030.268678428484, + "y": -1230.6480813100734 }, { "type": "QPointF", @@ -120,11 +120,6 @@ "x": -1592.433553865018, "y": -1150.9286376239052 }, - { - "type": "QPointF", - "x": -1581.1249477487709, - "y": -1139.9848040550612 - }, { "type": "QPointF", "x": -1574.7272893318411, @@ -310,11 +305,6 @@ "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 51d6dcf24..55a851c7c 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json @@ -225,21 +225,11 @@ "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, 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 7e2ce0cfa..38483c8a9 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": 1101.8482040478996, - "y": 244.8082798528157 + "x": 1102.2898194097418, + "y": 245.01541704287078 }, { "type": "QPointF", @@ -140,21 +140,11 @@ "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, 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 6c23608ec..b2706a7b4 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 @@ -240,21 +240,11 @@ "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, 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 ed69f50c4..4d6b6e335 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 @@ -240,21 +240,11 @@ "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, diff --git a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json index 1fa3de755..0fca67a6b 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json @@ -230,21 +230,11 @@ "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, 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 b1182dcbc..462176cf6 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 @@ -230,21 +230,11 @@ "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, 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 83784e3b1..9dc924f52 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 @@ -67,13 +67,8 @@ }, { "type": "QPointF", - "x": 284.4390076163077, - "y": -68.44485122652873 - }, - { - "type": "QPointF", - "x": 284.5734311894892, - "y": -68.99248415563486 + "x": 284.4959443876258, + "y": -68.43087536087263 }, { "type": "QPointF", @@ -230,21 +225,11 @@ "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, diff --git a/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json b/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json index 456c459cf..c6c66a011 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json @@ -260,11 +260,6 @@ "x": 954.9126743758827, "y": 1599.02515094508 }, - { - "type": "QPointF", - "x": 941.1480338176947, - "y": 1598.7097479128342 - }, { "type": "QPointF", "x": 929.6966471777685, diff --git a/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json b/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json index dbb6c7b63..e0af32b77 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json @@ -2,23 +2,18 @@ "vector": [ { "type": "QPointF", - "x": 692.3263132377243, - "y": 425.0598484090772 + "x": 692.3267996783844, + "y": 425.0547824881589 }, { "type": "QPointF", - "x": 729.9485435174106, - "y": 428.6724161589221 + "x": 729.9490299580725, + "y": 428.66735023800396 }, { "type": "QPointF", - "x": 902.8367306099547, - "y": 438.0946986997068 - }, - { - "type": "QPointF", - "x": 1047.2274990256597, - "y": 444.9608350659975 + "x": 1047.3703808444025, + "y": 444.96790138807927 }, { "type": "QPointF", @@ -47,8 +42,8 @@ }, { "type": "QPointF", - "x": 1779.204057451268, - "y": 460.15036806979015 + "x": 1779.4842113185928, + "y": 460.1465274137461 }, { "type": "QPointF", @@ -117,8 +112,8 @@ }, { "type": "QPointF", - "x": 1986.4149731529892, - "y": 1450.5996057600491 + "x": 1986.415017807355, + "y": 1450.5995504284354 }, { "type": "QPointF", @@ -142,8 +137,8 @@ }, { "type": "QPointF", - "x": 2100.6375771334715, - "y": 1515.7770650603459 + "x": 2101.0413693548594, + "y": 1515.9306231177372 }, { "type": "QPointF", @@ -197,8 +192,8 @@ }, { "type": "QPointF", - "x": 692.3263132377243, - "y": 425.0598484090772 + "x": 692.3267996783844, + "y": 425.0547824881589 } ] } diff --git a/src/test/ValentinaTest/share/smart_pattern_#133/input.json b/src/test/ValentinaTest/share/smart_pattern_#133/input.json new file mode 100644 index 000000000..2d5ec1350 --- /dev/null +++ b/src/test/ValentinaTest/share/smart_pattern_#133/input.json @@ -0,0 +1,286 @@ +{ + "vector": [ + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 2929.9770747304974, + "y": -276.4297327130487 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 2929.494592436758, + "y": -276.7606225402938 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3020.6267648722614, + "y": -214.2615232263168 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3088.3164558816297, + "y": -169.50935896803173 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3129.0516855236456, + "y": -143.6575896644236 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3146.9122431535925, + "y": -132.85807100626303 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3182.3207891081, + "y": -111.31224886884328 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3240.854911582732, + "y": -74.8319142840869 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3282.194746084433, + "y": -49.82580136992735 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3325.1763277140276, + "y": -25.257860139156612 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3369.4782848426557, + "y": -2.0857627157284724 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3403.4016107132747, + "y": 13.705195402949922 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3426.2415849998115, + "y": 23.34654364295037 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3449.230881619873, + "y": 32.10024036139115 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3472.3293291198524, + "y": 39.84657654277807 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3483.9089681080395, + "y": 43.255120195555406 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3483.9089681080395, + "y": 43.255120195555406 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 3447.5678964202975, + "y": 170.44883665362593 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 3447.5678964202975, + "y": 170.44883665362593 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3389.1244783120674, + "y": 153.77793257366946 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3252.3200130171417, + "y": 115.54965743238373 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3173.1572046119477, + "y": 94.31817557366725 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3147.756296486791, + "y": 88.1473890182314 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3122.245206035337, + "y": 82.25776665675014 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3041.9854088227075, + "y": 64.30895193326627 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2972.2752985376483, + "y": 49.89666830709157 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2927.2740602422737, + "y": 41.446379094112636 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2886.864263786687, + "y": 34.93216727832491 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2854.15352003896, + "y": 31.234718533530163 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2842.1714408688977, + "y": 30.88990256838886 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2842.1714408688977, + "y": 30.88990256838886 + } + ] +} diff --git a/src/test/ValentinaTest/share/smart_pattern_#133/output.json b/src/test/ValentinaTest/share/smart_pattern_#133/output.json new file mode 100644 index 000000000..8fff4d070 --- /dev/null +++ b/src/test/ValentinaTest/share/smart_pattern_#133/output.json @@ -0,0 +1,144 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 2914.8751101032244, + "y": -322.14660963573755 + }, + { + "type": "QPointF", + "x": 2940.3264245982937, + "y": -314.92253942662785 + }, + { + "type": "QPointF", + "x": 3041.9531023346835, + "y": -245.46521190898392 + }, + { + "type": "QPointF", + "x": 3108.6971255127173, + "y": -200.96114841642915 + }, + { + "type": "QPointF", + "x": 3148.9580710534224, + "y": -175.78835654256642 + }, + { + "type": "QPointF", + "x": 3201.9395957269226, + "y": -143.55493133873182 + }, + { + "type": "QPointF", + "x": 3261.1271882374804, + "y": -107.36170019590531 + }, + { + "type": "QPointF", + "x": 3301.3564050369955, + "y": -82.40696567509488 + }, + { + "type": "QPointF", + "x": 3343.3191765382894, + "y": -58.4213684718917 + }, + { + "type": "QPointF", + "x": 3386.2208551896647, + "y": -35.981685402091905 + }, + { + "type": "QPointF", + "x": 3418.7308452277093, + "y": -20.848620528460394 + }, + { + "type": "QPointF", + "x": 3440.319979440316, + "y": -11.735284474201483 + }, + { + "type": "QPointF", + "x": 3461.9693959581145, + "y": -3.4917775300772096 + }, + { + "type": "QPointF", + "x": 3483.678198210371, + "y": 3.788524764758021 + }, + { + "type": "QPointF", + "x": 3519.731204659397, + "y": 14.18111796688273 + }, + { + "type": "QPointF", + "x": 3462.6234754097254, + "y": 214.0581162062353 + }, + { + "type": "QPointF", + "x": 3378.7569662168626, + "y": 190.12346255909503 + }, + { + "type": "QPointF", + "x": 3242.1482695261966, + "y": 151.95046087571671 + }, + { + "type": "QPointF", + "x": 3163.799392078877, + "y": 130.9394133995313 + }, + { + "type": "QPointF", + "x": 3138.833989122527, + "y": 124.87442658272099 + }, + { + "type": "QPointF", + "x": 3034.0345168547487, + "y": 101.25971932387034 + }, + { + "type": "QPointF", + "x": 2964.9609699226594, + "y": 86.97904259878241 + }, + { + "type": "QPointF", + "x": 2920.7778125684367, + "y": 78.68237183752217 + }, + { + "type": "QPointF", + "x": 2881.731281757689, + "y": 72.38792359271476 + }, + { + "type": "QPointF", + "x": 2851.4826590738026, + "y": 68.96877993652426 + }, + { + "type": "QPointF", + "x": 2831.5261872065494, + "y": 68.39447976624034 + }, + { + "type": "QPointF", + "x": 2806.07487271148, + "y": 61.17040955713102 + }, + { + "type": "QPointF", + "x": 2914.8751101032244, + "y": -322.14660963573755 + } + ] +} diff --git a/src/test/ValentinaTest/share/smart_pattern_#36/input.json b/src/test/ValentinaTest/share/smart_pattern_#36/input.json index 539ab800f..c884f25b1 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#36/input.json +++ b/src/test/ValentinaTest/share/smart_pattern_#36/input.json @@ -246,21 +246,6 @@ "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", @@ -291,6 +276,21 @@ "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 73cd953c9..dc94f7c47 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#36/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#36/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -216.57559446259248, + "y": 21608.014646112726 }, { "type": "QPointF", - "x": -222.85996685366638, - "y": 21586.28344916246 + "x": -222.82601779268137, + "y": 21587.061010495858 }, { "type": "QPointF", @@ -132,8 +132,8 @@ }, { "type": "QPointF", - "x": 55.849455392117505, - "y": 22133.479634813404 + "x": 55.82641527988781, + "y": 22132.93457364255 }, { "type": "QPointF", @@ -152,8 +152,8 @@ }, { "type": "QPointF", - "x": 55.826415279887826, - "y": 22490.511095648795 + "x": 55.84945539211752, + "y": 22489.96603447794 }, { "type": "QPointF", @@ -282,18 +282,13 @@ }, { "type": "QPointF", - "x": -220.620815347658, - "y": 23026.447080003007 + "x": -220.46264595849237, + "y": 23025.538326035232 }, { "type": "QPointF", - "x": -216.13435317554772, - "y": 23014.48384648047 - }, - { - "type": "QPointF", - "x": -202.58580499399324, - "y": 22985.400282661478 + "x": -202.6052425243754, + "y": 22985.452196583858 }, { "type": "QPointF", @@ -347,8 +342,8 @@ }, { "type": "QPointF", - "x": -115.32578480080944, - "y": 22485.162420331548 + "x": -115.33334113373941, + "y": 22485.70747025547 }, { "type": "QPointF", @@ -367,8 +362,8 @@ }, { "type": "QPointF", - "x": -115.33334113373941, - "y": 22137.738199035874 + "x": -115.32578480080944, + "y": 22138.283248959797 }, { "type": "QPointF", @@ -422,13 +417,13 @@ }, { "type": "QPointF", - "x": -202.6152214315237, - "y": 21637.97693416576 + "x": -202.58580499399324, + "y": 21638.045386629867 }, { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -216.57559446259248, + "y": 21608.014646112726 } ] } diff --git a/src/test/ValentinaTest/share/smart_pattern_#99/output.json b/src/test/ValentinaTest/share/smart_pattern_#99/output.json index b6cd8bac8..a7b3ce448 100644 --- a/src/test/ValentinaTest/share/smart_pattern_#99/output.json +++ b/src/test/ValentinaTest/share/smart_pattern_#99/output.json @@ -2,38 +2,38 @@ "vector": [ { "type": "QPointF", - "x": 166.2793358771866, - "y": 317.0063195835933 + "x": 166.02062314300517, + "y": 312.9788859158875 }, { "type": "QPointF", - "x": 165.64505339863834, - "y": 297.1143398796336 + "x": 165.70933046188543, + "y": 293.23000247811854 }, { "type": "QPointF", - "x": 166.1722452473025, - "y": 280.2244654294098 + "x": 167.30604170523088, + "y": 274.50013264093303 }, { "type": "QPointF", - "x": 166.16205798196063, - "y": 276.72549910116425 + "x": 167.19749972538847, + "y": 269.95767347494336 }, { "type": "QPointF", - "x": 168.97844031610092, - "y": 256.82932371757767 + "x": 167.28869518172655, + "y": 266.6239856783655 }, { "type": "QPointF", - "x": 173.11677764302698, - "y": 240.88394423619718 + "x": 171.2459135294844, + "y": 247.0901582437869 }, { "type": "QPointF", - "x": 178.0948003175508, - "y": 228.9419652712462 + "x": 176.64841312963426, + "y": 231.89367477880018 }, { "type": "QPointF", @@ -47,8 +47,8 @@ }, { "type": "QPointF", - "x": 185.99757111618186, - "y": 217.49928602474253 + "x": 186.39376078521363, + "y": 217.17940045276504 }, { "type": "QPointF", @@ -82,18 +82,13 @@ }, { "type": "QPointF", - "x": 255.24575032218632, - "y": 191.05145610681262 + "x": 258.32256210111353, + "y": 190.9510874021363 }, { "type": "QPointF", - "x": 277.95765129804875, - "y": 191.65321329780488 - }, - { - "type": "QPointF", - "x": 285.5408358146581, - "y": 192.855354584027 + "x": 282.88849327137484, + "y": 192.3327170360014 }, { "type": "QPointF", @@ -107,28 +102,28 @@ }, { "type": "QPointF", - "x": 308.61498933509586, - "y": 205.17662895779023 + "x": 310.57923284664963, + "y": 206.8104493101314 }, { "type": "QPointF", - "x": 317.8211186961886, - "y": 213.7039790657329 + "x": 320.37180984256605, + "y": 216.47325684819089 }, { "type": "QPointF", - "x": 326.23567071378, - "y": 223.57518983261718 + "x": 328.8995060022702, + "y": 227.14525040044498 }, { "type": "QPointF", - "x": 335.7687333062743, - "y": 237.32368245582865 + "x": 337.94611732452876, + "y": 240.8170859291849 }, { "type": "QPointF", - "x": 351.5894679236029, - "y": 263.84403704994895 + "x": 351.57469774103606, + "y": 263.8115467734212 }, { "type": "QPointF", @@ -167,8 +162,8 @@ }, { "type": "QPointF", - "x": 371.3330132939416, - "y": 177.8252966333725 + "x": 374.66587589785377, + "y": 175.5116088179777 }, { "type": "QPointF", @@ -177,13 +172,8 @@ }, { "type": "QPointF", - "x": 401.24232600874655, - "y": 162.09376642883635 - }, - { - "type": "QPointF", - "x": 416.5041370775075, - "y": 156.9754834453434 + "x": 400.5329831004733, + "y": 162.36522176917418 }, { "type": "QPointF", @@ -197,28 +187,23 @@ }, { "type": "QPointF", - "x": 434.6801823142321, - "y": 153.28952836821526 + "x": 438.0633612753594, + "y": 153.03192944510397 }, { "type": "QPointF", - "x": 448.33671251987124, - "y": 152.809882511774 + "x": 455.2191266225963, + "y": 153.05624563323727 }, { "type": "QPointF", - "x": 465.38530369692694, - "y": 154.00600077743474 + "x": 472.13962450478647, + "y": 155.14589827825722 }, { "type": "QPointF", - "x": 475.68791359201066, - "y": 155.9902739944185 - }, - { - "type": "QPointF", - "x": 484.19308368052646, - "y": 159.05322984284635 + "x": 482.43834619808706, + "y": 158.29886734863854 }, { "type": "QPointF", @@ -237,18 +222,18 @@ }, { "type": "QPointF", - "x": 529.6792386289801, - "y": 203.52841021677506 + "x": 536.0426969749838, + "y": 211.60401356856727 }, { "type": "QPointF", - "x": 559.7613549461172, - "y": 242.4936218299132 + "x": 559.4375896091323, + "y": 242.04457762986158 }, { "type": "QPointF", - "x": 569.5835818133556, - "y": 257.3121087709943 + "x": 569.311475660773, + "y": 256.86701943291433 }, { "type": "QPointF", @@ -257,13 +242,8 @@ }, { "type": "QPointF", - "x": 585.014909318949, - "y": 286.9983512578358 - }, - { - "type": "QPointF", - "x": 591.1019941479228, - "y": 302.05819169893664 + "x": 586.6374302807619, + "y": 290.77190755205044 }, { "type": "QPointF", @@ -277,28 +257,23 @@ }, { "type": "QPointF", - "x": 591.4691411901464, - "y": 336.9021533252068 + "x": 590.6510591717047, + "y": 340.91518746861993 }, { "type": "QPointF", - "x": 587.7772567627065, - "y": 353.05391040771735 + "x": 585.4872424358157, + "y": 361.2157855904426 }, { "type": "QPointF", - "x": 582.8754009676815, - "y": 369.4196601831339 + "x": 579.9229547052828, + "y": 377.65318039832954 }, { "type": "QPointF", - "x": 576.3979894710554, - "y": 386.4062544290843 - }, - { - "type": "QPointF", - "x": 568.7091425226228, - "y": 402.8846548007183 + "x": 571.8578768835727, + "y": 396.3873347680203 }, { "type": "QPointF", @@ -312,68 +287,68 @@ }, { "type": "QPointF", - "x": 528.3345265604034, - "y": 476.92160008646584 + "x": 526.817689287619, + "y": 478.6960129039927 }, { "type": "QPointF", - "x": 520.2343656529063, - "y": 485.0367289659276 + "x": 519.0740546654762, + "y": 485.9591789956344 }, { "type": "QPointF", - "x": 513.148845575274, - "y": 489.9896405767957 + "x": 509.94726195445895, + "y": 491.73200570919147 }, { "type": "QPointF", - "x": 505.5219398390943, - "y": 493.75314459015317 + "x": 499.48882330035383, + "y": 496.0219887131292 }, { "type": "QPointF", - "x": 493.1624730540218, - "y": 498.00078352401664 + "x": 483.1823868029168, + "y": 500.5066198031956 }, { "type": "QPointF", - "x": 476.32590489565666, - "y": 501.8211255823292 + "x": 469.31906002715755, + "y": 502.76699104452376 }, { "type": "QPointF", - "x": 465.68981801438673, - "y": 503.0580521806556 + "x": 458.61213259187986, + "y": 503.1196305607171 }, { "type": "QPointF", - "x": 454.9458499674166, - "y": 502.9444423349683 + "x": 443.8536819162971, + "y": 501.9185119737654 }, { "type": "QPointF", - "x": 439.3060103264079, - "y": 501.3191976012906 + "x": 427.1929958670552, + "y": 499.2248924703412 }, { "type": "QPointF", - "x": 423.2043144587875, - "y": 498.34929359863105 + "x": 415.2822129385592, + "y": 496.2167954717386 }, { "type": "QPointF", - "x": 411.3722974923289, - "y": 494.89048056695367 + "x": 405.51268591803284, + "y": 492.34625734655305 }, { "type": "QPointF", - "x": 404.0462328838181, - "y": 491.56426076213603 + "x": 399.1440538155622, + "y": 488.76255604621974 }, { "type": "QPointF", - "x": 397.6192436403225, - "y": 487.3958668879086 + "x": 397.651509179127, + "y": 487.0589090075787 }, { "type": "QPointF", @@ -382,23 +357,28 @@ }, { "type": "QPointF", - "x": 389.46280257533397, - "y": 476.7991800818359 + "x": 388.7637811139682, + "y": 475.5345799921174 }, { "type": "QPointF", - "x": 385.21740968628404, - "y": 467.7455266773488 + "x": 384.02761759391484, + "y": 464.5866207957423 }, { "type": "QPointF", - "x": 381.98288724618385, - "y": 458.53069141599417 + "x": 380.4304614262938, + "y": 453.47849078579617 }, { "type": "QPointF", - "x": 368.3461454578772, - "y": 411.2975955501923 + "x": 368.49295008766654, + "y": 411.6985932639229 + }, + { + "type": "QPointF", + "x": 367.6462390140756, + "y": 411.29354992278223 }, { "type": "QPointF", @@ -407,8 +387,8 @@ }, { "type": "QPointF", - "x": 354.94905309156206, - "y": 444.28762369139116 + "x": 355.1561846360663, + "y": 443.7676398081635 }, { "type": "QPointF", @@ -417,13 +397,13 @@ }, { "type": "QPointF", - "x": 340.52244605437, - "y": 471.85996007627705 + "x": 339.0381408643451, + "y": 473.9103469636046 }, { "type": "QPointF", - "x": 332.3013407792153, - "y": 481.91406607342856 + "x": 328.4003671533969, + "y": 485.7230912940063 }, { "type": "QPointF", @@ -432,13 +412,13 @@ }, { "type": "QPointF", - "x": 308.4504919589761, - "y": 496.94455134299847 + "x": 306.70041004704234, + "y": 497.47875631537966 }, { "type": "QPointF", - "x": 293.41117665937344, - "y": 500.741531068732 + "x": 290.47717224660175, + "y": 501.3077427754172 }, { "type": "QPointF", @@ -467,48 +447,48 @@ }, { "type": "QPointF", - "x": 220.20894480356736, - "y": 493.9717974895532 + "x": 219.11733302477276, + "y": 493.5618654509618 }, { "type": "QPointF", - "x": 214.23653207492043, - "y": 491.72898244053755 + "x": 212.63608885738194, + "y": 490.0800375140309 }, { "type": "QPointF", - "x": 199.2867956563084, - "y": 474.27137643587264 + "x": 202.91098065710946, + "y": 479.33521360057284 }, { "type": "QPointF", - "x": 193.05436777423637, - "y": 463.35364232842176 + "x": 196.03783581368415, + "y": 468.9566791455622 }, { "type": "QPointF", - "x": 186.4552262793201, - "y": 447.9927324953534 + "x": 188.96153147430664, + "y": 454.3702537301474 }, { "type": "QPointF", - "x": 181.07652203439048, - "y": 431.23130737455057 + "x": 183.1651247359179, + "y": 438.3396830609576 }, { "type": "QPointF", - "x": 176.74074040059125, - "y": 412.44411172139985 + "x": 178.31430533286823, + "y": 420.11842584896306 }, { "type": "QPointF", - "x": 174.31642834550638, - "y": 396.57264472089304 + "x": 174.82594122279494, + "y": 400.59766857295676 }, { "type": "QPointF", - "x": 166.2793358771866, - "y": 317.0063195835933 + "x": 166.02062314300517, + "y": 312.9788859158875 } ] } diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index b0e383255..738852acf 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -143,5 +143,7 @@ smart_pattern_#120_piece_1/output.json smart_pattern_#120_piece_2/input.json smart_pattern_#120_piece_2/output.json + smart_pattern_#133/input.json + smart_pattern_#133/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 4a28780eb..022699162 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -1053,6 +1053,12 @@ void TST_VAbstractPiece::EquidistantAngleType_data() QStringLiteral("://smart_pattern_#118/input.json"), QStringLiteral("://smart_pattern_#118/output.json"), 26.45669291338583 /*seam allowance width*/); + + // See file src/app/share/collection/bugs/smart_pattern_#133.val (private collection) + ASSERT_TEST_CASE("Эдит 1", + QStringLiteral("://smart_pattern_#133/input.json"), + QStringLiteral("://smart_pattern_#133/output.json"), + 26.45669291338583 /*seam allowance width*/); } //---------------------------------------------------------------------------------------------------------------------