VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(paco): Paperless without detail. Fixes #1400

Browse source
This commit is contained in:
Joost De Cock 2021-11-08 19:36:47 +01:00
parent 76244a6860
commit 0c999a7f0b
8 changed files with 285 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@
#### Fixed #### Fixed
- Make paperless markings available when detail is disabled Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
- Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401) - Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)
### simon ### simon

2
config/changelog.yaml
View file

@ -3,6 +3,8 @@ unreleased:
Fixed: Fixed:
paco: paco:
- Make paperless markings available when detail is disabled
Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
- Make pocket flaps properly parametric - Make pocket flaps properly parametric
Closes [#1401](https://github.com/freesewing/freesewing/issues/1401) Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)
simon: simon:

1
packages/paco/CHANGELOG.md
View file

@ -5,6 +5,7 @@
### Fixed ### Fixed
- Make paperless markings available when detail is disabled Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
- Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401) - Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)
## 2.19.0 (2021-10-17) ## 2.19.0 (2021-10-17)

236
packages/paco/src/back.js
View file

@ -178,128 +178,128 @@ export default function (part) {
.close() .close()
.attr('class', 'fabric sa') .attr('class', 'fabric sa')
} }
}
if (paperless) { if (paperless) {
// Help construct cross seam // Help construct cross seam
paths.hint = new Path() paths.hint = new Path()
.move(points.crossSeamCurveStart) .move(points.crossSeamCurveStart)
.line(points.crossSeamCurveMax) .line(points.crossSeamCurveMax)
.line(points.fork) .line(points.fork)
.attr('class', 'note lashed') .attr('class', 'note lashed')
macro('hd', { macro('hd', {
from: points.floorIn, from: points.floorIn,
to: points.floorOut, to: points.floorOut,
y: points.floorIn.y - 30, y: points.floorIn.y - 30,
}) })
macro('hd', { macro('hd', {
from: points.floorIn, from: points.floorIn,
to: points.floor, to: points.floor,
y: points.floorIn.y - 15, y: points.floorIn.y - 15,
}) })
macro('hd', { macro('hd', {
from: points.floor, from: points.floor,
to: points.floorOut, to: points.floorOut,
y: points.floorIn.y - 15, y: points.floorIn.y - 15,
}) })
macro('vd', { macro('vd', {
from: points.floorOut, from: points.floorOut,
to: points.styleWaistOut, to: points.styleWaistOut,
x: x:
(points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) + (points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) +
sa + sa +
15, 15,
}) })
macro('vd', { macro('vd', {
from: points.floorIn, from: points.floorIn,
to: points.fork, to: points.fork,
x: points.fork.x - sa - 15, x: points.fork.x - sa - 15,
}) })
macro('vd', { macro('vd', {
from: points.fork, from: points.fork,
to: points.styleWaistIn, to: points.styleWaistIn,
x: points.fork.x - sa - 15, x: points.fork.x - sa - 15,
}) })
macro('vd', { macro('vd', {
from: points.floorIn, from: points.floorIn,
to: points.styleWaistIn, to: points.styleWaistIn,
x: points.fork.x - sa - 30, x: points.fork.x - sa - 30,
}) })
macro('vd', { macro('vd', {
from: points.crossSeamCurveStart, from: points.crossSeamCurveStart,
to: points.styleWaistIn, to: points.styleWaistIn,
x: points.crossSeamCurveStart.x - sa - 15, x: points.crossSeamCurveStart.x - sa - 15,
}) })
macro('hd', { macro('hd', {
from: points.styleWaistIn, from: points.styleWaistIn,
to: points.grainlineTop, to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 15, y: points.styleWaistIn.y - sa - 15,
}) })
macro('hd', { macro('hd', {
from: points.crossSeamCurveStart, from: points.crossSeamCurveStart,
to: points.grainlineTop, to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 30, y: points.styleWaistIn.y - sa - 30,
}) })
macro('hd', { macro('hd', {
from: points.crossSeamCurveMax, from: points.crossSeamCurveMax,
to: points.grainlineTop, to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 45, y: points.styleWaistIn.y - sa - 45,
}) })
macro('hd', { macro('hd', {
from: points.fork, from: points.fork,
to: points.grainlineTop, to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 60, y: points.styleWaistIn.y - sa - 60,
}) })
macro('hd', {
from: points.grainlineTop,
to: points.styleWaistOut,
y: points.styleWaistIn.y - sa - 15,
})
if (points.seatOut.x > points.styleWaistOut.x) {
macro('hd', { macro('hd', {
from: points.grainlineTop, from: points.grainlineTop,
to: points.styleWaistOut, to: points.seatOut,
y: points.styleWaistIn.y - sa - 15, y: points.styleWaistIn.y - sa - 30,
})
}
if (options.frontPockets) {
macro('ld', {
from: points.styleWaistOut,
to: points.pocketFlapTopIn,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopIn,
to: points.pocketFlapBottomIn,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopIn,
to: points.pocketFlapTopOut,
d: -15,
})
}
if (options.backPockets) {
macro('ld', {
from: points.styleWaistIn,
to: points.pocketBagWaistLeft,
d: -15 - sa,
})
macro('ld', {
from: points.styleWaistIn,
to: points.pocketWaistCenter,
d: -30 - sa,
})
macro('ld', {
from: points.pocketCenter,
to: points.pocketWaistCenter,
d: -15,
})
macro('ld', {
from: points.pocketBagBottomRight,
to: points.pocketBagWaistRight,
d: -15,
}) })
if (points.seatOut.x > points.styleWaistOut.x) {
macro('hd', {
from: points.grainlineTop,
to: points.seatOut,
y: points.styleWaistIn.y - sa - 30,
})
}
if (options.frontPockets) {
macro('ld', {
from: points.styleWaistOut,
to: points.pocketFlapTopIn,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopIn,
to: points.pocketFlapBottomIn,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopIn,
to: points.pocketFlapTopOut,
d: -15,
})
}
if (options.backPockets) {
macro('ld', {
from: points.styleWaistIn,
to: points.pocketBagWaistLeft,
d: -15 - sa,
})
macro('ld', {
from: points.styleWaistIn,
to: points.pocketWaistCenter,
d: -30 - sa,
})
macro('ld', {
from: points.pocketCenter,
to: points.pocketWaistCenter,
d: -15,
})
macro('ld', {
from: points.pocketBagBottomRight,
to: points.pocketBagWaistRight,
d: -15,
})
}
} }
} }

