Fix incorrect seam allowance. Closes #120

This commit is contained in:
Roman Telezhynskyi 2021-04-10 19:18:28 +03:00
parent bcceeab089
commit 197a4a54e1
14 changed files with 1600 additions and 185 deletions

View File

@ -1,6 +1,7 @@
# Version 0.7.47 (unreleased)
- [smart-pattern/valentina#118] Incorrect seam allowance.
- [smart-pattern/valentina#119] Improve tool Point of intersection curves.
- [smart-pattern/valentina#120] Incorrect seam allowance.
# Version 0.7.46 Mar 31, 2021
- Fix incorrect calculation of value for multisize measurements in Valentina.

View File

@ -97,7 +97,7 @@ private:
};
Q_DECLARE_METATYPE(VLayoutPassmark)
constexpr qreal accuracyPointOnLine = (0.128/*mm*/ / 25.4) * PrintDPI;
constexpr qreal accuracyPointOnLine = (0.138/*mm*/ / 25.4) * PrintDPI;
Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2,
qreal accuracy = accuracyPointOnLine);

View File

@ -202,58 +202,58 @@
},
{
"type": "QPointF",
"x": 2795.1934418373985,
"y": 714.0407970608541
"x": 2795.1870397580587,
"y": 714.0474084064654
},
{
"type": "QPointF",
"x": 2797.520564686708,
"y": 711.5183868986292
"x": 2797.5081938293038,
"y": 711.5320126236637
},
{
"type": "QPointF",
"x": 2797.55905511811,
"y": 711.5533198039858
"y": 711.5781695971301
},
{
"type": "QPointF",
"x": 2797.55905511811,
"y": 711.5533198039858
"y": 711.5781695971301
},
{
"type": "QPointF",
"x": 2797.565477459869,
"y": 778.3077483501366
"y": 778.332404004272
},
{
"type": "QPointF",
"x": 2798.0441679430687,
"y": 888.600497760094
"y": 888.6231149546354
},
{
"type": "QPointF",
"x": 2799.8047936736652,
"y": 981.4929110797046
"y": 981.5120337720853
},
{
"type": "QPointF",
"x": 2803.650599415853,
"y": 1068.6060917850425
"y": 1068.6208463497221
},
{
"type": "QPointF",
"x": 2810.3848299338274,
"y": 1161.5611433521817
"y": 1161.5712385806464
},
{
"type": "QPointF",
"x": 2820.8107299917833,
"y": 1271.9791692571957
"y": 1271.9848963579593
},
{
"type": "QPointF",
"x": 2844.4160857065513,
"y": 1489.955982223637
"y": 1489.9567587796728
},
{
"type": "QPointF",

View File

@ -115,11 +115,6 @@
"x": 2651.457513977499,
"y": 754.2498813699515
},
{
"type": "QPointF",
"x": 2661.906602177309,
"y": 755.9323325983764
},
{
"type": "QPointF",
"x": 2669.4674223109832,
@ -172,48 +167,43 @@
},
{
"type": "QPointF",
"x": 2795.1934418373985,
"y": 714.0407970608541
},
{
"type": "QPointF",
"x": 2797.520564686708,
"y": 711.5183868986292
"x": 2797.5081938293038,
"y": 711.5320126236637
},
{
"type": "QPointF",
"x": 2797.565477459869,
"y": 778.3077483501366
"y": 778.332404004272
},
{
"type": "QPointF",
"x": 2798.0441679430687,
"y": 888.600497760094
"y": 888.6231149546354
},
{
"type": "QPointF",
"x": 2799.8047936736652,
"y": 981.4929110797046
"y": 981.5120337720853
},
{
"type": "QPointF",
"x": 2803.650599415853,
"y": 1068.6060917850425
"y": 1068.6208463497221
},
{
"type": "QPointF",
"x": 2810.3848299338274,
"y": 1161.5611433521817
"y": 1161.5712385806464
},
{
"type": "QPointF",
"x": 2820.8107299917833,
"y": 1271.9791692571957
"y": 1271.9848963579593
},
{
"type": "QPointF",
"x": 2844.4160857065513,
"y": 1489.955982223637
"y": 1489.9567587796728
},
{
"type": "QPointF",

View File

@ -17,13 +17,13 @@
},
{
"type": "QPointF",
"x": 1407.8381204298632,
"y": 145.1062512160027
"x": 1408.0893420196692,
"y": 145.11548509775966
},
{
"type": "QPointF",
"x": 1483.7532902514336,
"y": 146.4528221367358
"x": 1483.9978697539314,
"y": 146.45716044812525
},
{
"type": "QPointF",
@ -100,11 +100,6 @@
"x": 1304.3044047855055,
"y": 678.9220639742948
},
{
"type": "QPointF",
"x": 1291.8905309106663,
"y": 667.5846686352518
},
{
"type": "QPointF",
"x": 1282.6488410331592,

View File

@ -0,0 +1,520 @@
{
"vector": [
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
},
{
"angle": 6,
"type": "VSAPoint",
"x": 726.8079975280607,
"y": 622.888701781939
},
{
"angle": 6,
"type": "VSAPoint",
"x": 754.3673278571332,
"y": 635.630828583758
},
{
"angle": 6,
"type": "VSAPoint",
"x": 781.0280722651629,
"y": 649.2144985332973
},
{
"angle": 6,
"type": "VSAPoint",
"x": 806.799580767585,
"y": 663.5877413692597
},
{
"angle": 6,
"type": "VSAPoint",
"x": 831.6912033798346,
"y": 678.6985868303482
},
{
"angle": 6,
"type": "VSAPoint",
"x": 855.7122901173473,
"y": 694.4950646552657
},
{
"angle": 6,
"type": "VSAPoint",
"x": 878.872190995558,
"y": 710.925204582715
},
{
"angle": 6,
"type": "VSAPoint",
"x": 901.180256029902,
"y": 727.9370363513991
},
{
"angle": 6,
"type": "VSAPoint",
"x": 922.6458352358145,
"y": 745.4785897000208
},
{
"angle": 6,
"type": "VSAPoint",
"x": 943.278278628731,
"y": 763.4978943672834
},
{
"angle": 6,
"type": "VSAPoint",
"x": 963.0869362240865,
"y": 781.9429800918895
},
{
"angle": 6,
"type": "VSAPoint",
"x": 982.0811580373162,
"y": 800.7618766125419
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1000.2702940838556,
"y": 819.9026136679438
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1017.6636943791395,
"y": 839.3132209967978
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1042.37878853631,
"y": 868.8039607286885
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1072.5033748045694,
"y": 908.6207538915453
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1099.6133183456423,
"y": 948.5815634448637
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1123.7834192830105,
"y": 988.2706272982668
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1145.088477740156,
"y": 1027.2721833613782
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1163.6032938405606,
"y": 1065.1704695438207
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1179.4026677077059,
"y": 1101.5497237552183
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1192.5613994650748,
"y": 1135.994183905194
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1203.154289236148,
"y": 1168.0880879033707
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1207.4096833403676,
"y": 1182.9997307219853
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1212.022828871306,
"y": 1200.3588500903552
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1219.4041899368062,
"y": 1235.235880725122
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1224.3720535154303,
"y": 1270.0050432406642
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1226.7046623947076,
"y": 1304.3347616404735
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1226.496853277681,
"y": 1329.562335863055
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1225.4788193061186,
"y": 1346.086759479433
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1223.6772332277046,
"y": 1362.3148105688415
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1221.0643753908807,
"y": 1378.2050421317176
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1217.612526144088,
"y": 1393.7160071684975
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1213.293965835767,
"y": 1408.8062586796173
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1208.0809748143597,
"y": 1423.4343496655133
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1201.945833428307,
"y": 1437.5588331266226
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1194.86082202605,
"y": 1451.1382620633813
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1186.79822095603,
"y": 1464.131189476226
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1177.7303105666883,
"y": 1476.4961683655927
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1167.6293712064657,
"y": 1488.1917517319184
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1156.4676832238038,
"y": 1499.1764925756397
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1144.2175269671434,
"y": 1509.408943897192
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1130.851182784926,
"y": 1518.847658697013
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1116.3409310255927,
"y": 1527.4511899755385
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1100.6590520375842,
"y": 1535.178090733205
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1083.7778261693425,
"y": 1541.986913970449
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1065.6695337693086,
"y": 1547.836212687707
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1046.3064551859234,
"y": 1552.6845398854152
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1025.660870767628,
"y": 1556.4904485640104
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1003.7050608628641,
"y": 1559.212491723929
},
{
"angle": 6,
"type": "VSAPoint",
"x": 980.4113058200722,
"y": 1560.8092223656067
},
{
"angle": 6,
"type": "VSAPoint",
"x": 955.751885987694,
"y": 1561.239193489481
},
{
"angle": 6,
"type": "VSAPoint",
"x": 942.8427542065093,
"y": 1560.9524866274971
},
{
"angle": 6,
"type": "VSAPoint",
"x": 932.8408996655451,
"y": 1560.5035571702351
},
{
"angle": 6,
"type": "VSAPoint",
"x": 913.8735721859588,
"y": 1558.1857240870427
},
{
"angle": 6,
"type": "VSAPoint",
"x": 896.1053882153979,
"y": 1554.2537835922294
},
{
"angle": 6,
"type": "VSAPoint",
"x": 879.4868872941008,
"y": 1548.8075818977768
},
{
"angle": 6,
"type": "VSAPoint",
"x": 863.9686089623065,
"y": 1541.9469652156642
},
{
"angle": 6,
"type": "VSAPoint",
"x": 849.5010927602539,
"y": 1533.7717797578728
},
{
"angle": 6,
"type": "VSAPoint",
"x": 836.0348782281815,
"y": 1524.3818717363822
},
{
"angle": 6,
"type": "VSAPoint",
"x": 823.5205049063281,
"y": 1513.8770873631734
},
{
"angle": 6,
"type": "VSAPoint",
"x": 811.9085123349323,
"y": 1502.3572728502265
},
{
"angle": 6,
"type": "VSAPoint",
"x": 801.149440054233,
"y": 1489.9222744095218
},
{
"angle": 6,
"type": "VSAPoint",
"x": 791.1938276044689,
"y": 1476.67193825304
},
{
"angle": 6,
"type": "VSAPoint",
"x": 781.9922145258788,
"y": 1462.706110592761
},
{
"angle": 6,
"type": "VSAPoint",
"x": 773.4951403587014,
"y": 1448.1246376406655
},
{
"angle": 6,
"type": "VSAPoint",
"x": 765.6531446431753,
"y": 1433.027365608734
},
{
"angle": 6,
"type": "VSAPoint",
"x": 754.9437999982238,
"y": 1409.6660208185863
},
{
"angle": 6,
"type": "VSAPoint",
"x": 742.5967537599449,
"y": 1377.57483681947
},
{
"angle": 6,
"type": "VSAPoint",
"x": 731.9797330525687,
"y": 1345.217688316655
},
{
"angle": 6,
"type": "VSAPoint",
"x": 718.3398397741655,
"y": 1297.7142208606672
},
{
"angle": 6,
"type": "VSAPoint",
"x": 706.5519873349563,
"y": 1254.5381527444517
},
{
"angle": 6,
"type": "VSAPoint",
"x": 698.8982319702905,
"y": 1229.1048431852737
},
{
"angle": 6,
"type": "VSAPoint",
"x": 690.9960837460767,
"y": 1207.3994176016122
},
{
"angle": 6,
"type": "VSAPoint",
"x": 684.6390350732308,
"y": 1194.2074612599308
},
{
"angle": 6,
"type": "VSAPoint",
"x": 680.1307128682538,
"y": 1186.8995080395903
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
},
{
"angle": 6,
"type": "VSAPoint",
"x": 680.5249837176159,
"y": 1114.1626832930294
},
{
"angle": 6,
"type": "VSAPoint",
"x": 685.3436809655902,
"y": 1014.1063107551211
},
{
"angle": 6,
"type": "VSAPoint",
"x": 692.0193814449215,
"y": 900.1566306917512
},
{
"angle": 6,
"type": "VSAPoint",
"x": 700.1576970999383,
"y": 778.8334557524149
},
{
"angle": 6,
"type": "VSAPoint",
"x": 709.3642398749706,
"y": 656.6565985866073
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
}
]
}

