change back
This commit is contained in:
Alexander Wang
parent
315af7a2c2
commit
e5b575f301
12 changed files with 123 additions and 123 deletions
|
|
@ -285,19 +285,19 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
|
|||
attrs.Height = &d2graph.Scalar{}
|
||||
attrs.Height.Value = scalar.ScalarString()
|
||||
attrs.Height.MapKey = f.LastPrimaryKey()
|
||||
case "pos-top":
|
||||
case "top":
|
||||
_, err := strconv.Atoi(scalar.ScalarString())
|
||||
if err != nil {
|
||||
c.errorf(scalar, "non-integer pos-top %#v: %s", scalar.ScalarString(), err)
|
||||
c.errorf(scalar, "non-integer top %#v: %s", scalar.ScalarString(), err)
|
||||
return
|
||||
}
|
||||
attrs.Top = &d2graph.Scalar{}
|
||||
attrs.Top.Value = scalar.ScalarString()
|
||||
attrs.Top.MapKey = f.LastPrimaryKey()
|
||||
case "pos-left":
|
||||
case "left":
|
||||
_, err := strconv.Atoi(scalar.ScalarString())
|
||||
if err != nil {
|
||||
c.errorf(scalar, "non-integer pos-left %#v: %s", scalar.ScalarString(), err)
|
||||
c.errorf(scalar, "non-integer left %#v: %s", scalar.ScalarString(), err)
|
||||
return
|
||||
}
|
||||
attrs.Left = &d2graph.Scalar{}
|
||||
|
|
|
|||
|
|
@ -116,8 +116,8 @@ x: {
|
|||
{
|
||||
name: "positions",
|
||||
text: `hey: {
|
||||
pos-top: 200
|
||||
pos-left: 230
|
||||
top: 200
|
||||
left: 230
|
||||
}
|
||||
`,
|
||||
assertions: func(t *testing.T, g *d2graph.Graph) {
|
||||
|
|
|
|||
|
|
@ -1433,19 +1433,19 @@ var ReservedKeywords2 map[string]struct{}
|
|||
|
||||
// Non Style/Holder keywords.
|
||||
var SimpleReservedKeywords = map[string]struct{}{
|
||||
"label": {},
|
||||
"desc": {},
|
||||
"shape": {},
|
||||
"icon": {},
|
||||
"constraint": {},
|
||||
"tooltip": {},
|
||||
"link": {},
|
||||
"near": {},
|
||||
"width": {},
|
||||
"height": {},
|
||||
"direction": {},
|
||||
"position-top": {},
|
||||
"position-left": {},
|
||||
"label": {},
|
||||
"desc": {},
|
||||
"shape": {},
|
||||
"icon": {},
|
||||
"constraint": {},
|
||||
"tooltip": {},
|
||||
"link": {},
|
||||
"near": {},
|
||||
"width": {},
|
||||
"height": {},
|
||||
"direction": {},
|
||||
"top": {},
|
||||
"left": {},
|
||||
}
|
||||
|
||||
// ReservedKeywordHolders are reserved keywords that are meaningless on its own and exist solely to hold a set of reserved keywords
|
||||
|
|
|
|||
|
|
@ -165,9 +165,9 @@ d -> g.e -> f -> g -> d.h
|
|||
},
|
||||
{
|
||||
name: "one_three_one_container",
|
||||
script: `top.start -> a
|
||||
top.start -> b
|
||||
top.start -> c
|
||||
script: `top2.start -> a
|
||||
top2.start -> b
|
||||
top2.start -> c
|
||||
a -> bottom.end
|
||||
b -> bottom.end
|
||||
c -> bottom.end
|
||||
|
|
@ -1576,13 +1576,13 @@ container: {
|
|||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
|
||||
left: {
|
||||
left2: {
|
||||
root: {
|
||||
shape: image
|
||||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
inner: {
|
||||
left: {
|
||||
left2: {
|
||||
shape: image
|
||||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
|
|
@ -1591,8 +1591,8 @@ container: {
|
|||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
}
|
||||
root -> inner.left: {
|
||||
label: to inner left
|
||||
root -> inner.left2: {
|
||||
label: to inner left2
|
||||
}
|
||||
root -> inner.right: {
|
||||
label: to inner right
|
||||
|
|
@ -1605,7 +1605,7 @@ container: {
|
|||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
inner: {
|
||||
left: {
|
||||
left2: {
|
||||
shape: image
|
||||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
|
|
@ -1614,16 +1614,16 @@ container: {
|
|||
icon: https://icons.terrastruct.com/essentials/004-picture.svg
|
||||
}
|
||||
}
|
||||
root -> inner.left: {
|
||||
label: to inner left
|
||||
root -> inner.left2: {
|
||||
label: to inner left2
|
||||
}
|
||||
root -> inner.right: {
|
||||
label: to inner right
|
||||
}
|
||||
}
|
||||
|
||||
root -> left.root: {
|
||||
label: to left container root
|
||||
root -> left2.root: {
|
||||
label: to left2 container root
|
||||
}
|
||||
|
||||
root -> right.root: {
|
||||
|
|
|
|||
20
e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json
generated
vendored
20
e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json
generated
vendored
|
|
@ -3,7 +3,7 @@
|
|||
"fontFamily": "SourceSansPro",
|
||||
"shapes": [
|
||||
{
|
||||
"id": "top",
|
||||
"id": "top2",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 0,
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "top",
|
||||
"label": "top2",
|
||||
"fontSize": 28,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 40,
|
||||
"labelWidth": 54,
|
||||
"labelHeight": 36,
|
||||
"labelPosition": "OUTSIDE_TOP_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "top.start",
|
||||
"id": "top2.start",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 123,
|
||||
|
|
@ -292,8 +292,8 @@
|
|||
],
|
||||
"connections": [
|
||||
{
|
||||
"id": "(top.start -> a)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> a)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "a",
|
||||
|
|
@ -340,8 +340,8 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "(top.start -> b)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> b)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "b",
|
||||
|
|
@ -388,8 +388,8 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "(top.start -> c)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> c)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "c",
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ width="530" height="800" viewBox="-102 -100 530 800"><style type="text/css">
|
|||
svgEl.setAttribute("height", height * ratio - 16);
|
||||
}
|
||||
});
|
||||
]]></script><g id="top"><g class="shape" ><rect x="0" y="41" width="326" height="125" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="163.000000" y="28.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">top</text></g><g id="a"><g class="shape" ><rect x="32" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="58.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="145" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="171.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><rect x="258" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="284.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="bottom"><g class="shape" ><rect x="0" y="473" width="324" height="125" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="162.000000" y="460.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">bottom</text></g><g id="top.start"><g class="shape" ><rect x="123" y="70" width="80" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="163.000000" y="108.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">start</text></g><g id="bottom.end"><g class="shape" ><rect x="137" y="502" width="72" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="173.000000" y="540.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">end</text></g><g id="(top.start -> 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 121.193509 135.977296 C 71.000000 159.823810 58.000000 226.000000 58.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><g id="(top.start -> b)[0]"><path d="M 166.503179 138.473834 C 170.036145 160.100000 171.000000 226.000000 171.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><g id="(top.start -> c)[0]"><path d="M 204.835425 131.732506 C 267.800000 158.987603 284.000000 226.000000 284.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><g id="(a -> bottom.end)[0]"><path d="M 58.000000 334.000000 C 58.000000 372.000000 73.800000 447.500000 134.144595 506.698811" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><g id="(b -> bottom.end)[0]"><path d="M 171.000000 334.000000 C 171.000000 372.000000 171.200000 446.100000 171.943268 498.500402" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><g id="(c -> bottom.end)[0]"><path d="M 284.000000 334.000000 C 284.000000 372.000000 269.000000 447.300000 211.800286 505.643709" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3356241695)"/></g><mask id="3356241695" maskUnits="userSpaceOnUse" x="-102" y="-100" width="530" height="800">
|
||||
]]></script><g id="top2"><g class="shape" ><rect x="0" y="41" width="326" height="125" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="163.000000" y="28.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">top2</text></g><g id="a"><g class="shape" ><rect x="32" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="58.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="145" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="171.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><rect x="258" y="266" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="284.500000" y="304.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="bottom"><g class="shape" ><rect x="0" y="473" width="324" height="125" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="162.000000" y="460.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">bottom</text></g><g id="top2.start"><g class="shape" ><rect x="123" y="70" width="80" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="163.000000" y="108.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">start</text></g><g id="bottom.end"><g class="shape" ><rect x="137" y="502" width="72" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="173.000000" y="540.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">end</text></g><g id="(top2.start -> 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 121.193509 135.977296 C 71.000000 159.823810 58.000000 226.000000 58.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><g id="(top2.start -> b)[0]"><path d="M 166.503179 138.473834 C 170.036145 160.100000 171.000000 226.000000 171.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><g id="(top2.start -> c)[0]"><path d="M 204.835425 131.732506 C 267.800000 158.987603 284.000000 226.000000 284.000000 262.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><g id="(a -> bottom.end)[0]"><path d="M 58.000000 334.000000 C 58.000000 372.000000 73.800000 447.500000 134.144595 506.698811" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><g id="(b -> bottom.end)[0]"><path d="M 171.000000 334.000000 C 171.000000 372.000000 171.200000 446.100000 171.943268 498.500402" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><g id="(c -> bottom.end)[0]"><path d="M 284.000000 334.000000 C 284.000000 372.000000 269.000000 447.300000 211.800286 505.643709" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2519017708)"/></g><mask id="2519017708" maskUnits="userSpaceOnUse" x="-102" y="-100" width="530" height="800">
|
||||
<rect x="-102" y="-100" width="530" height="800" fill="white"></rect>
|
||||
|
||||
</mask><style type="text/css"><![CDATA[
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 651 KiB After Width: | Height: | Size: 651 KiB |
20
e2etests/testdata/stable/one_three_one_container/elk/board.exp.json
generated
vendored
20
e2etests/testdata/stable/one_three_one_container/elk/board.exp.json
generated
vendored
|
|
@ -3,7 +3,7 @@
|
|||
"fontFamily": "SourceSansPro",
|
||||
"shapes": [
|
||||
{
|
||||
"id": "top",
|
||||
"id": "top2",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 63,
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "top",
|
||||
"label": "top2",
|
||||
"fontSize": 28,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 40,
|
||||
"labelWidth": 54,
|
||||
"labelHeight": 36,
|
||||
"labelPosition": "INSIDE_TOP_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "top.start",
|
||||
"id": "top2.start",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 113,
|
||||
|
|
@ -292,8 +292,8 @@
|
|||
],
|
||||
"connections": [
|
||||
{
|
||||
"id": "(top.start -> a)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> a)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "a",
|
||||
|
|
@ -339,8 +339,8 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "(top.start -> b)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> b)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "b",
|
||||
|
|
@ -378,8 +378,8 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "(top.start -> c)[0]",
|
||||
"src": "top.start",
|
||||
"id": "(top2.start -> c)[0]",
|
||||
"src": "top2.start",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "c",
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ width="444" height="822" viewBox="-90 -90 444 822"><style type="text/css">
|
|||
svgEl.setAttribute("height", height * ratio - 16);
|
||||
}
|
||||
});
|
||||
]]></script><g id="top"><g class="shape" ><rect x="63" y="12" width="180" height="166" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="153.000000" y="45.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">top</text></g><g id="a"><g class="shape" ><rect x="53" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="79.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="126" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="152.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><rect x="199" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="225.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="bottom"><g class="shape" ><rect x="12" y="464" width="172" height="166" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="98.000000" y="497.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">bottom</text></g><g id="top.start"><g class="shape" ><rect x="113" y="62" width="80" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="153.000000" y="100.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">start</text></g><g id="bottom.end"><g class="shape" ><rect x="62" y="514" width="72" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="98.000000" y="552.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">end</text></g><g id="(top.start -> 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 133.000000 130.000000 L 133.000000 213.000000 S 133.000000 223.000000 123.000000 223.000000 L 90.000000 223.000000 S 80.000000 223.000000 80.000000 233.000000 L 80.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><g id="(top.start -> b)[0]"><path d="M 153.000000 130.000000 L 153.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><g id="(top.start -> c)[0]"><path d="M 173.000000 130.000000 L 173.000000 213.000000 S 173.000000 223.000000 183.000000 223.000000 L 216.000000 223.000000 S 226.000000 223.000000 226.000000 233.000000 L 226.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><g id="(a -> bottom.end)[0]"><path d="M 80.000000 331.000000 L 80.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><g id="(b -> bottom.end)[0]"><path d="M 153.000000 331.000000 L 153.000000 359.000000 S 153.000000 369.000000 143.000000 369.000000 L 108.000000 369.000000 S 98.000000 369.000000 98.000000 379.000000 L 98.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><g id="(c -> bottom.end)[0]"><path d="M 226.000000 331.000000 L 226.000000 409.000000 S 226.000000 419.000000 216.000000 419.000000 L 126.000000 419.000000 S 116.000000 419.000000 116.000000 429.000000 L 116.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1526421571)"/></g><mask id="1526421571" maskUnits="userSpaceOnUse" x="-90" y="-90" width="444" height="822">
|
||||
]]></script><g id="top2"><g class="shape" ><rect x="63" y="12" width="180" height="166" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="153.000000" y="45.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">top2</text></g><g id="a"><g class="shape" ><rect x="53" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="79.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="126" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="152.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><rect x="199" y="263" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="225.500000" y="301.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="bottom"><g class="shape" ><rect x="12" y="464" width="172" height="166" style="fill:#E3E9FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="98.000000" y="497.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">bottom</text></g><g id="top2.start"><g class="shape" ><rect x="113" y="62" width="80" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="153.000000" y="100.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">start</text></g><g id="bottom.end"><g class="shape" ><rect x="62" y="514" width="72" height="66" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="98.000000" y="552.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">end</text></g><g id="(top2.start -> 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 133.000000 130.000000 L 133.000000 213.000000 S 133.000000 223.000000 123.000000 223.000000 L 90.000000 223.000000 S 80.000000 223.000000 80.000000 233.000000 L 80.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><g id="(top2.start -> b)[0]"><path d="M 153.000000 130.000000 L 153.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><g id="(top2.start -> c)[0]"><path d="M 173.000000 130.000000 L 173.000000 213.000000 S 173.000000 223.000000 183.000000 223.000000 L 216.000000 223.000000 S 226.000000 223.000000 226.000000 233.000000 L 226.000000 259.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><g id="(a -> bottom.end)[0]"><path d="M 80.000000 331.000000 L 80.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><g id="(b -> bottom.end)[0]"><path d="M 153.000000 331.000000 L 153.000000 359.000000 S 153.000000 369.000000 143.000000 369.000000 L 108.000000 369.000000 S 98.000000 369.000000 98.000000 379.000000 L 98.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><g id="(c -> bottom.end)[0]"><path d="M 226.000000 331.000000 L 226.000000 409.000000 S 226.000000 419.000000 216.000000 419.000000 L 126.000000 419.000000 S 116.000000 419.000000 116.000000 429.000000 L 116.000000 510.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#164819422)"/></g><mask id="164819422" maskUnits="userSpaceOnUse" x="-90" y="-90" width="444" height="822">
|
||||
<rect x="-90" y="-90" width="444" height="822" fill="white"></rect>
|
||||
|
||||
</mask><style type="text/css"><![CDATA[
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 652 KiB After Width: | Height: | Size: 652 KiB |
56
e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
generated
vendored
56
e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
generated
vendored
|
|
@ -148,7 +148,7 @@
|
|||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "container.left",
|
||||
"id": "container.left2",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 20,
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -182,14 +182,14 @@
|
|||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 33,
|
||||
"labelWidth": 44,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "OUTSIDE_TOP_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "container.left.root",
|
||||
"id": "container.left2.root",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 174,
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner",
|
||||
"id": "container.left2.inner",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 40,
|
||||
|
|
@ -282,7 +282,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner.left",
|
||||
"id": "container.left2.inner.left2",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 80,
|
||||
|
|
@ -319,7 +319,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -327,14 +327,14 @@
|
|||
"italic": false,
|
||||
"bold": true,
|
||||
"underline": false,
|
||||
"labelWidth": 24,
|
||||
"labelWidth": 32,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "OUTSIDE_BOTTOM_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 4
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner.right",
|
||||
"id": "container.left2.inner.right",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 268,
|
||||
|
|
@ -520,7 +520,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.right.inner.left",
|
||||
"id": "container.right.inner.left2",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 536,
|
||||
|
|
@ -557,7 +557,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -565,7 +565,7 @@
|
|||
"italic": false,
|
||||
"bold": true,
|
||||
"underline": false,
|
||||
"labelWidth": 24,
|
||||
"labelWidth": 32,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "OUTSIDE_BOTTOM_CENTER",
|
||||
"zIndex": 0,
|
||||
|
|
@ -674,18 +674,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.left.(root -> inner.left)[0]",
|
||||
"src": "container.left.root",
|
||||
"id": "container.left2.(root -> inner.left2)[0]",
|
||||
"src": "container.left2.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.inner.left",
|
||||
"dst": "container.left2.inner.left2",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to inner left",
|
||||
"label": "to inner left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -693,7 +693,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 76,
|
||||
"labelWidth": 84,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
@ -722,11 +722,11 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.left.(root -> inner.right)[0]",
|
||||
"src": "container.left.root",
|
||||
"id": "container.left2.(root -> inner.right)[0]",
|
||||
"src": "container.left2.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.inner.right",
|
||||
"dst": "container.left2.inner.right",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
|
|
@ -770,18 +770,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.right.(root -> inner.left)[0]",
|
||||
"id": "container.right.(root -> inner.left2)[0]",
|
||||
"src": "container.right.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.right.inner.left",
|
||||
"dst": "container.right.inner.left2",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to inner left",
|
||||
"label": "to inner left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -789,7 +789,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 76,
|
||||
"labelWidth": 84,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
@ -866,18 +866,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.(root -> left.root)[0]",
|
||||
"id": "container.(root -> left2.root)[0]",
|
||||
"src": "container.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.root",
|
||||
"dst": "container.left2.root",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to left container root",
|
||||
"label": "to left2 container root",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -885,7 +885,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 136,
|
||||
"labelWidth": 143,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 798 KiB After Width: | Height: | Size: 798 KiB |
64
e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
generated
vendored
64
e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
generated
vendored
|
|
@ -148,7 +148,7 @@
|
|||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "container.left",
|
||||
"id": "container.left2",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 62,
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -182,14 +182,14 @@
|
|||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 33,
|
||||
"labelWidth": 44,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "INSIDE_TOP_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "container.left.root",
|
||||
"id": "container.left2.root",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 183,
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner",
|
||||
"id": "container.left2.inner",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 112,
|
||||
|
|
@ -282,7 +282,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner.left",
|
||||
"id": "container.left2.inner.left2",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 162,
|
||||
|
|
@ -319,7 +319,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -327,14 +327,14 @@
|
|||
"italic": false,
|
||||
"bold": true,
|
||||
"underline": false,
|
||||
"labelWidth": 24,
|
||||
"labelWidth": 32,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "OUTSIDE_BOTTOM_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 4
|
||||
},
|
||||
{
|
||||
"id": "container.left.inner.right",
|
||||
"id": "container.left2.inner.right",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 310,
|
||||
|
|
@ -520,7 +520,7 @@
|
|||
"level": 3
|
||||
},
|
||||
{
|
||||
"id": "container.right.inner.left",
|
||||
"id": "container.right.inner.left2",
|
||||
"type": "image",
|
||||
"pos": {
|
||||
"x": 658,
|
||||
|
|
@ -557,7 +557,7 @@
|
|||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "left",
|
||||
"label": "left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -565,7 +565,7 @@
|
|||
"italic": false,
|
||||
"bold": true,
|
||||
"underline": false,
|
||||
"labelWidth": 24,
|
||||
"labelWidth": 32,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "OUTSIDE_BOTTOM_CENTER",
|
||||
"zIndex": 0,
|
||||
|
|
@ -665,18 +665,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.left.(root -> inner.left)[0]",
|
||||
"src": "container.left.root",
|
||||
"id": "container.left2.(root -> inner.left2)[0]",
|
||||
"src": "container.left2.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.inner.left",
|
||||
"dst": "container.left2.inner.left2",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to inner left",
|
||||
"label": "to inner left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -684,7 +684,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 76,
|
||||
"labelWidth": 84,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
@ -704,11 +704,11 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.left.(root -> inner.right)[0]",
|
||||
"src": "container.left.root",
|
||||
"id": "container.left2.(root -> inner.right)[0]",
|
||||
"src": "container.left2.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.inner.right",
|
||||
"dst": "container.left2.inner.right",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
|
|
@ -737,11 +737,11 @@
|
|||
"y": 865
|
||||
},
|
||||
{
|
||||
"x": 318,
|
||||
"x": 322,
|
||||
"y": 865
|
||||
},
|
||||
{
|
||||
"x": 318,
|
||||
"x": 322,
|
||||
"y": 966
|
||||
},
|
||||
{
|
||||
|
|
@ -759,18 +759,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.right.(root -> inner.left)[0]",
|
||||
"id": "container.right.(root -> inner.left2)[0]",
|
||||
"src": "container.right.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.right.inner.left",
|
||||
"dst": "container.right.inner.left2",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to inner left",
|
||||
"label": "to inner left2",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -778,7 +778,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 76,
|
||||
"labelWidth": 84,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
@ -831,11 +831,11 @@
|
|||
"y": 865
|
||||
},
|
||||
{
|
||||
"x": 814,
|
||||
"x": 818,
|
||||
"y": 865
|
||||
},
|
||||
{
|
||||
"x": 814,
|
||||
"x": 818,
|
||||
"y": 966
|
||||
},
|
||||
{
|
||||
|
|
@ -853,18 +853,18 @@
|
|||
"zIndex": 0
|
||||
},
|
||||
{
|
||||
"id": "container.(root -> left.root)[0]",
|
||||
"id": "container.(root -> left2.root)[0]",
|
||||
"src": "container.root",
|
||||
"srcArrow": "none",
|
||||
"srcLabel": "",
|
||||
"dst": "container.left.root",
|
||||
"dst": "container.left2.root",
|
||||
"dstArrow": "triangle",
|
||||
"dstLabel": "",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "#0D32B2",
|
||||
"label": "to left container root",
|
||||
"label": "to left2 container root",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
|
|
@ -872,7 +872,7 @@
|
|||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 136,
|
||||
"labelWidth": 143,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 798 KiB After Width: | Height: | Size: 798 KiB |
Loading…
Reference in a new issue