24
packages/paco/src/cuff.js
View file

@ -53,19 +53,19 @@ export default function (part) {
.line(points.bottomRight.shift(-90, sa).shift(0, sa)) .line(points.bottomRight.shift(-90, sa).shift(0, sa))
.attr('class', 'help') .attr('class', 'help')
} }
}
if (paperless) { if (paperless) {
macro('vd', { macro('vd', {
from: points.bottomRight, from: points.bottomRight,
to: points.topRight, to: points.topRight,
x: points.topRight.x + 15 + sa, x: points.topRight.x + 15 + sa,
}) })
macro('hd', { macro('hd', {
from: points.bottomLeft, from: points.bottomLeft,
to: points.bottomRight, to: points.bottomRight,
y: points.bottomRight.y + 15 + sa, y: points.bottomRight.y + 15 + sa,
}) })
}
} }
return part return part

194
packages/paco/src/front.js
View file

@ -210,111 +210,111 @@ export default function (part) {
.close() .close()
.attr('class', 'fabric sa') .attr('class', 'fabric sa')
} }
}
if (paperless) { if (paperless) {
// Help construct crotch seam // Help construct crotch seam
paths.hint = new Path() paths.hint = new Path()
.move(points.crotchSeamCurveStart) .move(points.crotchSeamCurveStart)
.line(points.crotchSeamCurveMax) .line(points.crotchSeamCurveMax)
.line(points.fork) .line(points.fork)
.attr('class', 'note lashed') .attr('class', 'note lashed')
macro('hd', { macro('hd', {
from: points.floorOut, from: points.floorOut,
to: points.floor, to: points.floor,
y: points.floorIn.y - 15, y: points.floorIn.y - 15,
}) })
macro('hd', { macro('hd', {
from: points.floor, from: points.floor,
to: points.floorIn, to: points.floorIn,
y: points.floorIn.y - 15, y: points.floorIn.y - 15,
}) })
macro('hd', { macro('hd', {
from: points.floorOut, from: points.floorOut,
to: points.floorIn, to: points.floorIn,
y: points.floorIn.y - 30, y: points.floorIn.y - 30,
}) })
macro('vd', { macro('vd', {
from: points.floorOut, from: points.floorOut,
to: points.fork, to: points.fork,
x: points.fork.x + sa + 15, x: points.fork.x + sa + 15,
}) })
macro('vd', { macro('vd', {
from: points.fork, from: points.fork,
to: points.styleWaistIn, to: points.styleWaistIn,
x: points.fork.x + sa + 15, x: points.fork.x + sa + 15,
}) })
macro('vd', { macro('vd', {
from: points.floorIn, from: points.floorIn,
to: points.styleWaistOut, to: points.styleWaistOut,
x: x:
(points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) - (points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) -
sa - sa -
15, 15,
}) })
macro('vd', { macro('vd', {
from: points.crotchSeamCurveStart, from: points.crotchSeamCurveStart,
to: points.styleWaistIn, to: points.styleWaistIn,
x: points.crotchSeamCurveStart.x + sa + 15, x: points.crotchSeamCurveStart.x + sa + 15,
}) })
macro('hd', {
from: points.styleWaistOut,
to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 15,
})
if (points.styleWaistOut.x < points.seatOut.x) {
macro('hd', { macro('hd', {
from: points.styleWaistOut, from: points.styleWaistOut,
to: points.grainlineTop, to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 15,
})
if (points.styleWaistOut.x < points.seatOut.x) {
macro('hd', {
from: points.styleWaistOut,
to: points.grainlineTop,
y: points.styleWaistIn.y - sa - 30,
})
}
macro('hd', {
from: points.grainlineTop,
to: points.styleWaistIn,
y: points.styleWaistIn.y - sa - 15,
})
macro('hd', {
from: points.grainlineTop,
to: points.crotchSeamCurveStart,
y: points.styleWaistIn.y - sa - 30, y: points.styleWaistIn.y - sa - 30,
}) })
macro('hd', { }
from: points.grainlineTop, macro('hd', {
to: points.crotchSeamCurveMax, from: points.grainlineTop,
y: points.styleWaistIn.y - sa - 45, to: points.styleWaistIn,
y: points.styleWaistIn.y - sa - 15,
})
macro('hd', {
from: points.grainlineTop,
to: points.crotchSeamCurveStart,
y: points.styleWaistIn.y - sa - 30,
})
macro('hd', {
from: points.grainlineTop,
to: points.crotchSeamCurveMax,
y: points.styleWaistIn.y - sa - 45,
})
macro('hd', {
from: points.grainlineTop,
to: points.fork,
y: points.styleWaistIn.y - sa - 60,
})
if (options.frontPockets) {
macro('ld', {
from: points.pocketFlapTopIn,
to: points.styleWaistOut,
d: -15,
}) })
macro('hd', { macro('ld', {
from: points.grainlineTop, from: points.pocketFlapTopIn,
to: points.fork, to: points.pocketFlapBottomIn,
y: points.styleWaistIn.y - sa - 60, d: -15,
})
macro('ld', {
from: points.pocketFlapTopOut,
to: points.pocketFlapTopIn,
d: 15,
})
macro('ld', {
from: points.styleWaistOut || points.waistOut,
to: points.topLeft,
d: 10 + sa,
})
macro('ld', {
from: points.topLeft,
to: points.topRight,
d: 10 + sa,
}) })
if (options.frontPockets) {
macro('ld', {
from: points.pocketFlapTopIn,
to: points.styleWaistOut,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopIn,
to: points.pocketFlapBottomIn,
d: -15,
})
macro('ld', {
from: points.pocketFlapTopOut,
to: points.pocketFlapTopIn,
d: 15,
})
macro('ld', {
from: points.styleWaistOut || points.waistOut,
to: points.topLeft,
d: 10 + sa,
})
macro('ld', {
from: points.topLeft,
to: points.topRight,
d: 10 + sa,
})
}
} }
} }