View File

@ -0,0 +1,419 @@
{
"vector": [
{
"type": "QPointF",
"x": 679.3851616778779,
"y": 560.5071958351052
},
{
"type": "QPointF",
"x": 771.5253642394297,
"y": 601.9546553381315
},
{
"type": "QPointF",
"x": 799.4376087748578,
"y": 616.2058356936133
},
{
"type": "QPointF",
"x": 826.4126763608873,
"y": 631.2797030782433
},
{
"type": "QPointF",
"x": 852.4578079793142,
"y": 647.1196224652111
},
{
"type": "QPointF",
"x": 877.5809531604997,
"y": 663.6690296577056
},
{
"type": "QPointF",
"x": 901.7907248274646,
"y": 680.8715248752063
},
{
"type": "QPointF",
"x": 925.0963403503594,
"y": 698.6709507275484
},
{
"type": "QPointF",
"x": 947.5075534628146,
"y": 717.0114538453757
},
{
"type": "QPointF",
"x": 969.0345813622434,
"y": 735.8375305507107
},
{
"type": "QPointF",
"x": 989.6880307490753,
"y": 755.0940578223057
},
{
"type": "QPointF",
"x": 1009.4788258609301,
"y": 774.7263114219681
},
{
"type": "QPointF",
"x": 1028.4181408179645,
"y": 794.6799734175851
},
{
"type": "QPointF",
"x": 1046.6313379043359,
"y": 815.0365143510681
},
{
"type": "QPointF",
"x": 1072.5195471519162,
"y": 846.0000679241381
},
{
"type": "QPointF",
"x": 1103.2326972486792,
"y": 886.5947879276818
},
{
"type": "QPointF",
"x": 1131.8938186908024,
"y": 928.9231770809744
},
{
"type": "QPointF",
"x": 1156.952462519591,
"y": 970.1516475329622
},
{
"type": "QPointF",
"x": 1179.0478403597917,
"y": 1010.68168766554
},
{
"type": "QPointF",
"x": 1198.2703716433202,
"y": 1050.1146874790124
},
{
"type": "QPointF",
"x": 1214.7092455016766,
"y": 1088.0616393306495
},
{
"type": "QPointF",
"x": 1228.4522431131863,
"y": 1124.1480790942294
},
{
"type": "QPointF",
"x": 1239.498617577997,
"y": 1157.7163641148504
},
{
"type": "QPointF",
"x": 1243.9371430484484,
"y": 1173.292643401877
},
{
"type": "QPointF",
"x": 1248.798757776046,
"y": 1191.586744425441
},
{
"type": "QPointF",
"x": 1256.6412809572312,
"y": 1228.6427722795033
},
{
"type": "QPointF",
"x": 1261.9854393682826,
"y": 1266.0455530446939
},
{
"type": "QPointF",
"x": 1264.5105042440828,
"y": 1303.207705215837
},
{
"type": "QPointF",
"x": 1264.2825490193795,
"y": 1330.8809730344592
},
{
"type": "QPointF",
"x": 1263.0433176952379,
"y": 1350.2570493662236
},
{
"type": "QPointF",
"x": 1261.1324256351706,
"y": 1367.4696901324185
},
{
"type": "QPointF",
"x": 1258.1870795248535,
"y": 1385.3819665165963
},
{
"type": "QPointF",
"x": 1254.259895289484,
"y": 1403.028860402362
},
{
"type": "QPointF",
"x": 1249.2997133041586,
"y": 1420.3611166071119
},
{
"type": "QPointF",
"x": 1243.2551308267514,
"y": 1437.3227231182614
},
{
"type": "QPointF",
"x": 1236.076406635598,
"y": 1453.8497702928087
},
{
"type": "QPointF",
"x": 1227.7179800037757,
"y": 1469.869880074677
},
{
"type": "QPointF",
"x": 1218.1413963843438,
"y": 1485.3025989639923
},
{
"type": "QPointF",
"x": 1207.318198770456,
"y": 1500.0610829217153
},
{
"type": "QPointF",
"x": 1195.2321442955154,
"y": 1514.05517323754
},
{
"type": "QPointF",
"x": 1181.8800595132454,
"y": 1527.195586343914
},
{
"type": "QPointF",
"x": 1167.2708519352282,
"y": 1539.3985331681424
},
{
"type": "QPointF",
"x": 1151.4226411637437,
"y": 1550.5898312164527
},
{
"type": "QPointF",
"x": 1134.3585074135146,
"y": 1560.707630059371
},
{
"type": "QPointF",
"x": 1116.1017451381758,
"y": 1569.703247890992
},
{
"type": "QPointF",
"x": 1096.6715820282905,
"y": 1577.5401518645901
},
{
"type": "QPointF",
"x": 1076.0800742491963,
"y": 1584.191573068637
},
{
"type": "QPointF",
"x": 1054.3304683092908,
"y": 1589.63746358464
},
{
"type": "QPointF",
"x": 1031.4169229882777,
"y": 1593.861459342171
},
{
"type": "QPointF",
"x": 1007.3252389313808,
"y": 1596.8483044680145
},
{
"type": "QPointF",
"x": 982.0341722455236,
"y": 1598.5819459982806
},
{
"type": "QPointF",
"x": 954.9126743758827,
"y": 1599.02515094508
},
{
"type": "QPointF",
"x": 941.1480338176947,
"y": 1598.7097479128342
},
{
"type": "QPointF",
"x": 929.6966471777685,
"y": 1598.195756755684
},
{
"type": "QPointF",
"x": 907.483440354716,
"y": 1595.4812728246357
},
{
"type": "QPointF",
"x": 886.1127249748149,
"y": 1590.7521242889954
},
{
"type": "QPointF",
"x": 865.9269655274252,
"y": 1584.136863512658
},
{
"type": "QPointF",
"x": 846.989714534499,
"y": 1575.764722138622
},
{
"type": "QPointF",
"x": 829.3502587762655,
"y": 1565.797163078442
},
{
"type": "QPointF",
"x": 813.0301529589129,
"y": 1554.417254332673
},
{
"type": "QPointF",
"x": 798.0173460754563,
"y": 1541.8152410243486
},
{
"type": "QPointF",
"x": 784.2682736561633,
"y": 1528.175311182722
},
{
"type": "QPointF",
"x": 771.7152579891342,
"y": 1513.6669292169577
},
{
"type": "QPointF",
"x": 760.2756390298981,
"y": 1498.441467450863
},
{
"type": "QPointF",
"x": 749.8599308295067,
"y": 1482.6329364417857
},
{
"type": "QPointF",
"x": 739.954732735659,
"y": 1465.546575347063
},
{
"type": "QPointF",
"x": 731.2959376388606,
"y": 1448.777450809409
},
{
"type": "QPointF",
"x": 720.0938869758143,
"y": 1424.3413180139733
},
{
"type": "QPointF",
"x": 706.9812877693627,
"y": 1390.260386775834
},
{
"type": "QPointF",
"x": 695.6523318331946,
"y": 1355.64854530984
},
{
"type": "QPointF",
"x": 682.0124385547914,
"y": 1308.1450778538522
},
{
"type": "QPointF",
"x": 670.219541387873,
"y": 1264.96282546516
},
{
"type": "QPointF",
"x": 663.0158295671732,
"y": 1241.0250035749032
},
{
"type": "QPointF",
"x": 656.1276142232095,
"y": 1222.104623785708
},
{
"type": "QPointF",
"x": 651.4423683209832,
"y": 1212.3819423067657
},
{
"type": "QPointF",
"x": 648.9851082478891,
"y": 1208.3987439354166
},
{
"type": "QPointF",
"x": 639.4512595200423,
"y": 1196.0020170393075
},
{
"type": "QPointF",
"x": 642.759451136787,
"y": 1112.6635482583558
},
{
"type": "QPointF",
"x": 647.5921598654662,
"y": 1012.2882041596299
},
{
"type": "QPointF",
"x": 654.2887990813598,
"y": 897.946198274302
},
{
"type": "QPointF",
"x": 662.447168917079,
"y": 776.3038468625813
},
{
"type": "QPointF",
"x": 671.6758151491617,
"y": 653.8166164295044
},
{
"type": "QPointF",
"x": 679.3851616778779,
"y": 560.5071958351052
}
]
}

