aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in angle type By Intersection.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-09-10 13:17:06 +03:00
parent 384130ea65
commit 0536b42a7c
10 changed files with 2074 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/app/share/collection/bugs/Issue_#923_test7.val Normal file
View File

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
<pattern>
<!--Pattern created with Valentina v0.7.0.0a (https://valentinaproject.bitbucket.io/).-->
<version>0.8.5</version>
<unit>cm</unit>
<description/>
<notes/>
<patternName>Блуза</patternName>
<patternNumber>№14</patternNumber>
<company/>
<patternLabel dateFormat="MM-dd-yyyy" timeFormat="hh:mm:ss">
<line alignment="4" bold="true" italic="false" sfIncrement="4" text="%author%"/>
<line alignment="4" bold="false" italic="false" sfIncrement="2" text="%patternName%"/>
<line alignment="4" bold="false" italic="false" sfIncrement="0" text="Размер 28"/>
<line alignment="4" bold="false" italic="false" sfIncrement="0" text="Рост 110"/>
<line alignment="4" bold="false" italic="false" sfIncrement="0" text="%patternNumber%"/>
</patternLabel>
<measurements>Issue_#923.vit</measurements>
<increments>
<increment description="Прибавка на уработку." formula="0.3" name="#Пур"/>
<increment description="" formula="1.6" name="#М"/>
<increment description="Плечевая вытачка" formula="1.2" name="#Пв"/>
<increment description="Припуск на посадку." formula="0.3" name="#Ппос"/>
<increment description="Баланс платья. Он изменяется по размерам на 0.2" formula="4.3" name="#б"/>
<increment description="" formula="0.4" name="#Пур_1"/>
<increment description="" formula="0.7" name="#Пур_2"/>
<increment description="" formula="0.5" name="#Пур_3"/>
<increment description="Раствор вытачки" formula="3" name="#Рв"/>
</increments>
<previewCalculations>
<increment description="Прибавка на свободное облегание по груди." formula="8.5" name="#Пг_1"/>
<increment description="Ширина платья по линии груди. Шиг равна измерению полуобхвата груди третьему СгІІІ плюс прибавка на сободное облегание по груди Пг" formula="@СгІІІ+#Пг_1" name="#Шиг_1"/>
<increment description="Ширина спинки Шсп равна измерению ширины спины Шс плюс 1.4" formula="@Шс+1.4" name="#Шсп_1"/>
<increment description="Ширина полы на уровне груди Шгпол равна измерению ширины груди Шг плюс 1.3" formula="@Шг+1.3" name="#Шгпол_1"/>
<increment description="Ширина проймы Шпр равна ширине платья по линии грди Шиг минус ширина спинки Шсп и ширина полы на уровне груди" formula="#Шиг_1-(#Шсп_1+#Шгпол_1)" name="#Шпр_1"/>
</previewCalculations>
<draw name="Спинка">
<calculation>
<point id="1" mx="0.132292" my="0.264583" name="А" type="single" x="-21.556" y="-0.234005"/>
<point angle="270" basePoint="1" id="2" length="@Дтс+#Пур" lineColor="blue" mx="0.132292" my="0.264583" name="Т" type="endLine" typeLine="hair"/>
<point firstPoint="2" id="3" length="#Пур" lineColor="blue" mx="0.309469" my="-0.732036" name="оз" secondPoint="1" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="1" id="4" length="@Сш/3+1.3" lineColor="black" mx="0.170457" my="0.0928427" name="А1" type="endLine" typeLine="hair"/>
<point angle="90" basePoint="4" id="5" length="(0.15*@Сш)-0.4" lineColor="black" mx="-0.602755" my="-1.78694" name="А2" type="endLine" typeLine="hair"/>
<point firstPoint="5" id="6" length="1.5" lineColor="black" mx="-1.13677" my="-1.77626" name="А3" secondPoint="4" thirdPoint="1" type="bisector" typeLine="hair"/>
<spline color="blue" id="7" penStyle="hair" type="pathInteractive">
<pathPoint angle1="33.2366" angle2="213.237" length1="0" length2="0.217465" pSpline="5"/>
<pathPoint angle1="26.7192" angle2="206.719" length1="0.807377" length2="1.84187" pSpline="6"/>
<pathPoint angle1="180" angle2="0" length1="0" length2="0" pSpline="1"/>
</spline>
<point angle="0" basePoint="1" id="8" length="#Шсп_1" lineColor="black" mx="0.132292" my="0.264583" name="а" type="endLine" typeLine="hair"/>
<point c1Center="5" c1Radius="@Шп+#М+#Ппос" c2Center="3" c2Radius="@Впк" crossPoint="2" id="9" mx="0.132292" my="0.264583" name="П" type="pointOfIntersectionCircles"/>
<line firstPoint="5" id="10" lineColor="blue" secondPoint="9" typeLine="hair"/>
<point firstPoint="8" id="11" mx="0.132292" my="0.264583" name="П1" secondPoint="9" type="pointOfIntersection"/>
<line firstPoint="9" id="12" lineColor="black" secondPoint="11" typeLine="dashLine"/>
<point angle="270" basePoint="11" id="13" length="0.4*@СгІІІ+2.2" lineColor="black" mx="0.132292" my="0.264583" name="Г1" type="endLine" typeLine="hair"/>
<point firstPoint="2" id="14" mx="0.132292" my="0.208554" name="Г" secondPoint="13" type="pointOfIntersection"/>
<line firstPoint="13" id="15" lineColor="black" secondPoint="14" typeLine="hair"/>
<line firstPoint="8" id="16" lineColor="black" secondPoint="11" typeLine="hair"/>
<point firstPoint="13" id="17" length="6" lineColor="black" mx="0.132292" my="0.264583" name="П2" secondPoint="11" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="13" id="18" length="#Шпр_1/2-1.4" lineColor="black" mx="0.132292" my="0.264583" name="Г2" type="endLine" typeLine="hair"/>
<point firstPoint="17" id="19" length="1.9" lineColor="black" mx="0.132292" my="0.264583" name="I" secondPoint="13" thirdPoint="18" type="bisector" typeLine="hair"/>
<spline color="blue" id="20" penStyle="hair" type="pathInteractive">
<pathPoint angle1="70.1645" angle2="250.164" length1="0" length2="3.11186" pSpline="9"/>
<pathPoint angle1="90" angle2="270" length1="2.15999" length2="1.47142" pSpline="17"/>
<pathPoint angle1="123.093" angle2="303.093" length1="1.05178" length2="1.37047" pSpline="19"/>
<pathPoint angle1="3.90346" angle2="183.903" length1="0.426519" length2="0" pSpline="18"/>
</spline>
<line firstPoint="1" id="48" lineColor="blue" secondPoint="14" typeLine="hair"/>
<line firstPoint="14" id="59" lineColor="black" secondPoint="18" typeLine="hair"/>
<point angle="270" basePoint="1" id="186" length="@Ди+#Пур_3" lineColor="black" mx="0.132292" my="0.264583" name="Н" type="endLine" typeLine="hair"/>
<point angle="0" basePoint="186" id="187" length="Line_Г1_Г+Line_Г1_Г2" lineColor="black" mx="0.132292" my="0.264583" name="Н1" type="endLine" typeLine="hair"/>
<line firstPoint="18" id="188" lineColor="black" secondPoint="187" typeLine="hair"/>
<point firstPoint="1" id="250" length="9" lineColor="black" mx="0.132292" my="0.264583" name="А4" secondPoint="14" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="250" curve="20" id="360" lineColor="black" mx="0.132292" my="0.264583" name="А5" showLabel="true" type="curveIntersectAxis" typeLine="none"/>
<spline aScale="2.3" angle1="318.43" angle2="209.346" color="black" id="363" length1="1.00806" length2="1.763" penStyle="dotLine" point1="250" point4="360" type="simpleInteractive"/>
</calculation>
<modeling>
<point id="382" idObject="250" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="383" idObject="1" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="384" idObject="7" inUse="false" type="modelingPath"/>
<point id="385" idObject="5" inUse="false" mx="-0.602755" my="-1.78694" showLabel="true" type="modeling"/>
<point id="386" idObject="9" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="387" idObject="20" inUse="false" type="modelingPath"/>
<point id="388" idObject="360" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="389" idObject="363" inUse="false" type="modelingSpline"/>
<point id="481" idObject="9" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="482" idObject="20" inUse="false" type="modelingPath"/>
<point id="483" idObject="360" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="484" idObject="363" inUse="false" type="modelingSpline"/>
<point id="485" idObject="250" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="486" idObject="1" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="487" idObject="7" inUse="false" type="modelingPath"/>
<point id="488" idObject="5" inUse="false" mx="-0.602755" my="-1.78694" showLabel="true" type="modeling"/>
<point id="490" idObject="5" inUse="false" mx="-0.602755" my="-1.78694" showLabel="true" type="modeling"/>
<point id="491" idObject="9" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="492" idObject="20" inUse="false" type="modelingPath"/>
<point id="493" idObject="360" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="494" idObject="363" inUse="false" type="modelingSpline"/>
<point id="495" idObject="250" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="496" idObject="1" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="497" idObject="7" inUse="false" type="modelingPath"/>
</modeling>
<details>
<detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="390" mx="24.067" my="-56.4319" name="Test 7.1" seamAllowance="true" version="2" width="1">
<data annotation="" foldPosition="" fontSize="0" height="1" letter="" mx="0" my="0" onFold="false" orientation="" quantity="1" rotation="0" rotationWay="" tilt="" visible="false" width="1"/>
<patternInfo fontSize="0" height="1" mx="0" my="0" rotation="0" visible="false" width="1"/>
<grainline arrows="0" length="1" mx="0" my="0" rotation="90" visible="false"/>
<nodes>
<node angle="1" idObject="386" passmark="false" passmarkAngle="intersection2Right" passmarkLine="two" type="NodePoint"/>
<node idObject="387" reverse="0" type="NodeSplinePath"/>
<node idObject="388" type="NodePoint"/>
<node idObject="389" reverse="1" type="NodeSpline"/>
<node after="0" angle="1" before="1" idObject="382" type="NodePoint"/>
<node after="1" before="0" idObject="383" type="NodePoint"/>
<node idObject="384" reverse="1" type="NodeSplinePath"/>
<node idObject="385" type="NodePoint"/>
</nodes>
</detail>
<detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="489" mx="44.307" my="-56.891" name="Test 7.2" seamAllowance="true" version="2" width="1">
<data annotation="" foldPosition="" fontSize="0" height="1" letter="" mx="0" my="0" onFold="false" orientation="" quantity="1" rotation="0" rotationWay="" tilt="" visible="false" width="1"/>
<patternInfo fontSize="0" height="1" mx="0" my="0" rotation="0" visible="false" width="1"/>
<grainline arrows="0" length="1" mx="0" my="0" rotation="90" visible="false"/>
<nodes>
<node idObject="488" type="NodePoint"/>
<node angle="1" idObject="481" passmark="false" passmarkAngle="intersection2Right" passmarkLine="two" type="NodePoint"/>
<node idObject="482" reverse="0" type="NodeSplinePath"/>
<node idObject="483" type="NodePoint"/>
<node idObject="484" reverse="1" type="NodeSpline"/>
<node after="0" angle="1" before="1" idObject="485" type="NodePoint"/>
<node after="1" before="0" idObject="486" type="NodePoint"/>
<node idObject="487" reverse="1" type="NodeSplinePath"/>
</nodes>
</detail>
<detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="498" mx="62.1312" my="-57.1057" name="Test 7.3" seamAllowance="true" version="2" width="1">
<data annotation="" foldPosition="" fontSize="0" height="1" letter="" mx="0" my="0" onFold="false" orientation="" quantity="1" rotation="0" rotationWay="" tilt="" visible="false" width="1"/>
<patternInfo fontSize="0" height="1" mx="0" my="0" rotation="0" visible="false" width="1"/>
<grainline arrows="0" length="1" mx="0" my="0" rotation="90" visible="false"/>
<nodes>
<node idObject="497" reverse="1" type="NodeSplinePath"/>
<node idObject="490" type="NodePoint"/>
<node angle="1" idObject="491" passmark="false" passmarkAngle="intersection2Right" passmarkLine="two" type="NodePoint"/>
<node idObject="492" reverse="0" type="NodeSplinePath"/>
<node idObject="493" type="NodePoint"/>
<node idObject="494" reverse="1" type="NodeSpline"/>
<node after="0" angle="1" before="1" idObject="495" type="NodePoint"/>
<node after="1" before="0" idObject="496" type="NodePoint"/>
</nodes>
</detail>
</details>
<groups/>
</draw>
</pattern>

9
src/libs/vlayout/vabstractpiece.cpp
View File

@ -239,7 +239,14 @@ QVector<QPointF> AngleByIntersection(const QVector<QPointF> &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<QPointF> temp = pointsIntr;
temp.append(bigLine1.p2());
temp = VAbstractPiece::RollbackSeamAllowance(temp, edge2, &success);
if (success)
{
pointsIntr = temp;
}
if (needRollback != nullptr)
{

481
src/test/ValentinaTest/share/Issue_923_test7_1/input.json Normal file
View File

@ -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
}
]
}

