Improvements to the american system waist block

1 files changed, 35 insertions, 22 deletions

diff --git a/blocks/americal_system_waist.val b/blocks/american_system_waist.val
index c7e024b..6a9e787 100644
--- a/blocks/americal_system_waist.val
+++ b/blocks/american_system_waist.val
@@ -17,13 +17,14 @@
     </patternLabel>
     <measurements>../../measurements/EoV_americansystem.vit</measurements>
     <increments>
-        <increment description="Distance between center front and neck. Formula is valid for neck circ between 25 and 37 cm." formula="5 + (neck_mid_circ - 25) / 4" name="#neck_point_from_origin"/>
+        <increment description="Distance between center front and neck. Formula is valid for neck circ between 25 and 37 cm." formula="6.35 + (neck_mid_circ - 30) / 4" name="#neck_point_from_origin"/>
         <increment description="distance between the dart at their apices" formula="6" name="#dart_distance"/>
         <increment description="width of the first dart on the waistline" formula="3.8" name="#front_dart_width"/>
         <increment description="width of the second dart on the waistline" formula="(bust_circ - waist_circ) / 4" name="#back_dart_width"/>
         <increment description="distance between darts on waistline" formula="1.8" name="#dart_distance_waist"/>
         <increment description="width of the center back at the waistline" formula="3.8" name="#center_back_width"/>
         <increment description="" formula="8" name="#cuff_height"/>
+        <increment description="" formula="2" name="#default_allowance"/>
     </increments>
     <previewCalculations/>
     <draw name="block">
@@ -49,7 +50,7 @@
             <point firstPoint="15" id="19" length="#front_dart_width / 2" lineColor="black" mx="0.132292" my="0.264583" name="A7" secondPoint="16" showLabel="true" type="alongLine" typeLine="none"/>
             <point firstPoint="15" id="20" length="Line_A4_A7" lineColor="black" mx="0.132292" my="0.264583" name="A8" secondPoint="10" showLabel="true" type="alongLine" typeLine="none"/>
             <point firstPoint="20" id="21" length="#dart_distance_waist" lineColor="black" mx="0.132292" my="0.264583" name="A9" secondPoint="10" showLabel="true" type="alongLine" typeLine="none"/>
-            <point firstPoint="21" id="22" length="#back_dart_width" lineColor="black" mx="0.132292" my="0.264583" name="A10" secondPoint="10" showLabel="true" type="alongLine" typeLine="none"/>
+            <point firstPoint="21" id="22" length="#back_dart_width" lineColor="black" mx="0.0923979" my="0.224689" name="A10" secondPoint="10" showLabel="true" type="alongLine" typeLine="none"/>
             <point firstPoint="21" id="23" length="CurrentLength/2" lineColor="black" mx="0.132292" my="0.264583" name="A11" secondPoint="22" showLabel="true" type="alongLine" typeLine="none"/>
             <point firstPoint="15" id="24" length="-Line_A6_A4" lineColor="black" mx="0.132292" my="0.264583" name="A12" secondPoint="17" showLabel="true" type="alongLine" typeLine="none"/>
             <line firstPoint="23" id="25" lineColor="black" secondPoint="18" typeLine="hair"/>
@@ -59,10 +60,10 @@
             <spline aScale="0" angle1="280" angle2="90" color="black" id="29" length1="8" length2="4" penStyle="hair" point1="17" point4="20" type="simpleInteractive"/>
             <spline aScale="0" angle1="270" angle2="80" color="black" id="30" length1="4" length2="8" penStyle="hair" point1="20" point4="24" type="simpleInteractive"/>
             <spline aScale="0" angle1="100" angle2="270" color="black" id="31" length1="4" length2="8" penStyle="hair" point1="24" point4="19" type="simpleInteractive"/>