View File

@ -0,0 +1,321 @@
{
"vector": [
{
"angle": 4,
"type": "VSAPoint",
"x": 726.3328951195898,
"y": 466.32672911664105
},
{
"angle": 4,
"type": "VSAPoint",
"x": 726.3328951195898,
"y": 466.32672911664105
},
{
"angle": 6,
"type": "VSAPoint",
"x": 748.4704983324366,
"y": 467.6644498046602
},
{
"type": "VSAPoint",
"x": 893.3647248091735,
"y": 475.431155781443
},
{
"type": "VSAPoint",
"x": 893.3647248091735,
"y": 475.431155781443
},
{
"type": "VSAPoint",
"x": 893.3647248091735,
"y": 475.431155781443
},
{
"angle": 6,
"type": "VSAPoint",
"x": 900.7799673284717,
"y": 475.83396978129576
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1045.4320327261817,
"y": 482.7134397143277
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1214.0408472485012,
"y": 489.5927257320857
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1394.4761078914503,
"y": 495.3251575547605
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1529.9727237352329,
"y": 498.08351679152236
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1617.6880295809483,
"y": 499.01458866922655
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1701.5366515170822,
"y": 499.0139449657674
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1780.0023016681369,
"y": 497.9382518961688
},
{
"type": "VSAPoint",
"x": 1816.423613879903,
"y": 496.898717956112
},
{
"type": "VSAPoint",
"x": 1816.423613879903,
"y": 496.898717956112
},
{
"type": "VSAPoint",
"x": 1849.4135433070867,
"y": 1222.677165354331
},
{
"type": "VSAPoint",
"x": 1849.4135433070867,
"y": 1222.677165354331
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1850.4239458186876,
"y": 1238.2316356319525
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1854.1875736320867,
"y": 1268.5318954632107
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1859.7916578915156,
"y": 1297.6192626599368
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1866.9573864834126,
"y": 1325.22431970463
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1875.4059472942151,
"y": 1351.0776490797903
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1884.8585282103609,
"y": 1374.909833267917
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1895.0363171182871,
"y": 1396.45145475151
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1905.6605019044318,
"y": 1415.4330960130683
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1911.0540380375096,
"y": 1423.7562266489372
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1915.2176538409371,
"y": 1429.836295711893
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1924.2956860224986,
"y": 1441.6625061671757
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1934.1907119103657,
"y": 1453.0690095985565
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1944.80943485638,
"y": 1464.0347017625381
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1961.8290579118616,
"y": 1479.6722498340055
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1986.2891263748718,
"y": 1498.7055156356078
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2011.9646434036204,
"y": 1515.5956599846636
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2038.1092358128394,
"y": 1530.173848933194
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2063.9765304172624,
"y": 1542.2712485332213
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2088.8201540316245,
"y": 1551.7190248367672
},
{
"angle": 5,
"type": "VSAPoint",
"x": 2100.5355463151377,
"y": 1555.2755905511813
},
{
"angle": 5,
"type": "VSAPoint",
"x": 2100.5355463151377,
"y": 1555.2755905511813
},
{
"type": "VSAPoint",
"x": 2100.5355463151377,
"y": 3063.3070866141734
},
{
"angle": 4,
"saAfter": 151.18110236220474,
"type": "VSAPoint",
"x": 2100.5355463151377,
"y": 4586.456692913386
},
{
"saBefore": 151.18110236220474,
"type": "VSAPoint",
"x": 677.76,
"y": 4586.456692913386
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 3063.3070866141734
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
},
{
"angle": 6,
"type": "VSAPoint",
"x": 680.5249837176159,
"y": 1114.1626832930294
},
{
"angle": 6,
"type": "VSAPoint",
"x": 685.3436809655902,
"y": 1014.1063107551211
},
{
"angle": 6,
"type": "VSAPoint",
"x": 692.0193814449215,
"y": 900.1566306917512
},
{
"angle": 6,
"type": "VSAPoint",
"x": 700.1576970999383,
"y": 778.8334557524149
},
{
"angle": 6,
"type": "VSAPoint",
"x": 709.3642398749706,
"y": 656.6565985866073
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
},
{
"angle": 6,
"type": "VSAPoint",
"x": 719.2446217143472,
"y": 540.1458718438239
},
{
"angle": 4,
"type": "VSAPoint",
"x": 726.3328951195898,
"y": 466.32672911664105
}
]
}