149
src/test/ValentinaTest/share/Issue_923_test7_1/output.json Normal file
View File

@ -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
}
]
}

481
src/test/ValentinaTest/share/Issue_923_test7_2/input.json Normal file
View File

@ -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
}
]
}

149
src/test/ValentinaTest/share/Issue_923_test7_2/output.json Normal file
View File

@ -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
}
]
}

481
src/test/ValentinaTest/share/Issue_923_test7_3/input.json Normal file
View File

@ -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
}
]
}

149
src/test/ValentinaTest/share/Issue_923_test7_3/output.json Normal file
View File

@ -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
}
]
}

6
src/test/ValentinaTest/share/test_data.qrc
View File

@ -101,5 +101,11 @@
<file>Issue_924_Test_1/seamAllowance.json</file>
<file>DP_6/input.json</file>
<file>DP_6/output.json</file>
<file>Issue_923_test7_1/input.json</file>
<file>Issue_923_test7_1/output.json</file>
<file>Issue_923_test7_2/input.json</file>
<file>Issue_923_test7_2/output.json</file>
<file>Issue_923_test7_3/input.json</file>
<file>Issue_923_test7_3/output.json</file>
</qresource>
</RCC>

18
src/test/ValentinaTest/tst_vabstractpiece.cpp
View File

@ -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"),