Merge branch 'Noble' of https://github.com/woutervdub/freesewing into Noble

designs/noble/config/index.js

@@ -15,15 +15,28 @@ export default {
   optionGroups: {
     type: ['dartPosition'],
     fit: ['chestEase', 'waistEase', 'bustSpanEase'],
-    darts: ['backDartHeight', 'waistDartLength', 'shoulderDartPosition','upperDartLength','armholeDartPosition'],
+    darts: [
+      'backDartHeight',
+      'waistDartLength',
+      'shoulderDartPosition',
+      'upperDartLength',
+      'armholeDartPosition',
+    ],
     armhole: [
       'armholeDepth',
       'backArmholeSlant',
       'backArmholeCurvature',
+      'frontArmholeCurvature',
       'frontArmholePitchDepth',
       'backArmholePitchDepth',
     ],
-    advanced: ['backNeckCutout', 'backHemSlope', 'frontShoulderWidth', 'highBustWidth', 'shoulderToShoulderEase'],
+    advanced: [
+      'backNeckCutout',
+      'backHemSlope',
+      'frontShoulderWidth',
+      'highBustWidth',
+      'shoulderToShoulderEase',
+    ],
   },
   measurements: [
     'chest',
@@ -34,14 +47,12 @@ export default {
     'hpsToWaistBack',
     'shoulderToShoulder',
     'shoulderSlope',
-  // ],
-  // optionalMeasurements: [
     'highBust',
     'underbust',
     'bustSpan',
     'hpsToBust',
   ],
-  hide: ['bellaFrontSideDart', 'bellaBack', 'backPoints', 'frontPoints',],
+  hide: ['bellaFrontSideDart', 'bellaBack', 'backPoints', 'frontPoints'],
   inject: {
     ...Bella.config.inject,
     backPoints: 'bellaBack',
@@ -59,16 +70,9 @@ export default {
     backOutside: 'backPoints',
     frontPoints: 'bellaBack',
     frontInside: 'frontPoints',
-    frontOutside: ['frontPoints','frontInside'],
+    frontOutside: ['frontPoints', 'frontInside'],
   },
-  parts: [
+  parts: ['backPoints', 'backInside', 'backOutside', 'frontPoints', 'frontInside', 'frontOutside'],
-    'backPoints',
-    'backInside',
-    'backOutside',
-    'frontPoints',
-    'frontInside',
-    'frontOutside',
-  ],
   options: {
     // Constants
     acrossBackFactor: 0.925,
@@ -79,6 +83,8 @@ export default {
     backDartLocation: 0.145,
     backCenterWaistReduction: 0.35,
     collarFactor: 0.19,
+    bustDartCurve: 1,
+    bustDartLength: 0.9,
 
     // Percentages
     backNeckCutout: { pct: 6, min: 3, max: 9 },
@@ -97,13 +103,20 @@ export default {
     frontArmholePitchDepth: { pct: 29, max: 31, min: 27 },
     backArmholePitchDepth: { pct: 35, max: 40, min: 30 },
     highBustWidth: { pct: 86, max: 92, min: 80 },
-    bustDartLength: { pct: 90, min: 75, max: 100 },
     waistDartLength: { pct: 90, min: 75, max: 95 },
-    bustDartCurve: { pct: 100, min: 0, max: 100 },
     upperDartLength: { pct: 90, min: 80, max: 95 },
-    dartPosition: { dflt: 'shoulder', list: ['shoulder','armhole'] },
+    dartPosition: { dflt: 'shoulder', list: ['shoulder', 'armhole'] },
-    shoulderDartPosition: { pct: 50, min: 10, max: 90, hide: ({options}) => (options.dartPosition != 'shoulder') },
+    shoulderDartPosition: {
-    armholeDartPosition: { pct: 50, min: 10, max: 90, hide: ({options}) => (options.dartPosition == 'shoulder') },
+      pct: 50,
-  }
+      min: 10,
-
+      max: 90,
+      hide: ({ options }) => options.dartPosition != 'shoulder',
+    },
+    armholeDartPosition: {
+      pct: 50,
+      min: 10,
+      max: 90,
+      hide: ({ options }) => options.dartPosition == 'shoulder',
+    },
+  },
 }

markdown/org/docs/patterns/noble/options/bustdartcurve/de.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart curve"
----
-
----
-
-The **bust dart curve** option controls the curvature of the bust dart. From straight to slightly curved.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartcurve/en.md

@@ -1,10 +0,0 @@
----
-title: "Bust dart curve"
----
-
----
-
-The **bust dart curve** option controls the curvature of the bust dart.
-From straight to slightly curved.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartcurve/es.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart curve"
----
-
----
-
-The **bust dart curve** option controls the curvature of the bust dart. From straight to slightly curved.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartcurve/fr.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart curve"
----
-
----
-
-The **bust dart curve** option controls the curvature of the bust dart. From straight to slightly curved.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartcurve/nl.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart curve"
----
-
----
-
-The **bust dart curve** option controls the curvature of the bust dart. From straight to slightly curved.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartlength/de.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart length"
----
-
----
-
-The **bust dart length** option controls the length of the bust dart. The maximum length brings the dart all the way to the bust apex.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartlength/en.md

@@ -1,10 +0,0 @@
----
-title: "Bust dart length"
----
-
----
-
-The **bust dart length** option controls the length of the bust dart.
-The maximum length brings the dart all the way to the bust apex.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartlength/es.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart length"
----
-
----
-
-The **bust dart length** option controls the length of the bust dart. The maximum length brings the dart all the way to the bust apex.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartlength/fr.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart length"
----
-
----
-
-The **bust dart length** option controls the length of the bust dart. The maximum length brings the dart all the way to the bust apex.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/bustdartlength/nl.md

@@ -1,9 +0,0 @@
----
-title: "Bust dart length"
----
-
----
-
-The **bust dart length** option controls the length of the bust dart. The maximum length brings the dart all the way to the bust apex.
-
-## Effect of this option on the pattern

markdown/org/docs/patterns/noble/options/dartPosition/de.md

@@ -1,5 +0,0 @@
----
-title: "Dart position"
----
-
-The **Dart position** option controls whether to create the princess seam at the shoulder or armhole.

markdown/org/docs/patterns/noble/options/dartPosition/en.md

@@ -1,5 +0,0 @@
----
-title: "Dart position"
----
-
-The **Dart position** option controls whether to create the princess seam at the shoulder or armhole.

markdown/org/docs/patterns/noble/options/dartPosition/es.md

@@ -1,5 +0,0 @@
----
-title: "Posición de la pinza"
----
-
-La opción de **posición de la pinza** controla si crear el corte princesa en el hombro o la sisa.

markdown/org/docs/patterns/noble/options/dartPosition/fr.md

@@ -1,5 +0,0 @@
----
-title: "Dart position"
----
-
-The **Dart position** option controls whether to create the princess seam at the shoulder or armhole.

markdown/org/docs/patterns/noble/options/dartPosition/nl.md

@@ -1,5 +0,0 @@
----
-title: "Dart position"
----
-
-The **Dart position** option controls whether to create the princess seam at the shoulder or armhole.