-            <spline aScale="0" angle1="AngleLine_A11_Ah" angle2="AngleLine_A11_Ah + 180 - 15" color="black" id="32" length1="4" length2="8" penStyle="hair" point1="21" point4="18" type="simpleInteractive"/>
-            <spline aScale="0" angle1="AngleLine_A11_Ah + 180 + 15" angle2="AngleLine_A11_Ah" color="black" id="33" length1="8" length2="4" penStyle="hair" point1="18" point4="22" type="simpleInteractive"/>
-            <spline aScale="0" angle1="AngleLine_A11_Ah + 180" angle2="AngleLine_A11_Ah - 15" color="black" id="34" length1="8" length2="4" penStyle="hair" point1="22" point4="26" type="simpleInteractive"/>
-            <spline aScale="0" angle1="AngleLine_A11_Ah + 15" angle2="AngleLine_A11_Ah + 180" color="black" id="35" length1="4" length2="8" penStyle="hair" point1="26" point4="21" type="simpleInteractive"/>
+            <spline aScale="0" angle1="AngleLine_A11_Ah" angle2="AngleLine_A11_Ah + 180 - 10" color="black" id="32" length1="8" length2="4" penStyle="hair" point1="21" point4="18" type="simpleInteractive"/>
+            <spline aScale="0" angle1="AngleLine_A11_Ah + 180 + 10" angle2="AngleLine_A11_Ah" color="black" id="33" length1="4" length2="8" penStyle="hair" point1="18" point4="22" type="simpleInteractive"/>
+            <spline aScale="0" angle1="AngleLine_A11_Ah + 180" angle2="AngleLine_A11_Ah - 10" color="black" id="34" length1="8" length2="4" penStyle="hair" point1="22" point4="26" type="simpleInteractive"/>
+            <spline aScale="0" angle1="AngleLine_A11_Ah + 10" angle2="AngleLine_A11_Ah + 180" color="black" id="35" length1="4" length2="8" penStyle="hair" point1="26" point4="21" type="simpleInteractive"/>
             <point firstPoint="7" id="36" length="CurrentLength/2" lineColor="black" mx="0.132292" my="0.264583" name="Ai" secondPoint="3" showLabel="true" type="alongLine" typeLine="none"/>
             <point angle="0" basePoint="36" id="37" length="across_chest_f / 2" lineColor="black" mx="0.132292" my="0.264583" name="Aj" showLabel="true" type="endLine" typeLine="hair"/>
             <point angle="90" basePoint="9" id="38" length="0.6" lineColor="black" mx="0.132292" my="0.264583" name="A14" showLabel="true" type="endLine" typeLine="hair"/>
@@ -186,9 +187,9 @@
             <point angle="0" basePoint="271" curve="269" id="277" lineColor="black" mx="0.132292" my="0.264583" name="D9" showLabel="true" type="curveIntersectAxis" typeLine="hair"/>
             <spline aScale="0" angle1="235" angle2="0" color="black" id="305" length1="1" length2="3" penStyle="hair" point1="196" point4="189" type="simpleInteractive"/>
             <point firstPoint="4" id="335" length="CurrentLength/2" lineColor="black" mx="-2.84125" my="-0.160209" name="A15" secondPoint="6" showLabel="true" type="alongLine" typeLine="none"/>
-            <point firstPoint="335" id="336" length="3" lineColor="black" mx="0.291589" my="0.530078" name="A16" secondPoint="6" showLabel="true" type="alongLine" typeLine="none"/>
+            <point firstPoint="335" id="336" length="4" lineColor="black" mx="-2.43323" my="0.230348" name="A16" secondPoint="6" showLabel="true" type="alongLine" typeLine="none"/>
             <point firstPoint="335" id="337" length="CurrentLength/2" lineColor="black" mx="-0.451797" my="-1.59388" name="A17" secondPoint="336" showLabel="true" type="alongLine" typeLine="none"/>
