From 22c3bbcd46ccafb2f49fb5062942c6043096377b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 4 Nov 2019 12:20:07 +0200 Subject: [PATCH] Fix tests. --HG-- branch : develop --- .../ValentinaTest/share/Issue_604/input.json | 26 +++ .../ValentinaTest/share/Issue_604/output.json | 29 ++++ .../share/{Issue_927 => Issue_627}/input.json | 0 .../{Issue_927 => Issue_627}/output.json | 20 +-- .../ValentinaTest/share/Issue_646/output.json | 150 +++++++++--------- .../output.json | 118 +++++++------- .../share/Issue_923_test1/output.json | 6 +- .../share/Issue_923_test1_1/output.json | 12 +- .../share/Issue_923_test2/output.json | 6 +- .../share/Issue_923_test2_2/output.json | 8 +- .../share/Issue_923_test3/output.json | 6 +- .../share/Issue_923_test3_3/output.json | 16 +- .../share/Issue_923_test4/output.json | 6 +- .../share/Issue_923_test4_4/output.json | 12 +- .../share/Issue_923_test5/output.json | 6 +- .../share/Issue_923_test5_5/output.json | 16 +- .../share/Issue_923_test6/output.json | 6 +- .../share/Issue_923_test6_6/output.json | 16 +- .../share/Issue_923_test7_1/output.json | 6 +- .../share/Issue_923_test7_2/output.json | 6 +- .../share/Issue_923_test7_3/output.json | 10 +- .../share/seamtest1_by_angle/output.json | 34 ++-- .../share/seamtest1_by_angle_2/output.json | 36 ++--- .../output.json | 38 ++--- .../output.json | 38 ++--- .../seamtest1_by_intersection/output.json | 35 ++-- .../output.json | 34 ++-- .../output.json | 34 ++-- src/test/ValentinaTest/share/test_data.qrc | 6 +- src/test/ValentinaTest/tst_vabstractpiece.cpp | 37 +---- 30 files changed, 410 insertions(+), 363 deletions(-) create mode 100644 src/test/ValentinaTest/share/Issue_604/input.json create mode 100644 src/test/ValentinaTest/share/Issue_604/output.json rename src/test/ValentinaTest/share/{Issue_927 => Issue_627}/input.json (100%) rename src/test/ValentinaTest/share/{Issue_927 => Issue_627}/output.json (83%) diff --git a/src/test/ValentinaTest/share/Issue_604/input.json b/src/test/ValentinaTest/share/Issue_604/input.json new file mode 100644 index 000000000..846e8a08d --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_604/input.json @@ -0,0 +1,26 @@ +{ + "vector": [ + { + "saBefore": 0, + "type": "VSAPoint", + "x": 97.33089106412865, + "y": -223.03306117556505 + }, + { + "type": "VSAPoint", + "x": 990.7494050554427, + "y": 2.8190939950449954 + }, + { + "type": "VSAPoint", + "x": 908.3966357321775, + "y": 379.5839357215551 + }, + { + "saAfter": 0, + "type": "VSAPoint", + "x": -135.41196425151074, + "y": 697.6434574129539 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_604/output.json b/src/test/ValentinaTest/share/Issue_604/output.json new file mode 100644 index 000000000..ed43dcbd4 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_604/output.json @@ -0,0 +1,29 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 99.56017552183889, + "y": -234.1647796671699 + }, + { + "type": "QPointF", + "x": 1004.1704360325448, + "y": -5.483401649771935 + }, + { + "type": "QPointF", + "x": 918.0553434338283, + "y": 388.4941111872279 + }, + { + "type": "QPointF", + "x": -139.29206702645467, + "y": 710.679051642683 + }, + { + "type": "QPointF", + "x": 99.56017552183889, + "y": -234.1647796671699 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_927/input.json b/src/test/ValentinaTest/share/Issue_627/input.json similarity index 100% rename from src/test/ValentinaTest/share/Issue_927/input.json rename to src/test/ValentinaTest/share/Issue_627/input.json diff --git a/src/test/ValentinaTest/share/Issue_927/output.json b/src/test/ValentinaTest/share/Issue_627/output.json similarity index 83% rename from src/test/ValentinaTest/share/Issue_927/output.json rename to src/test/ValentinaTest/share/Issue_627/output.json index 582753000..345131744 100644 --- a/src/test/ValentinaTest/share/Issue_927/output.json +++ b/src/test/ValentinaTest/share/Issue_627/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 11561.41547872419, - "y": -14.638641388671703 + "x": 11560.846475874965, + "y": -14.623761696484117 }, { "type": "QPointF", - "x": 11781.963905683213, - "y": -3501.90869534006 + "x": 11781.326946495077, + "y": -3500.819302857501 }, { "type": "QPointF", @@ -47,13 +47,13 @@ }, { "type": "QPointF", - "x": 13707.971545534987, - "y": -7002.489438444618 + "x": 13708.573357026718, + "y": -7003.606684992652 }, { "type": "QPointF", - "x": 13491.504163312642, - "y": -14.778496052732635 + "x": 13492.070905293423, + "y": -14.763675483318366 }, { "type": "QPointF", @@ -87,8 +87,8 @@ }, { "type": "QPointF", - "x": 11561.41547872419, - "y": -14.638641388671703 + "x": 11560.846475874965, + "y": -14.623761696484117 } ] } diff --git a/src/test/ValentinaTest/share/Issue_646/output.json b/src/test/ValentinaTest/share/Issue_646/output.json index f045437c6..f4943b6b0 100644 --- a/src/test/ValentinaTest/share/Issue_646/output.json +++ b/src/test/ValentinaTest/share/Issue_646/output.json @@ -2,188 +2,188 @@ "vector": [ { "type": "QPointF", - "x": 1391.2086175709487, - "y": 1170.9617637988192 + "x": 1391.2039211231315, + "y": 1170.9444368424918 }, { "type": "QPointF", - "x": 1352.8724409448819, + "x": 1353.4015748031497, "y": 1362.8345196850394 }, { "type": "QPointF", - "x": 1350.7006018935115, - "y": 1367.7703033753553 + "x": 1351.1847957148477, + "y": 1367.9837020242383 }, { "type": "QPointF", - "x": 1344.7091020991327, - "y": 1376.7412507612619 + "x": 1345.1491063827884, + "y": 1377.0351535858993 }, { "type": "QPointF", - "x": 1336.8188773941715, - "y": 1384.7187366406629 + "x": 1337.195060618467, + "y": 1385.0908506308913 }, { "type": "QPointF", - "x": 1327.1245505580102, - "y": 1391.7655137338006 + "x": 1327.4356491832236, + "y": 1392.193532758326 }, { "type": "QPointF", - "x": 1315.719957407725, - "y": 1397.9460214130117 + "x": 1315.972058403799, + "y": 1398.411239348762 }, { "type": "QPointF", - "x": 1302.6986100196889, - "y": 1403.3248236720353 + "x": 1302.9006184964092, + "y": 1403.813879103759 }, { "type": "QPointF", - "x": 1288.1538221481612, - "y": 1407.96642828257 + "x": 1288.3146848455422, + "y": 1408.4705173942918 }, { "type": "QPointF", - "x": 1272.1788269472245, - "y": 1411.9352463954385 + "x": 1272.3064038330447, + "y": 1412.4487702782033 }, { "type": "QPointF", - "x": 1245.8888202964258, - "y": 1416.8316039587498 + "x": 1245.9857010948988, + "y": 1417.3517931078604 }, { "type": "QPointF", - "x": 1206.4762313406886, - "y": 1421.5041357291352 + "x": 1206.53852508622, + "y": 1422.0295899414439 }, { "type": "QPointF", - "x": 1163.020904564699, - "y": 1424.642189912612 + "x": 1163.0590153626633, + "y": 1425.1699495236505 }, { "type": "QPointF", - "x": 963.7001554735343, - "y": 1432.1203128817076 + "x": 963.7205338463195, + "y": 1432.6490541812936 }, { "type": "QPointF", - "x": 911.2272672558029, - "y": 1435.2886982785724 + "x": 911.2591589138497, + "y": 1435.8168701844065 }, { "type": "QPointF", - "x": 859.1901256423455, - "y": 1440.0035196761964 + "x": 859.237872023468, + "y": 1440.530494934681 }, { "type": "QPointF", - "x": 808.3353546602272, - "y": 1446.7781884050733 + "x": 808.4052261459925, + "y": 1447.3026887534452 }, { "type": "QPointF", - "x": 771.4974477424232, - "y": 1453.6121839644047 + "x": 771.5939627010235, + "y": 1454.1324411149867 }, { "type": "QPointF", - "x": 747.6570201292775, - "y": 1459.0256232285362 + "x": 747.7741871176479, + "y": 1459.5416218107064 }, { "type": "QPointF", - "x": 724.5319402842023, - "y": 1465.2428135307375 + "x": 724.6693192587568, + "y": 1465.7538024321 }, { "type": "QPointF", - "x": 674.3274477843926, - "y": 1482.4260437177454 + "x": 674.507015051664, + "y": 1482.923776815389 }, { "type": "QPointF", - "x": 639.457302358586, - "y": 1492.6845877082906 + "x": 639.6066402491301, + "y": 1493.192210436715 }, { "type": "QPointF", - "x": 603.7701320001938, - "y": 1500.4476673006452 + "x": 603.8826034921715, + "y": 1500.9647096620215 }, { "type": "QPointF", - "x": 567.2425747899177, - "y": 1505.719021431953 + "x": 567.3181507277893, + "y": 1506.2427302418655 }, { "type": "QPointF", - "x": 529.850841736931, - "y": 1508.5025558239051 + "x": 529.8901218300683, + "y": 1509.0302296950115 }, { "type": "QPointF", - "x": 491.5711386807613, - "y": 1508.8021853636637 + "x": 491.57527912840374, + "y": 1509.3313030222791 }, { "type": "QPointF", - "x": 452.3796638495728, - "y": 1506.6218318353756 + "x": 452.3502707817418, + "y": 1507.150148679257 }, { "type": "QPointF", - "x": 412.2526067102235, - "y": 1501.9654212136918 + "x": 412.19161352943087, + "y": 1502.4910279791181 }, { "type": "QPointF", - "x": 371.16614801459684, - "y": 1494.8368810611023 + "x": 371.07569338620755, + "y": 1495.3582260526082 }, { "type": "QPointF", - "x": 329.0964607271508, - "y": 1485.2401384020645 + "x": 328.97877955542225, + "y": 1485.756019959969 }, { "type": "QPointF", - "x": 286.01971144731027, - "y": 1473.179118237178 + "x": 285.87704576492825, + "y": 1473.6886564035954 }, { "type": "QPointF", - "x": 241.91206198448054, - "y": 1458.657742687849 + "x": 241.7465938922898, + "y": 1459.1603388979738 }, { "type": "QPointF", - "x": 196.74967084445657, - "y": 1441.6799306590651 + "x": 196.56347626091042, + "y": 1442.1752227113166 }, { "type": "QPointF", - "x": 150.50869449347155, - "y": 1422.2495978710633 + "x": 150.30371460077188, + "y": 1422.7374153405683 }, { "type": "QPointF", - "x": 103.16528835176109, - "y": 1400.3706571181995 + "x": 102.94331495188868, + "y": 1400.8509803944567 }, { "type": "QPointF", - "x": 54.695607523982886, - "y": 1376.0470186423145 + "x": 54.45827862060838, + "y": 1376.5199431940014 }, { "type": "QPointF", - "x": 29.982215367626612, - "y": 1362.8678691934062 + "x": 29.507951730702608, + "y": 1363.2146255965158 }, { "type": "QPointF", @@ -487,8 +487,8 @@ }, { "type": "QPointF", - "x": 1391.2086175709487, - "y": 1170.9617637988192 + "x": 1391.2039211231315, + "y": 1170.9444368424918 } ] } diff --git a/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json b/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json index 63248b8cd..967d1828f 100644 --- a/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json +++ b/src/test/ValentinaTest/share/Issue_767_Fabric_SkinFusing_TopCollar_Notch/output.json @@ -2,13 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -2956.5030529864016, - "y": -931.8887724955887 + "x": -2957.3212835148197, + "y": -932.2852700735566 }, { "type": "QPointF", - "x": -2845.899935375713, - "y": -956.8546709870811 + "x": -2846.0247648681707, + "y": -957.4076865751346 + }, + { + "type": "QPointF", + "x": -2836.682640549089, + "y": -967.8242552486842 }, { "type": "QPointF", @@ -87,128 +92,133 @@ }, { "type": "QPointF", - "x": -2233.65827147828, - "y": -2034.554538171414 + "x": -2238.355793679728, + "y": -2021.0382097207842 }, { "type": "QPointF", - "x": -2268.8436352828485, - "y": -2142.342922919639 + "x": -2234.2007307741874, + "y": -2034.7193002881183 }, { "type": "QPointF", - "x": -2142.3122608136746, - "y": -2153.9156587153366 + "x": -2269.603163825121, + "y": -2142.8427508104614 }, { "type": "QPointF", - "x": -2102.0515744670092, - "y": -2047.9183811673374 + "x": -2141.93514863526, + "y": -2154.51944535007 }, { "type": "QPointF", - "x": -1957.5403230208335, - "y": -1829.7652886912047 + "x": -2101.5215880792693, + "y": -2048.1196845990708 }, { "type": "QPointF", - "x": -2104.9501005376533, - "y": -1680.2660917824794 + "x": -1956.8136170257674, + "y": -1829.6948341622265 }, { "type": "QPointF", - "x": -2157.060300463831, - "y": -1624.0358185292575 + "x": -2104.5464100140907, + "y": -1679.8680432879423 }, { "type": "QPointF", - "x": -2193.4274478512552, - "y": -1582.92646049531 + "x": -2156.644476582616, + "y": -1623.6504626643373 }, { "type": "QPointF", - "x": -2229.902122393521, - "y": -1539.6063545962465 + "x": -2193.0028259112105, + "y": -1582.5508212390416 }, { "type": "QPointF", - "x": -2265.2830714858405, - "y": -1494.9101435167322 + "x": -2229.4684452440633, + "y": -1539.241206992043 }, { "type": "QPointF", - "x": -2298.369042523422, - "y": -1449.6724699414328 + "x": -2264.838555877841, + "y": -1494.558270646135 }, { "type": "QPointF", - "x": -2320.8174013670823, - "y": -1415.919693555917 + "x": -2297.911442350272, + "y": -1449.3377899086402 }, { "type": "QPointF", - "x": -2334.512979027829, - "y": -1393.6772374133016 + "x": -2320.3453428089233, + "y": -1415.605735978391 }, { "type": "QPointF", - "x": -2347.040624083681, - "y": -1371.625419954687 + "x": -2334.0302257843186, + "y": -1393.3799867636847 }, { "type": "QPointF", - "x": -2359.1340239833617, - "y": -1348.4727660769108 + "x": -2346.5476865811015, + "y": -1371.345381990532 }, { "type": "QPointF", - "x": -2376.632959717138, - "y": -1311.9082207264003 + "x": -2358.63151568645, + "y": -1348.2102893077445 }, { "type": "QPointF", - "x": -2398.550531300069, - "y": -1260.3257755932725 + "x": -2376.12157640571, + "y": -1311.663484640768 }, { "type": "QPointF", - "x": -2418.827935677912, - "y": -1207.0492355851677 + "x": -2398.0287508025563, + "y": -1260.1040691314076 }, { "type": "QPointF", - "x": -2437.363294135359, - "y": -1153.5377980701433 + "x": -2418.29808643562, + "y": -1206.8475714503795 }, { "type": "QPointF", - "x": -2454.054727957102, - "y": -1101.2506604162588 + "x": -2436.8275916664184, + "y": -1153.3522407809085 }, { "type": "QPointF", - "x": -2475.6739879860315, - "y": -1027.6984737575344 + "x": -2453.5146498120807, + "y": -1101.0782532235787 }, { "type": "QPointF", - "x": -2528.614214397672, - "y": -824.5310924892902 + "x": -2475.1300682438928, + "y": -1027.5385989411034 }, { "type": "QPointF", - "x": -2789.994527523379, - "y": -836.9651369538702 + "x": -2528.181611085116, + "y": -823.9429430032887 }, { "type": "QPointF", - "x": -2901.657768809803, - "y": -817.2758947616983 + "x": -2790.0214662755443, + "y": -836.3988482055721 }, { "type": "QPointF", - "x": -2956.5030529864016, - "y": -931.8887724955887 + "x": -2901.983320083022, + "y": -816.6428163590526 + }, + { + "type": "QPointF", + "x": -2957.3212835148197, + "y": -932.2852700735566 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test1/output.json b/src/test/ValentinaTest/share/Issue_923_test1/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json index b34e42e62..3f0cc1c75 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -941.3979025221786, - "y": 276.1785521318314 + "x": -941.4607963790727, + "y": 276.12689835165446 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", @@ -162,8 +162,8 @@ }, { "type": "QPointF", - "x": -941.3979025221786, - "y": 276.1785521318314 + "x": -941.4607963790727, + "y": 276.12689835165446 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json index ad6250054..dcae2eb12 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -925.4764900602008, - "y": 240.34641605836427 + "x": -925.5802587835234, + "y": 240.2611923642163 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json index 5d1260655..a12c50066 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json @@ -2,18 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -957.530371934163, - "y": 262.92919726843803 + "x": -957.6750155239142, + "y": 262.8104036603184 }, { "type": "QPointF", - "x": -925.476490060202, - "y": 240.3464160583648 + "x": -925.5802587835236, + "y": 240.26119236421533 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", @@ -167,8 +167,8 @@ }, { "type": "QPointF", - "x": -957.530371934163, - "y": 262.92919726843803 + "x": -957.6750155239142, + "y": 262.8104036603184 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test4/output.json b/src/test/ValentinaTest/share/Issue_923_test4/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json index 6aa804221..8e5a4e41b 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -1086.9858464447993, - "y": 603.8333396546097 + "x": -1086.319675233741, + "y": 603.286223243 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", @@ -147,8 +147,8 @@ }, { "type": "QPointF", - "x": -1086.9858464447993, - "y": 603.8333396546097 + "x": -1086.319675233741, + "y": 603.286223243 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test5/output.json b/src/test/ValentinaTest/share/Issue_923_test5/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json index 4f4890a54..f9f3c95d8 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json @@ -2,18 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -949.4641372281714, - "y": 269.5538747001349 + "x": -949.5679059514944, + "y": 269.4686510059864 }, { "type": "QPointF", - "x": -925.4764900602046, - "y": 240.34641605836896 + "x": -925.5802587835218, + "y": 240.26119236421337 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", @@ -167,8 +167,8 @@ }, { "type": "QPointF", - "x": -949.4641372281714, - "y": 269.5538747001349 + "x": -949.5679059514944, + "y": 269.4686510059864 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index 229677e95..ce9aead9e 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json index 0cce9e6b4..a9f8fad39 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -831.0655338039053, - "y": 27.86864503893777 + "x": -831.5531621884526, + "y": 27.90388512315623 }, { "type": "QPointF", - "x": -797.0932693502834, - "y": -48.588064159004134 + "x": -797.7132813112016, + "y": -48.52244559084083 }, { "type": "QPointF", @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -631.7930917515523, - "y": -91.34256217336385 + "x": -631.8008980267215, + "y": -91.35633060009326 }, { "type": "QPointF", @@ -157,8 +157,8 @@ }, { "type": "QPointF", - "x": -831.0655338039053, - "y": 27.86864503893777 + "x": -831.5531621884526, + "y": 27.90388512315623 } ] } 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 09012f608..cf24c1470 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -107,13 +107,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json index 5bf1ff1f7..838693309 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -112,13 +112,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.735396006941144 + "x": -815.2818897637795, + "y": -46.697156391859295 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json index 961de83dd..28044c3b3 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -2,8 +2,8 @@ "vector": [ { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.83456737329983 + "x": -815.2818897637795, + "y": -46.78021234074653 }, { "type": "QPointF", @@ -157,13 +157,13 @@ }, { "type": "QPointF", - "x": -814.7527559055118, + "x": -815.2818897637795, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7527559055118, - "y": -46.83456737329983 + "x": -815.2818897637795, + "y": -46.78021234074653 } ] } diff --git a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json index 6aeef6c37..c52fe5ffd 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -62,13 +62,13 @@ }, { "type": "QPointF", - "x": 284.94491218126115, - "y": -68.7504632158891 + "x": 285.16939607807876, + "y": -68.9102571433973 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -77,13 +77,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -197,18 +197,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } 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 ec20da483..6a6b0e3a0 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json @@ -2,8 +2,8 @@ "vector": [ { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -117,23 +117,23 @@ }, { "type": "QPointF", - "x": 1290.2705536650083, - "y": 707.4996206162249 + "x": 1290.4028062852726, + "y": 707.5008815309488 }, { "type": "QPointF", - "x": 1302.416131870577, - "y": 881.6558256043734 + "x": 1302.4618765682826, + "y": 882.3181924346007 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -187,13 +187,13 @@ }, { "type": "QPointF", - "x": 284.94491218126115, - "y": -68.7504632158891 + "x": 285.16939607807876, + "y": -68.9102571433973 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -202,13 +202,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 } ] } 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 6438772fc..abf992f9a 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 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -72,18 +72,18 @@ }, { "type": "QPointF", - "x": 330.08665818979597, - "y": -109.70249321395286 + "x": 330.25975933130064, + "y": -109.86937656993382 }, { "type": "QPointF", - "x": 335.2142773012761, - "y": -61.81465243233077 + "x": 335.0862325583723, + "y": -62.02308576348085 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -92,13 +92,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -212,18 +212,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } 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 9a436aa73..38dc75215 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 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -67,18 +67,18 @@ }, { "type": "QPointF", - "x": 308.6809861986896, - "y": -89.06571203590164 + "x": 308.85408734019427, + "y": -89.23259539188258 }, { "type": "QPointF", - "x": 334.9131314168673, - "y": -61.856202407499886 + "x": 335.086232558372, + "y": -62.02308576348083 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -87,13 +87,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -207,18 +207,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } diff --git a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json index 120ac1bb8..f68975c00 100644 --- a/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json +++ b/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -67,8 +67,13 @@ }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 335.0862325583722, + "y": -62.02308576348085 + }, + { + "type": "QPointF", + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -77,13 +82,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -197,18 +202,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } 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 b82d82211..d91d9c711 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 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -67,13 +67,13 @@ }, { "type": "QPointF", - "x": 286.6862253773818, - "y": -68.51020916027548 + "x": 286.564782103786, + "y": -68.71773166746935 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -82,13 +82,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -202,18 +202,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } 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 120ac1bb8..ce0968ff2 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 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 }, { "type": "QPointF", - "x": 30, - "y": 2.202377824282337 + "x": 29.433070866141733, + "y": 2.2085234576982202 }, { "type": "QPointF", @@ -62,13 +62,13 @@ }, { "type": "QPointF", - "x": 284.4959443876259, - "y": -68.4308753608727 + "x": 284.5734311894893, + "y": -68.99248415563493 }, { "type": "QPointF", - "x": 556.951317720607, - "y": -31.220946854728947 + "x": 556.9804629248772, + "y": -31.407692230837736 }, { "type": "QPointF", @@ -77,13 +77,13 @@ }, { "type": "QPointF", - "x": 585.9167315845333, - "y": -20.702420721823497 + "x": 586.153833178555, + "y": -21.217486096297492 }, { "type": "QPointF", - "x": 1117.4559101159903, - "y": 212.6634418802967 + "x": 1117.7037149530322, + "y": 212.15307563552173 }, { "type": "QPointF", @@ -197,18 +197,18 @@ }, { "type": "QPointF", - "x": 1290.1538811177663, + "x": 1290.2822996456107, "y": 705.8266456692913 }, { "type": "QPointF", - "x": 1302.4161318705778, - "y": 881.6558256043734 + "x": 1302.4618913981099, + "y": 882.3181914081317 }, { "type": "QPointF", - "x": 30, - "y": 970.3935748031496 + "x": 29.433070866141634, + "y": 970.4328156646322 } ] } diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index 435a49fac..525224876 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -52,8 +52,8 @@ Issue_923_test6/output.json Issue_923_test6_6/input.json Issue_923_test6_6/output.json - Issue_927/input.json - Issue_927/output.json + Issue_627/input.json + Issue_627/output.json Issue_687/input.json Issue_687/output.json Issue_767_Fabric_TopCollar/input.json @@ -111,5 +111,7 @@ doll/output.json Issue_937_case_1a/input.json Issue_937_case_1a/output.json + Issue_604/input.json + Issue_604/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index ded1d5452..980425161 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -899,41 +899,16 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data() QTest::newRow("GAVAUDAN Laure.") << points << 37.795275590551185 << ekvOrig; #endif - points.clear(); - p = VSAPoint(97.33089106412862, -223.03306117556497); - p.SetSAAfter(-1); - p.SetSABefore(0); - points.append(p); - - p = VSAPoint(990.7494050554426, 2.819093995045); - p.SetSAAfter(-1); - p.SetSABefore(-1); - points.append(p); - - p = VSAPoint(908.3966357321774, 379.5839357215547); - p.SetSAAfter(-1); - p.SetSABefore(-1); - points.append(p); - - p = VSAPoint(-135.41154226686143, 697.6417881399819); - p.SetSAAfter(0); - p.SetSABefore(-1); - points.append(p); - - ekvOrig.clear(); - ekvOrig.append(QPointF(100.10981413873267, -234.02583351343978)); - ekvOrig.append(QPointF(1004.1704360325447, -5.483401649771952)); - ekvOrig.append(QPointF(918.0553412376563, 388.4941212347381)); - ekvOrig.append(QPointF(-138.65807550610091, 710.4843173601864)); - ekvOrig.append(QPointF(100.10981413873267, -234.02583351343978)); - // See the file "collection/bugs/Issue_#604.val" (since 0.5.0) - QTest::newRow("Issue #604.") << points << 11.338582677165354 << ekvOrig; + ASSERT_TEST_CASE("Issue #604.", + QStringLiteral("://Issue_604/input.json"), + QStringLiteral("://Issue_604/output.json"), + 11.338582677165354 /*seam allowance width*/); // See the file "collection/bugs/Issue_#627.val" ASSERT_TEST_CASE("Issue #627.", - QStringLiteral("://Issue_927/input.json"), - QStringLiteral("://Issue_927/output.json"), + QStringLiteral("://Issue_627/input.json"), + QStringLiteral("://Issue_627/output.json"), 56.692913385826778 /*seam allowance width*/); #if !defined (Q_PROCESSOR_S390) && !defined(Q_PROCESSOR_S390_X)