GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

updated tiltedCylinder shape

Browse Source
This commit is contained in:
omkarht 2024-09-23 19:42:53 +05:30
parent bb3b95f0bd
commit b3dfc60fff
1 changed files with 79 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts
View File

@ -4,64 +4,109 @@ import { styles2String, userNodeOverrides } from './handDrawnShapeStyles.js';
import rough from 'roughjs'; import rough from 'roughjs';
import intersect from '../intersect/index.js'; import intersect from '../intersect/index.js';
function createCylinderPathD(rx: number, ry: number, w: number, h: number) { export const createCylinderPathD = (
return `M ${w / 2} ${-h / 2} x: number,
L ${-w / 2} ${-h / 2} y: number,
A ${rx} ${ry} 0 0 0 ${-w / 2} ${h / 2} width: number,
L ${w / 2} ${h / 2} height: number,
A ${rx} ${ry} 0 0 0 ${w / 2} ${-h / 2} rx: number,
`; ry: number
} ): string => {
return `M${x},${y}
a${rx},${ry} 0,0,1 ${0},${-height}
l${width},${0}
a${rx},${ry} 0,0,1 ${0},${height}
M${width},${-height}
a${rx},${ry} 0,0,0 ${0},${height}
l${-width},${0}`;
};
function createInnerPathD(rx: number, ry: number, w: number, h: number) { export const createOuterCylinderPathD = (
return `M${w / 2} ${-h / 2} x: number,
A ${rx} ${ry} 0 0 0 ${w / 2} ${h / 2}`; y: number,
} width: number,
height: number,
rx: number,
ry: number
): string => {
return [
`M${x},${y}`,
`M${x + width},${y}`,
`a${rx},${ry} 0,0,0 ${0},${-height}`,
`l${-width},0`,
`a${rx},${ry} 0,0,0 ${0},${height}`,
`l${width},0`,
].join(' ');
};
export const createInnerCylinderPathD = (
x: number,
y: number,
width: number,
height: number,
rx: number,
ry: number
): string => {
return [`M${x + width / 2},${-height / 2}`, `a${rx},${ry} 0,0,0 0,${height}`].join(' ');
};
export const tiltedCylinder = async (parent: SVGAElement, node: Node) => { export const tiltedCylinder = async (parent: SVGAElement, node: Node) => {
const { labelStyles, nodeStyles } = styles2String(node); const { labelStyles, nodeStyles } = styles2String(node);
node.labelStyle = labelStyles; node.labelStyle = labelStyles;
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node)); const { shapeSvg, bbox, label, halfPadding } = await labelHelper(
const h = bbox.height + node.padding; parent,
node,
getNodeClasses(node)
);
const labelPadding = node.look === 'neo' ? halfPadding * 2 : halfPadding;
const h = bbox.height + labelPadding;
const ry = h / 2; const ry = h / 2;
const rx = ry / (2.5 + h / 50); const rx = ry / (2.5 + h / 50);
const w = bbox.width + rx + node.padding; const w = bbox.width + rx + labelPadding;
const { cssStyles } = node; const { cssStyles } = node;
// @ts-ignore - rough is not typed let cylinder: d3.Selection<SVGPathElement | SVGGElement, unknown, null, undefined>;
const rc = rough.svg(shapeSvg);
const options = userNodeOverrides(node, {});
if (node.look !== 'handDrawn') { if (node.look === 'handDrawn') {
options.roughness = 0; // @ts-ignore - rough is not typed
options.fillStyle = 'solid'; const rc = rough.svg(shapeSvg);
const outerPathData = createOuterCylinderPathD(0, 0, w, h, rx, ry);
const innerPathData = createInnerCylinderPathD(0, 0, w, h, rx, ry);
const outerNode = rc.path(outerPathData, userNodeOverrides(node, {}));
const innerLine = rc.path(innerPathData, userNodeOverrides(node, { fill: 'none' }));
cylinder = shapeSvg.insert(() => innerLine, ':first-child');
cylinder = shapeSvg.insert(() => outerNode, ':first-child');
cylinder.attr('class', 'basic label-container');
if (cssStyles) {
cylinder.attr('style', cssStyles);
}
} else {
const pathData = createCylinderPathD(0, 0, w, h, rx, ry);
cylinder = shapeSvg
.insert('path', ':first-child')
.attr('d', pathData)
.attr('class', 'basic label-container')
.attr('style', cssStyles)
.attr('style', nodeStyles);
} }
const cylinderPath = createCylinderPathD(rx, ry, w, h); cylinder.attr('class', 'basic label-container');
const cylinderNode = rc.path(cylinderPath, options);
const innerPath = createInnerPathD(rx, ry, w, h);
const innerNode = rc.path(innerPath, { ...options, fill: 'none' });
const tiltedCylinder = shapeSvg.insert(() => innerNode, ':first-child');
tiltedCylinder.insert(() => cylinderNode, ':first-child');
tiltedCylinder.attr('class', 'basic label-container');
if (cssStyles && node.look !== 'handDrawn') { if (cssStyles && node.look !== 'handDrawn') {
tiltedCylinder.selectAll('path').attr('style', cssStyles); cylinder.selectAll('path').attr('style', cssStyles);
} }
if (nodeStyles && node.look !== 'handDrawn') { if (nodeStyles && node.look !== 'handDrawn') {
tiltedCylinder.selectAll('path').attr('style', nodeStyles); cylinder.selectAll('path').attr('style', nodeStyles);
} }
cylinder.attr('label-offset-x', rx);
cylinder.attr('transform', `translate(${-w / 2}, ${h / 2} )`);
label.attr( label.attr(
'transform', 'transform',
`translate(${-(bbox.width / 2) - rx - (bbox.x - (bbox.left ?? 0))}, ${-(bbox.height / 2) - (bbox.y - (bbox.top ?? 0))})` `translate(${-(bbox.width / 2) - rx - (bbox.x - (bbox.left ?? 0))}, ${-(bbox.height / 2) - (bbox.y - (bbox.top ?? 0))})`
); );
updateNodeBounds(node, tiltedCylinder); updateNodeBounds(node, cylinder);
node.intersect = function (point) { node.intersect = function (point) {
const pos = intersect.rect(node, point); const pos = intersect.rect(node, point);