Incorrect fix of seam allowance distortion. Closes smart-pattern/valentina#99

This commit is contained in:
Roman Telezhynskyi 2021-02-23 18:29:54 +02:00
parent 9f940ba7cf
commit cecc1dfd4e
28 changed files with 3948 additions and 281 deletions

View File

@ -2,6 +2,7 @@
- Fix incorrect seam allowance for angle type second edge right angle.
- Fix regression with country flags.
- Fix bug in seam allowance.
- [smart-pattern/valentina#99] Incorrect fix of seam allowance distortion.
# Version 0.7.44 Feb 9, 2021
- Placeholder %size% has incorrect value.

View File

@ -0,0 +1,264 @@
<?xml version="1.0" encoding="UTF-8"?>
<pattern labelPrefix="de">
<!--Pattern created with Valentina v0.7.44.0 (https://valentinaproject.bitbucket.io/).-->
<version>0.8.10</version>
<unit>cm</unit>
<description/>
<notes>https://lesenchanteesleblog.com/2016/06/09/diy-doudou-elephant-avec-patron/</notes>
<patternName>Éléphant</patternName>
<patternNumber/>
<company>Les enchantées</company>
<customer/>
<birthDate>2000-01-01</birthDate>
<email/>
<patternLabel dateFormat="dd/MM/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="%patternNumber%"/>
<line alignment="4" bold="false" italic="true" sfIncrement="0" text="%customer%"/>
<line alignment="4" bold="false" italic="true" sfIncrement="0" text="%date%"/>
</patternLabel>
<measurements/>
<increments/>
<previewCalculations/>
<draw name="Corps">
<calculation>
<point id="1" mx="-2.11667" my="0.132292" name="A" showLabel="true" type="single" x="0.554264" y="10.1632"/>
<point angle="0" basePoint="1" id="2" length="2.7" lineColor="black" mx="1.08479" my="0.15875" name="A1" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="2" id="3" length="2" lineColor="black" mx="-1.66688" my="1.905" name="A2" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="3" id="4" length="4.5" lineColor="black" mx="-0.661459" my="0.978958" name="A3" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="3" id="79" length="0.08" lineColor="black" mx="0.264583" my="0.396875" name="A2b" secondPoint="4" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="4" id="5" length="4.5" lineColor="black" mx="-1.03188" my="1.00542" name="A4" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="5" id="6" length="0.8" lineColor="black" mx="0.264583" my="0.449792" name="A5" showLabel="true" type="endLine" typeLine="none"/>
<line firstPoint="1" id="7" lineColor="black" secondPoint="6" typeLine="dashLine"/>
<point firstPoint="4" id="8" length="0.4" lineColor="black" mx="0.264583" my="-1.56104" name="A6" secondPoint="5" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="4" id="9" length="0.4" lineColor="black" mx="-1.87855" my="-1.77271" name="A7" secondPoint="3" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="8" id="10" length="CurrentLength/2" lineColor="black" mx="0.264583" my="0.396875" name="A8" secondPoint="5" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="9" id="11" length="CurrentLength/2" lineColor="black" mx="0.264583" my="0.396875" name="A9" secondPoint="3" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="270" basePoint="11" id="12" length="2.4" lineColor="black" mx="-0.899584" my="1.29646" name="A10" showLabel="true" type="endLine" typeLine="none"/>
<point angle="270" basePoint="10" id="13" length="2.4" lineColor="black" mx="-0.582084" my="2.27542" name="A11" showLabel="true" type="endLine" typeLine="none"/>
<point angle="90" basePoint="1" id="14" length="4.1" lineColor="black" mx="-3.04271" my="-0.661458" name="A12" showLabel="true" type="endLine" typeLine="none"/>
<point angle="90" basePoint="14" id="15" length="4.1" lineColor="black" mx="-3.57188" my="-0.238125" name="A13" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="2" id="16" mx="-1.37584" my="-2.30187" name="A14" secondPoint="15" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="3" id="17" mx="-1.95792" my="-3.41312" name="A15" secondPoint="15" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="4" id="18" mx="0.211666" my="-1.66688" name="A16" secondPoint="15" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="6" id="19" mx="0.264583" my="0.396875" name="A17" secondPoint="15" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="6" id="20" mx="0.238125" my="0.396875" name="A18" secondPoint="14" showLabel="true" type="pointOfIntersection"/>
<line firstPoint="15" id="21" lineColor="black" secondPoint="19" typeLine="dashLine"/>
<line firstPoint="14" id="22" lineColor="black" secondPoint="20" typeLine="dashLine"/>
<line firstPoint="15" id="23" lineColor="black" secondPoint="1" typeLine="dashLine"/>
<line firstPoint="16" id="24" lineColor="black" secondPoint="2" typeLine="dashLine"/>
<line firstPoint="17" id="25" lineColor="black" secondPoint="3" typeLine="dashLine"/>
<line firstPoint="18" id="26" lineColor="black" secondPoint="4" typeLine="dashLine"/>
<line firstPoint="19" id="27" lineColor="black" secondPoint="6" typeLine="dashLine"/>
<point firstPoint="6" id="28" length="3" lineColor="black" mx="0.264583" my="0.396875" name="A19" secondPoint="20" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="5" id="29" length="0.2" lineColor="black" mx="0.423333" my="3.54542" name="A20" secondPoint="6" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="20" id="30" length="0.15" lineColor="black" mx="-3.73063" my="0.661458" name="A21" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="18" id="31" mx="0.264583" my="0.396875" name="A22" secondPoint="14" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="17" id="32" mx="0.264583" my="0.396875" name="A23" secondPoint="14" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="16" id="33" mx="0.264583" my="0.396875" name="A24" secondPoint="14" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="31" id="34" length="3" lineColor="black" mx="-3.33375" my="0.396875" name="A25" secondPoint="18" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="34" id="35" length="1.5" lineColor="black" mx="0.264583" my="0.396875" name="A26" showLabel="true" type="endLine" typeLine="hair"/>
<point firstPoint="3" id="37" length="0.8" lineColor="black" mx="0.291037" my="-2.43416" name="A27" secondPoint="32" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="12" id="38" length="0.2" lineColor="black" mx="-0.238125" my="-1.87854" name="A28" secondPoint="11" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="38" id="39" length="1.2" lineColor="black" mx="-1.53458" my="0.687917" name="A29" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="38" id="40" length="0.8" lineColor="black" mx="0.264583" my="0.449792" name="A30" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="13" id="41" length="0.25" lineColor="black" mx="-2.32834" my="-2.75166" name="A31" secondPoint="10" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="41" id="42" length="1.2" lineColor="black" mx="-1.42875" my="0.926042" name="A32" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="41" id="43" length="1" lineColor="black" mx="0.264583" my="0.396875" name="A33" showLabel="true" type="endLine" typeLine="none"/>
<spline aScale="10" color="black" id="44" penStyle="hair" type="pathInteractive">
<pathPoint angle1="178.073" angle2="358.073" length1="0" length2="1.92398" pSpline="35"/>
<pathPoint angle1="109.333" angle2="289.333" length1="1.52855" length2="0.34105" pSpline="30"/>
<pathPoint angle1="89.8535" angle2="269.853" length1="0.487009" length2="0.938072" pSpline="28"/>
<pathPoint angle1="64.169" angle2="244.169" length1="1.13408" length2="2.04586" pSpline="29"/>
<pathPoint angle1="32.2919" angle2="212.292" length1="0.272563" length2="0.212551" pSpline="43"/>
<pathPoint angle1="359.181" angle2="179.181" length1="0.278982" length2="0.37949" pSpline="13"/>
<pathPoint angle1="312.437" angle2="132.437" length1="0.174217" length2="0.392787" pSpline="42"/>
<pathPoint angle1="354.321" angle2="174.321" length1="0.340623" length2="0.397299" pSpline="8"/>
<pathPoint angle1="6.48633" angle2="186.486" length1="0.389842" length2="0.463919" pSpline="9"/>
<pathPoint angle1="37.1908" angle2="217.191" length1="0.962244" length2="0.0867163" pSpline="40"/>
<pathPoint angle1="6.63774" angle2="186.638" length1="0.376304" length2="0.41967" pSpline="12"/>
<pathPoint angle1="326.017" angle2="146.017" length1="0.314794" length2="0.38857" pSpline="39"/>
<pathPoint angle1="274.02" angle2="94.02" length1="1.01417" length2="0.905641" pSpline="79"/>
</spline>
<point firstPoint="17" id="45" length="1" lineColor="black" mx="0.026458" my="-2.80458" name="A34" secondPoint="18" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="17" id="46" length="0.2" lineColor="black" mx="-1.71979" my="1.37583" name="A35" secondPoint="32" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="16" id="47" length="1.9" lineColor="black" mx="-2.48709" my="-1.87854" name="A36" secondPoint="33" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="33" id="48" length="0.9" lineColor="black" mx="0.846666" my="-0.396875" name="A37" secondPoint="16" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="48" id="49" length="0.5" lineColor="black" mx="-2.98979" my="-2.2225" name="A38" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="33" id="50" length="0.4" lineColor="black" mx="-3.36022" my="-2.14312" name="A39" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="33" id="51" length="1.6" lineColor="black" mx="0.608541" my="-0.635" name="A40" secondPoint="2" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="33" id="52" length="2.1" lineColor="black" mx="0.264583" my="0.396875" name="A41" secondPoint="2" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="52" id="53" length="0.7" lineColor="black" mx="-0.396877" my="1.42875" name="A42" showLabel="true" type="endLine" typeLine="none"/>
<point angle="180" basePoint="52" id="54" length="1.1" lineColor="black" mx="-3.67771" my="0.9525" name="A43" showLabel="true" type="endLine" typeLine="none"/>
<point angle="90" basePoint="54" id="55" length="0.3" lineColor="black" mx="-2.01084" my="0.39688" name="A44" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="33" id="56" length="1.1" lineColor="black" mx="1.27" my="-0.079375" name="A45" secondPoint="2" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="56" id="57" length="0.6" lineColor="black" mx="-3.01626" my="-0.687915" name="A46" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="33" id="60" length="1.5" lineColor="black" mx="-5.52979" my="0.449792" name="A47" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="14" id="61" length="1.5" lineColor="black" mx="-3.96875" my="-0.47625" name="A48" secondPoint="1" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="2" id="62" length="1.25" lineColor="black" mx="-3.38667" my="1.905" name="A49" secondPoint="1" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="270" basePoint="2" id="63" length="0.3" lineColor="black" mx="-3.25438" my="2.09021" name="A50" showLabel="true" type="endLine" typeLine="none"/>
<spline aScale="10" color="black" id="64" penStyle="hair" type="pathInteractive">
<pathPoint angle1="1.56868" angle2="181.569" length1="0" length2="1.13203" pSpline="34"/>
<pathPoint angle1="359.935" angle2="179.935" length1="1.79773" length2="0.283309" pSpline="45"/>
<pathPoint angle1="22.3206" angle2="202.321" length1="0.239939" length2="0.985864" pSpline="46"/>
<pathPoint angle1="58.7963" angle2="238.796" length1="0.830664" length2="0.668194" pSpline="47"/>
<pathPoint angle1="90.3101" angle2="270.31" length1="0.310448" length2="0.24577" pSpline="49"/>
<pathPoint angle1="100.993" angle2="280.993" length1="0.220179" length2="0.421239" pSpline="50"/>
<pathPoint angle1="90.0291" angle2="270.029" length1="0.422307" length2="0.415298" pSpline="51"/>
<pathPoint angle1="0.873821" angle2="180.874" length1="0.220512" length2="0.179929" pSpline="53"/>
<pathPoint angle1="267.221" angle2="87.221" length1="0.243024" length2="0.122138" pSpline="55"/>
<pathPoint angle1="269.457" angle2="89.457" length1="0.37455" length2="0.385429" pSpline="57"/>
<pathPoint angle1="0.713269" angle2="180.713" length1="0.549122" length2="0.648723" pSpline="60"/>
<pathPoint angle1="90.0559" angle2="270.056" length1="0.868532" length2="1.62767" pSpline="61"/>
<pathPoint angle1="159.226" angle2="339.226" length1="0.465902" length2="0.437224" pSpline="62"/>
<pathPoint angle1="180.243" angle2="0.243" length1="0.519243" length2="1.07248" pSpline="63"/>
<pathPoint angle1="225.974" angle2="45.974" length1="0.352735" length2="1.71945" pSpline="37"/>
</spline>
<point firstPoint="6" id="65" length="1.8" lineColor="black" mx="2.27542" my="-0.47625" name="A51" secondPoint="20" showLabel="true" type="alongLine" typeLine="none"/>
<line firstPoint="37" id="66" lineColor="black" secondPoint="65" typeLine="dotLine"/>
<point angle="AngleLine_A27_A51" basePoint="37" curve="44" id="67" lineColor="black" mx="2.35479" my="1.40229" name="A52" showLabel="true" type="curveIntersectAxis" typeLine="hair"/>
<line firstPoint="37" id="80" lineColor="black" secondPoint="79" typeLine="hair"/>
<operation id="81" p1Line="37" p2Line="67" suffix="v" type="flippingByLine">
<source>
<item idObject="79"/>
<item idObject="44"/>
</source>
<destination>
<item idObject="82" mx="0.264583" my="0.396875"/>
<item idObject="83"/>
</destination>
</operation>
</calculation>
<modeling>
<point id="70" idObject="34" inUse="false" mx="-0.79375" my="-1.95792" showLabel="true" type="modeling"/>
<point id="71" idObject="35" inUse="false" mx="0.211666" my="-3.4925" showLabel="true" type="modeling"/>
<spline id="72" idObject="44" inUse="false" type="modelingPath"/>
<point id="73" idObject="37" inUse="false" mx="0.978953" my="-2.32833" showLabel="true" type="modeling"/>
<spline id="74" idObject="64" inUse="false" type="modelingPath"/>
<point id="76" idObject="37" inUse="false" mx="1.50812" my="-1.69333" showLabel="true" type="modeling"/>
<point id="77" idObject="67" inUse="false" mx="2.35479" my="1.40229" showLabel="true" type="modeling"/>
<path cut="false" firstToCountour="false" id="78" inUse="false" lastToCountour="false" name="Unnamed path" type="2" typeLine="dashLine" visible="1">
<nodes>
<node idObject="76" type="NodePoint"/>
<node idObject="77" type="NodePoint"/>
</nodes>
</path>
<point id="84" idObject="37" inUse="false" mx="-4.16478" my="-0.178895" showLabel="true" type="modeling"/>
<point id="85" idObject="82" inUse="false" mx="-3.99302" my="-1.38578" showLabel="true" type="modeling"/>
<spline id="86" idObject="83" inUse="false" type="modelingPath"/>
<point id="87" idObject="67" inUse="false" mx="2.35479" my="1.40229" showLabel="true" type="modeling"/>
<spline id="88" idObject="44" inUse="false" type="modelingPath"/>
<point id="89" idObject="79" inUse="false" mx="-3.04052" my="0.625057" showLabel="true" type="modeling"/>
</modeling>
<details>
<detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="90" mx="14.5907" my="-1.70631" name="Ventre" seamAllowance="true" version="2" width="0.75">
<data annotation="" foldPosition="" fontSize="14" height="1.09073" letter="" mx="457.035" my="300.695" onFold="false" orientation="" quantity="1" rotation="AngleLine_A27_A52" rotationWay="" tilt="" visible="true" width="1.65779">
<line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
<line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
<line alignment="4" bold="false" italic="false" sfIncrement="0" text="%pQuantity%x"/>
<line alignment="4" bold="false" italic="false" sfIncrement="0" text="%userMaterial1%"/>
</data>
<patternInfo fontSize="9" height="1.18146" mx="225.475" my="329.753" rotation="AngleLine_A27_A52" visible="true" width="3.04143"/>
<grainline arrows="0" length="2.67669" mx="426.081" my="390.683" rotation="90+AngleLine_A27_A52" visible="true"/>
<nodes>
<node idObject="84" type="NodePoint"/>
<node idObject="85" type="NodePoint"/>
<node idObject="86" reverse="1" type="NodeSplinePath"/>
<node idObject="87" type="NodePoint"/>
<node idObject="88" reverse="0" type="NodeSplinePath"/>
<node idObject="89" type="NodePoint"/>
</nodes>
</detail>
</details>
<groups>
<group id="58" name="Construction" visible="false">
<item object="52" tool="52"/>
<item object="54" tool="54"/>
<item object="56" tool="56"/>
<item object="33" tool="33"/>
<item object="48" tool="48"/>
<item object="17" tool="17"/>
<item object="16" tool="16"/>
<item object="15" tool="15"/>
<item object="10" tool="10"/>
<item object="41" tool="41"/>
<item object="38" tool="38"/>
<item object="11" tool="11"/>
<item object="5" tool="5"/>
<item object="6" tool="6"/>
<item object="20" tool="20"/>
<item object="65" tool="65"/>
<item object="66" tool="66"/>
<item object="3" tool="3"/>
<item object="4" tool="4"/>
<item object="2" tool="2"/>
<item object="1" tool="1"/>
<item object="14" tool="14"/>
<item object="19" tool="19"/>
<item object="18" tool="18"/>
<item object="26" tool="26"/>
<item object="21" tool="21"/>
<item object="27" tool="27"/>
<item object="24" tool="24"/>
<item object="25" tool="25"/>
<item object="22" tool="22"/>
<item object="31" tool="31"/>
<item object="32" tool="32"/>
<item object="7" tool="7"/>
<item object="23" tool="23"/>
</group>
<group id="91" name="Ventre" visible="true">
<item object="82" tool="81"/>
<item object="83" tool="81"/>
</group>
</groups>
</draw>
<draw name="Oreille">
<calculation>
<point id="92" mx="-1.37583" my="0.555625" name="B" showLabel="true" type="single" x="19.5694" y="8.11973"/>
<point angle="90" basePoint="92" id="93" length="6.5" lineColor="black" mx="-1.93146" my="-1.34937" name="B1" showLabel="true" type="endLine" typeLine="none"/>
<point angle="0" basePoint="93" id="94" length="4.1" lineColor="black" mx="0.740833" my="-1.64042" name="B2" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="94" id="95" mx="0.264587" my="0.79375" name="B3" secondPoint="92" showLabel="true" type="pointOfIntersection"/>
<line firstPoint="93" id="96" lineColor="black" secondPoint="94" typeLine="dashLine"/>
<line firstPoint="94" id="97" lineColor="black" secondPoint="95" typeLine="dashLine"/>
<line firstPoint="95" id="98" lineColor="black" secondPoint="92" typeLine="dashLine"/>
<line firstPoint="93" id="99" lineColor="black" secondPoint="92" typeLine="dashLine"/>
<point firstPoint="93" id="100" length="1.2" lineColor="black" mx="-2.09021" my="-0.608542" name="B4" secondPoint="92" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="92" id="101" length="0.5" lineColor="black" mx="-0.052917" my="1.03187" name="B5" secondPoint="95" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="90.0415" basePoint="101" id="102" length="2.8" lineColor="black" mx="-1.85208" my="-0.582084" name="B6" showLabel="true" type="endLine" typeLine="none"/>
<point firstPoint="93" id="103" length="2.2" lineColor="black" mx="-0.608542" my="-2.40771" name="B7" secondPoint="94" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="94" id="104" length="2.5" lineColor="black" mx="0.79375" my="-0.687917" name="B8" secondPoint="95" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="10" color="black" id="105" penStyle="hair" type="pathInteractive">
<pathPoint angle1="236.324" angle2="56.3241" length1="0" length2="0.552762" pSpline="100"/>
<pathPoint angle1="180.292" angle2="0.292" length1="0.902414" length2="1.06492" pSpline="103"/>
<pathPoint angle1="90.0996" angle2="270.1" length1="1.44595" length2="1.79877" pSpline="104"/>
<pathPoint angle1="11.8533" angle2="191.853" length1="1.84183" length2="1.13368" pSpline="92"/>
</spline>
<spline aScale="10" color="black" duplicate="1" id="106" penStyle="hair" type="pathInteractive">
<pathPoint angle1="113.214" angle2="293.214" length1="0" length2="0.835038" pSpline="100"/>
<pathPoint angle1="88.0745" angle2="268.075" length1="0.84274" length2="0.875761" pSpline="102"/>
<pathPoint angle1="70.9334" angle2="250.933" length1="0.609233" length2="0.791135" pSpline="92"/>
</spline>
</calculation>
<modeling>
<point id="107" idObject="92" inUse="false" mx="-1.37583" my="0.555625" showLabel="true" type="modeling"/>
<spline id="108" idObject="106" inUse="false" type="modelingPath"/>
<point id="109" idObject="100" inUse="false" mx="0.264583" my="0.396875" showLabel="true" type="modeling"/>
<spline id="110" idObject="105" inUse="false" type="modelingPath"/>
</modeling>
<details/>
<groups>
<group id="112" name="Construction" visible="true">
<item object="93" tool="93"/>
<item object="94" tool="94"/>
<item object="95" tool="95"/>
<item object="96" tool="96"/>
<item object="97" tool="97"/>
<item object="98" tool="98"/>
<item object="99" tool="99"/>
<item object="101" tool="101"/>
</group>
</groups>
</draw>
</pattern>

View File

@ -1067,6 +1067,9 @@ QVector<QPointF> VAbstractPiece::Equidistant(QVector<VSAPoint> points, qreal wid
// DumpVector(points, QStringLiteral("input.json.XXXXXX")); // Uncomment for dumping test data
// Fix distorsion. Must be done before the correction
points = CorrectPathDistortion(points);
points = CorrectEquidistantPoints(points);
if ( points.size() < 3 )
{
@ -1076,9 +1079,6 @@ QVector<QPointF> VAbstractPiece::Equidistant(QVector<VSAPoint> points, qreal wid
return QVector<QPointF>();
}
// Fix distorsion
points = CorrectPathDistortion(points);
if (points.last().toPoint() != points.first().toPoint())
{
points.append(points.at(0));// Should be always closed

View File

@ -3,17 +3,17 @@
{
"type": "QPointF",
"x": 1984.9598604245455,
"y": 3107.491870978859
"y": 3107.470448669474
},
{
"type": "QPointF",
"x": 2022.7551360150967,
"y": 3107.491870978859
"x": 2013.1486925189367,
"y": 3107.3642519699065
},
{
"type": "QPointF",
"x": 1997.303734527605,
"y": 3106.611912858666
"x": 1997.045434010333,
"y": 3106.5860997317195
},
{
"type": "QPointF",
@ -22,8 +22,8 @@
},
{
"type": "QPointF",
"x": 1964.1663907800346,
"y": 3102.675519252714
"x": 1964.1685608395817,
"y": 3102.6667943667003
},
{
"type": "QPointF",
@ -67,18 +67,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -228,7 +228,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -337,13 +337,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",
@ -433,7 +433,7 @@
{
"type": "QPointF",
"x": 1984.9598604245455,
"y": 3107.491870978859
"y": 3107.470448669474
}
]
}

View File

@ -57,18 +57,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -218,7 +218,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -327,13 +327,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",

View File

@ -57,18 +57,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -218,7 +218,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -327,13 +327,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",

View File

@ -57,18 +57,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -218,7 +218,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -327,13 +327,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",

View File

@ -57,18 +57,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -218,7 +218,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -327,13 +327,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",

View File

@ -57,18 +57,18 @@
},
{
"type": "QPointF",
"x": 1839.3034779579243,
"y": 3040.645910842773
"x": 1839.1287556560546,
"y": 3040.4942247221857
},
{
"type": "QPointF",
"x": 1828.0836807590824,
"y": 3029.6509944986296
"x": 1827.775230874743,
"y": 3029.062323188764
},
{
"type": "QPointF",
"x": 1817.4235118214906,
"y": 3017.918878796319
"x": 1817.5669314293834,
"y": 3018.0953984398657
},
{
"type": "QPointF",
@ -218,7 +218,7 @@
{
"type": "QPointF",
"x": 2750.0942175506984,
"y": 342.49876114111674
"y": 342.4987611411168
},
{
"type": "QPointF",
@ -327,13 +327,13 @@
},
{
"type": "QPointF",
"x": 2654.824750408218,
"x": 2654.8247504082183,
"y": 1037.6541962965302
},
{
"type": "QPointF",
"x": 2707.7220622041555,
"y": 1038.9183044833856
"x": 2707.722062204155,
"y": 1038.9183044833865
},
{
"type": "QPointF",

View File

@ -2,18 +2,23 @@
"vector": [
{
"type": "QPointF",
"x": 1180.7645816208317,
"y": -59.00020617354858
"x": 1181.3702112033557,
"y": -59.406362870594876
},
{
"type": "QPointF",
"x": 1268.5261798074243,
"y": 36.98562468383665
"x": 1269.0394640469171,
"y": 38.62919078337234
},
{
"type": "QPointF",
"x": 1198.6315176611233,
"y": 123.38243039634041
"x": 1216.9245192058738,
"y": 100.21766491121538
},
{
"type": "QPointF",
"x": 1198.8808131327262,
"y": 123.03980191699638
},
{
"type": "QPointF",
@ -67,8 +72,8 @@
},
{
"type": "QPointF",
"x": 1071.9609663888264,
"y": 391.03989292886365
"x": 1071.9871584114776,
"y": 391.04623791365884
},
{
"type": "QPointF",
@ -127,8 +132,8 @@
},
{
"type": "QPointF",
"x": 1180.7645816208317,
"y": -59.00020617354858
"x": 1181.3702112033557,
"y": -59.406362870594876
}
]
}

View File

@ -42,13 +42,13 @@
},
{
"type": "QPointF",
"x": -2735.5637236706502,
"y": -1198.8327987897178
"x": -2735.8620865001744,
"y": -1198.3515401880197
},
{
"type": "QPointF",
"x": -2709.3301962544565,
"y": -1242.350944420334
"x": -2709.429611880214,
"y": -1242.5497829527835
},
{
"type": "QPointF",

View File

@ -2,13 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": 207.8356097595722,
"y": 1768.5574036876958
"x": 207.97524435031346,
"y": 1768.5451872439698
},
{
"type": "QPointF",
"x": 173.0793708392803,
"y": 1567.494455438128
"x": 192.3532472917225,
"y": 1678.5395352135974
},
{
"type": "QPointF",
"x": 173.06637823139368,
"y": 1567.4188366954345
},
{
"type": "QPointF",
@ -22,8 +27,8 @@
},
{
"type": "QPointF",
"x": 113.91684776027131,
"y": 1184.789433696898
"x": 113.98342747073067,
"y": 1185.2608588355108
},
{
"type": "QPointF",
@ -37,8 +42,8 @@
},
{
"type": "QPointF",
"x": 36.983437936436985,
"y": 552.2646069820005
"x": 37.02982091108014,
"y": 552.7177947831434
},
{
"type": "QPointF",
@ -52,13 +57,13 @@
},
{
"type": "QPointF",
"x": -12.288070724611142,
"y": -17.710595485938104
"x": -12.288070724611146,
"y": -17.71059548593819
},
{
"type": "QPointF",
"x": 26.31665967166907,
"y": -20.64315536140112
"x": 26.316659671669136,
"y": -20.643155361401213
},
{
"type": "QPointF",
@ -252,18 +257,18 @@
},
{
"type": "QPointF",
"x": 967.4782824078412,
"y": 182.05248051659785
"x": 967.4782824078413,
"y": 182.0524805165979
},
{
"type": "QPointF",
"x": 1004.0810458391544,
"y": 191.4716400415735
"x": 1004.0810458391545,
"y": 191.47164004157355
},
{
"type": "QPointF",
"x": 988.9976255298626,
"y": 250.08566646847305
"y": 250.08566646847308
},
{
"type": "QPointF",
@ -377,8 +382,8 @@
},
{
"type": "QPointF",
"x": 207.8356097595722,
"y": 1768.5574036876958
"x": 207.97524435031346,
"y": 1768.5451872439698
}
]
}

View File

@ -2,18 +2,23 @@
"vector": [
{
"type": "QPointF",
"x": -219.1132362274485,
"y": 59.76521424266423
"x": -218.4362476442146,
"y": 60.082487681666066
},
{
"type": "QPointF",
"x": -196.65773024177247,
"y": 112.02910670072471
"x": -196.73040945651604,
"y": 111.99504529263494
},
{
"type": "QPointF",
"x": -214.89666292622343,
"y": 166.89727659461172
"x": -202.58871262669427,
"y": 128.53121708773386
},
{
"type": "QPointF",
"x": -214.84435298014208,
"y": 166.70961534534916
},
{
"type": "QPointF",
@ -32,18 +37,18 @@
},
{
"type": "QPointF",
"x": -243.47320060147146,
"y": 300.99291812881216
"x": -243.2111745960838,
"y": 301.26085147159137
},
{
"type": "QPointF",
"x": -246.1759764951169,
"y": 334.7350801577321
"x": -246.32424570745619,
"y": 331.5659013496832
},
{
"type": "QPointF",
"x": -251.05534306180104,
"y": 356.3979584259171
"x": -247.36754301589642,
"y": 354.40670968863236
},
{
"type": "QPointF",
@ -102,8 +107,8 @@
},
{
"type": "QPointF",
"x": -415.23237001939634,
"y": 388.15813749078177
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
@ -137,8 +142,8 @@
},
{
"type": "QPointF",
"x": -722.1497906411519,
"y": 384.93382569436017
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
@ -252,8 +257,8 @@
},
{
"type": "QPointF",
"x": -219.1132362274485,
"y": 59.76521424266423
"x": -218.4362476442146,
"y": 60.082487681666066
}
]
}