44
packages/paco/src/pocketbagback.js
View file

@ -73,29 +73,29 @@ export default function (part) {
.line(points.pocketBagBottomLeft) .line(points.pocketBagBottomLeft)
.attr('class', 'lining sa') .attr('class', 'lining sa')
} }
}
if (paperless) { if (paperless) {
macro('hd', { macro('hd', {
from: points.pocketBagBottomLeft, from: points.pocketBagBottomLeft,
to: points.pocketBagBottomRight, to: points.pocketBagBottomRight,
y: points.pocketBagBottomLeft.y + 15 + sa, y: points.pocketBagBottomLeft.y + 15 + sa,
}) })
macro('hd', { macro('hd', {
from: points.pocketLeft, from: points.pocketLeft,
to: points.pocketRight, to: points.pocketRight,
y: points.pocketLeft.y + 15 + sa, y: points.pocketLeft.y + 15 + sa,
}) })
macro('vd', { macro('vd', {
from: points.pocketRight, from: points.pocketRight,
to: points.pocketBagWaistRight, to: points.pocketBagWaistRight,
x: points.pocketBagBottomRight.x + 15 + sa, x: points.pocketBagBottomRight.x + 15 + sa,
}) })
macro('vd', { macro('vd', {
from: points.pocketBagBottomRight, from: points.pocketBagBottomRight,
to: points.pocketBagWaistRight, to: points.pocketBagWaistRight,
x: points.pocketBagBottomRight.x + 30 + sa, x: points.pocketBagBottomRight.x + 30 + sa,
}) })
}
} }
return part return part

