From e7e4e0716277c1cba9fe457fd259ee92586f96dc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 3 Apr 2023 10:50:25 +0300 Subject: [PATCH] Fix seam allowance. Loose requirements to case with prong. --- ChangeLog.txt | 1 + src/libs/vlayout/vabstractpiece.cpp | 3 +- .../share/Issue_923_test2/input.json | 28 +- .../share/Issue_923_test2/output.json | 238 +++---- .../share/Issue_923_test3/input.json | 28 +- .../share/Issue_923_test3/output.json | 234 +++---- .../share/Issue_923_test6/input.json | 28 +- .../share/Issue_923_test6/output.json | 550 ++++++++------- .../share/Issue_923_test7_1/input.json | 28 +- .../share/Issue_923_test7_1/output.json | 247 ++++--- .../share/Issue_923_test7_2/input.json | 28 +- .../share/Issue_923_test7_2/output.json | 247 ++++--- .../share/Issue_923_test7_3/input.json | 28 +- .../share/Issue_923_test7_3/output.json | 245 +++---- src/test/ValentinaTest/share/hat/input.json | 626 ++++++++++++++++++ src/test/ValentinaTest/share/hat/output.json | 359 ++++++++++ src/test/ValentinaTest/share/test_data.qrc | 2 + src/test/ValentinaTest/tst_vabstractpiece.cpp | 6 + 18 files changed, 1903 insertions(+), 1023 deletions(-) create mode 100644 src/test/ValentinaTest/share/hat/input.json create mode 100644 src/test/ValentinaTest/share/hat/output.json diff --git a/ChangeLog.txt b/ChangeLog.txt index bf4ace27f..2c214ecf4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -19,6 +19,7 @@ - Fix excluding objects in internal path. - Fix float-point accuracy issue in multisize measurements dimensions. - Fix compatibility with Richpeace DXF-AAMA/ASTM R12. +- Fix seam allowance. Loose requirements to case with prong. # Valentina 0.7.52 September 12, 2022 - Fix crash when default locale is ru. diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index 6138f9dc8..decb9ece4 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -1275,7 +1275,8 @@ auto VAbstractPiece::EkvPoint(QVector points, const VSAPoint &p1Lin return true; }; if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2, ToPixel(0.5, Unit::Mm)) && - IsOnLine(p2Line1, bigLine1.p2(), bigLine2.p1(), ToPixel(0.5, Unit::Mm))) + IsOnLine(p2Line1, bigLine1.p2(), bigLine2.p1(), ToPixel(0.5, Unit::Mm)) && + p2Line1.GetAngleType() == PieceNodeAngle::ByLength) { points.append(VRawSAPoint(bigLine1.p2(), p2Line1.CurvePoint(), p2Line1.TurnPoint())); points.append(VRawSAPoint(bigLine2.p1(), p2Line1.CurvePoint(), p2Line1.TurnPoint())); diff --git a/src/test/ValentinaTest/share/Issue_923_test2/input.json b/src/test/ValentinaTest/share/Issue_923_test2/input.json index bdb9a83b6..f60b4af6c 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/input.json @@ -33,7 +33,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -41,8 +41,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -50,8 +50,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -59,8 +59,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -68,8 +68,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -77,8 +77,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -86,7 +86,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -95,7 +95,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -104,7 +104,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index 2a871d163..0735fd244 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -2,303 +2,283 @@ "vector": [ { "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -814.7149606299213, + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": 330.5891727033602 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.923105387765915 + "y": 28.923105387766057 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.674417477891 + "y": -46.67441747789094 }, { "type": "QPointF", - "x": -814.2667801920632, - "y": -46.77051665539527 + "x": -814.2667801920694, + "y": -46.77051665539475 }, { "type": "QPointF", - "x": -778.5602746831936, - "y": -50.54949176119353 + "x": -778.5602746831969, + "y": -50.54949176119329 }, { "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 + "x": -737.9608911970803, + "y": -56.790170478392334 }, { "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 + "x": -709.2737849361882, + "y": -62.54507114228297 }, { "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 + "x": -681.3583296765614, + "y": -69.77242131730785 }, { "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 + "x": -662.7349969797801, + "y": -76.08666265976335 }, { "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 + "x": -652.0000133582183, + "y": -80.53001488530862 }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -647.5347421078806, + "y": -82.70049226350372 }, { "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 + "x": -631.5852394687715, + "y": -90.99511806184105 }, { "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699189 + "x": -616.3280202339932, + "y": -100.59426715697734 }, { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.9721553077516 + "x": -594.0963839106644, + "y": -115.97215530775206 }, { "type": "QPointF", - "x": -184.04865014874542, - "y": 76.19837439910728 + "x": -184.04865014874576, + "y": 76.19837439910705 }, { "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 + "x": -202.58871262669433, + "y": 128.5312170877332 }, { "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 + "x": -214.84435298014535, + "y": 166.709615345359 }, { "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 + "x": -224.9007219166664, + "y": 202.7867077349721 }, { "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 + "x": -232.93434714099442, + "y": 237.0808568349011 }, { "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 + "x": -239.08903715169467, + "y": 269.8170459573539 }, { "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 + "x": -243.50661138639543, + "y": 301.2305028748881 }, { "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 + "x": -246.32424570745593, + "y": 331.5659013496859 }, { "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 + "x": -247.42591881697234, + "y": 355.68472552671597 }, { "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 + "x": -274.1103616347226, + "y": 368.3965019419771 }, { "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 + "x": -280.4308271742487, + "y": 370.73899686729897 }, { "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 + "x": -286.53994881447335, + "y": 372.65108939343145 }, { "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 + "x": -295.7605238049802, + "y": 375.07066902356064 }, { "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 + "x": -309.1086607001497, + "y": 377.8122722714953 }, { "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 + "x": -323.7918413406422, + "y": 380.189287868496 }, { "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 + "x": -339.7464924132723, + "y": 382.2635758852316 }, { "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 + "x": -356.9362622181957, + "y": 384.07704503986554 }, { "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 + "x": -375.2815276936278, + "y": 385.65320885961137 }, { "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 + "x": -394.4224543531805, + "y": 386.98897134293713 }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -414.7876067251065, + "y": 388.13579550460133 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -435.9520270040898, + "y": 389.07661798449567 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -457.785958265363, + "y": 389.8184840359457 }, { "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 + "x": -480.1552993678824, + "y": 390.36735593535275 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -502.9230721502437, + "y": 390.7285243590086 }, { "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 + "x": -525.950383021198, + "y": 390.9068434964294 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -549.0970864147915, + "y": 390.90686803484715 }, { "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 + "x": -572.2222728858721, + "y": 390.7329321107654 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -595.1846601170994, + "y": 390.3891909827694 }, { "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 + "x": -617.8429427582319, + "y": 389.8796354203741 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -640.0561486385068, + "y": 389.2080817760433 }, { "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 + "x": -661.6840517509002, + "y": 388.3781346110811 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -682.5877079123363, + "y": 387.3931112039708 }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -702.6302136187057, + "y": 386.2559049695029 }, { "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -721.6778577696422, + "y": 384.9687413227853 }, { "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 + "x": -739.6019742862303, + "y": 383.5327301728113 }, { "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 + "x": -756.6283706367624, + "y": 381.91399989149096 }, { "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 + "x": -772.0557074133295, + "y": 380.1563856315983 }, { "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 + "x": -786.1074176186619, + "y": 378.2178680808823 }, { "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 + "x": -798.8005062137145, + "y": 376.0511796823399 }, { "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 + "x": -810.1810632465617, + "y": 373.5624561175911 }, { "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 - }, - { - "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 - }, - { - "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 - }, - { - "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 - }, - { - "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -814.7149606299213, + "y": 372.2542552635798 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test3/input.json b/src/test/ValentinaTest/share/Issue_923_test3/input.json index b6c3bea21..4c9c24413 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/input.json @@ -33,7 +33,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -41,8 +41,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -50,8 +50,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -59,8 +59,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -68,8 +68,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -77,8 +77,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -86,7 +86,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -95,7 +95,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -104,7 +104,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index 2a871d163..b4f0aac70 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -2,303 +2,303 @@ "vector": [ { "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -863.5718297690097, + "y": 340.0959369535931 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": 330.58917270335996 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.923105387765915 + "y": 28.923105387766057 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.674417477891 + "y": -46.67441747789094 }, { "type": "QPointF", - "x": -814.2667801920632, - "y": -46.77051665539527 + "x": -814.2667801920694, + "y": -46.77051665539475 }, { "type": "QPointF", - "x": -778.5602746831936, - "y": -50.54949176119353 + "x": -778.5602746831969, + "y": -50.54949176119329 }, { "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 + "x": -737.9608911970803, + "y": -56.790170478392334 }, { "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 + "x": -709.2737849361882, + "y": -62.54507114228297 }, { "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 + "x": -681.3583296765614, + "y": -69.77242131730785 }, { "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 + "x": -662.7349969797801, + "y": -76.08666265976335 }, { "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 + "x": -652.0000133582183, + "y": -80.53001488530862 }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -647.5347421078806, + "y": -82.70049226350372 }, { "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 + "x": -631.5852394687715, + "y": -90.99511806184105 }, { "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699189 + "x": -616.3280202339932, + "y": -100.59426715697734 }, { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.9721553077516 + "x": -594.0963839106644, + "y": -115.97215530775206 }, { "type": "QPointF", - "x": -184.04865014874542, - "y": 76.19837439910728 + "x": -184.04865014874576, + "y": 76.19837439910705 }, { "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 + "x": -202.58871262669433, + "y": 128.5312170877332 }, { "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 + "x": -214.84435298014535, + "y": 166.709615345359 }, { "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 + "x": -224.9007219166664, + "y": 202.7867077349721 }, { "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 + "x": -232.93434714099442, + "y": 237.0808568349011 }, { "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 + "x": -239.08903715169467, + "y": 269.8170459573539 }, { "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 + "x": -243.50661138639543, + "y": 301.2305028748881 }, { "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 + "x": -246.32424570745593, + "y": 331.5659013496859 }, { "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 + "x": -247.42591881697234, + "y": 355.68472552671597 }, { "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 + "x": -274.1103616347226, + "y": 368.3965019419771 }, { "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 + "x": -280.4308271742487, + "y": 370.73899686729897 }, { "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 + "x": -286.53994881447335, + "y": 372.65108939343145 }, { "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 + "x": -295.7605238049802, + "y": 375.07066902356064 }, { "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 + "x": -309.1086607001497, + "y": 377.8122722714953 }, { "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 + "x": -323.7918413406422, + "y": 380.189287868496 }, { "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 + "x": -339.7464924132723, + "y": 382.2635758852316 }, { "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 + "x": -356.9362622181957, + "y": 384.07704503986554 }, { "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 + "x": -375.2815276936278, + "y": 385.65320885961137 }, { "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 + "x": -394.4224543531805, + "y": 386.98897134293713 }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -414.7876067251065, + "y": 388.13579550460133 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -435.9520270040898, + "y": 389.07661798449567 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -457.785958265363, + "y": 389.8184840359457 }, { "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 + "x": -480.1552993678824, + "y": 390.36735593535275 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -502.9230721502437, + "y": 390.7285243590086 }, { "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 + "x": -525.950383021198, + "y": 390.9068434964294 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -549.0970864147915, + "y": 390.90686803484715 }, { "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 + "x": -572.2222728858721, + "y": 390.7329321107654 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -595.1846601170994, + "y": 390.3891909827694 }, { "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 + "x": -617.8429427582319, + "y": 389.8796354203741 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -640.0561486385068, + "y": 389.2080817760433 }, { "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 + "x": -661.6840517509002, + "y": 388.3781346110811 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -682.5877079123363, + "y": 387.3931112039708 }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -702.6302136187057, + "y": 386.2559049695029 }, { "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -721.6778577696422, + "y": 384.9687413227853 }, { "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 + "x": -739.6019742862303, + "y": 383.5327301728113 }, { "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 + "x": -756.6283706367624, + "y": 381.91399989149096 }, { "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 + "x": -772.0557074133295, + "y": 380.1563856315983 }, { "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 + "x": -786.1074176186619, + "y": 378.2178680808823 }, { "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 + "x": -798.8005062137145, + "y": 376.0511796823399 }, { "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 + "x": -810.1810632465617, + "y": 373.5624561175911 }, { "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 + "x": -818.0929557813661, + "y": 371.27957591636186 }, { "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 + "x": -823.6929755287717, + "y": 369.27180555078513 }, { "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 + "x": -829.5753368833371, + "y": 366.62694879394735 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -835.8151397150926, + "y": 362.8920896668538 }, { "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -863.5718297690097, + "y": 340.0959369535931 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test6/input.json b/src/test/ValentinaTest/share/Issue_923_test6/input.json index 1f55bb5a8..8b3a56509 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/input.json @@ -33,7 +33,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -41,8 +41,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -50,8 +50,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -59,8 +59,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -68,8 +68,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -77,8 +77,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -86,7 +86,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -95,7 +95,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -104,7 +104,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index 2a871d163..1f8806909 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -2,303 +2,283 @@ "vector": [ { "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -815.5965354330709, + "y": 28.923105387766057 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": -46.67441747789094 + }, + { + "type": "QPointF", + "x": -814.2667801920694, + "y": -46.77051665539475 + }, + { + "type": "QPointF", + "x": -778.5602746831969, + "y": -50.54949176119329 + }, + { + "type": "QPointF", + "x": -737.9608911970803, + "y": -56.790170478392334 + }, + { + "type": "QPointF", + "x": -709.2737849361882, + "y": -62.54507114228297 + }, + { + "type": "QPointF", + "x": -681.3583296765614, + "y": -69.77242131730785 + }, + { + "type": "QPointF", + "x": -662.7349969797801, + "y": -76.08666265976335 + }, + { + "type": "QPointF", + "x": -652.0000133582183, + "y": -80.53001488530862 + }, + { + "type": "QPointF", + "x": -647.5347421078806, + "y": -82.70049226350372 + }, + { + "type": "QPointF", + "x": -631.5852394687715, + "y": -90.99511806184105 + }, + { + "type": "QPointF", + "x": -616.3280202339932, + "y": -100.59426715697734 + }, + { + "type": "QPointF", + "x": -594.0963839106644, + "y": -115.97215530775206 + }, + { + "type": "QPointF", + "x": -184.04865014874576, + "y": 76.19837439910705 + }, + { + "type": "QPointF", + "x": -202.58871262669433, + "y": 128.5312170877332 + }, + { + "type": "QPointF", + "x": -214.84435298014535, + "y": 166.709615345359 + }, + { + "type": "QPointF", + "x": -224.9007219166664, + "y": 202.7867077349721 + }, + { + "type": "QPointF", + "x": -232.93434714099442, + "y": 237.0808568349011 + }, + { + "type": "QPointF", + "x": -239.08903715169467, + "y": 269.8170459573539 + }, + { + "type": "QPointF", + "x": -243.50661138639543, + "y": 301.2305028748881 + }, + { + "type": "QPointF", + "x": -246.32424570745593, + "y": 331.5659013496859 + }, + { + "type": "QPointF", + "x": -247.42591881697234, + "y": 355.68472552671597 + }, + { + "type": "QPointF", + "x": -274.1103616347226, + "y": 368.3965019419771 + }, + { + "type": "QPointF", + "x": -280.4308271742487, + "y": 370.73899686729897 + }, + { + "type": "QPointF", + "x": -286.53994881447335, + "y": 372.65108939343145 + }, + { + "type": "QPointF", + "x": -295.7605238049802, + "y": 375.07066902356064 + }, + { + "type": "QPointF", + "x": -309.1086607001497, + "y": 377.8122722714953 + }, + { + "type": "QPointF", + "x": -323.7918413406422, + "y": 380.189287868496 + }, + { + "type": "QPointF", + "x": -339.7464924132723, + "y": 382.2635758852316 + }, + { + "type": "QPointF", + "x": -356.9362622181957, + "y": 384.07704503986554 + }, + { + "type": "QPointF", + "x": -375.2815276936278, + "y": 385.65320885961137 + }, + { + "type": "QPointF", + "x": -394.4224543531805, + "y": 386.98897134293713 + }, + { + "type": "QPointF", + "x": -414.7876067251065, + "y": 388.13579550460133 + }, + { + "type": "QPointF", + "x": -435.9520270040898, + "y": 389.07661798449567 + }, + { + "type": "QPointF", + "x": -457.785958265363, + "y": 389.8184840359457 + }, + { + "type": "QPointF", + "x": -480.1552993678824, + "y": 390.36735593535275 + }, + { + "type": "QPointF", + "x": -502.9230721502437, + "y": 390.7285243590086 + }, + { + "type": "QPointF", + "x": -525.950383021198, + "y": 390.9068434964294 + }, + { + "type": "QPointF", + "x": -549.0970864147915, + "y": 390.90686803484715 + }, + { + "type": "QPointF", + "x": -572.2222728858721, + "y": 390.7329321107654 + }, + { + "type": "QPointF", + "x": -595.1846601170994, + "y": 390.3891909827694 + }, + { + "type": "QPointF", + "x": -617.8429427582319, + "y": 389.8796354203741 + }, + { + "type": "QPointF", + "x": -640.0561486385068, + "y": 389.2080817760433 + }, + { + "type": "QPointF", + "x": -661.6840517509002, + "y": 388.3781346110811 + }, + { + "type": "QPointF", + "x": -682.5877079123363, + "y": 387.3931112039708 + }, + { + "type": "QPointF", + "x": -702.6302136187057, + "y": 386.2559049695029 + }, + { + "type": "QPointF", + "x": -721.6778577696422, + "y": 384.9687413227853 + }, + { + "type": "QPointF", + "x": -739.6019742862303, + "y": 383.5327301728113 + }, + { + "type": "QPointF", + "x": -756.6283706367624, + "y": 381.91399989149096 + }, + { + "type": "QPointF", + "x": -772.0557074133295, + "y": 380.1563856315983 + }, + { + "type": "QPointF", + "x": -786.1074176186619, + "y": 378.2178680808823 + }, + { + "type": "QPointF", + "x": -798.8005062137145, + "y": 376.0511796823399 + }, + { + "type": "QPointF", + "x": -810.1810632465617, + "y": 373.5624561175911 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.923105387765915 + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.674417477891 - }, - { - "type": "QPointF", - "x": -814.2667801920632, - "y": -46.77051665539527 - }, - { - "type": "QPointF", - "x": -778.5602746831936, - "y": -50.54949176119353 - }, - { - "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 - }, - { - "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 - }, - { - "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 - }, - { - "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 - }, - { - "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 - }, - { - "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 - }, - { - "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 - }, - { - "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699189 - }, - { - "type": "QPointF", - "x": -594.0963839106636, - "y": -115.9721553077516 - }, - { - "type": "QPointF", - "x": -184.04865014874542, - "y": 76.19837439910728 - }, - { - "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 - }, - { - "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 - }, - { - "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 - }, - { - "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 - }, - { - "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 - }, - { - "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 - }, - { - "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 - }, - { - "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 - }, - { - "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 - }, - { - "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 - }, - { - "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 - }, - { - "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 - }, - { - "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 - }, - { - "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 - }, - { - "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 - }, - { - "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 - }, - { - "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 - }, - { - "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 - }, - { - "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 - }, - { - "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 - }, - { - "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 - }, - { - "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 - }, - { - "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 - }, - { - "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 - }, - { - "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 - }, - { - "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 - }, - { - "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 - }, - { - "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 - }, - { - "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 - }, - { - "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 - }, - { - "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 - }, - { - "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 - }, - { - "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 - }, - { - "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 - }, - { - "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 - }, - { - "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 - }, - { - "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 - }, - { - "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 - }, - { - "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 - }, - { - "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 - }, - { - "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 - }, - { - "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 - }, - { - "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 - }, - { - "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "y": 28.923105387766057 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test7_1/input.json b/src/test/ValentinaTest/share/Issue_923_test7_1/input.json index 8f88bc7be..204c0fc77 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/input.json @@ -451,7 +451,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -459,8 +459,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -468,8 +468,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -477,8 +477,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -486,8 +486,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -495,8 +495,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -504,7 +504,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -513,7 +513,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -522,7 +522,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { 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 677193ec3..21f13af0e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -2,313 +2,288 @@ "vector": [ { "type": "QPointF", - "x": -218.4362476442146, - "y": 60.082487681666066 + "x": -218.43624764421457, + "y": 60.082487681666 }, { "type": "QPointF", - "x": -196.73040945651604, - "y": 111.99504529263494 + "x": -196.73040945651616, + "y": 111.99504529263479 }, { "type": "QPointF", - "x": -196.73040945651593, - "y": 111.995045292635 + "x": -202.58871262669425, + "y": 128.53121708773293 }, { "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 + "x": -214.84435298014535, + "y": 166.709615345359 }, { "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 + "x": -224.9007219166664, + "y": 202.7867077349721 }, { "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 + "x": -232.93434714099442, + "y": 237.0808568349011 }, { "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 + "x": -239.08903715169467, + "y": 269.8170459573539 }, { "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 + "x": -243.50661138639543, + "y": 301.2305028748881 }, { "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 + "x": -246.32424570745593, + "y": 331.5659013496859 }, { "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 + "x": -247.42591881697234, + "y": 355.68472552671597 }, { "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 + "x": -274.1103616347226, + "y": 368.3965019419771 }, { "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 + "x": -280.4308271742487, + "y": 370.73899686729897 }, { "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 + "x": -286.53994881447335, + "y": 372.65108939343145 }, { "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 + "x": -295.7605238049802, + "y": 375.07066902356064 }, { "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 + "x": -309.1086607001497, + "y": 377.8122722714953 }, { "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 + "x": -323.7918413406422, + "y": 380.189287868496 }, { "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 + "x": -339.7464924132723, + "y": 382.2635758852316 }, { "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 + "x": -356.9362622181957, + "y": 384.07704503986554 }, { "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 + "x": -375.2815276936278, + "y": 385.65320885961137 }, { "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 + "x": -394.4224543531805, + "y": 386.98897134293713 }, { "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 + "x": -414.7876067251065, + "y": 388.13579550460133 }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -435.9520270040898, + "y": 389.07661798449567 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -457.785958265363, + "y": 389.8184840359457 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.1552993678824, + "y": 390.36735593535275 }, { "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 + "x": -502.9230721502437, + "y": 390.7285243590086 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.950383021198, + "y": 390.9068434964294 }, { "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 + "x": -549.0970864147915, + "y": 390.90686803484715 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858721, + "y": 390.7329321107654 }, { "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 + "x": -595.1846601170994, + "y": 390.3891909827694 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582319, + "y": 389.8796354203741 }, { "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 + "x": -640.0561486385068, + "y": 389.2080817760433 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509002, + "y": 388.3781346110811 }, { "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 + "x": -682.5877079123363, + "y": 387.3931112039708 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -702.6302136187057, + "y": 386.2559049695029 }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -721.6778577696422, + "y": 384.9687413227853 }, { "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -739.6019742862303, + "y": 383.5327301728113 }, { "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 + "x": -756.6283706367624, + "y": 381.91399989149096 }, { "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 + "x": -772.0557074133295, + "y": 380.1563856315983 }, { "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 + "x": -786.1074176186619, + "y": 378.2178680808823 }, { "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 + "x": -798.8005062137145, + "y": 376.0511796823399 }, { "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 + "x": -810.1810632465617, + "y": 373.5624561175911 }, { "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 - }, - { - "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 - }, - { - "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 - }, - { - "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 - }, - { - "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 - }, - { - "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -814.7149606299213, + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": 330.5891727033602 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.923105387766014 + "y": 28.923105387766057 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.674417477891 + "y": -46.67441747789091 }, { "type": "QPointF", - "x": -814.2667801920633, - "y": -46.770516655395255 + "x": -814.2667801920695, + "y": -46.77051665539474 }, { "type": "QPointF", - "x": -778.5602746831936, - "y": -50.54949176119353 + "x": -778.5602746831969, + "y": -50.54949176119329 }, { "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 + "x": -737.9608911970803, + "y": -56.790170478392334 }, { "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 + "x": -709.2737849361882, + "y": -62.54507114228297 }, { "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 + "x": -681.3583296765614, + "y": -69.77242131730785 }, { "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 + "x": -662.7349969797801, + "y": -76.08666265976335 }, { "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 + "x": -652.0000133582183, + "y": -80.53001488530862 }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -647.5347421078806, + "y": -82.70049226350372 }, { "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 + "x": -631.5852394687715, + "y": -90.99511806184105 }, { "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699185 + "x": -616.3280202339934, + "y": -100.59426715697732 }, { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.97215530775165 + "x": -594.0963839106644, + "y": -115.97215530775212 }, { "type": "QPointF", - "x": -218.4362476442146, - "y": 60.082487681666066 + "x": -218.43624764421457, + "y": 60.082487681666 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/input.json b/src/test/ValentinaTest/share/Issue_923_test7_2/input.json index d75751a85..5855a7f7e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/input.json @@ -457,7 +457,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -465,8 +465,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -474,8 +474,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -483,8 +483,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -492,8 +492,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -501,8 +501,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -510,7 +510,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -519,7 +519,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -528,7 +528,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { 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 692e35ae1..2a74f0659 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -2,313 +2,288 @@ "vector": [ { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.97215530775165 + "x": -594.0963839106644, + "y": -115.97215530775212 }, { "type": "QPointF", - "x": -218.4362476442146, - "y": 60.082487681666066 + "x": -218.43624764421457, + "y": 60.082487681666 }, { "type": "QPointF", - "x": -196.73040945651604, - "y": 111.99504529263494 + "x": -196.73040945651616, + "y": 111.99504529263479 }, { "type": "QPointF", - "x": -196.73040945651593, - "y": 111.995045292635 + "x": -202.58871262669425, + "y": 128.53121708773293 }, { "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 + "x": -214.84435298014535, + "y": 166.709615345359 }, { "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 + "x": -224.9007219166664, + "y": 202.7867077349721 }, { "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 + "x": -232.93434714099442, + "y": 237.0808568349011 }, { "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 + "x": -239.08903715169467, + "y": 269.8170459573539 }, { "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 + "x": -243.50661138639543, + "y": 301.2305028748881 }, { "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 + "x": -246.32424570745593, + "y": 331.5659013496859 }, { "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 + "x": -247.42591881697234, + "y": 355.68472552671597 }, { "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 + "x": -274.1103616347226, + "y": 368.3965019419771 }, { "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 + "x": -280.4308271742487, + "y": 370.73899686729897 }, { "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 + "x": -286.53994881447335, + "y": 372.65108939343145 }, { "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 + "x": -295.7605238049802, + "y": 375.07066902356064 }, { "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 + "x": -309.1086607001497, + "y": 377.8122722714953 }, { "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 + "x": -323.7918413406422, + "y": 380.189287868496 }, { "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 + "x": -339.7464924132723, + "y": 382.2635758852316 }, { "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 + "x": -356.9362622181957, + "y": 384.07704503986554 }, { "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 + "x": -375.2815276936278, + "y": 385.65320885961137 }, { "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 + "x": -394.4224543531805, + "y": 386.98897134293713 }, { "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 + "x": -414.7876067251065, + "y": 388.13579550460133 }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -435.9520270040898, + "y": 389.07661798449567 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -457.785958265363, + "y": 389.8184840359457 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.1552993678824, + "y": 390.36735593535275 }, { "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 + "x": -502.9230721502437, + "y": 390.7285243590086 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.950383021198, + "y": 390.9068434964294 }, { "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 + "x": -549.0970864147915, + "y": 390.90686803484715 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858721, + "y": 390.7329321107654 }, { "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 + "x": -595.1846601170994, + "y": 390.3891909827694 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582319, + "y": 389.8796354203741 }, { "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 + "x": -640.0561486385068, + "y": 389.2080817760433 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509002, + "y": 388.3781346110811 }, { "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 + "x": -682.5877079123363, + "y": 387.3931112039708 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -702.6302136187057, + "y": 386.2559049695029 }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -721.6778577696422, + "y": 384.9687413227853 }, { "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -739.6019742862303, + "y": 383.5327301728113 }, { "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 + "x": -756.6283706367624, + "y": 381.91399989149096 }, { "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 + "x": -772.0557074133295, + "y": 380.1563856315983 }, { "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 + "x": -786.1074176186619, + "y": 378.2178680808823 }, { "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 + "x": -798.8005062137145, + "y": 376.0511796823399 }, { "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 + "x": -810.1810632465617, + "y": 373.5624561175911 }, { "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 - }, - { - "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 - }, - { - "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 - }, - { - "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 - }, - { - "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 - }, - { - "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -814.7149606299213, + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": 330.5891727033602 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.923105387766014 + "y": 28.923105387766057 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.674417477891 + "y": -46.67441747789091 }, { "type": "QPointF", - "x": -814.2667801920633, - "y": -46.770516655395255 + "x": -814.2667801920695, + "y": -46.77051665539474 }, { "type": "QPointF", - "x": -778.5602746831936, - "y": -50.54949176119353 + "x": -778.5602746831969, + "y": -50.54949176119329 }, { "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 + "x": -737.9608911970803, + "y": -56.790170478392334 }, { "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 + "x": -709.2737849361882, + "y": -62.54507114228297 }, { "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 + "x": -681.3583296765614, + "y": -69.77242131730785 }, { "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 + "x": -662.7349969797801, + "y": -76.08666265976335 }, { "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 + "x": -652.0000133582183, + "y": -80.53001488530862 }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -647.5347421078806, + "y": -82.70049226350372 }, { "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 + "x": -631.5852394687715, + "y": -90.99511806184105 }, { "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699185 + "x": -616.3280202339934, + "y": -100.59426715697732 }, { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.97215530775165 + "x": -594.0963839106644, + "y": -115.97215530775212 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/input.json b/src/test/ValentinaTest/share/Issue_923_test7_3/input.json index 1549439c8..bad2df535 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/input.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/input.json @@ -16,7 +16,7 @@ "saBefore": 37.795275590551185, "type": "VSAPoint", "x": -810.9147913912859, - "y": -9.118915311803084 + "y": -9.118915311803082 }, { "angle": 6, @@ -24,8 +24,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -773.697565712941, - "y": -13.057776517652679 + "x": -773.6975657129408, + "y": -13.057776517652666 }, { "angle": 6, @@ -33,8 +33,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -731.3693960390717, - "y": -19.56419323976961 + "x": -731.3693960390715, + "y": -19.564193239769583 }, { "angle": 6, @@ -42,8 +42,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -700.8138618525178, - "y": -25.693917945236084 + "x": -700.8138618525176, + "y": -25.693917945236056 }, { "angle": 6, @@ -51,8 +51,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -670.5392892845426, - "y": -33.532046871057645 + "x": -670.5392892845424, + "y": -33.53204687105762 }, { "angle": 6, @@ -60,8 +60,8 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -649.4254060248002, - "y": -40.69070943425645 + "x": -649.4254060247999, + "y": -40.69070943425643 }, { "angle": 6, @@ -69,7 +69,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -636.4972481739836, + "x": -636.4972481739833, "y": -46.04184558720286 }, { @@ -78,7 +78,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -630.5509356263242, + "x": -630.5509356263238, "y": -48.932226964906654 }, { @@ -87,7 +87,7 @@ "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", - "x": -612.7709374645625, + "x": -612.7709374645622, "y": -58.17881193899319 }, { 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 08ee08177..7d6f9c1d3 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -3,312 +3,287 @@ { "type": "QPointF", "x": -815.5965354330709, - "y": 28.864326962967652 + "y": 28.864326962967752 }, { "type": "QPointF", "x": -815.5965354330709, - "y": -46.74789050888896 + "y": -46.747890508888815 }, { "type": "QPointF", - "x": -814.7887347652259, - "y": -46.8308714614612 + "x": -814.7887347652247, + "y": -46.83087146146117 }, { "type": "QPointF", - "x": -778.5027796006967, - "y": -50.55832953918108 + "x": -778.5027796007051, + "y": -50.55832953918005 }, { "type": "QPointF", - "x": -737.9608911970817, - "y": -56.79017047839188 + "x": -737.9608911970803, + "y": -56.790170478392334 }, { "type": "QPointF", - "x": -709.2737849361833, - "y": -62.54507114228375 + "x": -709.2737849361882, + "y": -62.54507114228297 }, { "type": "QPointF", - "x": -681.3583296765719, - "y": -69.77242131730468 + "x": -681.3583296765614, + "y": -69.77242131730785 }, { "type": "QPointF", - "x": -662.7349969797737, - "y": -76.08666265976586 + "x": -662.7349969797801, + "y": -76.08666265976335 }, { "type": "QPointF", - "x": -652.0000133582188, - "y": -80.53001488530833 + "x": -652.0000133582183, + "y": -80.53001488530862 }, { "type": "QPointF", - "x": -647.5347421078782, - "y": -82.70049226350477 + "x": -647.5347421078806, + "y": -82.70049226350372 }, { "type": "QPointF", - "x": -631.5852394687809, - "y": -90.99511806183605 + "x": -631.5852394687715, + "y": -90.99511806184105 }, { "type": "QPointF", - "x": -616.3280202339708, - "y": -100.59426715699185 + "x": -616.3280202339934, + "y": -100.59426715697732 }, { "type": "QPointF", - "x": -594.0963839106636, - "y": -115.97215530775165 + "x": -594.0963839106644, + "y": -115.97215530775212 }, { "type": "QPointF", - "x": -218.4362476442146, - "y": 60.082487681666066 + "x": -218.43624764421457, + "y": 60.082487681666 }, { "type": "QPointF", - "x": -196.73040945651604, - "y": 111.99504529263494 + "x": -196.73040945651616, + "y": 111.99504529263479 }, { "type": "QPointF", - "x": -196.73040945651593, - "y": 111.995045292635 + "x": -202.58871262669425, + "y": 128.53121708773293 }, { "type": "QPointF", - "x": -202.58871262669427, - "y": 128.53121708773386 + "x": -214.84435298014535, + "y": 166.709615345359 }, { "type": "QPointF", - "x": -214.84435298014208, - "y": 166.70961534534916 + "x": -224.9007219166664, + "y": 202.7867077349721 }, { "type": "QPointF", - "x": -224.9007219166651, - "y": 202.78670773496933 + "x": -232.93434714099442, + "y": 237.0808568349011 }, { "type": "QPointF", - "x": -232.93434714099388, - "y": 237.08085683490162 + "x": -239.08903715169467, + "y": 269.8170459573539 }, { "type": "QPointF", - "x": -239.0890371517, - "y": 269.81704595738483 + "x": -243.50661138639543, + "y": 301.2305028748881 }, { "type": "QPointF", - "x": -243.50661138639492, - "y": 301.2305028748772 + "x": -246.32424570745593, + "y": 331.5659013496859 }, { "type": "QPointF", - "x": -246.32424570745619, - "y": 331.5659013496832 + "x": -247.42591881697234, + "y": 355.68472552671597 }, { "type": "QPointF", - "x": -247.4259188169727, - "y": 355.684725526716 + "x": -274.1103616347226, + "y": 368.3965019419771 }, { "type": "QPointF", - "x": -274.1103616347323, - "y": 368.39650194198157 + "x": -280.4308271742487, + "y": 370.73899686729897 }, { "type": "QPointF", - "x": -280.43082717423164, - "y": 370.73899686729357 + "x": -286.53994881447335, + "y": 372.65108939343145 }, { "type": "QPointF", - "x": -285.6974576466219, - "y": 372.38739828360394 + "x": -295.7605238049802, + "y": 375.07066902356064 }, { "type": "QPointF", - "x": -295.7605238049826, - "y": 375.0706690235611 + "x": -309.1086607001497, + "y": 377.8122722714953 }, { "type": "QPointF", - "x": -308.3295870292442, - "y": 377.6522566136316 + "x": -323.7918413406422, + "y": 380.189287868496 }, { "type": "QPointF", - "x": -323.20961073643133, - "y": 380.0950323212031 + "x": -339.7464924132723, + "y": 382.2635758852316 }, { "type": "QPointF", - "x": -339.2933747725014, - "y": 382.20466538395215 + "x": -356.9362622181957, + "y": 384.07704503986554 }, { "type": "QPointF", - "x": -356.571621703457, - "y": 384.0385765592796 + "x": -375.2815276936278, + "y": 385.65320885961137 }, { "type": "QPointF", - "x": -374.97963878344376, - "y": 385.6272715746786 + "x": -394.4224543531805, + "y": 386.98897134293713 }, { "type": "QPointF", - "x": -394.4224543531813, - "y": 386.9889713429367 + "x": -414.7876067251065, + "y": 388.13579550460133 }, { "type": "QPointF", - "x": -414.7876067251059, - "y": 388.13579550460213 + "x": -435.9520270040898, + "y": 389.07661798449567 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -457.785958265363, + "y": 389.8184840359457 }, { "type": "QPointF", - "x": -457.7859582653625, - "y": 389.818484035946 + "x": -480.1552993678824, + "y": 390.36735593535275 }, { "type": "QPointF", - "x": -480.15529936788164, - "y": 390.3673559353522 + "x": -502.9230721502437, + "y": 390.7285243590086 }, { "type": "QPointF", - "x": -502.9230721502445, - "y": 390.728524359008 + "x": -525.950383021198, + "y": 390.9068434964294 }, { "type": "QPointF", - "x": -525.9503830211974, - "y": 390.90684349642925 + "x": -549.0970864147915, + "y": 390.90686803484715 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -572.2222728858721, + "y": 390.7329321107654 }, { "type": "QPointF", - "x": -572.2222728858704, - "y": 390.7329321107656 + "x": -595.1846601170994, + "y": 390.3891909827694 }, { "type": "QPointF", - "x": -595.1846601171007, - "y": 390.3891909827686 + "x": -617.8429427582319, + "y": 389.8796354203741 }, { "type": "QPointF", - "x": -617.8429427582322, - "y": 389.87963542037477 + "x": -640.0561486385068, + "y": 389.2080817760433 }, { "type": "QPointF", - "x": -640.0561486385066, - "y": 389.208081776043 + "x": -661.6840517509002, + "y": 388.3781346110811 }, { "type": "QPointF", - "x": -661.6840517509004, - "y": 388.3781346110808 + "x": -682.5877079123363, + "y": 387.3931112039708 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -702.6302136187057, + "y": 386.2559049695029 }, { "type": "QPointF", - "x": -702.630213618707, - "y": 386.255904969502 + "x": -721.6778577696422, + "y": 384.9687413227853 }, { "type": "QPointF", - "x": -721.6778577696439, - "y": 384.9687413227849 + "x": -739.6019742862303, + "y": 383.5327301728113 }, { "type": "QPointF", - "x": -739.6019742862287, - "y": 383.5327301728105 + "x": -756.6283706367624, + "y": 381.91399989149096 }, { "type": "QPointF", - "x": -756.2820913691256, - "y": 381.94700726179155 + "x": -772.0557074133295, + "y": 380.1563856315983 }, { "type": "QPointF", - "x": -771.6116072858362, - "y": 380.2069813195123 + "x": -786.1074176186619, + "y": 378.2178680808823 }, { "type": "QPointF", - "x": -785.5087261025127, - "y": 378.3004611599152 + "x": -798.8005062137145, + "y": 376.0511796823399 }, { "type": "QPointF", - "x": -797.9392812498397, - "y": 376.198189302873 + "x": -810.1810632465617, + "y": 373.5624561175911 }, { "type": "QPointF", - "x": -810.1810632465665, - "y": 373.5624561175904 - }, - { - "type": "QPointF", - "x": -818.0929557813755, - "y": 371.2795759163598 - }, - { - "type": "QPointF", - "x": -823.6929755287612, - "y": 369.27180555079025 - }, - { - "type": "QPointF", - "x": -829.5753368833404, - "y": 366.62694879394627 - }, - { - "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 - }, - { - "type": "QPointF", - "x": -838.7026077978918, - "y": 360.52065549216434 + "x": -814.7149606299213, + "y": 372.2542552635798 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 331.31319685039375 + "y": 330.5891727033602 }, { "type": "QPointF", "x": -815.5965354330709, - "y": 28.864326962967652 + "y": 28.864326962967752 } ] } diff --git a/src/test/ValentinaTest/share/hat/input.json b/src/test/ValentinaTest/share/hat/input.json new file mode 100644 index 000000000..0872b82a8 --- /dev/null +++ b/src/test/ValentinaTest/share/hat/input.json @@ -0,0 +1,626 @@ +{ + "vector": [ + { + "angle": 1, + "saBefore": 0, + "turnPoint": true, + "type": "VSAPoint", + "x": 29.999999999999943, + "y": 361.25971653543314 + }, + { + "angle": 1, + "curvePoint": true, + "saBefore": 0, + "turnPoint": true, + "type": "VSAPoint", + "x": 29.999999999999943, + "y": 361.25971653543314 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 31.73396290699989, + "y": 354.45851017139887 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 41.25493119356215, + "y": 316.26845068079757 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 53.21939514673762, + "y": 275.12569164692474 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 63.17801030657803, + "y": 245.33022656552694 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 74.79698588969273, + "y": 215.28054296635247 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 88.04014693829234, + "y": 186.63293747986256 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 95.32490579737316, + "y": 173.5144451866591 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 102.15423147111207, + "y": 162.06333466959018 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 117.87361973531404, + "y": 138.88507040105114 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 135.55721109055781, + "y": 116.18046604379055 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 154.63980419348007, + "y": 94.84386803398598 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 174.5561977007173, + "y": 75.76962280781511 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 189.69581722752943, + "y": 63.60622127567666 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 199.74948802498102, + "y": 56.60431303423299 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 209.6936831678694, + "y": 50.671062859047666 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 219.45775248827417, + "y": 45.91826405464286 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 228.97104581827483, + "y": 42.45770992554081 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 238.162912989951, + "y": 40.401193776263696 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 242.5984251968504, + "y": 39.99987401574802 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 242.5984251968504, + "y": 39.99987401574802 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 242.5984251968504, + "y": 39.99987401574802 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 247.0339374037498, + "y": 40.401193776263696 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 256.22580457542597, + "y": 42.45770992554081 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 265.73909790542666, + "y": 45.91826405464286 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 275.5031672258314, + "y": 50.671062859047666 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 285.44736236871984, + "y": 56.60431303423299 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 295.50103316617134, + "y": 63.606221275676646 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 310.6406526929835, + "y": 75.76962280781508 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 330.5570462002207, + "y": 94.84386803398598 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 349.63963930314287, + "y": 116.18046604379055 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 367.32323065838676, + "y": 138.88507040105114 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 383.04261892258876, + "y": 162.06333466959018 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 389.87194459632764, + "y": 173.5144451866591 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 397.15670345540843, + "y": 186.63293747986256 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 410.39986450400806, + "y": 215.28054296635247 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 422.0188400871228, + "y": 245.33022656552694 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 431.97745524696313, + "y": 275.12569164692474 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 443.94191920013867, + "y": 316.26845068079757 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 453.46288748670094, + "y": 354.45851017139887 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 455.19685039370086, + "y": 361.25971653543314 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 455.19685039370086, + "y": 361.25971653543314 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 455.19685039370086, + "y": 361.25971653543314 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 456.9308133007008, + "y": 354.45851017139887 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 466.45178158726304, + "y": 316.26845068079757 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 478.41624554043847, + "y": 275.12569164692474 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 488.37486070027893, + "y": 245.3302265655269 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 499.99383628339353, + "y": 215.28054296635247 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 513.2369973319932, + "y": 186.63293747986256 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 520.521756191074, + "y": 173.5144451866591 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 527.351081864813, + "y": 162.06333466959015 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 543.0704701290149, + "y": 138.8850704010511 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 560.7540614842587, + "y": 116.18046604379052 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 579.8366545871809, + "y": 94.84386803398596 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 599.7530480944181, + "y": 75.76962280781505 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 614.8926676212302, + "y": 63.60622127567662 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 624.9463384186819, + "y": 56.60431303423296 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 634.8905335615702, + "y": 50.67106285904764 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 644.654602881975, + "y": 45.91826405464284 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 654.1678962119756, + "y": 42.4577099255408 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 663.3597633836519, + "y": 40.40119377626369 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 667.7952755905513, + "y": 39.99987401574802 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 667.7952755905512, + "y": 39.999874015748 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 667.7952755905511, + "y": 39.99987401574802 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 672.2307877974506, + "y": 40.40119377626369 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 681.4226549691268, + "y": 42.4577099255408 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 690.9359482991274, + "y": 45.91826405464284 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 700.7000176195322, + "y": 50.67106285904762 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 710.6442127624206, + "y": 56.60431303423295 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 720.6978835598723, + "y": 63.60622127567662 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 735.8375030866844, + "y": 75.76962280781505 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 755.7538965939216, + "y": 94.84386803398593 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 774.8364896968437, + "y": 116.18046604379049 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 792.5200810520876, + "y": 138.8850704010511 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 808.2394693162895, + "y": 162.06333466959015 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 815.0687949900284, + "y": 173.5144451866591 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 822.3535538491093, + "y": 186.63293747986256 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 835.5967148977088, + "y": 215.28054296635247 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 847.2156904808235, + "y": 245.33022656552694 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 857.174305640664, + "y": 275.1256916469248 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 869.1387695938392, + "y": 316.26845068079757 + }, + { + "angle": 6, + "curvePoint": true, + "type": "VSAPoint", + "x": 878.6597378804015, + "y": 354.45851017139887 + }, + { + "curvePoint": true, + "turnPoint": true, + "type": "VSAPoint", + "x": 880.3937007874016, + "y": 361.25971653543314 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 880.3937007874015, + "y": 361.25971653543314 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 880.3937007874015, + "y": 928.1888503937009 + }, + { + "turnPoint": true, + "type": "VSAPoint", + "x": 880.3937007874014, + "y": 1136.0628661417325 + }, + { + "angle": 1, + "saAfter": 0, + "turnPoint": true, + "type": "VSAPoint", + "x": 29.999999999999808, + "y": 1136.0628661417325 + }, + { + "saAfter": 0, + "saBefore": 0, + "turnPoint": true, + "type": "VSAPoint", + "x": 29.999999999999844, + "y": 928.1888503937009 + } + ] +} diff --git a/src/test/ValentinaTest/share/hat/output.json b/src/test/ValentinaTest/share/hat/output.json new file mode 100644 index 000000000..9e12ab425 --- /dev/null +++ b/src/test/ValentinaTest/share/hat/output.json @@ -0,0 +1,359 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 29.118425196850335, + "y": 364.7175599168278 + }, + { + "type": "QPointF", + "x": 29.94307799754262, + "y": 261.30591867833493 + }, + { + "type": "QPointF", + "x": 38.28034110598727, + "y": 236.36142309988847 + }, + { + "type": "QPointF", + "x": 50.42641664350457, + "y": 204.9485223442931 + }, + { + "type": "QPointF", + "x": 64.43563647205879, + "y": 174.64377853357186 + }, + { + "type": "QPointF", + "x": 72.39329255299187, + "y": 160.31352382108352 + }, + { + "type": "QPointF", + "x": 79.82602319478619, + "y": 147.85065060505283 + }, + { + "type": "QPointF", + "x": 96.46605143628082, + "y": 123.31490115126226 + }, + { + "type": "QPointF", + "x": 115.23721379286627, + "y": 99.21392493718594 + }, + { + "type": "QPointF", + "x": 135.60152983653606, + "y": 76.44420895441118 + }, + { + "type": "QPointF", + "x": 157.08834979360478, + "y": 55.86594146623459 + }, + { + "type": "QPointF", + "x": 173.83199157479038, + "y": 42.413843959149226 + }, + { + "type": "QPointF", + "x": 185.3936560720791, + "y": 34.361689123435625 + }, + { + "type": "QPointF", + "x": 197.10339835582204, + "y": 27.375017054145104 + }, + { + "type": "QPointF", + "x": 209.11808343103752, + "y": 21.526699207665782 + }, + { + "type": "QPointF", + "x": 221.5299864367533, + "y": 17.011747265524747 + }, + { + "type": "QPointF", + "x": 235.2394443108585, + "y": 13.944500862877867 + }, + { + "type": "QPointF", + "x": 249.9574060828423, + "y": 13.944500862877867 + }, + { + "type": "QPointF", + "x": 263.6668639569475, + "y": 17.01174726552474 + }, + { + "type": "QPointF", + "x": 276.07876696266345, + "y": 21.526699207665832 + }, + { + "type": "QPointF", + "x": 288.09345203787865, + "y": 27.37501705414501 + }, + { + "type": "QPointF", + "x": 299.8031943216219, + "y": 34.3616891234357 + }, + { + "type": "QPointF", + "x": 311.3648588189105, + "y": 42.4138439591493 + }, + { + "type": "QPointF", + "x": 328.1085006000962, + "y": 55.865941466234666 + }, + { + "type": "QPointF", + "x": 349.5953205571646, + "y": 76.44420895441102 + }, + { + "type": "QPointF", + "x": 369.95963660083424, + "y": 99.21392493718575 + }, + { + "type": "QPointF", + "x": 388.73079895742006, + "y": 123.31490115126236 + }, + { + "type": "QPointF", + "x": 405.37082719891447, + "y": 147.85065060505255 + }, + { + "type": "QPointF", + "x": 412.8035578407087, + "y": 160.3135238210832 + }, + { + "type": "QPointF", + "x": 420.761213921642, + "y": 174.64377853357206 + }, + { + "type": "QPointF", + "x": 434.7704337501962, + "y": 204.9485223442931 + }, + { + "type": "QPointF", + "x": 446.9165092877135, + "y": 236.36142309988838 + }, + { + "type": "QPointF", + "x": 455.1968503937008, + "y": 261.1356121136812 + }, + { + "type": "QPointF", + "x": 463.47719149968816, + "y": 236.3614230998884 + }, + { + "type": "QPointF", + "x": 475.6232670372052, + "y": 204.94852234429345 + }, + { + "type": "QPointF", + "x": 489.4457291590669, + "y": 175.04777279772534 + }, + { + "type": "QPointF", + "x": 497.41525548705096, + "y": 159.48566964361396 + }, + { + "type": "QPointF", + "x": 505.91960858174565, + "y": 147.49378076706674 + }, + { + "type": "QPointF", + "x": 521.5037972468683, + "y": 123.51918129653623 + }, + { + "type": "QPointF", + "x": 540.4340641865671, + "y": 99.21392493718614 + }, + { + "type": "QPointF", + "x": 560.7983802302371, + "y": 76.44420895441104 + }, + { + "type": "QPointF", + "x": 582.2852001873056, + "y": 55.86594146623453 + }, + { + "type": "QPointF", + "x": 599.0288419684916, + "y": 42.413843959148835 + }, + { + "type": "QPointF", + "x": 610.5905064657796, + "y": 34.36168912343576 + }, + { + "type": "QPointF", + "x": 622.3002487495228, + "y": 27.3750170541451 + }, + { + "type": "QPointF", + "x": 634.3149338247384, + "y": 21.526699207665764 + }, + { + "type": "QPointF", + "x": 646.7268368304541, + "y": 17.011747265524743 + }, + { + "type": "QPointF", + "x": 660.4362947045594, + "y": 13.94450086287786 + }, + { + "type": "QPointF", + "x": 675.1542564765431, + "y": 13.94450086287786 + }, + { + "type": "QPointF", + "x": 688.8637143506484, + "y": 17.011747265524743 + }, + { + "type": "QPointF", + "x": 701.275617356364, + "y": 21.526699207665743 + }, + { + "type": "QPointF", + "x": 713.2903024315797, + "y": 27.375017054145108 + }, + { + "type": "QPointF", + "x": 725.0000447153227, + "y": 34.36168912343571 + }, + { + "type": "QPointF", + "x": 736.5617092126108, + "y": 42.413843959148785 + }, + { + "type": "QPointF", + "x": 753.305350993797, + "y": 55.86594146623462 + }, + { + "type": "QPointF", + "x": 774.7921709508654, + "y": 76.44420895441098 + }, + { + "type": "QPointF", + "x": 795.156486994535, + "y": 99.21392493718571 + }, + { + "type": "QPointF", + "x": 813.9276493511209, + "y": 123.31490115126243 + }, + { + "type": "QPointF", + "x": 830.5676775926153, + "y": 147.85065060505264 + }, + { + "type": "QPointF", + "x": 838.0004082344087, + "y": 160.31352382108162 + }, + { + "type": "QPointF", + "x": 845.9580643153425, + "y": 174.64377853357124 + }, + { + "type": "QPointF", + "x": 859.9672841438971, + "y": 204.94852234429356 + }, + { + "type": "QPointF", + "x": 872.1133596814137, + "y": 236.36142309988713 + }, + { + "type": "QPointF", + "x": 882.4324649928317, + "y": 267.23544896017984 + }, + { + "type": "QPointF", + "x": 894.685954055627, + "y": 309.3720920900203 + }, + { + "type": "QPointF", + "x": 904.3306932614294, + "y": 348.05861566144995 + }, + { + "type": "QPointF", + "x": 906.8503937007875, + "y": 357.94025014347284 + }, + { + "type": "QPointF", + "x": 906.8503937007872, + "y": 1162.5195590551182 + }, + { + "type": "QPointF", + "x": 29.999999999999805, + "y": 1162.5195590551182 + }, + { + "type": "QPointF", + "x": 29.11842519685024, + "y": 1136.0628661417325 + }, + { + "type": "QPointF", + "x": 29.118425196850335, + "y": 364.7175599168278 + } + ] +} diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index 19dce3d5d..cfb3e7662 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -161,5 +161,7 @@ custom_seam_allwance_exclude_p1/output.json custom_seam_allwance_exclude_p2/input.json custom_seam_allwance_exclude_p2/output.json + hat/input.json + hat/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 0a26377a2..8e32e864e 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -1140,6 +1140,12 @@ void TST_VAbstractPiece::EquidistantAngleType_data() QStringLiteral("://smart_pattern_#133/input.json"), QStringLiteral("://smart_pattern_#133/output.json"), 26.45669291338583 /*seam allowance width*/); + + // See file valentina_private_collection/bugs/hat/hat.val + ASSERT_TEST_CASE("hat", + QStringLiteral("://hat/input.json"), + QStringLiteral("://hat/output.json"), + 26.45669291338583 /*seam allowance width*/); } //---------------------------------------------------------------------------------------------------------------------