luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

also transfer arrowheads

Browse source
This commit is contained in:
Alexander Wang 2023-01-13 08:26:38 -08:00
parent adee356d81
commit 1420dab5a9
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
6 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2compiler/compile.go
View file

@ -757,10 +757,12 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) {
// TODO more attributes
if e.SrcTableColumnIndex != nil {
newEdge.SrcTableColumnIndex = new(int)
newEdge.SrcArrowhead = e.SrcArrowhead
*newEdge.SrcTableColumnIndex = *e.SrcTableColumnIndex
}
if e.DstTableColumnIndex != nil {
newEdge.DstTableColumnIndex = new(int)
newEdge.DstArrowhead = e.DstArrowhead
*newEdge.DstTableColumnIndex = *e.DstTableColumnIndex
}
newEdge.Attributes = e.Attributes

1
e2etests/stable_test.go
View file

@ -1813,6 +1813,7 @@ a: {
x.y -> a.b: {
style.animated: true
target-arrowhead.shape: cf-many
}
`,
},

2
e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json generated vendored
View file

@ -152,7 +152,7 @@
"srcArrow": "none",
"srcLabel": "",
"dst": "a",
"dstArrow": "triangle",
"dstArrow": "cf-many",
"dstLabel": "",
"opacity": 1,
"strokeDash": 0,

2
e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg vendored
View file

@ -56,7 +56,7 @@ width="280" height="464" viewBox="-102 -118 280 464"><style type="text/css">
</svg>
</g><title>I like turtles</title></g></g><g id="a"><g class="shape" ><rect class="shape" x="0" y="172" width="60" height="72" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="0.000000" y="172.000000" width="60.000000" height="36.000000" fill="#0A0F25" /><text class="text" x="20.000000" y="199.000000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">a</text><text class="text" x="10.000000" y="231.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">b</text>
<text class="text" x="40.000000" y="231.000000" style="text-anchor:start;font-size:20px;fill:#676C7E"></text>
<text class="text" x="40.000000" y="231.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="0.000000" y1="244.000000" x2="60.000000" y2="244.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="(x -&gt; a)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 30.000000 74.000000 C 30.000000 112.000000 30.000000 132.000000 30.000000 168.000000" class="connection animated-connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" marker-end="url(#mk-3990223579)" mask="url(#3439718239)"/></g><mask id="3439718239" maskUnits="userSpaceOnUse" x="-100" y="-100" width="280" height="464">
<text class="text" x="40.000000" y="231.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="0.000000" y1="244.000000" x2="60.000000" y2="244.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="(x -&gt; a)[0]"><marker id="mk-238431170" markerWidth="28.000000" markerHeight="30.000000" refX="25.000000" refY="15.000000" viewBox="0.000000 0.000000 28.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <g class="connection" stroke="#0D32B2" stroke-width="2" fill="white"><circle class="connection" stroke="#0D32B2" stroke-width="2" fill="white" cx="5.000000" cy="15.000000" r="4.000000"/><path d="M25.000000,15.000000 36.000000,15.000000 M10.000000,15.000000 36.000000,0.000000 M10.000000,15.000000 36.000000,30.000000"/></g> </marker><path d="M 30.000000 74.000000 C 30.000000 112.000000 30.000000 132.000000 30.000000 168.000000" class="connection animated-connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" marker-end="url(#mk-238431170)" mask="url(#833117786)"/></g><mask id="833117786" maskUnits="userSpaceOnUse" x="-100" y="-100" width="280" height="464">
<rect x="-100" y="-100" width="280" height="464" fill="white"></rect>
</mask><style type="text/css"><![CDATA[

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 328 KiB

After

Width:  |  Height:  |  Size: 329 KiB

2
e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json generated vendored
View file

@ -152,7 +152,7 @@
"srcArrow": "none",
"srcLabel": "",
"dst": "a",
"dstArrow": "triangle",
"dstArrow": "cf-many",
"dstLabel": "",
"opacity": 1,
"strokeDash": 0,

2
e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg vendored
View file

@ -56,7 +56,7 @@ width="280" height="464" viewBox="-90 -106 280 464"><style type="text/css">
</svg>
</g><title>I like turtles</title></g></g><g id="a"><g class="shape" ><rect class="shape" x="12" y="184" width="60" height="72" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="12.000000" y="184.000000" width="60.000000" height="36.000000" fill="#0A0F25" /><text class="text" x="32.000000" y="211.000000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">a</text><text class="text" x="22.000000" y="243.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">b</text>
<text class="text" x="52.000000" y="243.000000" style="text-anchor:start;font-size:20px;fill:#676C7E"></text>
<text class="text" x="52.000000" y="243.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="12.000000" y1="256.000000" x2="72.000000" y2="256.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="(x -&gt; a)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 42.000000 86.000000 L 42.000000 180.000000" class="connection animated-connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" marker-end="url(#mk-3990223579)" mask="url(#1608076706)"/></g><mask id="1608076706" maskUnits="userSpaceOnUse" x="-100" y="-100" width="280" height="464">
<text class="text" x="52.000000" y="243.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="12.000000" y1="256.000000" x2="72.000000" y2="256.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="(x -&gt; a)[0]"><marker id="mk-238431170" markerWidth="28.000000" markerHeight="30.000000" refX="25.000000" refY="15.000000" viewBox="0.000000 0.000000 28.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <g class="connection" stroke="#0D32B2" stroke-width="2" fill="white"><circle class="connection" stroke="#0D32B2" stroke-width="2" fill="white" cx="5.000000" cy="15.000000" r="4.000000"/><path d="M25.000000,15.000000 36.000000,15.000000 M10.000000,15.000000 36.000000,0.000000 M10.000000,15.000000 36.000000,30.000000"/></g> </marker><path d="M 42.000000 86.000000 L 42.000000 180.000000" class="connection animated-connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" marker-end="url(#mk-238431170)" mask="url(#1359229009)"/></g><mask id="1359229009" maskUnits="userSpaceOnUse" x="-100" y="-100" width="280" height="464">
<rect x="-100" y="-100" width="280" height="464" fill="white"></rect>
</mask><style type="text/css"><![CDATA[

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 328 KiB

After

Width:  |  Height:  |  Size: 329 KiB