64
packages/paco/src/pocketbagfront.js
View file

@ -59,39 +59,39 @@ export default function (part) {
.line(points.bottomRight) .line(points.bottomRight)
.attr('class', 'lining sa') .attr('class', 'lining sa')
} }
}
if (paperless) { if (paperless) {
macro('hd', { macro('hd', {
from: points.flapBottomLeft, from: points.flapBottomLeft,
to: points.bottomRight, to: points.bottomRight,
y: points.bottomRight.y + 15 + sa, y: points.bottomRight.y + 15 + sa,
}) })
macro('hd', { macro('hd', {
from: points.topLeft, from: points.topLeft,
to: points.topRight, to: points.topRight,
y: points.topLeft.y - 15 - sa, y: points.topLeft.y - 15 - sa,
}) })
macro('vd', { macro('vd', {
from: points.bottomRight, from: points.bottomRight,
to: points.topRight, to: points.topRight,
x: points.topRight.x + 15 + sa, x: points.topRight.x + 15 + sa,
}) })
macro('vd', { macro('vd', {
from: points.bottomRight, from: points.bottomRight,
to: points.topLeft, to: points.topLeft,
x: points.topRight.x + 30 + sa, x: points.topRight.x + 30 + sa,
}) })
macro('ld', { macro('ld', {
from: points.flapTopLeft, from: points.flapTopLeft,
to: points.topLeft, to: points.topLeft,
d: 15 + sa, d: 15 + sa,
}) })
macro('ld', { macro('ld', {
from: points.flapBottomLeft, from: points.flapBottomLeft,
to: points.flapTopLeft, to: points.flapTopLeft,
d: 15 + sa, d: 15 + sa,
}) })
}
} }
return part return part