View File

@ -0,0 +1,204 @@
{
"vector": [
{
"type": "QPointF",
"x": 692.3263132377243,
"y": 425.0598484090772
},
{
"type": "QPointF",
"x": 729.9485435174106,
"y": 428.6724161589221
},
{
"type": "QPointF",
"x": 902.8367306099547,
"y": 438.0946986997068
},
{
"type": "QPointF",
"x": 1047.2274990256597,
"y": 444.9608350659975
},
{
"type": "QPointF",
"x": 1215.5816229877987,
"y": 451.8288691084969
},
{
"type": "QPointF",
"x": 1395.6762590253597,
"y": 457.54894156875224
},
{
"type": "QPointF",
"x": 1530.7419780161567,
"y": 460.29607039967215
},
{
"type": "QPointF",
"x": 1618.0891925886142,
"y": 461.22144213169855
},
{
"type": "QPointF",
"x": 1701.5363613638349,
"y": 461.2186693763291
},
{
"type": "QPointF",
"x": 1779.204057451268,
"y": 460.15036806979015
},
{
"type": "QPointF",
"x": 1852.4772835848457,
"y": 458.0590099929468
},
{
"type": "QPointF",
"x": 1888.112185721004,
"y": 1235.031600121014
},
{
"type": "QPointF",
"x": 1891.5390667367983,
"y": 1262.620774804999
},
{
"type": "QPointF",
"x": 1896.6767985033866,
"y": 1289.287591993124
},
{
"type": "QPointF",
"x": 1903.2463666212266,
"y": 1314.5960167159142
},
{
"type": "QPointF",
"x": 1910.9690199812524,
"y": 1338.228006286451
},
{
"type": "QPointF",
"x": 1919.546670079213,
"y": 1359.8542836861754
},
{
"type": "QPointF",
"x": 1928.6530532008871,
"y": 1379.1282399517556
},
{
"type": "QPointF",
"x": 1938.0436997249546,
"y": 1395.9059868680563
},
{
"type": "QPointF",
"x": 1945.822628290763,
"y": 1407.6356364111596
},
{
"type": "QPointF",
"x": 1953.5872392492531,
"y": 1417.7508157211655
},
{
"type": "QPointF",
"x": 1962.0622235753383,
"y": 1427.5203644714038
},
{
"type": "QPointF",
"x": 1971.193285152719,
"y": 1436.9497855888935
},
{
"type": "QPointF",
"x": 1986.4149731529892,
"y": 1450.5996057600491
},
{
"type": "QPointF",
"x": 2008.3149346481869,
"y": 1467.954893611232
},
{
"type": "QPointF",
"x": 2031.5799186205747,
"y": 1483.2593152177033
},
{
"type": "QPointF",
"x": 2055.3399893657565,
"y": 1496.5078981495822
},
{
"type": "QPointF",
"x": 2078.719642066318,
"y": 1507.441898227823
},
{
"type": "QPointF",
"x": 2100.6375771334715,
"y": 1515.7770650603459
},
{
"type": "QPointF",
"x": 2138.330821905689,
"y": 1515.7770650603459
},
{
"type": "QPointF",
"x": 2138.330821905689,
"y": 4737.637795275591
},
{
"type": "QPointF",
"x": 639.9647244094485,
"y": 4737.637795275591
},
{
"type": "QPointF",
"x": 639.9647244094488,
"y": 1183.067041495775
},
{
"type": "QPointF",
"x": 642.759451136787,
"y": 1112.6635482583558
},
{
"type": "QPointF",
"x": 647.5921598654662,
"y": 1012.2882041596299
},
{
"type": "QPointF",
"x": 654.2887990813598,
"y": 897.946198274302
},
{
"type": "QPointF",
"x": 662.447168917079,
"y": 776.3038468625813
},
{
"type": "QPointF",
"x": 671.6758151491617,
"y": 653.8166164295044
},
{
"type": "QPointF",
"x": 681.5845186532164,
"y": 536.9522071164919
},
{
"type": "QPointF",
"x": 692.3263132377243,
"y": 425.0598484090772
}
]
}

