From cecc1dfd4e4b259467d15c8fbb3ce96b5da0e3de Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Feb 2021 18:29:54 +0200 Subject: [PATCH] Incorrect fix of seam allowance distortion. Closes smart-pattern/valentina#99 --- ChangeLog.txt | 1 + .../collection/bugs/smart_pattern_#99.val | 264 ++ src/libs/vlayout/vabstractpiece.cpp | 6 +- .../output.json | 36 +- .../output.json | 20 +- .../DP_6_hem_by_intersection/output.json | 20 +- .../share/DP_6_hem_by_length/output.json | 20 +- .../output.json | 20 +- .../output.json | 20 +- .../share/Issue_298_case1/output.json | 25 +- .../Issue_767_Fabric_TopCollar/output.json | 8 +- .../share/Issue_880_Detail/output.json | 43 +- .../share/Issue_923_test7_1/output.json | 41 +- .../share/Issue_937_case_1a/output.json | 30 +- src/test/ValentinaTest/share/doll/output.json | 23 +- .../loop_start_point_on_line/output.json | 29 +- .../share/panties_case1/output.json | 24 +- .../share/seamtest1_by_angle/output.json | 32 +- .../share/seamtest1_by_angle_2/output.json | 4 +- .../output.json | 36 +- .../output.json | 34 +- .../seamtest1_by_intersection/output.json | 36 +- .../output.json | 36 +- .../output.json | 34 +- .../share/smart_pattern_#99/input.json | 2840 +++++++++++++++++ .../share/smart_pattern_#99/output.json | 539 ++++ src/test/ValentinaTest/share/test_data.qrc | 2 + src/test/ValentinaTest/tst_vabstractpiece.cpp | 6 + 28 files changed, 3948 insertions(+), 281 deletions(-) create mode 100644 src/app/share/collection/bugs/smart_pattern_#99.val create mode 100644 src/test/ValentinaTest/share/smart_pattern_#99/input.json create mode 100644 src/test/ValentinaTest/share/smart_pattern_#99/output.json diff --git a/ChangeLog.txt b/ChangeLog.txt index 26c0ceab2..338b15a19 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,7 @@ - Fix incorrect seam allowance for angle type second edge right angle. - Fix regression with country flags. - Fix bug in seam allowance. +- [smart-pattern/valentina#99] Incorrect fix of seam allowance distortion. # Version 0.7.44 Feb 9, 2021 - Placeholder %size% has incorrect value. diff --git a/src/app/share/collection/bugs/smart_pattern_#99.val b/src/app/share/collection/bugs/smart_pattern_#99.val new file mode 100644 index 000000000..36a571447 --- /dev/null +++ b/src/app/share/collection/bugs/smart_pattern_#99.val @@ -0,0 +1,264 @@ + + + + 0.8.10 + cm + + https://lesenchanteesleblog.com/2016/06/09/diy-doudou-elephant-avec-patron/ + Éléphant + + Les enchantées + + 2000-01-01 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index e8c5ecf2b..bdecf18c2 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -1067,6 +1067,9 @@ QVector VAbstractPiece::Equidistant(QVector points, qreal wid // DumpVector(points, QStringLiteral("input.json.XXXXXX")); // Uncomment for dumping test data + // Fix distorsion. Must be done before the correction + points = CorrectPathDistortion(points); + points = CorrectEquidistantPoints(points); if ( points.size() < 3 ) { @@ -1076,9 +1079,6 @@ QVector VAbstractPiece::Equidistant(QVector points, qreal wid return QVector(); } - // Fix distorsion - points = CorrectPathDistortion(points); - if (points.last().toPoint() != points.first().toPoint()) { points.append(points.at(0));// Should be always closed 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 e58994553..0a5e542cc 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 @@ -3,17 +3,17 @@ { "type": "QPointF", "x": 1984.9598604245455, - "y": 3107.491870978859 + "y": 3107.470448669474 }, { "type": "QPointF", - "x": 2022.7551360150967, - "y": 3107.491870978859 + "x": 2013.1486925189367, + "y": 3107.3642519699065 }, { "type": "QPointF", - "x": 1997.303734527605, - "y": 3106.611912858666 + "x": 1997.045434010333, + "y": 3106.5860997317195 }, { "type": "QPointF", @@ -22,8 +22,8 @@ }, { "type": "QPointF", - "x": 1964.1663907800346, - "y": 3102.675519252714 + "x": 1964.1685608395817, + "y": 3102.6667943667003 }, { "type": "QPointF", @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -228,7 +228,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -337,13 +337,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", @@ -433,7 +433,7 @@ { "type": "QPointF", "x": 1984.9598604245455, - "y": 3107.491870978859 + "y": 3107.470448669474 } ] } 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 9f9c2f886..c13751998 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 @@ -57,18 +57,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -218,7 +218,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -327,13 +327,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", 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 9f9c2f886..c13751998 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 @@ -57,18 +57,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -218,7 +218,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -327,13 +327,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", 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 9f9c2f886..c13751998 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 @@ -57,18 +57,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -218,7 +218,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -327,13 +327,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", 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 9f9c2f886..c13751998 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 @@ -57,18 +57,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -218,7 +218,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -327,13 +327,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", 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 9f9c2f886..c13751998 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 @@ -57,18 +57,18 @@ }, { "type": "QPointF", - "x": 1839.3034779579243, - "y": 3040.645910842773 + "x": 1839.1287556560546, + "y": 3040.4942247221857 }, { "type": "QPointF", - "x": 1828.0836807590824, - "y": 3029.6509944986296 + "x": 1827.775230874743, + "y": 3029.062323188764 }, { "type": "QPointF", - "x": 1817.4235118214906, - "y": 3017.918878796319 + "x": 1817.5669314293834, + "y": 3018.0953984398657 }, { "type": "QPointF", @@ -218,7 +218,7 @@ { "type": "QPointF", "x": 2750.0942175506984, - "y": 342.49876114111674 + "y": 342.4987611411168 }, { "type": "QPointF", @@ -327,13 +327,13 @@ }, { "type": "QPointF", - "x": 2654.824750408218, + "x": 2654.8247504082183, "y": 1037.6541962965302 }, { "type": "QPointF", - "x": 2707.7220622041555, - "y": 1038.9183044833856 + "x": 2707.722062204155, + "y": 1038.9183044833865 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_298_case1/output.json b/src/test/ValentinaTest/share/Issue_298_case1/output.json index f7c9f2516..4557fee35 100644 --- a/src/test/ValentinaTest/share/Issue_298_case1/output.json +++ b/src/test/ValentinaTest/share/Issue_298_case1/output.json @@ -2,18 +2,23 @@ "vector": [ { "type": "QPointF", - "x": 1180.7645816208317, - "y": -59.00020617354858 + "x": 1181.3702112033557, + "y": -59.406362870594876 }, { "type": "QPointF", - "x": 1268.5261798074243, - "y": 36.98562468383665 + "x": 1269.0394640469171, + "y": 38.62919078337234 }, { "type": "QPointF", - "x": 1198.6315176611233, - "y": 123.38243039634041 + "x": 1216.9245192058738, + "y": 100.21766491121538 + }, + { + "type": "QPointF", + "x": 1198.8808131327262, + "y": 123.03980191699638 }, { "type": "QPointF", @@ -67,8 +72,8 @@ }, { "type": "QPointF", - "x": 1071.9609663888264, - "y": 391.03989292886365 + "x": 1071.9871584114776, + "y": 391.04623791365884 }, { "type": "QPointF", @@ -127,8 +132,8 @@ }, { "type": "QPointF", - "x": 1180.7645816208317, - "y": -59.00020617354858 + "x": 1181.3702112033557, + "y": -59.406362870594876 } ] } diff --git a/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json b/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json index 1a53379f0..157aa7178 100644 --- a/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json +++ b/src/test/ValentinaTest/share/Issue_767_Fabric_TopCollar/output.json @@ -42,13 +42,13 @@ }, { "type": "QPointF", - "x": -2735.5637236706502, - "y": -1198.8327987897178 + "x": -2735.8620865001744, + "y": -1198.3515401880197 }, { "type": "QPointF", - "x": -2709.3301962544565, - "y": -1242.350944420334 + "x": -2709.429611880214, + "y": -1242.5497829527835 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_880_Detail/output.json b/src/test/ValentinaTest/share/Issue_880_Detail/output.json index 5601bab9d..6e12aacbb 100644 --- a/src/test/ValentinaTest/share/Issue_880_Detail/output.json +++ b/src/test/ValentinaTest/share/Issue_880_Detail/output.json @@ -2,13 +2,18 @@ "vector": [ { "type": "QPointF", - "x": 207.8356097595722, - "y": 1768.5574036876958 + "x": 207.97524435031346, + "y": 1768.5451872439698 }, { "type": "QPointF", - "x": 173.0793708392803, - "y": 1567.494455438128 + "x": 192.3532472917225, + "y": 1678.5395352135974 + }, + { + "type": "QPointF", + "x": 173.06637823139368, + "y": 1567.4188366954345 }, { "type": "QPointF", @@ -22,8 +27,8 @@ }, { "type": "QPointF", - "x": 113.91684776027131, - "y": 1184.789433696898 + "x": 113.98342747073067, + "y": 1185.2608588355108 }, { "type": "QPointF", @@ -37,8 +42,8 @@ }, { "type": "QPointF", - "x": 36.983437936436985, - "y": 552.2646069820005 + "x": 37.02982091108014, + "y": 552.7177947831434 }, { "type": "QPointF", @@ -52,13 +57,13 @@ }, { "type": "QPointF", - "x": -12.288070724611142, - "y": -17.710595485938104 + "x": -12.288070724611146, + "y": -17.71059548593819 }, { "type": "QPointF", - "x": 26.31665967166907, - "y": -20.64315536140112 + "x": 26.316659671669136, + "y": -20.643155361401213 }, { "type": "QPointF", @@ -252,18 +257,18 @@ }, { "type": "QPointF", - "x": 967.4782824078412, - "y": 182.05248051659785 + "x": 967.4782824078413, + "y": 182.0524805165979 }, { "type": "QPointF", - "x": 1004.0810458391544, - "y": 191.4716400415735 + "x": 1004.0810458391545, + "y": 191.47164004157355 }, { "type": "QPointF", "x": 988.9976255298626, - "y": 250.08566646847305 + "y": 250.08566646847308 }, { "type": "QPointF", @@ -377,8 +382,8 @@ }, { "type": "QPointF", - "x": 207.8356097595722, - "y": 1768.5574036876958 + "x": 207.97524435031346, + "y": 1768.5451872439698 } ] } 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 26b81ae55..ed21365e3 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -2,18 +2,23 @@ "vector": [ { "type": "QPointF", - "x": -219.1132362274485, - "y": 59.76521424266423 + "x": -218.4362476442146, + "y": 60.082487681666066 }, { "type": "QPointF", - "x": -196.65773024177247, - "y": 112.02910670072471 + "x": -196.73040945651604, + "y": 111.99504529263494 }, { "type": "QPointF", - "x": -214.89666292622343, - "y": 166.89727659461172 + "x": -202.58871262669427, + "y": 128.53121708773386 + }, + { + "type": "QPointF", + "x": -214.84435298014208, + "y": 166.70961534534916 }, { "type": "QPointF", @@ -32,18 +37,18 @@ }, { "type": "QPointF", - "x": -243.47320060147146, - "y": 300.99291812881216 + "x": -243.2111745960838, + "y": 301.26085147159137 }, { "type": "QPointF", - "x": -246.1759764951169, - "y": 334.7350801577321 + "x": -246.32424570745619, + "y": 331.5659013496832 }, { "type": "QPointF", - "x": -251.05534306180104, - "y": 356.3979584259171 + "x": -247.36754301589642, + "y": 354.40670968863236 }, { "type": "QPointF", @@ -102,8 +107,8 @@ }, { "type": "QPointF", - "x": -415.23237001939634, - "y": 388.15813749078177 + "x": -414.7876067251059, + "y": 388.13579550460213 }, { "type": "QPointF", @@ -137,8 +142,8 @@ }, { "type": "QPointF", - "x": -722.1497906411519, - "y": 384.93382569436017 + "x": -721.6778577696439, + "y": 384.9687413227849 }, { "type": "QPointF", @@ -252,8 +257,8 @@ }, { "type": "QPointF", - "x": -219.1132362274485, - "y": 59.76521424266423 + "x": -218.4362476442146, + "y": 60.082487681666066 } ] } 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 4dbc8b3a5..e5d6c75db 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_1a/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_1a/output.json @@ -52,18 +52,18 @@ }, { "type": "QPointF", - "x": 1816.1141828457614, - "y": 212.3887020561369 + "x": 1816.1141828457537, + "y": 212.38870205614276 }, { "type": "QPointF", - "x": 1821.1582741564016, - "y": 207.9156854487886 + "x": 1821.158274156406, + "y": 207.91568544878376 }, { "type": "QPointF", "x": 1829.8906021517287, - "y": 197.95711777636723 + "y": 197.95711777636726 }, { "type": "QPointF", @@ -132,28 +132,28 @@ }, { "type": "QPointF", - "x": 2043.8408021651217, - "y": -231.36182837730803 + "x": 2043.470724801957, + "y": -231.58427464889738 }, { "type": "QPointF", - "x": 2048.5472886712973, - "y": -256.8983432709658 + "x": 2048.852905918943, + "y": -256.66210067911084 }, { "type": "QPointF", - "x": 2055.2130708651216, - "y": -292.0522999673984 + "x": 2054.8508178913967, + "y": -292.384011086662 }, { "type": "QPointF", - "x": 2096.2010430479354, - "y": -305.76697662558325 + "x": 2095.52601931633, + "y": -306.38508853570886 }, { "type": "QPointF", - "x": 2118.596734377698, - "y": -285.25948496501354 + "x": 2118.596734377724, + "y": -285.25948496499177 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/doll/output.json b/src/test/ValentinaTest/share/doll/output.json index 0bedf284f..c87cc2e59 100644 --- a/src/test/ValentinaTest/share/doll/output.json +++ b/src/test/ValentinaTest/share/doll/output.json @@ -42,13 +42,8 @@ }, { "type": "QPointF", - "x": 182.57176177093885, - "y": 307.54028260167195 - }, - { - "type": "QPointF", - "x": 183.22877397002802, - "y": 304.74101381048894 + "x": 183.2925825930999, + "y": 304.79941219485175 }, { "type": "QPointF", @@ -97,23 +92,23 @@ }, { "type": "QPointF", - "x": -35.8670113621213, - "y": 351.0160620770652 + "x": -35.867011362121275, + "y": 351.01606207706516 }, { "type": "QPointF", - "x": -71.33016037970901, - "y": 144.14769280779635 + "x": -71.33016037970897, + "y": 144.14769280779652 }, { "type": "QPointF", - "x": 325.80435893876364, - "y": 76.06748949606039 + "x": 325.8043589387637, + "y": 76.06748949606035 }, { "type": "QPointF", "x": 330.9882848734929, - "y": 102.87077188278467 + "y": 102.87077188278468 }, { "type": "QPointF", 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 4dd4400af..2d339d6fc 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 @@ -2,18 +2,23 @@ "vector": [ { "type": "QPointF", - "x": -2164.841154977491, - "y": -1195.3118331606747 + "x": -2165.385424573768, + "y": -1195.2534638392945 }, { "type": "QPointF", - "x": -2118.43416950323, - "y": -1210.583578833799 + "x": -2158.364241613096, + "y": -1197.537569688092 }, { "type": "QPointF", - "x": -2082.437616769119, - "y": -1220.0101487988097 + "x": -2117.551298201531, + "y": -1210.8146888395456 + }, + { + "type": "QPointF", + "x": -2083.1478929409827, + "y": -1220.0868889606825 }, { "type": "QPointF", @@ -352,13 +357,13 @@ }, { "type": "QPointF", - "x": -2141.1199442290053, - "y": 2.4962907724991394 + "x": -2141.1199442289458, + "y": 2.49629077248366 }, { "type": "QPointF", - "x": -2191.9582652746717, - "y": 12.914358254731537 + "x": -2191.958265274672, + "y": 12.91435825472845 }, { "type": "QPointF", @@ -367,8 +372,8 @@ }, { "type": "QPointF", - "x": -2164.841154977491, - "y": -1195.3118331606747 + "x": -2165.385424573768, + "y": -1195.2534638392945 } ] } diff --git a/src/test/ValentinaTest/share/panties_case1/output.json b/src/test/ValentinaTest/share/panties_case1/output.json index 7ff3a3c62..210fe442f 100644 --- a/src/test/ValentinaTest/share/panties_case1/output.json +++ b/src/test/ValentinaTest/share/panties_case1/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 1786.0710599536046, - "y": 557.5240420963199 + "x": 1786.5659489404482, + "y": 557.5134215650199 }, { "type": "QPointF", - "x": 1749.6370245691528, - "y": 576.8618185344574 + "x": 1749.5520466515043, + "y": 576.9120200174077 }, { "type": "QPointF", @@ -67,17 +67,17 @@ }, { "type": "QPointF", - "x": 1525.37666027745, - "y": 809.8047500951102 + "x": 1525.1842993824857, + "y": 810.2370420401115 }, { "type": "QPointF", - "x": 1522.1062814637592, + "x": 1521.8348817961976, "y": 818.5825511811023 }, { "type": "QPointF", - "x": 1522.1062814637592, + "x": 1521.8348817961976, "y": 845.0392440944881 }, { @@ -107,13 +107,13 @@ }, { "type": "QPointF", - "x": 1696.2923013503678, - "y": 48.363400642197 + "x": 1696.2690262201031, + "y": 48.3645621551752 }, { "type": "QPointF", - "x": 1786.0710599536046, - "y": 557.5240420963199 + "x": 1786.5659489404482, + "y": 557.5134215650199 } ] } diff --git a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json index a52ae008e..51d6dcf24 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -67,13 +67,13 @@ }, { "type": "QPointF", - "x": 285.16939607807876, - "y": -68.9102571433973 + "x": 285.16939607807865, + "y": -68.91025714339723 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -83,17 +83,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -252,23 +252,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", 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 869ca88a2..7e2ce0cfa 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json @@ -197,8 +197,8 @@ }, { "type": "QPointF", - "x": 46.111397855976776, - "y": 2.027726815668483 + "x": 46.111397855976755, + "y": 2.027726815668484 }, { "type": "QPointF", 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 b93e8ff38..6c23608ec 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 @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -77,18 +77,18 @@ }, { "type": "QPointF", - "x": 330.25975933130064, - "y": -109.86937656993382 + "x": 330.2597593313006, + "y": -109.8693765699337 }, { "type": "QPointF", - "x": 335.0862325583723, - "y": -62.02308576348085 + "x": 335.08623255837216, + "y": -62.0230857634808 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -98,17 +98,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -267,23 +267,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", 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 1ff3aaa38..ed69f50c4 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 @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -78,17 +78,17 @@ { "type": "QPointF", "x": 308.85408734019427, - "y": -89.23259539188258 + "y": -89.2325953918828 }, { "type": "QPointF", - "x": 335.086232558372, - "y": -62.02308576348083 + "x": 335.0862325583717, + "y": -62.023085763480815 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -98,17 +98,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -267,23 +267,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json index 70cde564a..1fa3de755 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 284.4959443876259, - "y": -68.4308753608727 + "x": 284.4959443876258, + "y": -68.43087536087263 }, { "type": "QPointF", - "x": 335.0862325583722, - "y": -62.02308576348085 + "x": 335.08623255837205, + "y": -62.023085763480815 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -88,17 +88,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -257,23 +257,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", 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 6ac8f2b7a..b1182dcbc 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 @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 286.0749094907468, - "y": -69.55482696186911 + "x": 286.0749094907467, + "y": -69.55482696186903 }, { "type": "QPointF", - "x": 286.564782103786, - "y": -68.71773166746935 + "x": 286.5647821037859, + "y": -68.71773166746928 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -88,17 +88,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -257,23 +257,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", 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 fc277af66..83784e3b1 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 @@ -12,7 +12,7 @@ }, { "type": "QPointF", - "x": 46.111397855976776, + "x": 46.11139785597676, "y": 2.027726815668483 }, { @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 284.4390076163078, + "x": 284.4390076163077, "y": -68.44485122652873 }, { "type": "QPointF", - "x": 284.5734311894893, - "y": -68.99248415563493 + "x": 284.5734311894892, + "y": -68.99248415563486 }, { "type": "QPointF", "x": 556.9804629248772, - "y": -31.407692230837736 + "y": -31.407692230837753 }, { "type": "QPointF", @@ -88,17 +88,17 @@ { "type": "QPointF", "x": 586.153833178555, - "y": -21.217486096297492 + "y": -21.2174860962975 }, { "type": "QPointF", - "x": 1117.7037149530322, - "y": 212.15307563552173 + "x": 1117.7037149530324, + "y": 212.15307563552184 }, { "type": "QPointF", "x": 1101.8482040478996, - "y": 244.8082798528157 + "y": 244.80827985281576 }, { "type": "QPointF", @@ -257,23 +257,23 @@ }, { "type": "QPointF", - "x": 1104.502219000503, - "y": 705.4274804063973 + "x": 1104.0444208482252, + "y": 705.3744462055462 }, { "type": "QPointF", - "x": 1110.9097384210777, - "y": 705.8266456692913 + "x": 1111.3488014116294, + "y": 705.7937559506272 }, { "type": "QPointF", - "x": 1290.2822996456107, - "y": 705.8266456692913 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.4618913981099, - "y": 882.3181914081317 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/smart_pattern_#99/input.json b/src/test/ValentinaTest/share/smart_pattern_#99/input.json new file mode 100644 index 000000000..0142fbc46 --- /dev/null +++ b/src/test/ValentinaTest/share/smart_pattern_#99/input.json @@ -0,0 +1,2840 @@ +{ + "vector": [ + { + "type": "VSAPoint", + "x": 198.58635590551182, + "y": 353.88472440944884 + }, + { + "type": "VSAPoint", + "x": 195.44059463069686, + "y": 323.6609671191231 + }, + { + "type": "VSAPoint", + "x": 195.44059463069686, + "y": 323.6609671191231 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 195.20762078055733, + "y": 321.8797222362904 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.7976977608299, + "y": 318.3158379812819 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.45370521825592, + "y": 314.7550851910324 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.1741996644928, + "y": 311.20280258995297 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.95773761119779, + "y": 307.66432890245505 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.80287557002825, + "y": 304.1450028529502 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.70817005264152, + "y": 300.6501631658497 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.67217757069486, + "y": 297.1851485655649 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.6934546358456, + "y": 293.7552977765071 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.77055775975109, + "y": 290.3659495230879 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 193.90204345406858, + "y": 287.02244252971855 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.08646823045552, + "y": 283.7301155208104 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.32238860056913, + "y": 280.494307220775 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.6083610760667, + "y": 277.3203563540235 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 194.9429421686056, + "y": 274.2136016449675 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 195.32468838984317, + "y": 271.1793818180183 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 195.7521562514367, + "y": 268.2230355975872 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 196.2239022650435, + "y": 265.3499017080858 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 196.73848294232093, + "y": 262.5653188739253 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 197.29445479492625, + "y": 259.87462581951706 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 197.89037433451682, + "y": 257.28316126927257 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 198.52479807274992, + "y": 254.79626394760317 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 199.1962825212829, + "y": 252.41927257892027 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 199.90338419177309, + "y": 250.15752588763524 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 200.64465959587778, + "y": 248.01636259815945 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 201.41866524525432, + "y": 246.0011214349043 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 202.22395765156, + "y": 244.11714112228117 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 203.0590933264521, + "y": 242.36976038470146 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 203.922628781588, + "y": 240.7643179465765 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 204.813120528625, + "y": 239.30615253231772 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 205.7291250792205, + "y": 238.00060286633655 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 206.66919894503167, + "y": 236.8530076730443 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 207.14872345114864, + "y": 236.34702646167284 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 207.5437859944171, + "y": 235.94921354021335 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 208.38372570939168, + "y": 235.16285990819495 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 209.28123047098472, + "y": 234.38820159417082 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 210.23384193752233, + "y": 233.62587044804485 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 211.23910176733048, + "y": 232.8764983197209 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 212.29455161873523, + "y": 232.14071705910297 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 213.9609495429977, + "y": 231.06201390523137 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 216.34348927529902, + "y": 229.67957878907822 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 218.88253894385514, + "y": 228.3628804420194 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 221.55843181527422, + "y": 227.11697366328622 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 224.3515011561645, + "y": 225.94691325210994 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 227.24208023313406, + "y": 224.8577540077218 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 230.21050231279122, + "y": 223.8545507293532 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 233.23710066174408, + "y": 222.9423582162354 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 236.30220854660087, + "y": 222.12623126759968 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 239.38615923396975, + "y": 221.4112246826773 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 242.4692859904589, + "y": 220.8023932606996 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 245.53192208267654, + "y": 220.30479180089787 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 248.5544007772309, + "y": 219.92347510250346 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 250.04153285045976, + "y": 219.78316428693768 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 251.36948934464183, + "y": 219.6712363758457 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 254.01441676024405, + "y": 219.4921394194099 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 256.63178653618434, + "y": 219.3640065157158 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 259.20562650318743, + "y": 219.28378590236764 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 261.7199644919781, + "y": 219.24842581696987 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 264.15882833328124, + "y": 219.25487449712676 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 266.5062458578217, + "y": 219.30008018044273 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 268.7462448963241, + "y": 219.38099110452202 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 270.8628532795133, + "y": 219.4945555069691 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 272.8400988381141, + "y": 219.63772162538817 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 274.6620094028513, + "y": 219.8074376973837 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 276.3126128044497, + "y": 220.00065196055994 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 277.77593687363407, + "y": 220.21431265252124 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 279.0360094411292, + "y": 220.44536801087196 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 280.0768583376599, + "y": 220.69076627321652 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 280.88251139395106, + "y": 220.94745567715916 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 281.18135009185187, + "y": 221.07936061056466 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 281.948007948733, + "y": 221.4519730655319 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 283.45715814901877, + "y": 222.24744636182504 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 284.93781861237056, + "y": 223.1011271432315 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 286.390554760164, + "y": 224.0106925447323 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 287.81593201377444, + "y": 224.97381970130846 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 289.21451579457744, + "y": 225.9881857479409 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 290.58687152394856, + "y": 227.0514678196107 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 291.9335646232631, + "y": 228.16134305129876 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 293.2551605138968, + "y": 229.31548857798614 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 294.5522246172249, + "y": 230.51158153465383 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 295.8253223546231, + "y": 231.74729905628277 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 297.0750191474667, + "y": 233.02031827785407 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 298.9096728488409, + "y": 234.99076971319937 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 301.27544582370706, + "y": 237.73274397576768 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 303.5577926051139, + "y": 240.58211346776312 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 305.76123656406554, + "y": 243.52029526903362 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 307.89030107156583, + "y": 246.52870645942727 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 309.9495094986187, + "y": 249.58876411879191 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 311.9433852162279, + "y": 252.6818853269756 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 313.87645159539755, + "y": 255.7894871638263 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 316.6781161425151, + "y": 260.4413880439845 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 320.23367332226366, + "y": 266.52048044786346 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 323.62741382632424, + "y": 272.32300280367394 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 326.0852179376047, + "y": 276.3871923316866 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 327.69465096539847, + "y": 278.94165407240035 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 329.2839849937877, + "y": 281.3433501604128 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 330.8577433937766, + "y": 283.573697675572 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 332.420449536369, + "y": 285.614113697726 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 333.5878491785744, + "y": 287.0016527715505 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 334.3651537171393, + "y": 287.8619906752309 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 335.14223958754485, + "y": 288.6643928130745 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 335.9196722111664, + "y": 289.40653632006234 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 336.6980170093795, + "y": 290.08609833117526 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 337.47783940355964, + "y": 290.70075598139437 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 338.2597048150824, + "y": 291.2481864057006 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 339.044178665323, + "y": 291.726066739075 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 339.8318263756572, + "y": 292.13207411649853 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 340.6232133674604, + "y": 292.4638856729522 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 341.41890506210814, + "y": 292.7191785434169 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 342.2194668809758, + "y": 292.8956298628739 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 343.0254642454389, + "y": 292.99091676630394 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 343.837462576873, + "y": 293.0027163886881 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 344.2461741785104, + "y": 292.97295875839563 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 346.88768992531834, + "y": 292.73215489623624 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 351.23440304955113, + "y": 292.2998320037016 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 354.75073308317246, + "y": 291.87195323420866 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 357.7624566402359, + "y": 291.38774339320213 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 360.59535033479494, + "y": 290.786427286127 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 363.5751907809032, + "y": 290.0072297184281 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 368.91293941662684, + "y": 288.41318732099745 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 373.8592248347916, + "y": 286.8658924179524 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 374.1451674476813, + "y": 286.7679914601762 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 374.6964855145127, + "y": 286.4934512822858 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 375.22373191009376, + "y": 286.12694615697745 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 375.7275832116321, + "y": 285.67127715912585 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 376.20871599633546, + "y": 285.1292453636056 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 376.66780684141156, + "y": 284.50365184529153 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 377.105532324068, + "y": 283.7972976790584 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 377.5225690215127, + "y": 283.01298393978084 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 377.91959351095335, + "y": 282.1535117023336 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 378.2972823695976, + "y": 281.2216820415914 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 378.8312468859348, + "y": 279.70256407510203 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 379.4787297449376, + "y": 277.4383731123447 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 380.06104847049403, + "y": 274.9351718041527 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 380.58361568026555, + "y": 272.2153687495237 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 381.05184399191415, + "y": 269.3013725474557 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 381.4711460231015, + "y": 266.21559179694646 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 381.8469343914894, + "y": 262.9804350969937 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 382.1846217147396, + "y": 259.6183110465954 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 382.48962061051395, + "y": 256.1516282447492 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 382.9000628642084, + "y": 250.81064235006716 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 383.6045465565004, + "y": 239.84679130850327 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 384.2798399454308, + "y": 229.06982569734083 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 384.7885816319727, + "y": 222.2711764773906 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 385.2351809018886, + "y": 217.52609914225883 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 385.57010284557026, + "y": 214.55258204486802 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 385.94270039137905, + "y": 211.76581798300094 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 386.35838615697674, + "y": 209.1882155556554 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 386.8225727600252, + "y": 206.84218336182926 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 387.3406728181859, + "y": 204.75013000052024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 387.769865392537, + "y": 203.3704060699863 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.07442484200965, + "y": 202.5358715752801 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.3955072526952, + "y": 201.7774366256395 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.7337892018013, + "y": 201.09790229593915 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.91035036714914, + "y": 200.79206079247547 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 389.0789491499009, + "y": 200.52494283760456 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 389.51941679452824, + "y": 199.97212551072292 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 390.0783869975469, + "y": 199.3987517970538 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 390.74983582944856, + "y": 198.8067564896864 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 391.52773936072515, + "y": 198.1980743817099 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 392.4060736618683, + "y": 197.5746402662135 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 393.8880340930217, + "y": 196.61730081685124 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 396.1750001604089, + "y": 195.30513805780922 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 398.75525857611456, + "y": 193.96879354429296 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 401.580617904073, + "y": 192.62374562101598 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 404.6028867082182, + "y": 191.28547263269178 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 407.7738735524845, + "y": 189.96945292403387 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 411.04538700080604, + "y": 188.6911648397558 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 414.3692356171171, + "y": 187.46608672457103 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 417.6972279653519, + "y": 186.30969692319317 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 420.9811726094447, + "y": 185.2374737803357 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 424.1728781133296, + "y": 184.26489564071207 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 427.2241530409409, + "y": 183.40744084903588 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 430.08680595621274, + "y": 182.6805877500206 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 431.42146812018257, + "y": 182.37738295172255 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 432.40778613600355, + "y": 182.17043424530877 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 434.57379710485645, + "y": 181.82067086430652 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 436.9396769799911, + "y": 181.54578946020342 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 439.46966907432835, + "y": 181.34348018712024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 442.12801670078903, + "y": 181.21143319917775 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 444.8789631722939, + "y": 181.14733865049678 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 447.6867518017637, + "y": 181.14888669519812 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 450.51562590211927, + "y": 181.21376748740252 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 453.32982878628127, + "y": 181.33967118123084 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 456.0936037671706, + "y": 181.52428793080375 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 458.7711941577081, + "y": 181.76530789024216 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 461.3268432708144, + "y": 182.06042121366676 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 463.7247944194104, + "y": 182.4073180551984 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 465.9292909164168, + "y": 182.8036885689579 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 467.90457607475446, + "y": 183.247222909066 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 469.61489320734427, + "y": 183.7356112296435 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 470.3462396719227, + "y": 183.99762835625643 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 471.2428963773219, + "y": 184.34082407915278 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 472.99763385976297, + "y": 185.0951865733606 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 474.3203458571643, + "y": 185.76426699960803 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 475.2194940889507, + "y": 186.27196343294065 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 476.14227833240034, + "y": 186.843263839264 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 477.0968866782507, + "y": 187.48821767403535 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 478.09150721723904, + "y": 188.216874392712 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 479.13432804010256, + "y": 189.03928345075119 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 480.23353723757873, + "y": 189.96549430361011 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 481.3973229004048, + "y": 191.00555640674617 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 482.6338731193182, + "y": 192.16951921561653 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 483.9513759850562, + "y": 193.46743218567843 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 486.08465008573876, + "y": 195.66755715183893 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 489.3036287870103, + "y": 199.18767752459934 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 492.9938037088523, + "y": 203.42448874035676 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 497.2206795771633, + "y": 208.45838644276927 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 502.04976111784197, + "y": 214.36976627549495 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 507.546553056787, + "y": 221.23902388219187 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 513.7765601198969, + "y": 229.14655490651813 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 520.8052870330705, + "y": 238.17275499213184 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 528.6982385222061, + "y": 248.3980197826911 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 533.0293721123036, + "y": 254.04041083806976 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 534.2450543684041, + "y": 255.63658711845704 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 536.6074619757014, + "y": 258.8465679668583 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 538.8887326101642, + "y": 262.0765850943268 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 541.0906566196262, + "y": 265.3253966496571 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 543.2150243519209, + "y": 268.59176078164404 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 545.2636261548815, + "y": 271.8744356390823 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 547.2382523763418, + "y": 275.1721793707667 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 549.1406933641352, + "y": 278.48375012549184 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 550.9727394660949, + "y": 281.80790605205254 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 552.736181030055, + "y": 285.1434052992434 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 554.4328084038486, + "y": 288.48900601585916 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 556.0644119353092, + "y": 291.8434663506946 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 557.6327819722704, + "y": 295.2055444525445 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 559.1397088625656, + "y": 298.57399847020326 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 560.5869829540283, + "y": 301.94758655246585 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 561.9763945944919, + "y": 305.325066848127 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 563.3097341317903, + "y": 308.7051975059814 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 564.5887919137565, + "y": 312.08673667482367 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 565.8153582882244, + "y": 315.4684425034485 + }, + { + "type": "VSAPoint", + "x": 566.1324325650127, + "y": 316.38003586442824 + }, + { + "type": "VSAPoint", + "x": 566.1324325650127, + "y": 316.38003586442824 + }, + { + "type": "VSAPoint", + "x": 566.1324325650127, + "y": 316.38003586442824 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 566.0060154589853, + "y": 317.33688343227095 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 565.4877605284323, + "y": 320.8966321887548 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 564.9180623788752, + "y": 324.46681985586895 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 564.2949167343879, + "y": 328.0465917887784 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 563.616319319045, + "y": 331.63509334264813 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 562.8802658569205, + "y": 335.23146987264306 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 562.0847520720883, + "y": 338.83486673392804 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 561.227773688623, + "y": 342.44442928166825 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 560.3073264305983, + "y": 346.0593028710284 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 559.3214060220887, + "y": 349.6786328571736 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 558.2680081871683, + "y": 353.3015645952688 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 557.1451286499112, + "y": 356.92724344047895 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 555.9507631343915, + "y": 360.554814747969 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 554.6829073646836, + "y": 364.18342387290375 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 553.3395570648615, + "y": 367.8122161704483 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 551.9187079589992, + "y": 371.4403369957678 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 550.4183557711713, + "y": 375.06693170402684 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 548.8364962254514, + "y": 378.6911456503906 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 547.1711250459141, + "y": 382.31212419002395 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 546.3028913385826, + "y": 384.1209448818898 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 543.2006642598294, + "y": 390.52184186191835 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 537.535670448618, + "y": 402.1305699733798 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 532.4749042214539, + "y": 412.3903913753097 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 527.9704490988856, + "y": 421.3932752996892 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 523.9743886014617, + "y": 429.2311909784995 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 520.4388062497305, + "y": 435.9961076437221 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 517.3157855642405, + "y": 441.7799945273381 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 514.5574100655404, + "y": 446.67482086132884 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 512.1157632741781, + "y": 450.7725558776757 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 510.4708339773115, + "y": 453.35821166754323 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 509.4426354126483, + "y": 454.89548184246604 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 508.4666660051281, + "y": 456.28521188096727 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 507.53693619481953, + "y": 457.5388979370447 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 506.64745642179116, + "y": 458.6680361646959 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 505.79223712611144, + "y": 459.6841227179185 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 504.965288747849, + "y": 460.59865375071024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 504.16062172707245, + "y": 461.4231254170687 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 503.3722465038503, + "y": 462.1690338709916 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 502.5941735182511, + "y": 462.84787526647654 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 501.433862530821, + "y": 463.77032529618333 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 499.8676552661831, + "y": 464.86355958449764 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 499.05879685039366, + "y": 465.3807874015748 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 498.39544529339, + "y": 465.78512060292104 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 496.81902180965926, + "y": 466.60889050140497 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 494.97403176316857, + "y": 467.4422487052733 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 492.8950283549279, + "y": 468.27571089278706 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 490.61656478594676, + "y": 469.099792742207 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 488.17319425723497, + "y": 469.905009931794 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 485.5994699698021, + "y": 470.6818781398089 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 482.9299451246578, + "y": 471.42091304451264 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 480.19917292281195, + "y": 472.11263032416593 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 477.4417065652739, + "y": 472.7475456570297 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 474.6920992530536, + "y": 473.31617472136475 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 471.9849041871605, + "y": 473.80903319543194 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 469.35467456860454, + "y": 474.2166367574922 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 466.8359635983951, + "y": 474.52950108580626 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 464.46332447754196, + "y": 474.7381418586351 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 462.2713104070549, + "y": 474.8330747542395 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 461.2635212598425, + "y": 474.8296062992126 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 459.89512569180783, + "y": 474.8022236217203 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 456.9446634814911, + "y": 474.66854532746163 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 453.78308803321636, + "y": 474.4450546374898 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 450.4607238482488, + "y": 474.13717725337807 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 447.02789542785354, + "y": 473.7503388766993 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 443.5349272732959, + "y": 473.28996520902683 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 440.032143885841, + "y": 472.76148195193366 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 436.5698697667541, + "y": 472.17031480699274 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 433.19842941730053, + "y": 471.5218894757774 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 429.9681473387453, + "y": 470.8216316598606 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 426.9293480323538, + "y": 470.0749670608155 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 424.1323559993911, + "y": 469.2873213802151 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 421.6274957411225, + "y": 468.46412031963257 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 419.9827165964786, + "y": 467.82583581711526 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 418.99656451830106, + "y": 467.39265534706215 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 418.11175291575864, + "y": 466.95363798914843 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 417.33457235150956, + "y": 466.5094619560706 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 416.671313388212, + "y": 466.06080546052533 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 416.1282665885242, + "y": 465.60834671520934 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 415.90919055118104, + "y": 465.3807874015748 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 415.6744949121821, + "y": 465.11691086342705 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 415.2059336467294, + "y": 464.51970744510993 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 414.73828120790273, + "y": 463.8417556151489 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 414.27144071967086, + "y": 463.085935372191 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 413.5724192583051, + "y": 461.8213352824725 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 412.6424474730342, + "y": 459.8770443023384 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 411.7139797215789, + "y": 457.6731196458617 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 410.78624099568907, + "y": 455.23260130221774 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 409.85845628711434, + "y": 452.5785292605823 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 408.92985058760416, + "y": 449.73394351013076 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 407.5340521637328, + "y": 445.17686587372935 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 405.6626147200966, + "y": 438.62109199003635 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 402.8245238499593, + "y": 428.2026348509896 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 399.92009745169366, + "y": 417.60703981194797 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 398.4393501316662, + "y": 412.4590323775087 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 397.4404418974062, + "y": 409.1254012769567 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 396.4306375649564, + "y": 405.90077632687087 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 395.4091621260667, + "y": 402.8081975164265 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 394.37524057248663, + "y": 399.8707048347992 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 393.3280978959659, + "y": 397.1113382711645 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 392.2669590882542, + "y": 394.55313781469806 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 391.1910491411011, + "y": 392.21914345457526 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 390.09959304625636, + "y": 390.1323951799718 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 389.2698043994204, + "y": 388.75243565071 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.7116901709946, + "y": 387.91609606739985 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 388.149253463505, + "y": 387.1545279993808 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 387.5823974009204, + "y": 386.4706114452996 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 387.01102510720943, + "y": 385.86722640380333 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 386.4350397063409, + "y": 385.347252873539 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 385.85434432228345, + "y": 384.9135708531535 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 385.2688420790058, + "y": 384.5690603412937 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 384.6784361004767, + "y": 384.3166013366067 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 384.08302951066474, + "y": 384.1590738377393 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 383.78320629921257, + "y": 384.1209448818898 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 378.6263437405544, + "y": 383.6045830842633 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 373.0766440496252, + "y": 383.121504412122 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 370.0008370915018, + "y": 382.96022983219746 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 367.10487653591144, + "y": 382.94349048438045 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 364.05742475655484, + "y": 383.0775636241024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 360.52714412713283, + "y": 383.3687265067947 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 356.18269702134603, + "y": 383.8232563878887 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 353.5469858267717, + "y": 384.1209448818898 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 353.140687387566, + "y": 384.174351512309 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 352.3478076469671, + "y": 384.3499141458275 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 351.5776678286232, + "y": 384.6060313176218 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 350.8292449957345, + "y": 384.94054223998114 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 350.10151621150135, + "y": 385.3512861251944 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 349.39345853912414, + "y": 385.83610218555054 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 348.70404904180305, + "y": 386.39282963333847 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 348.03226478273837, + "y": 387.0193076808472 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 347.3770828251304, + "y": 387.71337554036575 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 346.73748023217945, + "y": 388.47287242418304 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 346.11243406708576, + "y": 389.29563754458786 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 345.5009213930497, + "y": 390.1795101138695 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 344.90191927327146, + "y": 391.1223293443167 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 344.3144047709514, + "y": 392.1219344482185 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 343.45131834152363, + "y": 393.71666590565854 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 342.3329398000359, + "y": 396.03066190165725 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 341.2420988659859, + "y": 398.5329072126756 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 340.170612044976, + "y": 401.2061155370253 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 339.1102958426086, + "y": 404.0330005730182 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 337.52402606968593, + "y": 408.5098505567174 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 335.37221544403303, + "y": 414.8782452783023 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 333.11778439379134, + "y": 421.55019341607033 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 331.3134462186173, + "y": 426.6720944091589 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 330.047889167072, + "y": 430.10608627751816 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 328.7198512845899, + "y": 433.538178142326 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 327.3211490767732, + "y": 436.95108370189405 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 325.8435990492243, + "y": 440.32751665453395 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 324.2790177075454, + "y": 443.6501906985576 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 322.6192215573389, + "y": 446.9018195322766 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 320.85602710420704, + "y": 450.0651168540026 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 319.45717451289846, + "y": 452.365517795319 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 318.49035653314064, + "y": 453.86471191435453 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 317.49308576205294, + "y": 455.3320996106921 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 316.4643392628353, + "y": 456.7655200966209 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 315.40309409868826, + "y": 458.1628125844296 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 314.30832733281204, + "y": 459.52181628640733 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 313.179016028407, + "y": 460.840370414843 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 312.01413724867336, + "y": 462.1163141820256 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 310.81266805681133, + "y": 463.34748680024416 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 309.57358551602135, + "y": 464.53172748178747 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 308.29586668950355, + "y": 465.66687543894466 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 306.9784886404583, + "y": 466.75076988400457 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 306.3028913385827, + "y": 467.2705511811024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 306.0368536792996, + "y": 467.46009653890087 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 305.29965090725057, + "y": 467.8742201558208 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 304.32981912363664, + "y": 468.3247898441746 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 303.1423849202518, + "y": 468.8055907037913 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 301.75237488889, + "y": 469.31040783450027 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 300.17481562134526, + "y": 469.83302633613084 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 298.4247337094115, + "y": 470.36723130851203 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 296.51715574488264, + "y": 470.9068078514732 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 294.4671083195528, + "y": 471.4455410648434 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 292.28961802521576, + "y": 471.977216048452 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 289.99971145366567, + "y": 472.4956179021282 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 287.61241519669636, + "y": 472.9945317257011 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 285.14275584610186, + "y": 473.46774261900003 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 282.60575999367614, + "y": 473.90903568185416 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 280.0164542312131, + "y": 474.31219601409276 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 277.38986515050686, + "y": 474.6710087155449 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 276.06667086614175, + "y": 474.8296062992126 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 274.5818488819599, + "y": 474.99255599538003 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 271.5446458311724, + "y": 475.2295739520757 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 268.4446260071953, + "y": 475.360814712133 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 265.3020717719389, + "y": 475.3872566379167 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 262.1372654873135, + "y": 475.3098780917921 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 258.97048951522913, + "y": 475.1296574361239 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 255.82202621759592, + "y": 474.8475730332773 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 252.71215795632423, + "y": 474.46460324561724 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 249.66116709332417, + "y": 473.9817264355087 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 246.68933599050598, + "y": 473.3999209653166 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 243.81694700977977, + "y": 472.7201651974061 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 241.0642825130558, + "y": 471.9434374941422 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 238.45162486224422, + "y": 471.0707162178898 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 236.60169663070394, + "y": 470.350821729573 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 235.4193876540233, + "y": 469.84338312642257 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 234.28348921739519, + "y": 469.3124964588554 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 233.1965366160585, + "y": 468.758284022167 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 232.16106514525188, + "y": 468.1808681116531 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 231.17961010021423, + "y": 467.58037102260926 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 230.71234015748033, + "y": 467.2705511811024 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 230.14050134808969, + "y": 466.8718519030715 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 228.98801289411497, + "y": 465.93778340220894 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 227.82719427887008, + "y": 464.84415439310385 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 226.66053754786833, + "y": 463.59590201522116 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 225.49053474662304, + "y": 462.19796340802577 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 224.31967792064745, + "y": 460.6552757109826 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 223.15045911545488, + "y": 458.97277606355647 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 221.9853703765586, + "y": 457.1554016052123 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 220.8269037494719, + "y": 455.208089475415 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 219.67755127970813, + "y": 453.1357768136295 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 218.5398050127805, + "y": 450.9434007593206 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 217.41615699420237, + "y": 448.63589845195327 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 216.30909926948698, + "y": 446.2182070309924 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 215.22112388414763, + "y": 443.69526363590296 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 214.15472288369767, + "y": 441.0720054061497 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 213.11238831365034, + "y": 438.35336948119766 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 212.09661221951887, + "y": 435.54429300051163 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 211.10988664681668, + "y": 432.6497131035565 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 210.15470364105698, + "y": 429.67456692979727 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 209.2335552477531, + "y": 426.62379161869876 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 208.34893351241834, + "y": 423.50232430972596 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 207.50333048056592, + "y": 420.3151021423437 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 206.69923819770924, + "y": 417.0670622560168 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 205.93914870936152, + "y": 413.7631417902103 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 205.225554061036, + "y": 410.4082778843889 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 204.56094629824605, + "y": 407.0074076780178 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 203.947817466505, + "y": 403.56546831056164 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 203.38865961132603, + "y": 400.08739692148544 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 202.88596477822256, + "y": 396.578130650254 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 202.44222501270775, + "y": 393.0426066363324 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 202.05993236029497, + "y": 389.48576201918536 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": 201.74157886649743, + "y": 385.91253393827776 + }, + { + "type": "VSAPoint", + "x": 201.6099779527559, + "y": 384.1209448818898 + }, + { + "type": "VSAPoint", + "x": 201.6099779527559, + "y": 384.1209448818898 + } + ] +} diff --git a/src/test/ValentinaTest/share/smart_pattern_#99/output.json b/src/test/ValentinaTest/share/smart_pattern_#99/output.json new file mode 100644 index 000000000..e8a615d19 --- /dev/null +++ b/src/test/ValentinaTest/share/smart_pattern_#99/output.json @@ -0,0 +1,539 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 166.2793358771866, + "y": 317.0063195835933 + }, + { + "type": "QPointF", + "x": 165.64275495245442, + "y": 301.03538140265255 + }, + { + "type": "QPointF", + "x": 165.9241818618377, + "y": 283.76299680393265 + }, + { + "type": "QPointF", + "x": 165.88627642302018, + "y": 280.21495093296807 + }, + { + "type": "QPointF", + "x": 167.78024031224584, + "y": 263.63026674491516 + }, + { + "type": "QPointF", + "x": 171.2459135294844, + "y": 247.0901582437869 + }, + { + "type": "QPointF", + "x": 175.35351394576222, + "y": 234.8597797393187 + }, + { + "type": "QPointF", + "x": 179.7306152508974, + "y": 225.99041905785725 + }, + { + "type": "QPointF", + "x": 184.8167066465138, + "y": 218.45272205761742 + }, + { + "type": "QPointF", + "x": 186.06814702527078, + "y": 217.44230267355644 + }, + { + "type": "QPointF", + "x": 187.2901543369056, + "y": 215.92418137543507 + }, + { + "type": "QPointF", + "x": 196.89081710839, + "y": 208.34478105780212 + }, + { + "type": "QPointF", + "x": 203.29392527811845, + "y": 204.51550744665195 + }, + { + "type": "QPointF", + "x": 210.60586727103993, + "y": 200.97193709900534 + }, + { + "type": "QPointF", + "x": 222.03055445161348, + "y": 196.7139895702384 + }, + { + "type": "QPointF", + "x": 233.89457456941724, + "y": 193.60179993286891 + }, + { + "type": "QPointF", + "x": 248.98872642851768, + "y": 191.42493440584562 + }, + { + "type": "QPointF", + "x": 264.23377987042534, + "y": 190.90851689495304 + }, + { + "type": "QPointF", + "x": 282.88849327137484, + "y": 192.3327170360014 + }, + { + "type": "QPointF", + "x": 288.2031868096645, + "y": 193.48305021794997 + }, + { + "type": "QPointF", + "x": 292.0507070275667, + "y": 194.88291402164677 + }, + { + "type": "QPointF", + "x": 302.2609179912159, + "y": 200.52339431871832 + }, + { + "type": "QPointF", + "x": 312.4716122896351, + "y": 208.47683247462922 + }, + { + "type": "QPointF", + "x": 320.37180984256605, + "y": 216.47325684819089 + }, + { + "type": "QPointF", + "x": 326.23567071378, + "y": 223.57518983261718 + }, + { + "type": "QPointF", + "x": 333.7748575886651, + "y": 234.23056124764497 + }, + { + "type": "QPointF", + "x": 340.96073277166533, + "y": 245.8168833793835 + }, + { + "type": "QPointF", + "x": 351.5894679236029, + "y": 263.84403704994895 + }, + { + "type": "QPointF", + "x": 353.2512234548283, + "y": 263.3673080331528 + }, + { + "type": "QPointF", + "x": 354.6369381456461, + "y": 248.63868742738416 + }, + { + "type": "QPointF", + "x": 357.4736650430952, + "y": 210.79601581293596 + }, + { + "type": "QPointF", + "x": 359.3073327569976, + "y": 200.02799414967882 + }, + { + "type": "QPointF", + "x": 359.73199799735687, + "y": 195.76084622496757 + }, + { + "type": "QPointF", + "x": 362.7120659075751, + "y": 189.21200989719003 + }, + { + "type": "QPointF", + "x": 364.2921931987103, + "y": 186.1786983822252 + }, + { + "type": "QPointF", + "x": 366.5306945072866, + "y": 182.93652936261128 + }, + { + "type": "QPointF", + "x": 369.982180722541, + "y": 179.37377930160977 + }, + { + "type": "QPointF", + "x": 374.6890134539639, + "y": 175.54739778670276 + }, + { + "type": "QPointF", + "x": 377.2538085237466, + "y": 173.8065326338944 + }, + { + "type": "QPointF", + "x": 398.9256180190481, + "y": 162.99327226113368 + }, + { + "type": "QPointF", + "x": 416.5041370775075, + "y": 156.9754834453434 + }, + { + "type": "QPointF", + "x": 427.8889886897312, + "y": 154.18647318396557 + }, + { + "type": "QPointF", + "x": 438.0633612753594, + "y": 153.03192944510397 + }, + { + "type": "QPointF", + "x": 451.7825414078947, + "y": 152.8956366849569 + }, + { + "type": "QPointF", + "x": 465.38530369692694, + "y": 154.00600077743474 + }, + { + "type": "QPointF", + "x": 475.68791359201066, + "y": 155.9902739944185 + }, + { + "type": "QPointF", + "x": 484.19308368052646, + "y": 159.05322984284635 + }, + { + "type": "QPointF", + "x": 493.8490103693721, + "y": 164.62147416122724 + }, + { + "type": "QPointF", + "x": 504.30214237411684, + "y": 173.73502446586204 + }, + { + "type": "QPointF", + "x": 510.67904759033263, + "y": 180.57012994104807 + }, + { + "type": "QPointF", + "x": 524.0023556963948, + "y": 196.43641192353618 + }, + { + "type": "QPointF", + "x": 559.7613549461172, + "y": 242.4936218299132 + }, + { + "type": "QPointF", + "x": 569.5835818133556, + "y": 257.3121087709943 + }, + { + "type": "QPointF", + "x": 578.0175928754072, + "y": 272.3226478275148 + }, + { + "type": "QPointF", + "x": 585.014909318949, + "y": 286.9983512578358 + }, + { + "type": "QPointF", + "x": 591.1019941479228, + "y": 302.05819169893664 + }, + { + "type": "QPointF", + "x": 593.6592659318968, + "y": 309.1009580349592 + }, + { + "type": "QPointF", + "x": 594.5621538949604, + "y": 317.9492631765719 + }, + { + "type": "QPointF", + "x": 591.4691411901464, + "y": 336.9021533252068 + }, + { + "type": "QPointF", + "x": 587.7772567627065, + "y": 353.05391040771735 + }, + { + "type": "QPointF", + "x": 582.7107603326205, + "y": 369.9049033568516 + }, + { + "type": "QPointF", + "x": 576.3979894710554, + "y": 386.4062544290843 + }, + { + "type": "QPointF", + "x": 568.7091425226228, + "y": 402.8846548007183 + }, + { + "type": "QPointF", + "x": 549.2280816776043, + "y": 442.10646157989896 + }, + { + "type": "QPointF", + "x": 538.9087372946932, + "y": 461.18462682908535 + }, + { + "type": "QPointF", + "x": 528.3345265604034, + "y": 476.92160008646584 + }, + { + "type": "QPointF", + "x": 520.2343656529063, + "y": 485.0367289659276 + }, + { + "type": "QPointF", + "x": 513.148845575274, + "y": 489.9896405767957 + }, + { + "type": "QPointF", + "x": 505.5219398390943, + "y": 493.75314459015317 + }, + { + "type": "QPointF", + "x": 493.1624730540218, + "y": 498.00078352401664 + }, + { + "type": "QPointF", + "x": 479.769261267493, + "y": 501.2042372736896 + }, + { + "type": "QPointF", + "x": 465.68981801438673, + "y": 503.0580521806556 + }, + { + "type": "QPointF", + "x": 454.9458499674166, + "y": 502.9444423349683 + }, + { + "type": "QPointF", + "x": 439.3060103264079, + "y": 501.3191976012906 + }, + { + "type": "QPointF", + "x": 423.2043144587875, + "y": 498.34929359863105 + }, + { + "type": "QPointF", + "x": 411.3722974923289, + "y": 494.89048056695367 + }, + { + "type": "QPointF", + "x": 404.0462328838181, + "y": 491.56426076213603 + }, + { + "type": "QPointF", + "x": 397.6192436403225, + "y": 487.3958668879086 + }, + { + "type": "QPointF", + "x": 395.8065790202349, + "y": 485.71619133980585 + }, + { + "type": "QPointF", + "x": 390.1544796169675, + "y": 477.9820353387566 + }, + { + "type": "QPointF", + "x": 386.5194680676028, + "y": 470.8821137717501 + }, + { + "type": "QPointF", + "x": 381.8262598501652, + "y": 458.03556842219757 + }, + { + "type": "QPointF", + "x": 368.3461454578772, + "y": 411.2975955501923 + }, + { + "type": "QPointF", + "x": 366.64848225314825, + "y": 411.33744639475356 + }, + { + "type": "QPointF", + "x": 354.94905309156206, + "y": 444.28762369139116 + }, + { + "type": "QPointF", + "x": 349.5264395561675, + "y": 456.53775435663135 + }, + { + "type": "QPointF", + "x": 341.93489933666746, + "y": 469.79816790408853 + }, + { + "type": "QPointF", + "x": 334.11338915152845, + "y": 479.95250344559355 + }, + { + "type": "QPointF", + "x": 325.34007746842036, + "y": 488.3512524365335 + }, + { + "type": "QPointF", + "x": 321.5584979241992, + "y": 491.67184971202573 + }, + { + "type": "QPointF", + "x": 308.4504919589761, + "y": 496.94455134299847 + }, + { + "type": "QPointF", + "x": 293.41117665937344, + "y": 500.741531068732 + }, + { + "type": "QPointF", + "x": 276.78725103080393, + "y": 503.25309046316846 + }, + { + "type": "QPointF", + "x": 264.6092166309341, + "y": 503.7252445480846 + }, + { + "type": "QPointF", + "x": 252.35742731035515, + "y": 502.981505596202 + }, + { + "type": "QPointF", + "x": 240.16140370368174, + "y": 500.98447655539013 + }, + { + "type": "QPointF", + "x": 232.08334886242122, + "y": 498.82957588934755 + }, + { + "type": "QPointF", + "x": 220.20894480356736, + "y": 493.9717974895532 + }, + { + "type": "QPointF", + "x": 214.23653207492043, + "y": 491.72898244053755 + }, + { + "type": "QPointF", + "x": 200.54353768038376, + "y": 476.1142489208116 + }, + { + "type": "QPointF", + "x": 194.51735337202624, + "y": 466.1928074212942 + }, + { + "type": "QPointF", + "x": 188.96153147430664, + "y": 454.3702537301474 + }, + { + "type": "QPointF", + "x": 183.01824799966036, + "y": 437.8681242930998 + }, + { + "type": "QPointF", + "x": 179.18342598456445, + "y": 423.87894050611567 + }, + { + "type": "QPointF", + "x": 175.960729453766, + "y": 408.06485844817104 + }, + { + "type": "QPointF", + "x": 173.8253139307419, + "y": 392.00129957222134 + }, + { + "type": "QPointF", + "x": 166.2793358771866, + "y": 317.0063195835933 + } + ] +} diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index 83d363a08..e92c2a531 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -127,5 +127,7 @@ panties_case1/output.json panties_case2/input.json panties_case2/output.json + smart_pattern_#99/input.json + smart_pattern_#99/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 4a2c4b1c3..004b50d1c 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -342,6 +342,12 @@ void TST_VAbstractPiece::LayoutAllowanceRemoveLoop_data() QStringLiteral("://smart_pattern_#58/input.json"), QStringLiteral("://smart_pattern_#58/output.json"), 18.897637795275593 /*seam allowance width (0.5 cm)*/); + + // See file src/app/share/collection/test/smart_pattern_#99.val + ASSERT_TEST_CASE("Incorrect fix of distortion", + QStringLiteral("://smart_pattern_#99/input.json"), + QStringLiteral("://smart_pattern_#99/output.json"), + 28.346456692913389 /*seam allowance width*/); } //---------------------------------------------------------------------------------------------------------------------