View File

@ -52,18 +52,18 @@
},
{
"type": "QPointF",
"x": 1816.1141828457614,
"y": 212.3887020561369
"x": 1816.1141828457537,
"y": 212.38870205614276
},
{
"type": "QPointF",
"x": 1821.1582741564016,
"y": 207.9156854487886
"x": 1821.158274156406,
"y": 207.91568544878376
},
{
"type": "QPointF",
"x": 1829.8906021517287,
"y": 197.95711777636723
"y": 197.95711777636726
},
{
"type": "QPointF",
@ -132,28 +132,28 @@
},
{
"type": "QPointF",
"x": 2043.8408021651217,
"y": -231.36182837730803
"x": 2043.470724801957,
"y": -231.58427464889738
},
{
"type": "QPointF",
"x": 2048.5472886712973,
"y": -256.8983432709658
"x": 2048.852905918943,
"y": -256.66210067911084
},
{
"type": "QPointF",
"x": 2055.2130708651216,
"y": -292.0522999673984
"x": 2054.8508178913967,
"y": -292.384011086662
},
{
"type": "QPointF",
"x": 2096.2010430479354,
"y": -305.76697662558325
"x": 2095.52601931633,
"y": -306.38508853570886
},
{
"type": "QPointF",
"x": 2118.596734377698,
"y": -285.25948496501354
"x": 2118.596734377724,
"y": -285.25948496499177
},
{
"type": "QPointF",

View File

@ -42,13 +42,8 @@
},
{
"type": "QPointF",
"x": 182.57176177093885,
"y": 307.54028260167195
},
{
"type": "QPointF",
"x": 183.22877397002802,
"y": 304.74101381048894
"x": 183.2925825930999,
"y": 304.79941219485175
},
{
"type": "QPointF",
@ -97,23 +92,23 @@
},
{
"type": "QPointF",
"x": -35.8670113621213,
"y": 351.0160620770652
"x": -35.867011362121275,
"y": 351.01606207706516
},
{
"type": "QPointF",
"x": -71.33016037970901,
"y": 144.14769280779635
"x": -71.33016037970897,
"y": 144.14769280779652
},
{
"type": "QPointF",
"x": 325.80435893876364,
"y": 76.06748949606039
"x": 325.8043589387637,
"y": 76.06748949606035
},
{
"type": "QPointF",
"x": 330.9882848734929,
"y": 102.87077188278467
"y": 102.87077188278468
},
{
"type": "QPointF",

View File

@ -2,18 +2,23 @@
"vector": [
{
"type": "QPointF",
"x": -2164.841154977491,
"y": -1195.3118331606747
"x": -2165.385424573768,
"y": -1195.2534638392945
},
{
"type": "QPointF",
"x": -2118.43416950323,
"y": -1210.583578833799
"x": -2158.364241613096,
"y": -1197.537569688092
},
{
"type": "QPointF",
"x": -2082.437616769119,
"y": -1220.0101487988097
"x": -2117.551298201531,
"y": -1210.8146888395456
},
{
"type": "QPointF",
"x": -2083.1478929409827,
"y": -1220.0868889606825
},
{
"type": "QPointF",
@ -352,13 +357,13 @@
},
{
"type": "QPointF",
"x": -2141.1199442290053,
"y": 2.4962907724991394
"x": -2141.1199442289458,
"y": 2.49629077248366
},
{
"type": "QPointF",
"x": -2191.9582652746717,
"y": 12.914358254731537
"x": -2191.958265274672,
"y": 12.91435825472845
},
{
"type": "QPointF",
@ -367,8 +372,8 @@
},
{
"type": "QPointF",
"x": -2164.841154977491,
"y": -1195.3118331606747
"x": -2165.385424573768,
"y": -1195.2534638392945
}
]
}