View File

@ -6,12 +6,6 @@
"y": 21597.251791493014
},
{
"type": "VSAPoint",
"x": -188.23334010667102,
"y": 21597.251791493014
},
{
"angle": 6,
"type": "VSAPoint",
"x": -188.0288159203024,
"y": 21597.69546369572

View File

@ -2,23 +2,8 @@
"vector": [
{
"type": "QPointF",
"x": -215.6414755238939,
"y": 21610.019843083213
},
{
"type": "QPointF",
"x": -185.4416809267488,
"y": 21596.600628239823
},
{
"type": "QPointF",
"x": -215.87209587564425,
"y": 21609.478265010075
},
{
"type": "QPointF",
"x": -218.99406907567914,
"y": 21602.146768820647
"x": -218.88332702810496,
"y": 21602.601187587297
},
{
"type": "QPointF",
@ -130,11 +115,6 @@
"x": 44.74330398553326,
"y": 21891.4437971853
},
{
"type": "QPointF",
"x": 45.774998600307924,
"y": 21904.16054336412
},
{
"type": "QPointF",
"x": 47.53333931071059,
@ -190,11 +170,6 @@
"x": 47.49610294540294,
"y": 22693.52994907348
},
{
"type": "QPointF",
"x": 45.806971514775746,
"y": 22718.852549989988
},
{
"type": "QPointF",
"x": 44.62552984829121,
@ -332,8 +307,8 @@
},
{
"type": "QPointF",
"x": -153.4650960199354,
"y": 22851.581055284918
"x": -153.3907628043003,
"y": 22851.331837685506
},
{
"type": "QPointF",
@ -382,7 +357,7 @@
},
{
"type": "QPointF",
"x": -109.85897382113086,
"x": -109.85897382113089,
"y": 22311.722834645672
},
{
@ -432,8 +407,8 @@
},
{
"type": "QPointF",
"x": -153.4650960199354,
"y": 21771.864614006427
"x": -153.53513142803976,
"y": 21771.61415466484
},
{
"type": "QPointF",
@ -447,13 +422,13 @@
},
{
"type": "QPointF",
"x": -202.58580499399324,
"y": 21638.045386629867
"x": -202.6152214315237,
"y": 21637.97693416576
},
{
"type": "QPointF",
"x": -215.6414755238939,
"y": 21610.019843083213
"x": -218.88332702810496,
"y": 21602.601187587297
}
]
}