-            <point angle="AngleLine_Am_As - 90" basePoint="337" id="338" length="20" lineColor="black" mx="0.132292" my="0.264583" name="A18" showLabel="true" type="endLine" typeLine="hair"/>
+            <point angle="AngleLine_Am_As - 90 + 10" basePoint="337" id="338" length="25" lineColor="black" mx="0.132292" my="0.264583" name="A18" showLabel="true" type="endLine" typeLine="hair"/>
             <point firstPoint="6" id="342" length="- Line_A15_A16" lineColor="black" mx="0.132292" my="0.264583" name="A19" secondPoint="4" showLabel="true" type="alongLine" typeLine="none"/>
             <point id="343" mx="-2.78815" my="-2.28417" name="A20" p1Line1="335" p1Line2="36" p2Line1="338" p2Line2="37" showLabel="true" type="lineIntersect"/>
             <point id="344" mx="2.25625" my="-1.80628" name="A21" p1Line1="336" p1Line2="36" p2Line1="338" p2Line2="37" showLabel="true" type="lineIntersect"/>
@@ -196,12 +197,13 @@
             <point firstPoint="37" id="346" length="- Line_A20_A21" lineColor="black" mx="0.132292" my="0.264583" name="A22" secondPoint="36" showLabel="true" type="alongLine" typeLine="none"/>
             <spline aScale="0" angle1="AngleLine_Am_As - 90" angle2="100" color="black" id="347" length1="2" length2="5" penStyle="hair" point1="342" point4="346" type="simpleInteractive"/>
             <spline aScale="0" angle1="280" angle2="180" color="black" id="348" length1="6" length2="3" penStyle="hair" point1="346" point4="8" type="simpleInteractive"/>
+            <line firstPoint="335" id="357" lineColor="black" secondPoint="338" typeLine="hair"/>
+            <point firstPoint="338" id="358" length="Line_A15_A18" lineColor="black" mx="-1.01213" my="-2.24225" name="A23" secondPoint="336" showLabel="true" type="alongLine" typeLine="none"/>
         </calculation>
         <modeling>
             <point id="94" idObject="3" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <spline id="95" idObject="27" inUse="true" type="modelingSpline"/>
             <point id="96" idObject="4" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
-            <point id="97" idObject="6" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <spline id="98" idObject="39" inUse="true" type="modelingPath"/>
             <point id="99" idObject="38" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <point id="100" idObject="10" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
@@ -329,8 +331,6 @@
             <spline id="223" idObject="201" inUse="true" type="modelingSpline"/>
             <point id="238" idObject="197" inUse="true" type="pin"/>
             <point id="240" idObject="237" inUse="true" type="pin"/>
-            <point id="242" idObject="191" inUse="false" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
-            <point id="243" idObject="193" inUse="false" mx="-1.48412" my="0.264583" showLabel="true" type="modeling"/>
             <point id="245" idObject="191" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <point id="246" idObject="194" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <path cut="false" firstToCountour="false" id="247" inUse="true" lastToCountour="false" name="elbow_line" type="2" typeLine="dashDotLine" visible="1">
@@ -396,15 +396,27 @@
             <point id="334" idObject="237" inUse="true" type="pin"/>
             <point id="349" idObject="335" inUse="true" mx="-2.84125" my="-0.160209" showLabel="true" type="modeling"/>
             <point id="350" idObject="338" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
-            <point id="351" idObject="336" inUse="true" mx="0.291589" my="0.530078" showLabel="true" type="modeling"/>
+            <point id="351" idObject="336" inUse="false" mx="0.291589" my="0.530078" showLabel="true" type="modeling"/>
             <point id="352" idObject="342" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <spline id="353" idObject="347" inUse="true" type="modelingSpline"/>
             <point id="354" idObject="346" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
             <spline id="355" idObject="348" inUse="true" type="modelingSpline"/>
             <point id="356" idObject="8" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