View File

@ -2,13 +2,13 @@
"vector": [
{
"type": "QPointF",
"x": 1786.0710599536046,
"y": 557.5240420963199
"x": 1786.5659489404482,
"y": 557.5134215650199
},
{
"type": "QPointF",
"x": 1749.6370245691528,
"y": 576.8618185344574
"x": 1749.5520466515043,
"y": 576.9120200174077
},
{
"type": "QPointF",
@ -67,17 +67,17 @@
},
{
"type": "QPointF",
"x": 1525.37666027745,
"y": 809.8047500951102
"x": 1525.1842993824857,
"y": 810.2370420401115
},
{
"type": "QPointF",
"x": 1522.1062814637592,
"x": 1521.8348817961976,
"y": 818.5825511811023
},
{
"type": "QPointF",
"x": 1522.1062814637592,
"x": 1521.8348817961976,
"y": 845.0392440944881
},
{
@ -107,13 +107,13 @@
},
{
"type": "QPointF",
"x": 1696.2923013503678,
"y": 48.363400642197
"x": 1696.2690262201031,
"y": 48.3645621551752
},
{
"type": "QPointF",
"x": 1786.0710599536046,
"y": 557.5240420963199
"x": 1786.5659489404482,
"y": 557.5134215650199
}
]
}

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -67,13 +67,13 @@
},
{
"type": "QPointF",
"x": 285.16939607807876,
"y": -68.9102571433973
"x": 285.16939607807865,
"y": -68.91025714339723
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -83,17 +83,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -252,23 +252,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

View File

@ -197,8 +197,8 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"y": 2.027726815668483
"x": 46.111397855976755,
"y": 2.027726815668484
},
{
"type": "QPointF",

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -77,18 +77,18 @@
},
{
"type": "QPointF",
"x": 330.25975933130064,
"y": -109.86937656993382
"x": 330.2597593313006,
"y": -109.8693765699337
},
{
"type": "QPointF",
"x": 335.0862325583723,
"y": -62.02308576348085
"x": 335.08623255837216,
"y": -62.0230857634808
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -98,17 +98,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -267,23 +267,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -78,17 +78,17 @@
{
"type": "QPointF",
"x": 308.85408734019427,
"y": -89.23259539188258
"y": -89.2325953918828
},
{
"type": "QPointF",
"x": 335.086232558372,
"y": -62.02308576348083
"x": 335.0862325583717,
"y": -62.023085763480815
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -98,17 +98,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -267,23 +267,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -67,18 +67,18 @@
},
{
"type": "QPointF",
"x": 284.4959443876259,
"y": -68.4308753608727
"x": 284.4959443876258,
"y": -68.43087536087263
},
{
"type": "QPointF",
"x": 335.0862325583722,
"y": -62.02308576348085
"x": 335.08623255837205,
"y": -62.023085763480815
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -88,17 +88,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -257,23 +257,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -67,18 +67,18 @@
},
{
"type": "QPointF",
"x": 286.0749094907468,
"y": -69.55482696186911
"x": 286.0749094907467,
"y": -69.55482696186903
},
{
"type": "QPointF",
"x": 286.564782103786,
"y": -68.71773166746935
"x": 286.5647821037859,
"y": -68.71773166746928
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -88,17 +88,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -257,23 +257,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

View File

@ -12,7 +12,7 @@
},
{
"type": "QPointF",
"x": 46.111397855976776,
"x": 46.11139785597676,
"y": 2.027726815668483
},
{
@ -67,18 +67,18 @@
},
{
"type": "QPointF",
"x": 284.4390076163078,
"x": 284.4390076163077,
"y": -68.44485122652873
},
{
"type": "QPointF",
"x": 284.5734311894893,
"y": -68.99248415563493
"x": 284.5734311894892,
"y": -68.99248415563486
},
{
"type": "QPointF",
"x": 556.9804629248772,
"y": -31.407692230837736
"y": -31.407692230837753
},
{
"type": "QPointF",
@ -88,17 +88,17 @@
{
"type": "QPointF",
"x": 586.153833178555,
"y": -21.217486096297492
"y": -21.2174860962975
},
{
"type": "QPointF",
"x": 1117.7037149530322,
"y": 212.15307563552173
"x": 1117.7037149530324,
"y": 212.15307563552184
},
{
"type": "QPointF",
"x": 1101.8482040478996,
"y": 244.8082798528157
"y": 244.80827985281576
},
{
"type": "QPointF",
@ -257,23 +257,23 @@
},
{
"type": "QPointF",
"x": 1104.502219000503,
"y": 705.4274804063973
"x": 1104.0444208482252,
"y": 705.3744462055462
},
{
"type": "QPointF",
"x": 1110.9097384210777,
"y": 705.8266456692913
"x": 1111.3488014116294,
"y": 705.7937559506272
},
{
"type": "QPointF",
"x": 1290.2822996456107,
"y": 705.8266456692913
"x": 1290.4028062852726,
"y": 707.5008815309488
},
{
"type": "QPointF",
"x": 1302.4618913981099,
"y": 882.3181914081317
"x": 1302.4618765682826,
"y": 882.3181924346007
},
{
"type": "QPointF",

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,539 @@
{
"vector": [
{
"type": "QPointF",
"x": 166.2793358771866,
"y": 317.0063195835933
},
{
"type": "QPointF",
"x": 165.64275495245442,
"y": 301.03538140265255
},
{
"type": "QPointF",
"x": 165.9241818618377,
"y": 283.76299680393265
},
{
"type": "QPointF",
"x": 165.88627642302018,
"y": 280.21495093296807
},
{
"type": "QPointF",
"x": 167.78024031224584,
"y": 263.63026674491516
},
{
"type": "QPointF",
"x": 171.2459135294844,
"y": 247.0901582437869
},
{
"type": "QPointF",
"x": 175.35351394576222,
"y": 234.8597797393187
},
{
"type": "QPointF",
"x": 179.7306152508974,
"y": 225.99041905785725
},
{
"type": "QPointF",
"x": 184.8167066465138,
"y": 218.45272205761742
},
{
"type": "QPointF",
"x": 186.06814702527078,
"y": 217.44230267355644
},
{
"type": "QPointF",
"x": 187.2901543369056,
"y": 215.92418137543507
},
{
"type": "QPointF",
"x": 196.89081710839,
"y": 208.34478105780212
},
{
"type": "QPointF",
"x": 203.29392527811845,
"y": 204.51550744665195
},
{
"type": "QPointF",
"x": 210.60586727103993,
"y": 200.97193709900534
},
{
"type": "QPointF",
"x": 222.03055445161348,
"y": 196.7139895702384
},
{
"type": "QPointF",
"x": 233.89457456941724,
"y": 193.60179993286891
},
{
"type": "QPointF",
"x": 248.98872642851768,
"y": 191.42493440584562
},
{
"type": "QPointF",
"x": 264.23377987042534,
"y": 190.90851689495304
},
{
"type": "QPointF",
"x": 282.88849327137484,
"y": 192.3327170360014
},
{
"type": "QPointF",
"x": 288.2031868096645,
"y": 193.48305021794997
},
{
"type": "QPointF",
"x": 292.0507070275667,
"y": 194.88291402164677
},
{
"type": "QPointF",
"x": 302.2609179912159,
"y": 200.52339431871832
},
{
"type": "QPointF",
"x": 312.4716122896351,
"y": 208.47683247462922
},
{
"type": "QPointF",
"x": 320.37180984256605,
"y": 216.47325684819089
},
{
"type": "QPointF",
"x": 326.23567071378,
"y": 223.57518983261718
},
{
"type": "QPointF",
"x": 333.7748575886651,
"y": 234.23056124764497
},
{
"type": "QPointF",
"x": 340.96073277166533,
"y": 245.8168833793835
},
{
"type": "QPointF",
"x": 351.5894679236029,
"y": 263.84403704994895
},
{
"type": "QPointF",
"x": 353.2512234548283,
"y": 263.3673080331528
},
{
"type": "QPointF",
"x": 354.6369381456461,
"y": 248.63868742738416
},
{
"type": "QPointF",
"x": 357.4736650430952,
"y": 210.79601581293596
},
{
"type": "QPointF",
"x": 359.3073327569976,
"y": 200.02799414967882
},
{
"type": "QPointF",
"x": 359.73199799735687,
"y": 195.76084622496757
},
{
"type": "QPointF",
"x": 362.7120659075751,
"y": 189.21200989719003
},
{
"type": "QPointF",
"x": 364.2921931987103,
"y": 186.1786983822252
},
{
"type": "QPointF",
"x": 366.5306945072866,
"y": 182.93652936261128
},
{
"type": "QPointF",
"x": 369.982180722541,
"y": 179.37377930160977
},
{
"type": "QPointF",
"x": 374.6890134539639,
"y": 175.54739778670276
},
{
"type": "QPointF",
"x": 377.2538085237466,
"y": 173.8065326338944
},
{
"type": "QPointF",
"x": 398.9256180190481,
"y": 162.99327226113368
},
{
"type": "QPointF",
"x": 416.5041370775075,
"y": 156.9754834453434
},
{
"type": "QPointF",
"x": 427.8889886897312,
"y": 154.18647318396557
},
{
"type": "QPointF",
"x": 438.0633612753594,
"y": 153.03192944510397
},
{
"type": "QPointF",
"x": 451.7825414078947,
"y": 152.8956366849569
},
{
"type": "QPointF",
"x": 465.38530369692694,
"y": 154.00600077743474
},
{
"type": "QPointF",
"x": 475.68791359201066,
"y": 155.9902739944185
},
{
"type": "QPointF",
"x": 484.19308368052646,
"y": 159.05322984284635
},
{
"type": "QPointF",
"x": 493.8490103693721,
"y": 164.62147416122724
},
{
"type": "QPointF",
"x": 504.30214237411684,
"y": 173.73502446586204
},
{
"type": "QPointF",
"x": 510.67904759033263,
"y": 180.57012994104807
},
{
"type": "QPointF",
"x": 524.0023556963948,
"y": 196.43641192353618
},
{
"type": "QPointF",
"x": 559.7613549461172,
"y": 242.4936218299132
},
{
"type": "QPointF",
"x": 569.5835818133556,
"y": 257.3121087709943
},
{
"type": "QPointF",
"x": 578.0175928754072,
"y": 272.3226478275148
},
{
"type": "QPointF",
"x": 585.014909318949,
"y": 286.9983512578358
},
{
"type": "QPointF",
"x": 591.1019941479228,
"y": 302.05819169893664
},
{
"type": "QPointF",
"x": 593.6592659318968,
"y": 309.1009580349592
},
{
"type": "QPointF",
"x": 594.5621538949604,
"y": 317.9492631765719
},
{
"type": "QPointF",
"x": 591.4691411901464,
"y": 336.9021533252068
},
{
"type": "QPointF",
"x": 587.7772567627065,
"y": 353.05391040771735
},
{
"type": "QPointF",
"x": 582.7107603326205,
"y": 369.9049033568516
},
{
"type": "QPointF",
"x": 576.3979894710554,
"y": 386.4062544290843
},
{
"type": "QPointF",
"x": 568.7091425226228,
"y": 402.8846548007183
},
{
"type": "QPointF",
"x": 549.2280816776043,
"y": 442.10646157989896
},
{
"type": "QPointF",
"x": 538.9087372946932,
"y": 461.18462682908535
},
{
"type": "QPointF",
"x": 528.3345265604034,
"y": 476.92160008646584
},
{
"type": "QPointF",
"x": 520.2343656529063,
"y": 485.0367289659276
},
{
"type": "QPointF",
"x": 513.148845575274,
"y": 489.9896405767957
},
{
"type": "QPointF",
"x": 505.5219398390943,
"y": 493.75314459015317
},
{
"type": "QPointF",
"x": 493.1624730540218,
"y": 498.00078352401664
},
{
"type": "QPointF",
"x": 479.769261267493,
"y": 501.2042372736896
},
{
"type": "QPointF",
"x": 465.68981801438673,
"y": 503.0580521806556
},
{
"type": "QPointF",
"x": 454.9458499674166,
"y": 502.9444423349683
},
{
"type": "QPointF",
"x": 439.3060103264079,
"y": 501.3191976012906
},
{
"type": "QPointF",
"x": 423.2043144587875,
"y": 498.34929359863105
},
{
"type": "QPointF",
"x": 411.3722974923289,
"y": 494.89048056695367
},
{
"type": "QPointF",
"x": 404.0462328838181,
"y": 491.56426076213603
},
{
"type": "QPointF",
"x": 397.6192436403225,
"y": 487.3958668879086
},
{
"type": "QPointF",
"x": 395.8065790202349,
"y": 485.71619133980585
},
{
"type": "QPointF",
"x": 390.1544796169675,
"y": 477.9820353387566
},
{
"type": "QPointF",
"x": 386.5194680676028,
"y": 470.8821137717501
},
{
"type": "QPointF",
"x": 381.8262598501652,
"y": 458.03556842219757
},
{
"type": "QPointF",
"x": 368.3461454578772,
"y": 411.2975955501923
},
{
"type": "QPointF",
"x": 366.64848225314825,
"y": 411.33744639475356
},
{
"type": "QPointF",
"x": 354.94905309156206,
"y": 444.28762369139116
},
{
"type": "QPointF",
"x": 349.5264395561675,
"y": 456.53775435663135
},
{
"type": "QPointF",
"x": 341.93489933666746,
"y": 469.79816790408853
},
{
"type": "QPointF",
"x": 334.11338915152845,
"y": 479.95250344559355
},
{
"type": "QPointF",
"x": 325.34007746842036,
"y": 488.3512524365335
},
{
"type": "QPointF",
"x": 321.5584979241992,
"y": 491.67184971202573
},
{
"type": "QPointF",
"x": 308.4504919589761,
"y": 496.94455134299847
},
{
"type": "QPointF",
"x": 293.41117665937344,
"y": 500.741531068732
},
{
"type": "QPointF",
"x": 276.78725103080393,
"y": 503.25309046316846
},
{
"type": "QPointF",
"x": 264.6092166309341,
"y": 503.7252445480846
},
{
"type": "QPointF",
"x": 252.35742731035515,
"y": 502.981505596202
},
{
"type": "QPointF",
"x": 240.16140370368174,
"y": 500.98447655539013
},
{
"type": "QPointF",
"x": 232.08334886242122,
"y": 498.82957588934755
},
{
"type": "QPointF",
"x": 220.20894480356736,
"y": 493.9717974895532
},
{
"type": "QPointF",
"x": 214.23653207492043,
"y": 491.72898244053755
},
{
"type": "QPointF",
"x": 200.54353768038376,
"y": 476.1142489208116
},
{
"type": "QPointF",
"x": 194.51735337202624,
"y": 466.1928074212942
},
{
"type": "QPointF",
"x": 188.96153147430664,
"y": 454.3702537301474
},
{
"type": "QPointF",
"x": 183.01824799966036,
"y": 437.8681242930998
},
{
"type": "QPointF",
"x": 179.18342598456445,
"y": 423.87894050611567
},
{
"type": "QPointF",
"x": 175.960729453766,
"y": 408.06485844817104
},
{
"type": "QPointF",
"x": 173.8253139307419,
"y": 392.00129957222134
},
{
"type": "QPointF",
"x": 166.2793358771866,
"y": 317.0063195835933
}
]
}

View File

@ -127,5 +127,7 @@
<file>panties_case1/output.json</file>
<file>panties_case2/input.json</file>
<file>panties_case2/output.json</file>
<file>smart_pattern_#99/input.json</file>
<file>smart_pattern_#99/output.json</file>
</qresource>
</RCC>

View File

@ -342,6 +342,12 @@ void TST_VAbstractPiece::LayoutAllowanceRemoveLoop_data()
QStringLiteral("://smart_pattern_#58/input.json"),
QStringLiteral("://smart_pattern_#58/output.json"),
18.897637795275593 /*seam allowance width (0.5 cm)*/);
// See file src/app/share/collection/test/smart_pattern_#99.val
ASSERT_TEST_CASE("Incorrect fix of distortion",
QStringLiteral("://smart_pattern_#99/input.json"),
QStringLiteral("://smart_pattern_#99/output.json"),
28.346456692913389 /*seam allowance width*/);
}
//---------------------------------------------------------------------------------------------------------------------