View File

@ -7,38 +7,38 @@
},
{
"type": "QPointF",
"x": 165.64275495245442,
"y": 301.03538140265255
"x": 165.64505339863834,
"y": 297.1143398796336
},
{
"type": "QPointF",
"x": 165.9241818618377,
"y": 283.76299680393265
"x": 166.1722452473025,
"y": 280.2244654294098
},
{
"type": "QPointF",
"x": 165.88627642302018,
"y": 280.21495093296807
"x": 166.16205798196063,
"y": 276.72549910116425
},
{
"type": "QPointF",
"x": 167.78024031224584,
"y": 263.63026674491516
"x": 168.97844031610092,
"y": 256.82932371757767
},
{
"type": "QPointF",
"x": 171.2459135294844,
"y": 247.0901582437869
"x": 173.11677764302698,
"y": 240.88394423619718
},
{
"type": "QPointF",
"x": 175.35351394576222,
"y": 234.8597797393187
"x": 178.0948003175508,
"y": 228.9419652712462
},
{
"type": "QPointF",
"x": 179.7306152508974,
"y": 225.99041905785725
"x": 181.60851258888675,
"y": 223.02525030282638
},
{
"type": "QPointF",
@ -47,8 +47,8 @@
},
{
"type": "QPointF",
"x": 186.05638437375595,
"y": 217.45179989875413
"x": 185.99757111618186,
"y": 217.49928602474253
},
{
"type": "QPointF",
@ -62,38 +62,38 @@
},
{
"type": "QPointF",
"x": 203.29392527811845,
"y": 204.51550744665195
"x": 206.91766056957408,
"y": 202.6653456860961
},
{
"type": "QPointF",
"x": 214.35663608521494,
"y": 199.4209961283468
"x": 218.16643746973782,
"y": 198.0034374929712
},
{
"type": "QPointF",
"x": 225.94358343752913,
"y": 195.5502751712512
"x": 229.8999689979584,
"y": 194.5122323575353
},
{
"type": "QPointF",
"x": 237.92331027067195,
"y": 192.82283444004733
"x": 241.98385054517243,
"y": 192.18126436552825
},
{
"type": "QPointF",
"x": 248.98872642851768,
"y": 191.42493440584562
"x": 255.24575032218632,
"y": 191.05145610681262
},
{
"type": "QPointF",
"x": 264.23377987042534,
"y": 190.90851689495304
"x": 277.95765129804875,
"y": 191.65321329780488
},
{
"type": "QPointF",
"x": 282.88849327137484,
"y": 192.3327170360014
"x": 285.5408358146581,
"y": 192.855354584027
},
{
"type": "QPointF",
@ -102,23 +102,18 @@
},
{
"type": "QPointF",
"x": 292.0507070275667,
"y": 194.88291402164677
"x": 297.61571920551216,
"y": 197.69023243490062
},
{
"type": "QPointF",
"x": 302.2609179912159,
"y": 200.52339431871832
"x": 308.61498933509586,
"y": 205.17662895779023
},
{
"type": "QPointF",
"x": 312.4716122896351,
"y": 208.47683247462922
},
{
"type": "QPointF",
"x": 320.37180984256605,
"y": 216.47325684819089
"x": 317.8211186961886,
"y": 213.7039790657329
},
{
"type": "QPointF",
@ -127,13 +122,8 @@
},
{
"type": "QPointF",
"x": 333.7748575886651,
"y": 234.23056124764497
},
{
"type": "QPointF",
"x": 340.96073277166533,
"y": 245.8168833793835
"x": 335.7687333062743,
"y": 237.32368245582865
},
{
"type": "QPointF",
@ -165,11 +155,6 @@
"x": 359.73199799735687,
"y": 195.76084622496757
},
{
"type": "QPointF",
"x": 362.7120659075751,
"y": 189.21200989719003
},
{
"type": "QPointF",
"x": 364.2921931987103,
@ -202,18 +187,23 @@
},
{
"type": "QPointF",
"x": 427.8889886897312,
"y": 154.18647318396557
"x": 421.8791603554242,
"y": 155.51865193116913
},
{
"type": "QPointF",
"x": 438.0633612753594,
"y": 153.03192944510397
"x": 419.8611668067176,
"y": 155.48279077619534
},
{
"type": "QPointF",
"x": 451.7825414078947,
"y": 152.8956366849569
"x": 434.6801823142321,
"y": 153.28952836821526
},
{
"type": "QPointF",
"x": 448.33671251987124,
"y": 152.809882511774
},
{
"type": "QPointF",
@ -232,8 +222,8 @@
},
{
"type": "QPointF",
"x": 493.8490103693721,
"y": 164.62147416122724
"x": 495.6447785087039,
"y": 165.95919540294628
},
{
"type": "QPointF",
@ -242,8 +232,8 @@
},
{
"type": "QPointF",
"x": 514.7022174780654,
"y": 185.19631333337082
"x": 514.3692225121746,
"y": 184.8069411568055
},
{
"type": "QPointF",
@ -297,8 +287,8 @@
},
{
"type": "QPointF",
"x": 582.7107603326205,
"y": 369.9049033568516
"x": 582.8754009676815,
"y": 369.4196601831339
},
{
"type": "QPointF",
@ -347,8 +337,8 @@
},
{
"type": "QPointF",
"x": 479.769261267493,
"y": 501.2042372736896
"x": 476.32590489565666,
"y": 501.8211255823292
},
{
"type": "QPointF",
@ -392,18 +382,18 @@
},
{
"type": "QPointF",
"x": 390.1544796169675,
"y": 477.9820353387566
"x": 389.46280257533397,
"y": 476.7991800818359
},
{
"type": "QPointF",
"x": 386.5194680676028,
"y": 470.8821137717501
"x": 385.21740968628404,
"y": 467.7455266773488
},
{
"type": "QPointF",
"x": 381.8262598501652,
"y": 458.03556842219757
"x": 381.98288724618385,
"y": 458.53069141599417
},
{
"type": "QPointF",
@ -427,18 +417,13 @@
},
{
"type": "QPointF",
"x": 341.93489933666746,
"y": 469.79816790408853
"x": 340.52244605437,
"y": 471.85996007627705
},
{
"type": "QPointF",
"x": 334.11338915152845,
"y": 479.95250344559355
},
{
"type": "QPointF",
"x": 325.34007746842036,
"y": 488.3512524365335
"x": 332.3013407792153,
"y": 481.91406607342856
},
{
"type": "QPointF",
@ -477,8 +462,8 @@
},
{
"type": "QPointF",
"x": 232.08334886242122,
"y": 498.82957588934755
"x": 228.17162935681384,
"y": 497.48744007705824
},
{
"type": "QPointF",
@ -492,38 +477,33 @@
},
{
"type": "QPointF",
"x": 200.54353768038376,
"y": 476.1142489208116
"x": 199.2867956563084,
"y": 474.27137643587264
},
{
"type": "QPointF",
"x": 194.51735337202624,
"y": 466.1928074212942
"x": 193.05436777423637,
"y": 463.35364232842176
},
{
"type": "QPointF",
"x": 188.96153147430664,
"y": 454.3702537301474
"x": 186.4552262793201,
"y": 447.9927324953534
},
{
"type": "QPointF",
"x": 183.01824799966036,
"y": 437.8681242930998
"x": 181.07652203439048,
"y": 431.23130737455057
},
{
"type": "QPointF",
"x": 179.18342598456445,
"y": 423.87894050611567
"x": 176.74074040059125,
"y": 412.44411172139985
},
{
"type": "QPointF",
"x": 176.04067717773808,
"y": 408.53669833403853
},
{
"type": "QPointF",
"x": 173.8253139307419,
"y": 392.00129957222134
"x": 174.31642834550638,
"y": 396.57264472089304
},
{
"type": "QPointF",

View File

@ -139,5 +139,9 @@
<file>smart_pattern_#113/output.json</file>
<file>smart_pattern_#118/input.json</file>
<file>smart_pattern_#118/output.json</file>
<file>smart_pattern_#120_piece_1/input.json</file>
<file>smart_pattern_#120_piece_1/output.json</file>
<file>smart_pattern_#120_piece_2/input.json</file>
<file>smart_pattern_#120_piece_2/output.json</file>
</qresource>
</RCC>

View File

@ -346,6 +346,18 @@ void TST_VAbstractPiece::LayoutAllowanceRemoveLoop_data()
QStringLiteral("://smart_pattern_#99/input.json"),
QStringLiteral("://smart_pattern_#99/output.json"),
28.346456692913389 /*seam allowance width*/);
// See file src/app/share/collection/test/smart_pattern_#120.val (private collection)
ASSERT_TEST_CASE("Piece 1",
QStringLiteral("://smart_pattern_#120_piece_1/input.json"),
QStringLiteral("://smart_pattern_#120_piece_1/output.json"),
37.795275590551185);
// See file src/app/share/collection/test/smart_pattern_#120.val (private collection)
ASSERT_TEST_CASE("Piece 2",
QStringLiteral("://smart_pattern_#120_piece_2/input.json"),
QStringLiteral("://smart_pattern_#120_piece_2/output.json"),
37.795275590551185);
}
//---------------------------------------------------------------------------------------------------------------------