+            <point id="359" idObject="358" inUse="true" mx="-1.01213" my="-2.24225" showLabel="true" type="modeling"/>
+            <point id="360" idObject="197" inUse="false" type="pin"/>
+            <point id="361" idObject="335" inUse="true" mx="-2.84125" my="-0.160209" showLabel="true" type="modeling"/>
+            <point id="362" idObject="338" inUse="true" mx="0.132292" my="0.264583" showLabel="true" type="modeling"/>
+            <point id="363" idObject="358" inUse="true" mx="-1.01213" my="-2.24225" showLabel="true" type="modeling"/>
+            <path cut="false" firstToCountour="false" id="364" inUse="true" lastToCountour="false" name="shoulder_dart" type="2" typeLine="dotLine" visible="1">
+                <nodes>
+                    <node idObject="361" type="NodePoint"/>
+                    <node idObject="362" type="NodePoint"/>
+                    <node idObject="363" type="NodePoint"/>
+                </nodes>
+            </path>
         </modeling>
         <details>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="102" inLayout="true" mx="0" my="0" name="front" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="102" inLayout="true" mx="0" my="0" name="front" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="A" mx="358.284" my="344.829" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -417,8 +429,8 @@
                     <node idObject="95" reverse="0" type="NodeSpline"/>
                     <node idObject="96" type="NodePoint"/>
                     <node idObject="349" type="NodePoint"/>
-                    <node idObject="350" type="NodePoint"/>
-                    <node idObject="351" type="NodePoint"/>
+                    <node excluded="true" idObject="350" type="NodePoint"/>
+                    <node idObject="359" type="NodePoint"/>
                     <node idObject="352" type="NodePoint"/>
                     <node idObject="353" reverse="0" type="NodeSpline"/>
                     <node idObject="354" type="NodePoint"/>
@@ -432,13 +444,14 @@
                 <iPaths>
                     <record path="111"/>
                     <record path="120"/>
+                    <record path="364"/>
                 </iPaths>
                 <pins>
                     <record>123</record>
                     <record>124</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="138" inLayout="true" mx="0" my="0" name="center_back" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="138" inLayout="true" mx="0" my="0" name="center_back" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="B" mx="1973.85" my="289.982" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -468,7 +481,7 @@
                     <record>179</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="154" inLayout="true" mx="0" my="0" name="first_side" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="154" inLayout="true" mx="0" my="0" name="first_side" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="C" mx="2325.58" my="766.537" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -500,7 +513,7 @@
                     <record>180</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="166" inLayout="true" mx="0" my="0" name="second_side" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="166" inLayout="true" mx="0" my="0" name="second_side" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="D" mx="2548.25" my="1328.74" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -528,7 +541,7 @@
                     <record>181</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="224" inLayout="true" mx="0" my="0" name="upper_sleeve" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="224" inLayout="true" mx="-0.125407" my="0" name="upper_sleeve" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="E" mx="583.654" my="3172.55" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -539,7 +552,7 @@
                 <nodes>
                     <node idObject="211" type="NodePoint"/>
                     <node idObject="212" reverse="0" type="NodeSpline"/>
-                    <node idObject="213" type="NodePoint"/>
+                    <node idObject="213" passmark="true" passmarkAngle="straightforward" passmarkLine="tMark" type="NodePoint"/>
                     <node idObject="214" reverse="0" type="NodeSpline"/>
                     <node idObject="215" type="NodePoint"/>
                     <node idObject="216" reverse="0" type="NodeSpline"/>
@@ -559,7 +572,7 @@
                     <record>240</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="296" inLayout="true" mx="0" my="0" name="shirtwaist_sleeve" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="296" inLayout="false" mx="0" my="0" name="shirtwaist_sleeve" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="G" mx="2220.3" my="3074.38" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>
@@ -594,7 +607,7 @@
                     <record>298</record>
                 </pins>
             </detail>
-            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="329" inLayout="true" mx="-0.103641" my="-0.103641" name="lower_sleeve" seamAllowance="true" united="false" version="2" width="1">
+            <detail forbidFlipping="false" forceFlipping="false" hideMainPath="false" id="329" inLayout="true" mx="-0.103641" my="-0.103641" name="lower_sleeve" seamAllowance="true" united="false" version="2" width="#default_allowance">
                 <data annotation="" foldPosition="" fontSize="0" height="5" letter="F" mx="272.319" my="3665.81" onFold="false" orientation="" quantity="2" rotation="0" rotationWay="" tilt="" visible="true" width="5">
                     <line alignment="4" bold="true" italic="false" sfIncrement="6" text="%pLetter%"/>
                     <line alignment="4" bold="true" italic="false" sfIncrement="2" text="%pName%"/>