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

Fix for seam aloowance angle type By first edge symmetry.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-10-23 11:24:59 +03:00
parent 74111e870d
commit 7f9906bbcc
9 changed files with 998 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
src/app/share/collection/bugs/Issue_#937a.val Normal file
View File

@ -0,0 +1,221 @@
<?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/>
<measurements>Issue_#937a.vit</measurements>
<increments>
<increment description="Верхняя одежда" formula="4" name="#Пвпрз"/>
<increment description="Верхняя одежда" formula="3" name="#Пдтс"/>
<increment description="Верхняя одежда" formula="0.8" name="#Пош"/>
<increment description="Верхняя одежда" formula="3" name="#Пшс"/>
<increment description="Верхняя одежда" formula="10" name="#Псг"/>
<increment description="Свободное для роста 80-116 см" formula="6" name="#Пвгол"/>
<increment description="Базовая форма" formula="1" name="#Позап"/>
<increment description="" formula="4" name="#Псб"/>
<increment formula="4.5" name="#Пдс"/>
</increments>
<previewCalculations/>
<draw name="БК плечевого изделия">
<calculation>
<point id="1" mx="-1.68471" my="-0.793338" name="А" showLabel="false" type="single" x="11.4968" y="1.27429"/>
<point angle="270" basePoint="1" id="2" length="neck_back_to_waist_b+#Пдтс" lineColor="black" mx="-1.63522" my="-1.12076" name="А1" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="270" basePoint="2" id="3" length="waist_to_hip_side" lineColor="black" mx="-1.76703" my="-0.808948" name="А2" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="0" basePoint="1" id="4" length="lowbust_circ/4+#Псг/2" lineColor="black" mx="0.132292" my="0.264583" name="А3" showLabel="false" type="endLine" typeLine="hair"/>
<point firstPoint="4" id="5" mx="0.132292" my="0.264583" name="А4" secondPoint="2" showLabel="true" type="pointOfIntersection"/>
<point firstPoint="4" id="6" mx="0.132292" my="0.264583" name="А5" secondPoint="3" showLabel="true" type="pointOfIntersection"/>
<line firstPoint="3" id="7" lineColor="black" secondPoint="6" typeLine="hair"/>
<line firstPoint="6" id="8" lineColor="black" secondPoint="5" typeLine="hair"/>
<line firstPoint="5" id="9" lineColor="black" secondPoint="4" typeLine="hair"/>
<line firstPoint="2" id="10" lineColor="black" secondPoint="5" typeLine="hair"/>
<point firstPoint="1" id="11" length="2" lineColor="black" mx="-1.79589" my="-1.36046" name="А6" secondPoint="2" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="11" id="12" length="neck_back_to_highbust_b+#Пвпрз" lineColor="black" mx="-2.02267" my="-0.53355" name="А7" secondPoint="2" showLabel="false" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="12" id="13" lineColor="black" mx="0.132292" my="0.264583" name="А8" p1Line="4" p2Line="5" showLabel="true" type="lineIntersectAxis" typeLine="hair"/>
<point firstPoint="11" id="14" length="Line_А6_А7/2" lineColor="black" mx="-2.30201" my="-1.01243" name="А9" secondPoint="12" showLabel="false" type="alongLine" typeLine="none"/>
<point firstPoint="11" id="15" length="neck_back_to_highbust_b/4-2" lineColor="black" mx="-3.05721" my="-0.83106" name="А10" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="1" id="17" length="neck_circ/5+#Пош" lineColor="black" mx="0.036751" my="-1.93286" name="А11" secondPoint="4" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" angle1="0" angle2="231.901" color="black" id="18" length1="2.67346" length2="1.37863" penStyle="hair" point1="11" point4="17" type="simpleInteractive"/>
<point firstPoint="12" id="19" length="armfold_to_armfold_b/2+#Пшс" lineColor="black" mx="0.132292" my="0.264583" name="А12" secondPoint="13" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="19" id="20" mx="0.132292" my="0.264583" name="А13" secondPoint="14" showLabel="false" type="pointOfIntersection"/>
<point firstPoint="19" id="21" mx="-2.06257" my="0.623743" name="А14" secondPoint="15" showLabel="false" type="pointOfIntersection"/>
<point angle="0" basePoint="21" id="22" length="1.25" lineColor="black" mx="0.810705" my="-0.812896" name="А15" showLabel="true" type="endLine" typeLine="hair"/>
<line firstPoint="17" id="23" lineColor="black" secondPoint="22" typeLine="hair"/>
<spline aScale="0" color="black" id="24" penStyle="hair" type="pathInteractive">
<pathPoint angle1="0" angle2="180" length1="0" length2="1.9279" pSpline="13"/>
<pathPoint angle1="267.973" angle2="87.973" length1="3.71641" length2="0.982734" pSpline="20"/>
<pathPoint angle1="256.934" angle2="76.934" length1="3.72217" length2="1.15669" pSpline="22"/>
</spline>
<point firstPoint="1" id="25" length="neck_circ/5+0.5" lineColor="black" mx="-2.34192" my="-0.53355" name="А16" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" angle1="0" angle2="270" color="black" id="26" length1="3.63672" length2="2.68787" penStyle="hair" point1="25" point4="17" type="simpleInteractive"/>
<point angle="180" basePoint="20" id="27" length="0.6" lineColor="black" mx="-2.54145" my="-0.453737" name="А17" showLabel="false" type="endLine" typeLine="hair"/>
<point firstPoint="15" id="28" length="0.5" lineColor="black" mx="-1.46397" my="-0.334017" name="а" secondPoint="25" showLabel="false" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="28" id="29" lineColor="black" mx="0.132292" my="0.264583" name="а1" p1Line="4" p2Line="13" showLabel="false" type="lineIntersectAxis" typeLine="hair"/>
<point center="17" firstPoint="28" id="30" mx="0.132292" my="0.264583" name="А18" radius="Line_А11_А15" secondPoint="29" showLabel="true" type="pointOfContact"/>
<line firstPoint="17" id="31" lineColor="black" secondPoint="30" typeLine="hair"/>
<spline aScale="0" color="black" id="32" penStyle="hair" type="pathInteractive">
<pathPoint angle1="0" angle2="180" length1="0" length2="3.0735" pSpline="13"/>
<pathPoint angle1="266.765" angle2="86.765" length1="3.80171" length2="0.895773" pSpline="27"/>
<pathPoint angle1="250.655" angle2="70.655" length1="3.37095" length2="1.43079" pSpline="30"/>
</spline>
<point firstPoint="2" id="35" length="1" lineColor="black" mx="-2.35177" my="-0.451974" name="А20" secondPoint="3" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="17" id="37" length="1" lineColor="black" mx="1.85203" my="-1.83732" name="E" secondPoint="22" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="17" id="38" length="1" lineColor="black" mx="-0.875462" my="0.613479" name="F" secondPoint="30" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="11" id="39" length="0.7" lineColor="black" mx="-2.2684" my="0.613983" name="H" secondPoint="15" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" angle1="228.059" angle2="0" color="black" id="40" length1="1.77014" length2="3.31487" penStyle="hair" point1="37" point4="39" type="simpleInteractive"/>
<point firstPoint="25" id="41" length="2" lineColor="black" mx="-1.20528" my="-1.35961" name="G" secondPoint="14" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" angle1="270" angle2="0" color="black" id="42" length1="4.308" length2="3.54089" penStyle="hair" point1="38" point4="41" type="simpleInteractive"/>
<point angle="0" basePoint="4" id="43" length="30" lineColor="black" mx="0.132292" my="0.264583" name="А21" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="270" basePoint="43" id="44" length="Line_А6_А7/2" lineColor="black" mx="0.132292" my="0.264583" name="А22" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="270" basePoint="43" id="45" length="arm_shoulder_tip_to_wrist+1" lineColor="black" mx="0.132292" my="0.264583" name="А23" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="180" basePoint="44" id="46" length="25" lineColor="black" mx="0.132292" my="0.264583" name="b" showLabel="true" type="endLine" typeLine="hair"/>
<point center="43" firstPoint="44" id="47" mx="0.132292" my="0.264583" name="А24" radius="SplPath_А8_А15" secondPoint="46" showLabel="true" type="pointOfContact"/>
<line firstPoint="47" id="48" lineColor="black" secondPoint="43" typeLine="hair"/>
<point angle="180" basePoint="45" id="49" length="Line_А22_А24/3*2" lineColor="black" mx="-2.85727" my="-0.589579" name="А25" showLabel="true" type="endLine" typeLine="hair"/>
<line firstPoint="49" id="50" lineColor="black" secondPoint="47" typeLine="hair"/>
<point firstPoint="47" id="51" length="CurrentLength/3" lineColor="black" mx="0.132292" my="0.264583" name="А26" secondPoint="43" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="51" id="52" length="CurrentLength/2" lineColor="black" mx="0.132292" my="0.264583" name="А27" secondPoint="43" showLabel="true" type="alongLine" typeLine="none"/>
<point firstPoint="47" id="53" length="CurrentLength/2" lineColor="black" mx="-1.42459" my="-2.2756" name="А28" secondPoint="51" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="0" firstPoint="53" id="54" length="0.3" lineColor="black" mx="0.411471" my="0.309974" name="`А28" secondPoint="47" showLabel="true" type="normal" typeLine="hair"/>
<point angle="0" firstPoint="52" id="55" length="1" lineColor="black" mx="-1.12401" my="-1.52682" name="`А27" secondPoint="43" showLabel="true" type="normal" typeLine="hair"/>
<spline aScale="0" color="black" id="56" penStyle="hair" type="pathInteractive">
<pathPoint angle1="195.559" angle2="15.559" length1="0" length2="1.30083" pSpline="47"/>
<pathPoint angle1="209.266" angle2="29.2656" length1="0.625885" length2="0.735997" pSpline="54"/>
<pathPoint angle1="223.017" angle2="43.017" length1="0.711611" length2="2.04961" pSpline="51"/>
<pathPoint angle1="213.639" angle2="33.639" length1="1.41203" length2="0.947576" pSpline="55"/>
<pathPoint angle1="180" angle2="0" length1="2.18053" length2="0.860674" pSpline="43"/>
</spline>
<point id="57" length="SplPath_А24_А21_Seg_1+SplPath_А24_А21_Seg_2" mx="-2.86846" my="-0.0554971" name="А29" showLabel="true" splinePath="32" type="cutSplinePath"/>
<point id="58" length="SplPath_А24_А21_Seg_1+SplPath_А24_А21_Seg_2" mx="0.612412" my="-1.29581" name="А30" showLabel="true" splinePath="24" type="cutSplinePath"/>
<point firstPoint="43" id="59" length="CurrentLength/2" lineColor="black" mx="0.132292" my="0.264583" name="А31" secondPoint="45" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="59" id="60" lineColor="black" mx="-2.57878" my="0.757504" name="`А31" p1Line="47" p2Line="49" showLabel="true" type="lineIntersectAxis" typeLine="hair"/>
<operation id="61" p1Line="44" p2Line="59" suffix="а1" type="flippingByLine">
<source>
<item idObject="56"/>
<item idObject="60"/>
<item idObject="49"/>
<item idObject="47"/>
<item idObject="51"/>
</source>
<destination>
<item idObject="62"/>
<item idObject="63" mx="-2.57878" my="0.757504" showLabel="true"/>
<item idObject="64" mx="1.43652" my="-1.03965" showLabel="true"/>
<item idObject="65" mx="0.132292" my="0.264583" showLabel="true"/>
<item idObject="66" mx="1.03598" my="-1.29633" showLabel="true"/>
</destination>
</operation>
<line firstPoint="65" id="67" lineColor="black" secondPoint="64" typeLine="hair"/>
<line firstPoint="45" id="68" lineColor="black" secondPoint="64" typeLine="hair"/>
<line firstPoint="59" id="69" lineColor="black" secondPoint="63" typeLine="hair"/>
<point id="78" length="3" mx="-0.903842" my="0.431701" name="А36" showLabel="true" spline="40" type="cutSpline"/>
<point id="79" length="3" mx="0.600224" my="-0.771551" name="А35" showLabel="true" spline="42" type="cutSpline"/>
<spline aScale="0" angle1="308.258" angle2="107.905" color="black" id="80" length1="4.00849" length2="2.81673" penStyle="hair" point1="79" point4="57" type="simpleInteractive"/>
<spline aScale="0" angle1="328.335" angle2="105.971" color="black" id="81" length1="2.84453" length2="5.1575" penStyle="hair" point1="78" point4="58" type="simpleInteractive"/>
<point angle="90" basePoint="43" id="82" length="20" lineColor="black" mx="0.132292" my="0.264583" name="с" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="180" basePoint="82" id="83" length="3" lineColor="black" mx="0.132292" my="0.264583" name="с1" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="0" basePoint="82" id="84" length="3" lineColor="black" mx="0.132292" my="0.264583" name="с2" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="270" basePoint="83" id="85" length="20" lineColor="black" mx="0.132292" my="0.264583" name="с3" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="270" basePoint="84" id="86" length="20" lineColor="black" mx="0.132292" my="0.264583" name="с4" showLabel="true" type="endLine" typeLine="hair"/>
<point center="51" firstPoint="85" id="87" mx="0.180186" my="-1.65119" name="А37" radius="Spl_А36_А30" secondPoint="83" showLabel="true" type="pointOfContact"/>
<point center="66" firstPoint="86" id="88" mx="0.132292" my="0.264583" name="А38" radius="Spl_А35_А29" secondPoint="84" showLabel="true" type="pointOfContact"/>
<spline aScale="0" angle1="48.2054" angle2="261.052" color="black" id="89" length1="4.6016" length2="3.48412" penStyle="hair" point1="51" point4="87" type="simpleInteractive"/>
<spline aScale="0" angle1="287.928" angle2="134.779" color="black" id="90" length1="3.13785" length2="4.71015" penStyle="hair" point1="88" point4="66" type="simpleInteractive"/>
<spline aScale="0" angle1="317.027" angle2="176.13" color="black" id="91" length1="2.13588" length2="2.17394" penStyle="hair" point1="87" point4="88" type="simpleInteractive"/>
<point angle="90" basePoint="43" curve="91" id="254" lineColor="black" mx="0.017493" my="-1.6583" name="А39" showLabel="true" type="curveIntersectAxis" typeLine="hair"/>
<point firstPoint="5" id="257" length="1" lineColor="black" mx="-2.14954" my="-2.36292" name="А19" secondPoint="2" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" color="black" id="261" penStyle="hair" type="pathInteractive">
<pathPoint angle1="78.2657" angle2="258.266" length1="0" length2="2.8124" pSpline="13"/>
<pathPoint angle1="87.4906" angle2="267.491" length1="2.72277" length2="2.11198" pSpline="257"/>
<pathPoint angle1="102.445" angle2="282.445" length1="2.75168" length2="1.32234" pSpline="6"/>
</spline>
<spline aScale="0" angle1="0" angle2="180" color="black" id="262" length1="7.99933" length2="2.15021" penStyle="hair" point1="35" point4="257" type="simpleInteractive"/>
<point angle="270" basePoint="3" id="404" length="leg_crotch_to_floor/3-5" lineColor="black" mx="-2.34509" my="-0.808948" name="А32" showLabel="false" type="endLine" typeLine="hair"/>
<point firstPoint="6" id="405" mx="0.792926" my="-1.387" name="А33" secondPoint="404" showLabel="true" type="pointOfIntersection"/>
<line firstPoint="404" id="406" lineColor="black" secondPoint="405" typeLine="hair"/>
<line firstPoint="405" id="407" lineColor="black" secondPoint="6" typeLine="hair"/>
<point angle="270" basePoint="404" id="408" length="4" lineColor="black" mx="0.132292" my="0.264583" name="А34" showLabel="true" type="endLine" typeLine="hair"/>
<point angle="0" basePoint="404" id="409" length="hip_circ/4+#Псб+1" lineColor="black" mx="0.132292" my="0.264583" name="А40" showLabel="true" type="endLine" typeLine="hair"/>
<line firstPoint="13" id="410" lineColor="black" secondPoint="409" typeLine="hair"/>
<spline aScale="0" angle1="0" angle2="180" color="black" id="411" length1="7.82742" length2="2.64023" penStyle="hair" point1="408" point4="409" type="simpleInteractive"/>
<point firstPoint="404" id="412" length="0.5" lineColor="black" mx="0.132292" my="0.264583" name="А41" secondPoint="408" showLabel="true" type="alongLine" typeLine="none"/>
<spline aScale="0" angle1="0" angle2="180" color="black" id="413" length1="8.82152" length2="3.63451" penStyle="hair" point1="412" point4="409" type="simpleInteractive"/>
<point firstPoint="2" id="445" length="3" lineColor="black" mx="-1.99884" my="-0.135005" name="G1" secondPoint="3" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="0" basePoint="445" id="446" lineColor="black" mx="0.132292" my="0.264583" name="F1" p1Line="5" p2Line="6" showLabel="true" type="lineIntersectAxis" typeLine="hair"/>
<point firstPoint="445" id="447" length="0.75" lineColor="black" mx="0.132292" my="0.264583" name="А44" secondPoint="446" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="90" basePoint="447" curve="42" id="448" lineColor="black" mx="0.132292" my="0.264583" name="А45" showLabel="true" type="curveIntersectAxis" typeLine="hair"/>
<point firstPoint="45" id="1325" length="1" lineColor="black" mx="0.986454" my="-2.99676" name="А42" secondPoint="59" showLabel="true" type="alongLine" typeLine="none"/>
<point angle="180" basePoint="1325" id="1326" lineColor="black" mx="-0.100661" my="-2.22025" name="А43" p1Line="49" p2Line="60" showLabel="true" type="lineIntersectAxis" typeLine="hair"/>
<point angle="0" basePoint="1325" id="1327" lineColor="black" mx="1.68531" my="-2.33673" name="А46" p1Line="64" p2Line="63" showLabel="true" type="lineIntersectAxis" typeLine="hair"/>
<operation id="1328" p1Line="49" p2Line="64" suffix="а2" type="flippingByLine">
<source>
<item idObject="1326"/>
<item idObject="1327"/>
</source>
<destination>
<item idObject="1329" mx="-3.63378" my="0.73049" showLabel="true"/>
<item idObject="1330" mx="1.33588" my="0.342231" showLabel="true"/>
</destination>
</operation>
</calculation>
<modeling>
<point id="237" idObject="49" inUse="false" mx="1.19086" my="-2.01833" showLabel="true" type="modeling"/>
<point id="238" idObject="47" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="239" idObject="56" inUse="false" type="modelingPath"/>
<point id="240" idObject="51" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="241" idObject="89" inUse="false" type="modelingSpline"/>
<point id="242" idObject="87" inUse="false" mx="0.180186" my="-1.65119" showLabel="true" type="modeling"/>
<spline id="243" idObject="91" inUse="false" type="modelingSpline"/>
<point id="244" idObject="88" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<spline id="245" idObject="90" inUse="false" type="modelingSpline"/>
<point id="246" idObject="66" inUse="false" mx="1.03598" my="-1.29633" showLabel="true" type="modeling"/>
<spline id="247" idObject="62" inUse="false" type="modelingPath"/>
<point id="248" idObject="65" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="249" idObject="64" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="251" idObject="60" inUse="false" mx="-2.57878" my="0.757504" showLabel="true" type="modeling"/>
<point id="252" idObject="63" inUse="false" mx="-2.57878" my="0.757504" showLabel="true" type="modeling"/>
<path cut="false" firstToCountour="false" id="253" inUse="false" lastToCountour="false" name="Линия локтя" type="2" typeLine="dashLine" visible="1">
<nodes>
<node idObject="251" type="NodePoint"/>
<node idObject="252" type="NodePoint"/>
</nodes>
</path>
<point id="258" idObject="254" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<point id="259" idObject="45" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
<path cut="false" firstToCountour="false" id="260" inUse="false" lastToCountour="false" name="Линия середины рукава" type="2" typeLine="dashDotLine" visible="1">
<nodes>
<node idObject="258" type="NodePoint"/>
<node idObject="259" type="NodePoint"/>
</nodes>
</path>
</modeling>
<details>
<detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="250" mx="1.76941" my="1.51014" name="Case 1a" 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="10" mx="2009.36" my="545.253" rotation="90" visible="true"/>
<nodes>
<node angle="2" before="2" idObject="237" type="NodePoint"/>
<node idObject="238" type="NodePoint"/>
<node idObject="239" reverse="0" type="NodeSplinePath"/>
<node idObject="240" passmark="true" passmarkAngle="straightforward" passmarkLine="one" type="NodePoint"/>
<node idObject="241" reverse="0" type="NodeSpline"/>
<node angle="1" idObject="242" type="NodePoint"/>
<node idObject="243" reverse="0" type="NodeSpline"/>
<node idObject="244" type="NodePoint"/>
<node idObject="245" reverse="0" type="NodeSpline"/>
<node idObject="246" passmark="true" passmarkAngle="straightforward" passmarkLine="two" type="NodePoint"/>
<node idObject="247" reverse="1" type="NodeSplinePath"/>
<node idObject="248" type="NodePoint"/>
<node after="2" angle="3" idObject="249" type="NodePoint"/>
</nodes>
<iPaths>
<record path="253"/>
<record path="260"/>
</iPaths>
</detail>
</details>
<groups/>
</draw>
</pattern>

