Merge pull request #2050 from alixander/scale-fontsize
d2sequence: fix long self-messages
This commit is contained in:
Alexander Wang
GitHub
commit
ddf68ca4a3
16 changed files with 1660 additions and 442 deletions
|
|
@ -9,3 +9,4 @@
|
|||
#### Bugfixes ⛑️
|
||||
|
||||
- Sequence diagram multi-line edge labels no longer can collide with other elements [#2049](https://github.com/terrastruct/d2/pull/2049)
|
||||
- Sequence diagram long self-referential edge labels no longer can collide neighboring actors (or its own) lifeline edges [#2050](https://github.com/terrastruct/d2/pull/2050)
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
|
|||
if ref.MapKey == nil {
|
||||
continue
|
||||
}
|
||||
if ref.Key.HasGlob() {
|
||||
continue
|
||||
}
|
||||
min = go2.IntMin(min, ref.MapKey.Range.Start.Line)
|
||||
}
|
||||
return min
|
||||
|
|
@ -61,6 +64,9 @@ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
|
|||
if ref.MapKey == nil {
|
||||
continue
|
||||
}
|
||||
if ref.Edge.Src.HasGlob() || ref.Edge.Dst.HasGlob() {
|
||||
continue
|
||||
}
|
||||
min = go2.IntMin(min, ref.MapKey.Range.Start.Line)
|
||||
}
|
||||
return min
|
||||
|
|
@ -167,11 +173,17 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) (*s
|
|||
// by distributing the label length across the actors rank difference
|
||||
rankDiff := math.Abs(float64(sd.objectRank[message.Src]) - float64(sd.objectRank[message.Dst]))
|
||||
if rankDiff != 0 {
|
||||
// rankDiff = 0 for self edges
|
||||
distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff
|
||||
for rank := go2.IntMin(sd.objectRank[message.Src], sd.objectRank[message.Dst]); rank <= go2.IntMax(sd.objectRank[message.Src], sd.objectRank[message.Dst])-1; rank++ {
|
||||
sd.actorXStep[rank] = math.Max(sd.actorXStep[rank], distributedLabelWidth+HORIZONTAL_PAD)
|
||||
}
|
||||
} else {
|
||||
// self edge
|
||||
nextRank := sd.objectRank[message.Src]
|
||||
if nextRank < len(sd.actorXStep) {
|
||||
labelAdjust := float64(message.LabelDimensions.Width) + label.PADDING*4
|
||||
sd.actorXStep[nextRank] = math.Max(sd.actorXStep[nextRank], labelAdjust)
|
||||
}
|
||||
}
|
||||
sd.lastMessage[message.Src] = message
|
||||
if _, exists := sd.firstMessage[message.Src]; !exists {
|
||||
|
|
@ -240,6 +252,9 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
|
|||
for _, n := range sd.notes {
|
||||
inGroup := false
|
||||
for _, ref := range n.References {
|
||||
if ref.Key.HasGlob() {
|
||||
continue
|
||||
}
|
||||
curr := ref.ScopeObj
|
||||
for curr != nil {
|
||||
if curr == group {
|
||||
|
|
@ -571,7 +586,7 @@ func (sd *sequenceDiagram) routeMessages() error {
|
|||
isToSibling := currSrc == currDst
|
||||
|
||||
if isSelfMessage || isToDescendant || isFromDescendant || isToSibling {
|
||||
midX := startX + SELF_MESSAGE_HORIZONTAL_TRAVEL
|
||||
midX := startX + math.Max(SELF_MESSAGE_HORIZONTAL_TRAVEL, float64(message.LabelDimensions.Width)/2.+label.PADDING*2)
|
||||
startY := messageOffset + noteOffset
|
||||
endY := startY + math.Max(float64(message.LabelDimensions.Height), MIN_MESSAGE_DISTANCE)*1.5
|
||||
message.Route = []*geo.Point{
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 677 KiB After Width: | Height: | Size: 677 KiB |
4
e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json
generated
vendored
4
e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json
generated
vendored
|
|
@ -446,11 +446,11 @@
|
|||
"y": 508
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 293.5,
|
||||
"y": 508
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 293.5,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
4
e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json
generated
vendored
4
e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json
generated
vendored
|
|
@ -446,11 +446,11 @@
|
|||
"y": 508
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 293.5,
|
||||
"y": 508
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 293.5,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
488
e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json
generated
vendored
Normal file
488
e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json
generated
vendored
Normal file
|
|
@ -0,0 +1,488 @@
|
|||
{
|
||||
"name": "",
|
||||
"isFolderOnly": false,
|
||||
"fontFamily": "SourceSansPro",
|
||||
"shapes": [
|
||||
{
|
||||
"id": "Front-End",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 12,
|
||||
"y": 52
|
||||
},
|
||||
"width": 111,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B5",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "Front-End",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 66,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "Libreria",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 367,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B5",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "Libreria",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 50,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "CD",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 1249,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "N7",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "CD",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 20,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "Front-End.t1",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 61,
|
||||
"y": 193
|
||||
},
|
||||
"width": 12,
|
||||
"height": 272,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B4",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 14,
|
||||
"labelHeight": 21,
|
||||
"zIndex": 2,
|
||||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "Libreria.t1",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 411,
|
||||
"y": 193
|
||||
},
|
||||
"width": 12,
|
||||
"height": 272,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B4",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 14,
|
||||
"labelHeight": 21,
|
||||
"zIndex": 2,
|
||||
"level": 2
|
||||
}
|
||||
],
|
||||
"connections": [
|
||||
{
|
||||
"id": "(Front-End.t1 -> Libreria.t1)[0]",
|
||||
"src": "Front-End.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "generatePresentationPayload()",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 309,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 73.5,
|
||||
"y": 203
|
||||
},
|
||||
{
|
||||
"x": 411,
|
||||
"y": 203
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "Libreria.(t1 -> t1)[0]",
|
||||
"src": "Libreria.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "Generar y Firmar\nPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de Titularidad",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 862,
|
||||
"labelHeight": 55,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 423,
|
||||
"y": 288
|
||||
},
|
||||
{
|
||||
"x": 858,
|
||||
"y": 288
|
||||
},
|
||||
{
|
||||
"x": 858,
|
||||
"y": 370.5
|
||||
},
|
||||
{
|
||||
"x": 423,
|
||||
"y": 370.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "(Libreria.t1 -> Front-End.t1)[0]",
|
||||
"src": "Libreria.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Front-End.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "Presentacion Firmada",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 217,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 411,
|
||||
"y": 455.5
|
||||
},
|
||||
{
|
||||
"x": 73.5,
|
||||
"y": 455.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "(Front-End -- )[0]",
|
||||
"src": "Front-End",
|
||||
"srcArrow": "none",
|
||||
"dst": "Front-End-lifeline-end-2397425183",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 67.5,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 67.5,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
},
|
||||
{
|
||||
"id": "(Libreria -- )[0]",
|
||||
"src": "Libreria",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria-lifeline-end-2001012606",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 417,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 417,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
},
|
||||
{
|
||||
"id": "(CD -- )[0]",
|
||||
"src": "CD",
|
||||
"srcArrow": "none",
|
||||
"dst": "CD-lifeline-end-3941115933",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 1299,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 1299,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"id": "",
|
||||
"type": "",
|
||||
"pos": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"width": 0,
|
||||
"height": 0,
|
||||
"opacity": 0,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 0,
|
||||
"borderRadius": 0,
|
||||
"fill": "N7",
|
||||
"stroke": "",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 0,
|
||||
"fontFamily": "",
|
||||
"language": "",
|
||||
"color": "",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"zIndex": 0,
|
||||
"level": 0
|
||||
}
|
||||
}
|
||||
107
e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg
vendored
Normal file
107
e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg
vendored
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 19 KiB |
488
e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json
generated
vendored
Normal file
488
e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json
generated
vendored
Normal file
|
|
@ -0,0 +1,488 @@
|
|||
{
|
||||
"name": "",
|
||||
"isFolderOnly": false,
|
||||
"fontFamily": "SourceSansPro",
|
||||
"shapes": [
|
||||
{
|
||||
"id": "Front-End",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 12,
|
||||
"y": 52
|
||||
},
|
||||
"width": 111,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B5",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "Front-End",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 66,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "Libreria",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 367,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B5",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "Libreria",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 50,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "CD",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 1249,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
"height": 66,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "N7",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "CD",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 20,
|
||||
"labelHeight": 21,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"zIndex": 0,
|
||||
"level": 1
|
||||
},
|
||||
{
|
||||
"id": "Front-End.t1",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 61,
|
||||
"y": 193
|
||||
},
|
||||
"width": 12,
|
||||
"height": 272,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B4",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 14,
|
||||
"labelHeight": 21,
|
||||
"zIndex": 2,
|
||||
"level": 2
|
||||
},
|
||||
{
|
||||
"id": "Libreria.t1",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 411,
|
||||
"y": 193
|
||||
},
|
||||
"width": 12,
|
||||
"height": 272,
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"borderRadius": 0,
|
||||
"fill": "B4",
|
||||
"stroke": "B1",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N1",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 14,
|
||||
"labelHeight": 21,
|
||||
"zIndex": 2,
|
||||
"level": 2
|
||||
}
|
||||
],
|
||||
"connections": [
|
||||
{
|
||||
"id": "(Front-End.t1 -> Libreria.t1)[0]",
|
||||
"src": "Front-End.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "generatePresentationPayload()",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 309,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 73.5,
|
||||
"y": 203
|
||||
},
|
||||
{
|
||||
"x": 411,
|
||||
"y": 203
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "Libreria.(t1 -> t1)[0]",
|
||||
"src": "Libreria.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "Generar y Firmar\nPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de Titularidad",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 862,
|
||||
"labelHeight": 55,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 423,
|
||||
"y": 288
|
||||
},
|
||||
{
|
||||
"x": 858,
|
||||
"y": 288
|
||||
},
|
||||
{
|
||||
"x": 858,
|
||||
"y": 370.5
|
||||
},
|
||||
{
|
||||
"x": 423,
|
||||
"y": 370.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "(Libreria.t1 -> Front-End.t1)[0]",
|
||||
"src": "Libreria.t1",
|
||||
"srcArrow": "none",
|
||||
"dst": "Front-End.t1",
|
||||
"dstArrow": "triangle",
|
||||
"opacity": 1,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B1",
|
||||
"borderRadius": 10,
|
||||
"label": "Presentacion Firmada",
|
||||
"fontSize": 24,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "black",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 217,
|
||||
"labelHeight": 31,
|
||||
"labelPosition": "INSIDE_MIDDLE_CENTER",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 411,
|
||||
"y": 455.5
|
||||
},
|
||||
{
|
||||
"x": 73.5,
|
||||
"y": 455.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 4
|
||||
},
|
||||
{
|
||||
"id": "(Front-End -- )[0]",
|
||||
"src": "Front-End",
|
||||
"srcArrow": "none",
|
||||
"dst": "Front-End-lifeline-end-2397425183",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 67.5,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 67.5,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
},
|
||||
{
|
||||
"id": "(Libreria -- )[0]",
|
||||
"src": "Libreria",
|
||||
"srcArrow": "none",
|
||||
"dst": "Libreria-lifeline-end-2001012606",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 417,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 417,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
},
|
||||
{
|
||||
"id": "(CD -- )[0]",
|
||||
"src": "CD",
|
||||
"srcArrow": "none",
|
||||
"dst": "CD-lifeline-end-3941115933",
|
||||
"dstArrow": "none",
|
||||
"opacity": 1,
|
||||
"strokeDash": 6,
|
||||
"strokeWidth": 2,
|
||||
"stroke": "B2",
|
||||
"borderRadius": 10,
|
||||
"label": "",
|
||||
"fontSize": 16,
|
||||
"fontFamily": "DEFAULT",
|
||||
"language": "",
|
||||
"color": "N2",
|
||||
"italic": true,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"labelPosition": "",
|
||||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 1299,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 1299,
|
||||
"y": 525.5
|
||||
}
|
||||
],
|
||||
"animated": false,
|
||||
"tooltip": "",
|
||||
"icon": null,
|
||||
"zIndex": 1
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"id": "",
|
||||
"type": "",
|
||||
"pos": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"width": 0,
|
||||
"height": 0,
|
||||
"opacity": 0,
|
||||
"strokeDash": 0,
|
||||
"strokeWidth": 0,
|
||||
"borderRadius": 0,
|
||||
"fill": "N7",
|
||||
"stroke": "",
|
||||
"shadow": false,
|
||||
"3d": false,
|
||||
"multiple": false,
|
||||
"double-border": false,
|
||||
"tooltip": "",
|
||||
"link": "",
|
||||
"icon": null,
|
||||
"iconPosition": "",
|
||||
"blend": false,
|
||||
"fields": null,
|
||||
"methods": null,
|
||||
"columns": null,
|
||||
"label": "",
|
||||
"fontSize": 0,
|
||||
"fontFamily": "",
|
||||
"language": "",
|
||||
"color": "",
|
||||
"italic": false,
|
||||
"bold": false,
|
||||
"underline": false,
|
||||
"labelWidth": 0,
|
||||
"labelHeight": 0,
|
||||
"zIndex": 0,
|
||||
"level": 0
|
||||
}
|
||||
}
|
||||
107
e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg
vendored
Normal file
107
e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg
vendored
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 19 KiB |
24
e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json
generated
vendored
24
e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json
generated
vendored
|
|
@ -48,7 +48,7 @@
|
|||
"id": "y",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 162,
|
||||
"x": 293,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
|
|
@ -116,11 +116,11 @@
|
|||
"y": 188
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 188
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 267.5
|
||||
},
|
||||
{
|
||||
|
|
@ -162,11 +162,11 @@
|
|||
"y": 337.5
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 337.5
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 393
|
||||
},
|
||||
{
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
"y": 473
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 473
|
||||
}
|
||||
],
|
||||
|
|
@ -242,19 +242,19 @@
|
|||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 483.5,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 483.5,
|
||||
"y": 632.5
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 632.5
|
||||
}
|
||||
],
|
||||
|
|
@ -326,11 +326,11 @@
|
|||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 702.5
|
||||
}
|
||||
],
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
24
e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json
generated
vendored
24
e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json
generated
vendored
|
|
@ -48,7 +48,7 @@
|
|||
"id": "y",
|
||||
"type": "rectangle",
|
||||
"pos": {
|
||||
"x": 162,
|
||||
"x": 293,
|
||||
"y": 52
|
||||
},
|
||||
"width": 100,
|
||||
|
|
@ -116,11 +116,11 @@
|
|||
"y": 188
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 188
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 267.5
|
||||
},
|
||||
{
|
||||
|
|
@ -162,11 +162,11 @@
|
|||
"y": 337.5
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 337.5
|
||||
},
|
||||
{
|
||||
"x": 142,
|
||||
"x": 202.5,
|
||||
"y": 393
|
||||
},
|
||||
{
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
"y": 473
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 473
|
||||
}
|
||||
],
|
||||
|
|
@ -242,19 +242,19 @@
|
|||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 483.5,
|
||||
"y": 553
|
||||
},
|
||||
{
|
||||
"x": 292,
|
||||
"x": 483.5,
|
||||
"y": 632.5
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 632.5
|
||||
}
|
||||
],
|
||||
|
|
@ -326,11 +326,11 @@
|
|||
"labelPercentage": 0,
|
||||
"route": [
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 118
|
||||
},
|
||||
{
|
||||
"x": 212,
|
||||
"x": 343,
|
||||
"y": 702.5
|
||||
}
|
||||
],
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
|
@ -338,3 +338,15 @@ b
|
|||
a -> b: okay then
|
||||
a -> b: one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten
|
||||
a -> b: one\ntwo\nthree\nfour\nfive
|
||||
|
||||
-- sequence-fontsize --
|
||||
shape: sequence_diagram
|
||||
(** -> **)[*].style.font-size: 24
|
||||
(** -> **)[*].style.font-color: black
|
||||
Front-End
|
||||
Libreria
|
||||
CD
|
||||
|
||||
Front-End.t1 -> Libreria.t1: generatePresentationPayload()
|
||||
Libreria.t1 -> Libreria.t1: Generar y Firmar\nPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de Titularidad
|
||||
Libreria.t1 -> Front-End.t1: Presentacion Firmada
|
||||
|
|
|
|||
Loading…
Reference in a new issue