diff --git a/packages/florent/src/brimbottom.js b/packages/florent/src/brimbottom.js index 4e4f66c9d9a..bc3b784e651 100644 --- a/packages/florent/src/brimbottom.js +++ b/packages/florent/src/brimbottom.js @@ -48,10 +48,43 @@ export default function(part) { .attr("class", "fabric"); if (complete) { - if (sa) { - } + points.title = points.innerMid.shiftFractionTowards( + points.outerMidCp2, + 0.35 + ); + macro("title", { + at: points.title, + nr: 3, + title: "brimBottom" + }); + macro("grainline", { + from: points.outerMid, + to: points.innerMid + }); + + if (sa) paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); if (paperless) { + macro("hd", { + from: points.tipLeft, + to: points.tipRight, + y: points.tipLeft.y - sa - 15 + }); + macro("hd", { + from: paths.seam.edge("left"), + to: paths.seam.edge("right"), + y: points.tipLeft.y - sa - 30 + }); + macro("vd", { + from: points.outerMid, + to: points.innerMid, + x: points.innerMid.x - 15 + }); + macro("vd", { + from: points.outerMid, + to: points.tipRight, + x: points.tipRight.x + sa + 18 + }); } } diff --git a/packages/florent/src/briminterfacing.js b/packages/florent/src/briminterfacing.js index 8d478216cf2..518a19856f1 100644 --- a/packages/florent/src/briminterfacing.js +++ b/packages/florent/src/briminterfacing.js @@ -56,11 +56,44 @@ export default function(part) { .close() .attr("class", "interfacing"); + // Clean up + for (let i of Object.keys(paths)) { + if (["seam", "inset", "outset"].indexOf(i) === -1) delete paths[i]; + } + if (complete) { - if (sa) { - } + points.title = points.innerMid.shiftFractionTowards( + points.outerMidCp2, + 0.35 + ); + macro("title", { + at: points.title, + nr: 5, + title: "brimInterfacing" + }); + macro("grainline", { + from: points.outerMid, + to: points.innerMid + }); + + if (sa) paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); if (paperless) { + macro("hd", { + from: paths.seam.edge("left"), + to: paths.seam.edge("right"), + y: points.tipLeft.y - sa - 15 + }); + macro("vd", { + from: paths.outset.edge("bottom"), + to: paths.inset.edge("bottom"), + x: points.innerMid.x - 15 + }); + macro("vd", { + from: paths.outset.edge("bottom"), + to: paths.inset.edge("topRight"), + x: points.tipRight.x + sa + 18 + }); } } diff --git a/packages/florent/src/brimtop.js b/packages/florent/src/brimtop.js index 359ab90cf2c..5da89c95338 100644 --- a/packages/florent/src/brimtop.js +++ b/packages/florent/src/brimtop.js @@ -29,10 +29,39 @@ export default function(part) { .attr("class", "fabric"); if (complete) { - if (sa) { - } + points.title = points.innerMid.shiftFractionTowards( + points.outerMidCp2, + 0.35 + ); + macro("title", { + at: points.title, + nr: 4, + title: "brimTop" + }); + macro("grainline", { + from: points.outerMid, + to: points.innerMid + }); + + if (sa) paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); if (paperless) { + let bottom = paths.seam.edge("bottom"); + macro("hd", { + from: paths.seam.edge("left"), + to: paths.seam.edge("right"), + y: points.tipLeft.y - sa - 15 + }); + macro("vd", { + from: bottom, + to: points.innerMid, + x: points.innerMid.x - 15 + }); + macro("vd", { + from: bottom, + to: points.tipRight, + x: points.tipRight.x + sa + 18 + }); } }