38
src/app/share/collection/bugs/Issue_#937a.vit Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<vit>
<!--Measurements created with Valentina v0.6.1.1 (https://valentinaproject.bitbucket.io/).-->
<version>0.5.0</version>
<read-only>false</read-only>
<notes/>
<unit>cm</unit>
<pm_system>998</pm_system>
<personal>
<customer/>
<birth-date>1800-01-01</birth-date>
<gender>unknown</gender>
<email/>
</personal>
<body-measurements>
<m name="height" value="74"/>
<m name="lowbust_circ" value="47"/>
<m name="waist_circ" value="45"/>
<m name="hip_circ" value="48"/>
<m name="armfold_to_armfold_b" value="19.6"/>
<m name="neck_circ" value="25"/>
<m name="shoulder_length" value="5.8"/>
<m name="arm_wrist_circ" value="11.7"/>
<m name="neck_back_to_highbust_b" value="10.8"/>
<m name="neck_back_to_waist_b" value="19.4"/>
<m name="waist_to_hip_side" value="9.6"/>
<m name="height_neck_back" value="59.6"/>
<m name="rise_length_side_sitting" value="13.4"/>
<m name="leg_crotch_to_floor" value="27.5"/>
<m name="arm_shoulder_tip_to_wrist" value="25"/>
<m name="head_circ" value="47.5"/>
<m name="leg_ankle_circ" value="13.5"/>
<m description="рост 80-116 см" name="@Швк" value="5"/>
<m description="рост 74-98 см" name="@Шманж" value="4"/>
<m description="рост 74-98 см" name="@Вс" value="4"/>
<m description="Ширина пояса" name="@Шпояс" value="3"/>
</body-measurements>
</vit>

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

@ -351,6 +351,7 @@ QVector<QPointF> AngleByFirstSymmetry(const QVector<QPointF> &points, QPointF p1
{
QLineF allowance(px2, p2);
allowance.setAngle(allowance.angle() + 90);
pointsIntr.append(px2);
pointsIntr.append(allowance.p2());
pointsIntr.append(bigLine2.p1());
}

4
src/test/ValentinaTest/share/Issue_923_test3_3/output.json
View File

@ -7,8 +7,8 @@
},
{
"type": "QPointF",
"x": -915.0435068700746,
"y": 216.89494557577805
"x": -925.4690854411813,
"y": 240.35249736076804
},
{
"type": "QPointF",

4
src/test/ValentinaTest/share/Issue_937_case_1/output.json
View File

@ -27,8 +27,8 @@
},
{
"type": "QPointF",
"x": 107.07002512164966,
"y": 604.2565206153395
"x": 110.60240069942009,
"y": 621.4908395398686
},
{
"type": "QPointF",

437
src/test/ValentinaTest/share/Issue_937_case_1a/input.json Normal file
View File

@ -0,0 +1,437 @@
{
"vector": [
{
"angle": 2,
"saBefore": 75.59055118110237,
"type": "VSAPoint",
"x": 1848.01082181109,
"y": 1030.8393070866143
},
{
"type": "VSAPoint",
"x": 1671.2893035827765,
"y": 327.84718110236224
},
{
"type": "VSAPoint",
"x": 1671.2893035827765,
"y": 327.84718110236224
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1688.372140240957,
"y": 322.94413905734257
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1716.5354846574178,
"y": 313.5103413076031
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1738.904789013785,
"y": 304.43175735278106
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1757.0453362209319,
"y": 295.60668740016325
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1764.9406087705745,
"y": 291.26164583583846
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1774.5053457725976,
"y": 285.8153073866176
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1796.6724196528355,
"y": 272.2726178840532
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1819.5866284327656,
"y": 257.02170154184256
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1840.0279888326772,
"y": 241.6978786769865
},
{
"type": "VSAPoint",
"x": 1848.0108218110677,
"y": 234.6188346456649
},
{
"type": "VSAPoint",
"x": 1848.0108218110677,
"y": 234.6188346456649
},
{
"type": "VSAPoint",
"x": 1848.0108218110677,
"y": 234.6188346456649
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1858.8534932235239,
"y": 222.25357797315382
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1880.2477175428162,
"y": 195.58641618946143
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1901.1990774093565,
"y": 166.87732721497812
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1921.6036592164696,
"y": 136.43970097816313
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1941.35754935748,
"y": 104.58692740747574
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1960.3568342257124,
"y": 71.63239643137523
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1978.4976002144917,
"y": 37.88949797832085
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1995.6759337171432,
"y": 3.67162197677189
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2011.787921126991,
"y": -30.70784164481238
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2026.72964883736,
"y": -64.93550295797269
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2040.3972032415754,
"y": -98.69797203424977
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2052.686670732962,
"y": -131.68185894518436
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2063.494137704844,
"y": -163.57377376231716
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2072.7156905505462,
"y": -194.06032655718894
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2080.2474156633934,
"y": -222.8281274013404
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2085.9853994367118,
"y": -249.56378636631226
},
{
"angle": 1,
"type": "VSAPoint",
"x": 2088.068031496063,
"y": -261.96736884263447
},
{
"angle": 1,
"type": "VSAPoint",
"x": 2088.068031496063,
"y": -261.96736884263447
},
{
"angle": 1,
"type": "VSAPoint",
"x": 2088.068031496063,
"y": -261.96736884263447
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2093.657483084508,
"y": -256.8491686428997
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2105.334884759815,
"y": -247.02463595594847
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2123.8220925948735,
"y": -233.17242929563906
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2150.2581713810423,
"y": -216.62071732342656
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2178.3028954110514,
"y": -202.24961452388237
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2207.5998339810094,
"y": -190.15168642090634
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2237.792556387023,
"y": -180.41949853839853
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2268.524631925203,
"y": -173.1456164002589
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2299.4396298916563,
"y": -168.42260553038736
},
{
"type": "VSAPoint",
"x": 2314.8396850393706,
"y": -167.15867519535914
},
{
"type": "VSAPoint",
"x": 2314.8396850393706,
"y": -167.15867519535914
},
{
"type": "VSAPoint",
"x": 2314.8396850393706,
"y": -167.15867519535914
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2322.010028575929,
"y": -145.61308955377496
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2339.637410969939,
"y": -99.13974168385101
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2361.267739991481,
"y": -49.51427139590451
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2380.2854694075286,
"y": -10.789066434490545
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2394.1642108081796,
"y": 15.443500641661887
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2409.0805090172516,
"y": 41.89754239351732
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2425.042546290644,
"y": 68.44715750356406
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2442.058504884252,
"y": 94.9664446542904
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2460.1365670539744,
"y": 121.32950252818465
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2479.2849150557076,
"y": 147.4104298077351
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2499.5117311453505,
"y": 173.0833251754301
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2520.8251975787994,
"y": 198.22228731375787
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2543.2334966119515,
"y": 222.70141490520683
},
{
"type": "VSAPoint",
"x": 2554.896894724366,
"y": 234.6188346456649
},
{
"type": "VSAPoint",
"x": 2554.896894724366,
"y": 234.6188346456649
},
{
"type": "VSAPoint",
"x": 2554.896894724366,
"y": 234.6188346456649
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2562.8797277027566,
"y": 241.69787867698648
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2583.321088102669,
"y": 257.0217015418425
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2606.235296882598,
"y": 272.27261788405315
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2628.402370762836,
"y": 285.8153073866176
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2637.967107764859,
"y": 291.26164583583846
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2645.862380314502,
"y": 295.60668740016314
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2664.002927521649,
"y": 304.431757352781
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2686.372231878016,
"y": 313.51034130760297
},
{
"angle": 6,
"type": "VSAPoint",
"x": 2714.535576294477,
"y": 322.94413905734257
},
{
"type": "VSAPoint",
"x": 2731.6184129526573,
"y": 327.84718110236224
},
{
"type": "VSAPoint",
"x": 2731.6184129526573,
"y": 327.84718110236224
},
{
"angle": 3,
"saAfter": 75.59055118110237,
"type": "VSAPoint",
"x": 2554.896894724344,
"y": 1030.8393070866143
}
]
}

289
src/test/ValentinaTest/share/Issue_937_case_1a/output.json Normal file
View File

@ -0,0 +1,289 @@
{
"vector": [
{
"type": "QPointF",
"x": 1790.0373027647304,
"y": 1106.4298582677168
},
{
"type": "QPointF",
"x": 1809.039616552721,
"y": 1030.8393070866143
},
{
"type": "QPointF",
"x": 1625.7211470605166,
"y": 301.6047356972375
},
{
"type": "QPointF",
"x": 1677.1510463933573,
"y": 286.8435479714687
},
{
"type": "QPointF",
"x": 1703.4138212480711,
"y": 278.04637876234926
},
{
"type": "QPointF",
"x": 1723.5137525631783,
"y": 269.88882003708585
},
{
"type": "QPointF",
"x": 1755.2977021921959,
"y": 253.25938675287418
},
{
"type": "QPointF",
"x": 1776.3420993297266,
"y": 240.4025822083505
},
{
"type": "QPointF",
"x": 1797.7637952365174,
"y": 226.14503156279258
},
{
"type": "QPointF",
"x": 1821.1582741564016,
"y": 207.9156854487886
},
{
"type": "QPointF",
"x": 1850.2268389063556,
"y": 172.6087009553809
},
{
"type": "QPointF",
"x": 1870.2249267950706,
"y": 145.2058551175055
},
{
"type": "QPointF",
"x": 1889.836815745804,
"y": 115.95069314833182
},
{
"type": "QPointF",
"x": 1908.9175481929235,
"y": 85.18337360456252
},
{
"type": "QPointF",
"x": 1927.3332233514307,
"y": 53.24112200584291
},
{
"type": "QPointF",
"x": 1944.9574938924545,
"y": 20.458935655897122
},
{
"type": "QPointF",
"x": 1961.6692094416467,
"y": -12.829474442041569
},
{
"type": "QPointF",
"x": 1977.3508112727925,
"y": -46.290589198904264
},
{
"type": "QPointF",
"x": 1991.8872271781745,
"y": -79.58978524645178
},
{
"type": "QPointF",
"x": 2005.1651187141283,
"y": -112.38968412540115
},
{
"type": "QPointF",
"x": 2017.0724182445153,
"y": -144.34786468940496
},
{
"type": "QPointF",
"x": 2027.498193269143,
"y": -175.1134390698845
},
{
"type": "QPointF",
"x": 2036.333053260422,
"y": -204.3215811329599
},
{
"type": "QPointF",
"x": 2043.7098515215694,
"y": -231.38670020515815
},
{
"type": "QPointF",
"x": 2055.2130708651216,
"y": -292.0522999673984
},
{
"type": "QPointF",
"x": 2096.2010430479354,
"y": -305.76697662558325
},
{
"type": "QPointF",
"x": 2128.851320460309,
"y": -276.6320078120429
},
{
"type": "QPointF",
"x": 2145.2196056546336,
"y": -264.3674802960657
},
{
"type": "QPointF",
"x": 2168.939173657971,
"y": -249.51658425841455
},
{
"type": "QPointF",
"x": 2194.160515418841,
"y": -236.5922818192089
},
{
"type": "QPointF",
"x": 2220.6310461540475,
"y": -225.66149541920834
},
{
"type": "QPointF",
"x": 2247.958778313922,
"y": -216.85279575290144
},
{
"type": "QPointF",
"x": 2275.742934422003,
"y": -210.27664776098405
},
{
"type": "QPointF",
"x": 2303.844726101479,
"y": -205.98342193871318
},
{
"type": "QPointF",
"x": 2342.8166649803834,
"y": -202.7848739275897
},
{
"type": "QPointF",
"x": 2357.6252360158223,
"y": -158.28779594983365
},
{
"type": "QPointF",
"x": 2374.650855533189,
"y": -113.40095337470302
},
{
"type": "QPointF",
"x": 2395.5715630428886,
"y": -65.40353512500977
},
{
"type": "QPointF",
"x": 2413.959562148755,
"y": -27.960630211024366
},
{
"type": "QPointF",
"x": 2441.7439264606173,
"y": 22.874874343832474
},
{
"type": "QPointF",
"x": 2473.5562132949735,
"y": 74.06879277048931
},
{
"type": "QPointF",
"x": 2490.9627711658104,
"y": 99.45260261835737
},
{
"type": "QPointF",
"x": 2509.3705570487227,
"y": 124.52485036246065
},
{
"type": "QPointF",
"x": 2528.7795075947815,
"y": 149.15966952319275
},
{
"type": "QPointF",
"x": 2549.188990792927,
"y": 173.2323949516483
},
{
"type": "QPointF",
"x": 2580.973552524787,
"y": 207.2276391804366
},
{
"type": "QPointF",
"x": 2586.793533689666,
"y": 212.3887020561312
},
{
"type": "QPointF",
"x": 2605.1439212989176,
"y": 226.1450315627929
},
{
"type": "QPointF",
"x": 2626.565617205801,
"y": 240.40258220841326
},
{
"type": "QPointF",
"x": 2663.251788844662,
"y": 262.0359243630072
},
{
"type": "QPointF",
"x": 2679.3939639722553,
"y": 269.8888200370858
},
{
"type": "QPointF",
"x": 2699.4938952873626,
"y": 278.04637876234915
},
{
"type": "QPointF",
"x": 2725.756670142078,
"y": 286.8435479714692
},
{
"type": "QPointF",
"x": 2777.186569474925,
"y": 301.60473569723985
},
{
"type": "QPointF",
"x": 2593.868099982721,
"y": 1030.8393070866146
},
{
"type": "QPointF",
"x": 2612.870413770712,
"y": 1106.4298582677168
},
{
"type": "QPointF",
"x": 1790.0373027647304,
"y": 1106.4298582677168
}
]
}

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

@ -109,5 +109,7 @@
<file>Issue_923_test7_3/output.json</file>
<file>doll/input.json</file>
<file>doll/output.json</file>
<file>Issue_937_case_1a/input.json</file>
<file>Issue_937_case_1a/output.json</file>
</qresource>
</RCC>

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

@ -1026,6 +1026,12 @@ void TST_VAbstractPiece::EquidistantAngleType_data()
QStringLiteral("://Issue_937_case_1/output.json"),
37.795275590551185 /*seam allowance width*/);
// See file src/app/share/collection/bugs/Issue_#937a.val
ASSERT_TEST_CASE("Issue 937. Case1a",
QStringLiteral("://Issue_937_case_1a/input.json"),
QStringLiteral("://Issue_937_case_1a/output.json"),
37.795275590551185 /*seam allowance width*/);
// See file src/app/share/collection/bugs/Issue_#937.val
ASSERT_TEST_CASE("Issue 937. Case2",
QStringLiteral("://Issue_937_case_2/input.json"),