From 0536b42a7c457dbf657b248968691f7f2f82a02f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 10 Sep 2019 13:17:06 +0300 Subject: [PATCH] Fix regression in angle type By Intersection. --HG-- branch : develop --- .../collection/bugs/Issue_#923_test7.val | 152 ++++++ src/libs/vlayout/vabstractpiece.cpp | 9 +- .../share/Issue_923_test7_1/input.json | 481 ++++++++++++++++++ .../share/Issue_923_test7_1/output.json | 149 ++++++ .../share/Issue_923_test7_2/input.json | 481 ++++++++++++++++++ .../share/Issue_923_test7_2/output.json | 149 ++++++ .../share/Issue_923_test7_3/input.json | 481 ++++++++++++++++++ .../share/Issue_923_test7_3/output.json | 149 ++++++ src/test/ValentinaTest/share/test_data.qrc | 6 + src/test/ValentinaTest/tst_vabstractpiece.cpp | 18 + 10 files changed, 2074 insertions(+), 1 deletion(-) create mode 100644 src/app/share/collection/bugs/Issue_#923_test7.val create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_1/input.json create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_1/output.json create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_2/input.json create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_2/output.json create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_3/input.json create mode 100644 src/test/ValentinaTest/share/Issue_923_test7_3/output.json diff --git a/src/app/share/collection/bugs/Issue_#923_test7.val b/src/app/share/collection/bugs/Issue_#923_test7.val new file mode 100644 index 000000000..0c2553fd2 --- /dev/null +++ b/src/app/share/collection/bugs/Issue_#923_test7.val @@ -0,0 +1,152 @@ + + + + 0.8.5 + cm + + + Блуза + №14 + + + + + + + + + Issue_#923.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index 6a3170698..56d944189 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -239,7 +239,14 @@ QVector AngleByIntersection(const QVector &points, QPointF p1, else {// Because artificial loop can lead to wrong clipping we must rollback current seam allowance points bool success = false; - pointsIntr = VAbstractPiece::RollbackSeamAllowance(pointsIntr, edge2, &success); + QVector temp = pointsIntr; + temp.append(bigLine1.p2()); + temp = VAbstractPiece::RollbackSeamAllowance(temp, edge2, &success); + + if (success) + { + pointsIntr = temp; + } if (needRollback != nullptr) { diff --git a/src/test/ValentinaTest/share/Issue_923_test7_1/input.json b/src/test/ValentinaTest/share/Issue_923_test7_1/input.json new file mode 100644 index 000000000..f680ac53f --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/input.json @@ -0,0 +1,481 @@ +{ + "vector": [ + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -238.40281543387266, + "y": 116.44191216638788 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -251.05490182747536, + "y": 155.85530707633535 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -261.5198582532174, + "y": 193.3982017541216 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -269.9242477292619, + "y": 229.27507897171068 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -276.39463327377155, + "y": 263.69042150106657 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -281.0575779049093, + "y": 296.8487121141533 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -284.03964464083833, + "y": 328.95443358293466 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -285.5557999020539, + "y": 332.07367819388446 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -288.834524798698, + "y": 333.54602837322557 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -292.6510175119016, + "y": 334.960499310105 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -296.9869360245949, + "y": 336.3175974119747 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -304.3654176607361, + "y": 338.2537916174847 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -315.933705278224, + "y": 340.62982770058966 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -329.2495397864151, + "y": 342.78548777779133 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -344.1661850487516, + "y": 344.72482310870555 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -360.5369049286754, + "y": 346.45188495294803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -378.2149632896285, + "y": 347.9707245701345 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -397.0536239950529, + "y": 349.2853932198809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -416.9061509083906, + "y": 350.399942161803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -437.6258078930837, + "y": 351.3184226555164 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -459.065858812574, + "y": 352.04488596063703 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -481.0795675303036, + "y": 352.5833833367806 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -503.5201979097145, + "y": 352.93796604356305 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -526.2410138142486, + "y": 353.1126853406 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -549.0952791073482, + "y": 353.1115924875072 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -571.936257652455, + "y": 352.93873874390056 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -594.617213313011, + "y": 352.5981753693958 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -616.9914099524583, + "y": 352.09395362360874 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -638.9121114342388, + "y": 351.430124766155 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -660.2325816217947, + "y": 350.61074005665057 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -680.8060843785678, + "y": 349.6398507547111 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.4858835680001, + "y": 348.52150811995256 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -719.1252430535337, + "y": 347.2597634119904 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -736.5774266986106, + "y": 345.8586678904407 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -752.6956983666726, + "y": 344.3222728149191 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -767.333321921162, + "y": 342.65462944504145 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -780.3435612255205, + "y": 340.8597890404234 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -791.5796801431904, + "y": 338.9418028606809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -800.8949425376136, + "y": 336.90472216542963 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -806.4645048840825, + "y": 335.2976928037018 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -809.5439285608359, + "y": 334.19362962533444 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -812.0605990299634, + "y": 333.06207165162374 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -813.9961742743959, + "y": 331.90352529002166 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -810.9147913912859, + "y": -9.118915311803084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -773.697565712941, + "y": -13.057776517652679 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -731.3693960390717, + "y": -19.56419323976961 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.8138618525178, + "y": -25.693917945236084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -670.5392892845426, + "y": -33.532046871057645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -649.4254060248002, + "y": -40.69070943425645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -636.4972481739836, + "y": -46.04184558720286 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -630.5509356263242, + "y": -48.932226964906654 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -612.7709374645625, + "y": -58.17881193899319 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -595.5042094427563, + "y": -69.04225265620269 + }, + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + }, + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json new file mode 100644 index 000000000..ca44e6e0e --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -0,0 +1,149 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": -219.1132362274485, + "y": 59.76521424266423 + }, + { + "type": "QPointF", + "x": -196.65773024177236, + "y": 112.02910670072477 + }, + { + "type": "QPointF", + "x": -214.89666292622343, + "y": 166.89727659461178 + }, + { + "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.49817442555994, + "y": 301.1705074811104 + }, + { + "type": "QPointF", + "x": -248.3168574229531, + "y": 354.919297434933 + }, + { + "type": "QPointF", + "x": -269.9238569102081, + "y": 366.58612044863963 + }, + { + "type": "QPointF", + "x": -286.16902160246076, + "y": 372.6172940694789 + }, + { + "type": "QPointF", + "x": -311.04178506989064, + "y": 378.1071805105328 + }, + { + "type": "QPointF", + "x": -358.1556709259087, + "y": 384.1720729374989 + }, + { + "type": "QPointF", + "x": -437.0178873589189, + "y": 389.1088088614001 + }, + { + "type": "QPointF", + "x": -550.0911721596755, + "y": 390.89374507300744 + }, + { + "type": "QPointF", + "x": -683.5941332112803, + "y": 387.332152895494 + }, + { + "type": "QPointF", + "x": -757.8761616208975, + "y": 381.7608312465323 + }, + { + "type": "QPointF", + "x": -799.0261371963916, + "y": 376.0668102876168 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": 371.920060042948 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": -46.83844987562506 + }, + { + "type": "QPointF", + "x": -778.5027796006967, + "y": -50.55832953918108 + }, + { + "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": -663.080059476596, + "y": -75.96966921296226 + }, + { + "type": "QPointF", + "x": -646.8510624753319, + "y": -83.05604358358234 + }, + { + "type": "QPointF", + "x": -631.5852394687809, + "y": -90.99511806183605 + }, + { + "type": "QPointF", + "x": -616.3280202339708, + "y": -100.59426715699185 + }, + { + "type": "QPointF", + "x": -594.0963839106636, + "y": -115.97215530775165 + }, + { + "type": "QPointF", + "x": -219.1132362274485, + "y": 59.76521424266423 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/input.json b/src/test/ValentinaTest/share/Issue_923_test7_2/input.json new file mode 100644 index 000000000..6d3ad3733 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/input.json @@ -0,0 +1,481 @@ +{ + "vector": [ + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + }, + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -238.40281543387266, + "y": 116.44191216638788 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -251.05490182747536, + "y": 155.85530707633535 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -261.5198582532174, + "y": 193.3982017541216 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -269.9242477292619, + "y": 229.27507897171068 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -276.39463327377155, + "y": 263.69042150106657 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -281.0575779049093, + "y": 296.8487121141533 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -284.03964464083833, + "y": 328.95443358293466 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -285.5557999020539, + "y": 332.07367819388446 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -288.834524798698, + "y": 333.54602837322557 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -292.6510175119016, + "y": 334.960499310105 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -296.9869360245949, + "y": 336.3175974119747 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -304.3654176607361, + "y": 338.2537916174847 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -315.933705278224, + "y": 340.62982770058966 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -329.2495397864151, + "y": 342.78548777779133 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -344.1661850487516, + "y": 344.72482310870555 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -360.5369049286754, + "y": 346.45188495294803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -378.2149632896285, + "y": 347.9707245701345 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -397.0536239950529, + "y": 349.2853932198809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -416.9061509083906, + "y": 350.399942161803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -437.6258078930837, + "y": 351.3184226555164 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -459.065858812574, + "y": 352.04488596063703 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -481.0795675303036, + "y": 352.5833833367806 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -503.5201979097145, + "y": 352.93796604356305 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -526.2410138142486, + "y": 353.1126853406 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -549.0952791073482, + "y": 353.1115924875072 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -571.936257652455, + "y": 352.93873874390056 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -594.617213313011, + "y": 352.5981753693958 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -616.9914099524583, + "y": 352.09395362360874 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -638.9121114342388, + "y": 351.430124766155 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -660.2325816217947, + "y": 350.61074005665057 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -680.8060843785678, + "y": 349.6398507547111 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.4858835680001, + "y": 348.52150811995256 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -719.1252430535337, + "y": 347.2597634119904 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -736.5774266986106, + "y": 345.8586678904407 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -752.6956983666726, + "y": 344.3222728149191 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -767.333321921162, + "y": 342.65462944504145 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -780.3435612255205, + "y": 340.8597890404234 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -791.5796801431904, + "y": 338.9418028606809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -800.8949425376136, + "y": 336.90472216542963 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -806.4645048840825, + "y": 335.2976928037018 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -809.5439285608359, + "y": 334.19362962533444 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -812.0605990299634, + "y": 333.06207165162374 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -813.9961742743959, + "y": 331.90352529002166 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -810.9147913912859, + "y": -9.118915311803084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -773.697565712941, + "y": -13.057776517652679 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -731.3693960390717, + "y": -19.56419323976961 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.8138618525178, + "y": -25.693917945236084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -670.5392892845426, + "y": -33.532046871057645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -649.4254060248002, + "y": -40.69070943425645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -636.4972481739836, + "y": -46.04184558720286 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -630.5509356263242, + "y": -48.932226964906654 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -612.7709374645625, + "y": -58.17881193899319 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -595.5042094427563, + "y": -69.04225265620269 + }, + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json new file mode 100644 index 000000000..97c2f63c1 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -0,0 +1,149 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": -594.0963839106636, + "y": -115.97215530775165 + }, + { + "type": "QPointF", + "x": -219.1132362274485, + "y": 59.76521424266423 + }, + { + "type": "QPointF", + "x": -196.65773024177236, + "y": 112.02910670072477 + }, + { + "type": "QPointF", + "x": -214.89666292622343, + "y": 166.89727659461178 + }, + { + "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.49817442555994, + "y": 301.1705074811104 + }, + { + "type": "QPointF", + "x": -248.3168574229531, + "y": 354.919297434933 + }, + { + "type": "QPointF", + "x": -269.9238569102081, + "y": 366.58612044863963 + }, + { + "type": "QPointF", + "x": -286.16902160246076, + "y": 372.6172940694789 + }, + { + "type": "QPointF", + "x": -311.04178506989064, + "y": 378.1071805105328 + }, + { + "type": "QPointF", + "x": -358.1556709259087, + "y": 384.1720729374989 + }, + { + "type": "QPointF", + "x": -437.0178873589189, + "y": 389.1088088614001 + }, + { + "type": "QPointF", + "x": -550.0911721596755, + "y": 390.89374507300744 + }, + { + "type": "QPointF", + "x": -683.5941332112803, + "y": 387.332152895494 + }, + { + "type": "QPointF", + "x": -757.8761616208975, + "y": 381.7608312465323 + }, + { + "type": "QPointF", + "x": -799.0261371963916, + "y": 376.0668102876168 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": 371.920060042948 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": -46.83844987562506 + }, + { + "type": "QPointF", + "x": -778.5027796006967, + "y": -50.55832953918108 + }, + { + "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": -663.080059476596, + "y": -75.96966921296226 + }, + { + "type": "QPointF", + "x": -646.8510624753319, + "y": -83.05604358358234 + }, + { + "type": "QPointF", + "x": -631.5852394687809, + "y": -90.99511806183605 + }, + { + "type": "QPointF", + "x": -616.3280202339708, + "y": -100.59426715699185 + }, + { + "type": "QPointF", + "x": -594.0963839106636, + "y": -115.97215530775165 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/input.json b/src/test/ValentinaTest/share/Issue_923_test7_3/input.json new file mode 100644 index 000000000..eb617991e --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/input.json @@ -0,0 +1,481 @@ +{ + "vector": [ + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -810.9147913912859, + "y": -9.118915311803084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -773.697565712941, + "y": -13.057776517652679 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -731.3693960390717, + "y": -19.56419323976961 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.8138618525178, + "y": -25.693917945236084 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -670.5392892845426, + "y": -33.532046871057645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -649.4254060248002, + "y": -40.69070943425645 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -636.4972481739836, + "y": -46.04184558720286 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -630.5509356263242, + "y": -48.932226964906654 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -612.7709374645625, + "y": -58.17881193899319 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -595.5042094427563, + "y": -69.04225265620269 + }, + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + }, + { + "type": "VSAPoint", + "x": -590.4629921259842, + "y": -72.52932283464567 + }, + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 1, + "type": "VSAPoint", + "x": -231.11800695198497, + "y": 95.87915857519384 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -238.40281543387266, + "y": 116.44191216638788 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -251.05490182747536, + "y": 155.85530707633535 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -261.5198582532174, + "y": 193.3982017541216 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -269.9242477292619, + "y": 229.27507897171068 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -276.39463327377155, + "y": 263.69042150106657 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -281.0575779049093, + "y": 296.8487121141533 + }, + { + "angle": 6, + "type": "VSAPoint", + "x": -284.03964464083833, + "y": 328.95443358293466 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "type": "VSAPoint", + "x": -284.1473856336994, + "y": 331.31319685039375 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -285.5557999020539, + "y": 332.07367819388446 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -288.834524798698, + "y": 333.54602837322557 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -292.6510175119016, + "y": 334.960499310105 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -296.9869360245949, + "y": 336.3175974119747 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -304.3654176607361, + "y": 338.2537916174847 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -315.933705278224, + "y": 340.62982770058966 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -329.2495397864151, + "y": 342.78548777779133 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -344.1661850487516, + "y": 344.72482310870555 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -360.5369049286754, + "y": 346.45188495294803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -378.2149632896285, + "y": 347.9707245701345 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -397.0536239950529, + "y": 349.2853932198809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -416.9061509083906, + "y": 350.399942161803 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -437.6258078930837, + "y": 351.3184226555164 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -459.065858812574, + "y": 352.04488596063703 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -481.0795675303036, + "y": 352.5833833367806 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -503.5201979097145, + "y": 352.93796604356305 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -526.2410138142486, + "y": 353.1126853406 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -549.0952791073482, + "y": 353.1115924875072 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -571.936257652455, + "y": 352.93873874390056 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -594.617213313011, + "y": 352.5981753693958 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -616.9914099524583, + "y": 352.09395362360874 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -638.9121114342388, + "y": 351.430124766155 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -660.2325816217947, + "y": 350.61074005665057 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -680.8060843785678, + "y": 349.6398507547111 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -700.4858835680001, + "y": 348.52150811995256 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -719.1252430535337, + "y": 347.2597634119904 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -736.5774266986106, + "y": 345.8586678904407 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -752.6956983666726, + "y": 344.3222728149191 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -767.333321921162, + "y": 342.65462944504145 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -780.3435612255205, + "y": 340.8597890404234 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -791.5796801431904, + "y": 338.9418028606809 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -800.8949425376136, + "y": 336.90472216542963 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -806.4645048840825, + "y": 335.2976928037018 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -809.5439285608359, + "y": 334.19362962533444 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -812.0605990299634, + "y": 333.06207165162374 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -813.9961742743959, + "y": 331.90352529002166 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "angle": 1, + "saAfter": 0, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": 331.31319685039375 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 0, + "type": "VSAPoint", + "x": -814.7149606299213, + "y": -8.844283464566928 + } + ] +} diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json new file mode 100644 index 000000000..1c74ea4b5 --- /dev/null +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -0,0 +1,149 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": -814.7149606299213, + "y": -46.83844987562506 + }, + { + "type": "QPointF", + "x": -778.5027796006967, + "y": -50.55832953918108 + }, + { + "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": -663.080059476596, + "y": -75.96966921296226 + }, + { + "type": "QPointF", + "x": -646.8510624753319, + "y": -83.05604358358234 + }, + { + "type": "QPointF", + "x": -631.5852394687809, + "y": -90.99511806183605 + }, + { + "type": "QPointF", + "x": -616.3280202339708, + "y": -100.59426715699185 + }, + { + "type": "QPointF", + "x": -594.0963839106636, + "y": -115.97215530775165 + }, + { + "type": "QPointF", + "x": -219.1132362274485, + "y": 59.76521424266423 + }, + { + "type": "QPointF", + "x": -196.65773024177236, + "y": 112.02910670072477 + }, + { + "type": "QPointF", + "x": -214.89666292622343, + "y": 166.89727659461178 + }, + { + "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.49817442555994, + "y": 301.1705074811104 + }, + { + "type": "QPointF", + "x": -248.3168574229531, + "y": 354.919297434933 + }, + { + "type": "QPointF", + "x": -269.9238569102081, + "y": 366.58612044863963 + }, + { + "type": "QPointF", + "x": -286.16902160246076, + "y": 372.6172940694789 + }, + { + "type": "QPointF", + "x": -311.04178506989064, + "y": 378.1071805105328 + }, + { + "type": "QPointF", + "x": -358.1556709259087, + "y": 384.1720729374989 + }, + { + "type": "QPointF", + "x": -437.0178873589189, + "y": 389.1088088614001 + }, + { + "type": "QPointF", + "x": -550.0911721596755, + "y": 390.89374507300744 + }, + { + "type": "QPointF", + "x": -683.5941332112803, + "y": 387.332152895494 + }, + { + "type": "QPointF", + "x": -757.8761616208975, + "y": 381.7608312465323 + }, + { + "type": "QPointF", + "x": -799.0261371963916, + "y": 376.0668102876168 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": 371.920060042948 + }, + { + "type": "QPointF", + "x": -814.7149606299213, + "y": -46.83844987562506 + } + ] +} diff --git a/src/test/ValentinaTest/share/test_data.qrc b/src/test/ValentinaTest/share/test_data.qrc index 821c70c0b..81da5e5b0 100644 --- a/src/test/ValentinaTest/share/test_data.qrc +++ b/src/test/ValentinaTest/share/test_data.qrc @@ -101,5 +101,11 @@ Issue_924_Test_1/seamAllowance.json DP_6/input.json DP_6/output.json + Issue_923_test7_1/input.json + Issue_923_test7_1/output.json + Issue_923_test7_2/input.json + Issue_923_test7_2/output.json + Issue_923_test7_3/input.json + Issue_923_test7_3/output.json diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 21cf7a368..0462b30f5 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -226,6 +226,24 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data() QStringLiteral("://Issue_923_test6_6/output.json"), 37.795275590551185 /*seam allowance width (1.0 cm)*/); + // See file src/app/share/collection/bugs/Issue_#923_test7.val + ASSERT_TEST_CASE("Issue 923. Test 7.1", + QStringLiteral("://Issue_923_test7_1/input.json"), + QStringLiteral("://Issue_923_test7_1/output.json"), + 37.795275590551185 /*seam allowance width (1.0 cm)*/); + + // See file src/app/share/collection/bugs/Issue_#923_test7.val + ASSERT_TEST_CASE("Issue 923. Test 7.2", + QStringLiteral("://Issue_923_test7_2/input.json"), + QStringLiteral("://Issue_923_test7_2/output.json"), + 37.795275590551185 /*seam allowance width (1.0 cm)*/); + + // See file src/app/share/collection/bugs/Issue_#923_test7.val + ASSERT_TEST_CASE("Issue 923. Test 7.3", + QStringLiteral("://Issue_923_test7_3/input.json"), + QStringLiteral("://Issue_923_test7_3/output.json"), + 37.795275590551185 /*seam allowance width (1.0 cm)*/); + // See file src/app/share/collection/bugs/loop_by_intersection.val ASSERT_TEST_CASE("Loop for angle by intersection", QStringLiteral("://loop_by_intersection/input.json"),