diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index cca675cbc2..f752ce62d7 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -29,3 +29,4 @@ all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) - Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) - Fixes dagre mis-aligning a nested shape's connection. [#1370](https://github.com/terrastruct/d2/pull/1370) +- Fixes a bug in grids sometimes putting a shape on the next row/column. [#1380](https://github.com/terrastruct/d2/pull/1380) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 3904705831..3e5e1d104b 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -590,7 +590,7 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr nCuts = gd.rows - 1 } if nCuts == 0 { - return genLayout(gd.objects, nil) + return GenLayout(gd.objects, nil) } var bestLayout [][]*d2graph.Object @@ -692,7 +692,7 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr // . A │ B │ C D E └────────────┘ // of these divisions, find the layout with rows closest to the targetSize tryDivision := func(division []int) bool { - layout := genLayout(gd.objects, division) + layout := GenLayout(gd.objects, division) dist := getDistToTarget(layout, targetSize, float64(gd.horizontalGap), float64(gd.verticalGap), columns) if dist < bestDist { bestLayout = layout @@ -786,8 +786,10 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( size = o.Width } if rowSize == 0 { + // if a single object meets the target size, end the row here if size > targetSize-debt { - fastDivision = append(fastDivision, i-1) + // cut row with just this object + fastDivision = append(fastDivision, i) // we build up a debt of distance past the target size across rows newDebt := size - targetSize debt += newDebt @@ -797,7 +799,11 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( continue } // debt is paid by decreasing threshold to start new row and ending below targetSize - if rowSize+(gap+size)/2. > targetSize-debt { + if rowSize+gap+(size)/2. > targetSize-debt { + // start a new row before this object since it is mostly past the target size + // . size + // ├...row─┼gap┼───┼───┤ + // ├──targetSize──┤ (debt=0) fastDivision = append(fastDivision, i-1) newDebt := rowSize - targetSize debt += newDebt @@ -807,7 +813,7 @@ func (gd *gridDiagram) fastLayout(targetSize float64, nCuts int, columns bool) ( } } if len(fastDivision) == nCuts { - layout = genLayout(gd.objects, fastDivision) + layout = GenLayout(gd.objects, fastDivision) } return layout @@ -885,7 +891,9 @@ func iterDivisions(objects []*d2graph.Object, nCuts int, f iterDivision, check c } // generate a grid of objects from the given cut indices -func genLayout(objects []*d2graph.Object, cutIndices []int) [][]*d2graph.Object { +// each cut index applies after the object at that index +// e.g. [0 1 2 3 4 5 6 7] with cutIndices [0, 2, 6] => [[0], [1, 2], [3,4,5,6], [7]] +func GenLayout(objects []*d2graph.Object, cutIndices []int) [][]*d2graph.Object { layout := make([][]*d2graph.Object, len(cutIndices)+1) objIndex := 0 for i := 0; i <= len(cutIndices); i++ { @@ -916,6 +924,13 @@ func getDistToTarget(layout [][]*d2graph.Object, targetSize float64, horizontalG rowSize += o.Width + horizontalGap } } + if len(row) > 0 { + if columns { + rowSize -= verticalGap + } else { + rowSize -= horizontalGap + } + } totalDelta += math.Abs(rowSize - targetSize) } return totalDelta diff --git a/d2layouts/d2grid/layout_test.go b/d2layouts/d2grid/layout_test.go new file mode 100644 index 0000000000..f874cb0e58 --- /dev/null +++ b/d2layouts/d2grid/layout_test.go @@ -0,0 +1,72 @@ +package d2grid_test + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2layouts/d2grid" +) + +func TestGenLayout(t *testing.T) { + objects := []*d2graph.Object{ + {ID: "1"}, + {ID: "2"}, + {ID: "3"}, + {ID: "4"}, + {ID: "5"}, + {ID: "6"}, + {ID: "7"}, + {ID: "8"}, + } + var cutIndices []int + var layout [][]*d2graph.Object + cutIndices = []int{0} + layout = d2grid.GenLayout(objects, cutIndices) + fmt.Printf("layout %v\n", len(layout)) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 1, len(layout[0]), "expected first row to be 1 object") + assert.Equalf(t, 7, len(layout[1]), "expected second row to be 7 objects") + assert.Equalf(t, objects[0].ID, layout[0][0].ID, "expected first object to be 1") + + cutIndices = []int{6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 7, len(layout[0]), "expected first row to be 7 objects") + assert.Equalf(t, 1, len(layout[1]), "expected second row to be 1 object") + + cutIndices = []int{0, 6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + assert.Equalf(t, 1, len(layout[0]), "expected first row to be 1 objects") + assert.Equalf(t, 6, len(layout[1]), "expected second row to be 6 objects") + assert.Equalf(t, 1, len(layout[2]), "expected second row to be 1 object") + + cutIndices = []int{1, 5} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + assert.Equalf(t, 2, len(layout[0]), "expected first row to be 2 objects") + assert.Equalf(t, 4, len(layout[1]), "expected second row to be 6 objects") + assert.Equalf(t, 2, len(layout[2]), "expected second row to be 2 object") + + cutIndices = []int{5} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 6, len(layout[0]), "expected first row to be 6 objects") + assert.Equalf(t, 2, len(layout[1]), "expected second row to be 2 object") + + cutIndices = []int{1} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 2 rows from 1 cut") + assert.Equalf(t, 2, len(layout[0]), "expected first row to be 2 object") + assert.Equalf(t, 6, len(layout[1]), "expected second row to be 6 objects") + + cutIndices = []int{0, 1, 2, 3, 4, 5, 6} + layout = d2grid.GenLayout(objects, cutIndices) + assert.Equalf(t, len(cutIndices)+1, len(layout), "expected 3 rows from 2 cuts") + for i := range layout { + assert.Equalf(t, 1, len(layout[i]), "expected row %d to be 1 object", i) + } +} diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index be778d7582..e542d469e5 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -934,6 +934,7 @@ cf many required: { loadFromFile(t, "slow_grid"), loadFromFile(t, "grid_oom"), loadFromFile(t, "cylinder_grid_label"), + loadFromFile(t, "grid_with_latex"), } runa(t, tcs) diff --git a/e2etests/testdata/files/grid_with_latex.d2 b/e2etests/testdata/files/grid_with_latex.d2 new file mode 100644 index 0000000000..9cb7245edf --- /dev/null +++ b/e2etests/testdata/files/grid_with_latex.d2 @@ -0,0 +1,27 @@ +x: { + grid-columns: 2 + + a.width: 50 + a.height: 72 + b.width: 50 + b.height: 30 +} + +y: { + grid-columns: 2 + + a.width: 50 + a.height: 73 + b.width: 50 + b.height: 30 +} + +z: { + grid-columns: 2 + lim: |latex + \\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h} + | + add: |latex + 1 + 1 + | +} diff --git a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json index 9aa86b3936..c522ffa6c8 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,10 +73,10 @@ "type": "class", "pos": { "x": 0, - "y": 377 + "y": 381 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -128,10 +128,10 @@ "type": "class", "pos": { "x": 0, - "y": 704 + "y": 713 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -193,10 +193,10 @@ "type": "class", "pos": { "x": 0, - "y": 1082 + "y": 1094 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -243,10 +243,10 @@ "type": "class", "pos": { "x": 0, - "y": 1383 + "y": 1403 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -308,10 +308,10 @@ "type": "class", "pos": { "x": 0, - "y": 1761 + "y": 1784 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -373,10 +373,10 @@ "type": "class", "pos": { "x": 0, - "y": 2139 + "y": 2165 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -438,7 +438,7 @@ "type": "class", "pos": { "x": 0, - "y": 2516 + "y": 2546 }, "width": 626, "height": 414, @@ -518,10 +518,10 @@ "type": "class", "pos": { "x": 0, - "y": 2970 + "y": 3000 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -568,10 +568,10 @@ "type": "class", "pos": { "x": 0, - "y": 3272 + "y": 3308 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -716,7 +716,7 @@ "y": 454 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -763,10 +763,10 @@ "type": "class", "pos": { "x": 666, - "y": 662 + "y": 665 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "class", "pos": { "x": 666, - "y": 993 + "y": 998 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -883,10 +883,10 @@ "type": "class", "pos": { "x": 666, - "y": 1242 + "y": 1250 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -938,10 +938,10 @@ "type": "class", "pos": { "x": 666, - "y": 1491 + "y": 1502 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -988,10 +988,10 @@ "type": "class", "pos": { "x": 666, - "y": 1699 + "y": 1714 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1038,10 +1038,10 @@ "type": "class", "pos": { "x": 666, - "y": 1907 + "y": 1925 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1088,10 +1088,10 @@ "type": "class", "pos": { "x": 666, - "y": 2115 + "y": 2137 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1138,10 +1138,10 @@ "type": "class", "pos": { "x": 666, - "y": 2323 + "y": 2349 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1203,10 +1203,10 @@ "type": "class", "pos": { "x": 666, - "y": 2654 + "y": 2681 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1268,10 +1268,10 @@ "type": "class", "pos": { "x": 666, - "y": 2985 + "y": 3014 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1323,10 +1323,10 @@ "type": "class", "pos": { "x": 666, - "y": 3234 + "y": 3266 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1373,10 +1373,10 @@ "type": "class", "pos": { "x": 666, - "y": 3442 + "y": 3478 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1426,7 +1426,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1478,10 +1478,10 @@ "type": "class", "pos": { "x": 1392, - "y": 274 + "y": 278 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1528,7 +1528,7 @@ "type": "class", "pos": { "x": 1392, - "y": 527 + "y": 537 }, "width": 650, "height": 276, @@ -1593,10 +1593,10 @@ "type": "class", "pos": { "x": 1392, - "y": 843 + "y": 853 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1643,10 +1643,10 @@ "type": "class", "pos": { "x": 1392, - "y": 1097 + "y": 1112 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1703,7 +1703,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1392 + "y": 1409 }, "width": 650, "height": 276, @@ -1768,7 +1768,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1708 + "y": 1725 }, "width": 650, "height": 276, @@ -1833,10 +1833,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2024 + "y": 2041 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1888,10 +1888,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2299 + "y": 2319 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1943,10 +1943,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2573 + "y": 2597 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1993,10 +1993,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2826 + "y": 2856 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2043,7 +2043,7 @@ "type": "class", "pos": { "x": 1392, - "y": 3080 + "y": 3115 }, "width": 650, "height": 276, @@ -2108,10 +2108,10 @@ "type": "class", "pos": { "x": 1392, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2161,7 +2161,7 @@ "y": 0 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2208,10 +2208,10 @@ "type": "class", "pos": { "x": 2082, - "y": 242 + "y": 247 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2258,10 +2258,10 @@ "type": "class", "pos": { "x": 2082, - "y": 484 + "y": 494 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2308,10 +2308,10 @@ "type": "class", "pos": { "x": 2082, - "y": 727 + "y": 741 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2358,10 +2358,10 @@ "type": "class", "pos": { "x": 2082, - "y": 969 + "y": 988 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2423,10 +2423,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1318 + "y": 1339 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2488,10 +2488,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1666 + "y": 1689 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2538,10 +2538,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1908 + "y": 1937 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2603,10 +2603,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2257 + "y": 2287 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2653,10 +2653,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2499 + "y": 2534 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2718,10 +2718,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2847 + "y": 2885 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2783,7 +2783,7 @@ "type": "class", "pos": { "x": 2082, - "y": 3196 + "y": 3235 }, "width": 927, "height": 414, @@ -2866,7 +2866,7 @@ "y": 0 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2918,7 +2918,7 @@ "type": "class", "pos": { "x": 3049, - "y": 269 + "y": 272 }, "width": 686, "height": 414, @@ -2998,10 +2998,10 @@ "type": "class", "pos": { "x": 3049, - "y": 723 + "y": 726 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3053,10 +3053,10 @@ "type": "class", "pos": { "x": 3049, - "y": 992 + "y": 999 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3118,10 +3118,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1336 + "y": 1344 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3168,10 +3168,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1568 + "y": 1581 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3223,10 +3223,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1837 + "y": 1853 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3273,10 +3273,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2070 + "y": 2090 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3323,10 +3323,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2302 + "y": 2326 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3378,10 +3378,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2572 + "y": 2599 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3428,10 +3428,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2804 + "y": 2835 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3493,10 +3493,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3148 + "y": 3180 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3548,10 +3548,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3417 + "y": 3453 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3601,7 +3601,7 @@ "y": 0 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3663,7 +3663,7 @@ "type": "class", "pos": { "x": 3775, - "y": 354 + "y": 358 }, "width": 927, "height": 460, @@ -3748,10 +3748,10 @@ "type": "class", "pos": { "x": 3775, - "y": 854 + "y": 858 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3813,10 +3813,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1208 + "y": 1216 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3883,10 +3883,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1598 + "y": 1610 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3948,10 +3948,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1952 + "y": 1968 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4018,10 +4018,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2343 + "y": 2362 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4088,10 +4088,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2733 + "y": 2756 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4143,10 +4143,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3014 + "y": 3044 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4208,10 +4208,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3368 + "y": 3402 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4266,7 +4266,7 @@ "y": 0 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4328,10 +4328,10 @@ "type": "class", "pos": { "x": 4742, - "y": 414 + "y": 420 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4383,10 +4383,10 @@ "type": "class", "pos": { "x": 4742, - "y": 760 + "y": 774 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4448,10 +4448,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1174 + "y": 1194 }, "width": 627, - "height": 340, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4508,10 +4508,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1555 + "y": 1581 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4573,10 +4573,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1969 + "y": 2001 }, "width": 627, - "height": 610, + "height": 611, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4673,7 +4673,7 @@ "type": "class", "pos": { "x": 4742, - "y": 2619 + "y": 2652 }, "width": 627, "height": 644, @@ -4778,10 +4778,10 @@ "type": "class", "pos": { "x": 4742, - "y": 3303 + "y": 3336 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4836,7 +4836,7 @@ "y": 0 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4898,10 +4898,10 @@ "type": "class", "pos": { "x": 5409, - "y": 353 + "y": 357 }, "width": 578, - "height": 274, + "height": 280, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4958,10 +4958,10 @@ "type": "class", "pos": { "x": 5409, - "y": 668 + "y": 677 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5013,10 +5013,10 @@ "type": "class", "pos": { "x": 5409, - "y": 944 + "y": 960 }, "width": 578, - "height": 390, + "height": 393, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5088,10 +5088,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1375 + "y": 1393 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5153,10 +5153,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1728 + "y": 1750 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5218,10 +5218,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2082 + "y": 2108 }, "width": 578, - "height": 197, + "height": 204, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5268,10 +5268,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2320 + "y": 2353 }, "width": 578, - "height": 467, + "height": 468, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5353,10 +5353,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2827 + "y": 2861 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5408,7 +5408,7 @@ "type": "class", "pos": { "x": 5409, - "y": 3104 + "y": 3144 }, "width": 578, "height": 506, @@ -5501,7 +5501,7 @@ "y": 0 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5553,10 +5553,10 @@ "type": "class", "pos": { "x": 6027, - "y": 306 + "y": 312 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5608,10 +5608,10 @@ "type": "class", "pos": { "x": 6027, - "y": 613 + "y": 624 }, "width": 626, - "height": 403, + "height": 405, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5683,10 +5683,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1057 + "y": 1070 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5748,10 +5748,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1432 + "y": 1449 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5813,10 +5813,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1807 + "y": 1828 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5878,10 +5878,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2183 + "y": 2207 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5933,10 +5933,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2490 + "y": 2519 }, "width": 626, - "height": 232, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5983,10 +5983,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2762 + "y": 2798 }, "width": 626, - "height": 301, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6043,7 +6043,7 @@ "type": "class", "pos": { "x": 6027, - "y": 3104 + "y": 3144 }, "width": 626, "height": 506, @@ -6136,7 +6136,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6188,7 +6188,7 @@ "type": "class", "pos": { "x": 6693, - "y": 274 + "y": 278 }, "width": 650, "height": 276, @@ -6253,10 +6253,10 @@ "type": "class", "pos": { "x": 6693, - "y": 590 + "y": 594 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6313,10 +6313,10 @@ "type": "class", "pos": { "x": 6693, - "y": 885 + "y": 891 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6368,10 +6368,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1159 + "y": 1169 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6418,10 +6418,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1413 + "y": 1428 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6473,7 +6473,7 @@ "type": "class", "pos": { "x": 6693, - "y": 1687 + "y": 1706 }, "width": 650, "height": 276, @@ -6538,10 +6538,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2003 + "y": 2022 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6588,10 +6588,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2257 + "y": 2281 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6648,7 +6648,7 @@ "type": "class", "pos": { "x": 6693, - "y": 2552 + "y": 2578 }, "width": 650, "height": 276, @@ -6713,10 +6713,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2868 + "y": 2894 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6768,10 +6768,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3142 + "y": 3172 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6818,10 +6818,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6871,7 +6871,7 @@ "y": 0 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6918,10 +6918,10 @@ "type": "class", "pos": { "x": 7383, - "y": 230 + "y": 268 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6983,10 +6983,10 @@ "type": "class", "pos": { "x": 7383, - "y": 559 + "y": 607 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7033,10 +7033,10 @@ "type": "class", "pos": { "x": 7383, - "y": 789 + "y": 875 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7083,7 +7083,7 @@ "type": "class", "pos": { "x": 7383, - "y": 1019 + "y": 1144 }, "width": 578, "height": 322, @@ -7153,10 +7153,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1381 + "y": 1506 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7203,10 +7203,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1611 + "y": 1774 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7268,10 +7268,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1940 + "y": 2113 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7328,10 +7328,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2236 + "y": 2428 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7388,10 +7388,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2532 + "y": 2744 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7438,10 +7438,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2762 + "y": 3012 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7503,10 +7503,10 @@ "type": "class", "pos": { "x": 7383, - "y": 3091 + "y": 3351 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7567,11 +7567,11 @@ "id": "127", "type": "class", "pos": { - "x": 7383, - "y": 3420 + "x": 8001, + "y": 0 }, "width": 578, - "height": 190, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7618,10 +7618,10 @@ "type": "class", "pos": { "x": 8001, - "y": 0 + "y": 178 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7683,10 +7683,10 @@ "type": "class", "pos": { "x": 8001, - "y": 350 + "y": 494 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7748,10 +7748,10 @@ "type": "class", "pos": { "x": 8001, - "y": 700 + "y": 810 }, "width": 578, - "height": 219, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7803,10 +7803,10 @@ "type": "class", "pos": { "x": 8001, - "y": 959 + "y": 1034 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7868,7 +7868,7 @@ "type": "class", "pos": { "x": 8001, - "y": 1310 + "y": 1350 }, "width": 578, "height": 2300, @@ -8156,7 +8156,7 @@ "y": 0 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8223,10 +8223,10 @@ "type": "class", "pos": { "x": 8619, - "y": 405 + "y": 410 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8278,10 +8278,10 @@ "type": "class", "pos": { "x": 8619, - "y": 811 + "y": 820 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8343,10 +8343,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1216 + "y": 1230 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8408,10 +8408,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1622 + "y": 1640 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8473,10 +8473,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2027 + "y": 2050 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8538,10 +8538,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2433 + "y": 2460 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8598,10 +8598,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2838 + "y": 2870 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8663,10 +8663,10 @@ "type": "class", "pos": { "x": 8619, - "y": 3244 + "y": 3280 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8721,7 +8721,7 @@ "y": 0 }, "width": 650, - "height": 138, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8768,10 +8768,10 @@ "type": "class", "pos": { "x": 9249, - "y": 178 + "y": 188 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8833,10 +8833,10 @@ "type": "class", "pos": { "x": 9249, - "y": 494 + "y": 514 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8898,10 +8898,10 @@ "type": "class", "pos": { "x": 9249, - "y": 810 + "y": 840 }, "width": 650, - "height": 460, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8983,7 +8983,7 @@ "type": "class", "pos": { "x": 9249, - "y": 1310 + "y": 1350 }, "width": 650, "height": 2300, @@ -9271,7 +9271,7 @@ "y": 0 }, "width": 626, - "height": 329, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9328,10 +9328,10 @@ "type": "class", "pos": { "x": 9939, - "y": 369 + "y": 373 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9393,10 +9393,10 @@ "type": "class", "pos": { "x": 9939, - "y": 759 + "y": 766 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9458,10 +9458,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1150 + "y": 1159 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9523,10 +9523,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1540 + "y": 1552 }, "width": 626, - "height": 308, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9578,10 +9578,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1888 + "y": 1905 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9628,10 +9628,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2215 + "y": 2238 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9678,7 +9678,7 @@ "type": "class", "pos": { "x": 9939, - "y": 2542 + "y": 2570 }, "width": 626, "height": 414, @@ -9758,10 +9758,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2996 + "y": 3024 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9808,10 +9808,10 @@ "type": "class", "pos": { "x": 9939, - "y": 3323 + "y": 3357 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg index a4d7f9d353..3086e7093e 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- - + .d2-110778175 .fill-N1{fill:#0A0F25;} + .d2-110778175 .fill-N2{fill:#676C7E;} + .d2-110778175 .fill-N3{fill:#9499AB;} + .d2-110778175 .fill-N4{fill:#CFD2DD;} + .d2-110778175 .fill-N5{fill:#DEE1EB;} + .d2-110778175 .fill-N6{fill:#EEF1F8;} + .d2-110778175 .fill-N7{fill:#FFFFFF;} + .d2-110778175 .fill-B1{fill:#0D32B2;} + .d2-110778175 .fill-B2{fill:#0D32B2;} + .d2-110778175 .fill-B3{fill:#E3E9FD;} + .d2-110778175 .fill-B4{fill:#E3E9FD;} + .d2-110778175 .fill-B5{fill:#EDF0FD;} + .d2-110778175 .fill-B6{fill:#F7F8FE;} + .d2-110778175 .fill-AA2{fill:#4A6FF3;} + .d2-110778175 .fill-AA4{fill:#EDF0FD;} + .d2-110778175 .fill-AA5{fill:#F7F8FE;} + .d2-110778175 .fill-AB4{fill:#EDF0FD;} + .d2-110778175 .fill-AB5{fill:#F7F8FE;} + .d2-110778175 .stroke-N1{stroke:#0A0F25;} + .d2-110778175 .stroke-N2{stroke:#676C7E;} + .d2-110778175 .stroke-N3{stroke:#9499AB;} + .d2-110778175 .stroke-N4{stroke:#CFD2DD;} + .d2-110778175 .stroke-N5{stroke:#DEE1EB;} + .d2-110778175 .stroke-N6{stroke:#EEF1F8;} + .d2-110778175 .stroke-N7{stroke:#FFFFFF;} + .d2-110778175 .stroke-B1{stroke:#0D32B2;} + .d2-110778175 .stroke-B2{stroke:#0D32B2;} + .d2-110778175 .stroke-B3{stroke:#E3E9FD;} + .d2-110778175 .stroke-B4{stroke:#E3E9FD;} + .d2-110778175 .stroke-B5{stroke:#EDF0FD;} + .d2-110778175 .stroke-B6{stroke:#F7F8FE;} + .d2-110778175 .stroke-AA2{stroke:#4A6FF3;} + .d2-110778175 .stroke-AA4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AA5{stroke:#F7F8FE;} + .d2-110778175 .stroke-AB4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AB5{stroke:#F7F8FE;} + .d2-110778175 .background-color-N1{background-color:#0A0F25;} + .d2-110778175 .background-color-N2{background-color:#676C7E;} + .d2-110778175 .background-color-N3{background-color:#9499AB;} + .d2-110778175 .background-color-N4{background-color:#CFD2DD;} + .d2-110778175 .background-color-N5{background-color:#DEE1EB;} + .d2-110778175 .background-color-N6{background-color:#EEF1F8;} + .d2-110778175 .background-color-N7{background-color:#FFFFFF;} + .d2-110778175 .background-color-B1{background-color:#0D32B2;} + .d2-110778175 .background-color-B2{background-color:#0D32B2;} + .d2-110778175 .background-color-B3{background-color:#E3E9FD;} + .d2-110778175 .background-color-B4{background-color:#E3E9FD;} + .d2-110778175 .background-color-B5{background-color:#EDF0FD;} + .d2-110778175 .background-color-B6{background-color:#F7F8FE;} + .d2-110778175 .background-color-AA2{background-color:#4A6FF3;} + .d2-110778175 .background-color-AA4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AA5{background-color:#F7F8FE;} + .d2-110778175 .background-color-AB4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AB5{background-color:#F7F8FE;} + .d2-110778175 .color-N1{color:#0A0F25;} + .d2-110778175 .color-N2{color:#676C7E;} + .d2-110778175 .color-N3{color:#9499AB;} + .d2-110778175 .color-N4{color:#CFD2DD;} + .d2-110778175 .color-N5{color:#DEE1EB;} + .d2-110778175 .color-N6{color:#EEF1F8;} + .d2-110778175 .color-N7{color:#FFFFFF;} + .d2-110778175 .color-B1{color:#0D32B2;} + .d2-110778175 .color-B2{color:#0D32B2;} + .d2-110778175 .color-B3{color:#E3E9FD;} + .d2-110778175 .color-B4{color:#E3E9FD;} + .d2-110778175 .color-B5{color:#EDF0FD;} + .d2-110778175 .color-B6{color:#F7F8FE;} + .d2-110778175 .color-AA2{color:#4A6FF3;} + .d2-110778175 .color-AA4{color:#EDF0FD;} + .d2-110778175 .color-AA5{color:#F7F8FE;} + .d2-110778175 .color-AB4{color:#EDF0FD;} + .d2-110778175 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/elk/board.exp.json b/e2etests/testdata/regression/grid_oom/elk/board.exp.json index 9aa86b3936..c522ffa6c8 100644 --- a/e2etests/testdata/regression/grid_oom/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,10 +73,10 @@ "type": "class", "pos": { "x": 0, - "y": 377 + "y": 381 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -128,10 +128,10 @@ "type": "class", "pos": { "x": 0, - "y": 704 + "y": 713 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -193,10 +193,10 @@ "type": "class", "pos": { "x": 0, - "y": 1082 + "y": 1094 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -243,10 +243,10 @@ "type": "class", "pos": { "x": 0, - "y": 1383 + "y": 1403 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -308,10 +308,10 @@ "type": "class", "pos": { "x": 0, - "y": 1761 + "y": 1784 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -373,10 +373,10 @@ "type": "class", "pos": { "x": 0, - "y": 2139 + "y": 2165 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -438,7 +438,7 @@ "type": "class", "pos": { "x": 0, - "y": 2516 + "y": 2546 }, "width": 626, "height": 414, @@ -518,10 +518,10 @@ "type": "class", "pos": { "x": 0, - "y": 2970 + "y": 3000 }, "width": 626, - "height": 261, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -568,10 +568,10 @@ "type": "class", "pos": { "x": 0, - "y": 3272 + "y": 3308 }, "width": 626, - "height": 337, + "height": 341, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -716,7 +716,7 @@ "y": 454 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -763,10 +763,10 @@ "type": "class", "pos": { "x": 666, - "y": 662 + "y": 665 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "class", "pos": { "x": 666, - "y": 993 + "y": 998 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -883,10 +883,10 @@ "type": "class", "pos": { "x": 666, - "y": 1242 + "y": 1250 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -938,10 +938,10 @@ "type": "class", "pos": { "x": 666, - "y": 1491 + "y": 1502 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -988,10 +988,10 @@ "type": "class", "pos": { "x": 666, - "y": 1699 + "y": 1714 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1038,10 +1038,10 @@ "type": "class", "pos": { "x": 666, - "y": 1907 + "y": 1925 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1088,10 +1088,10 @@ "type": "class", "pos": { "x": 666, - "y": 2115 + "y": 2137 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1138,10 +1138,10 @@ "type": "class", "pos": { "x": 666, - "y": 2323 + "y": 2349 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1203,10 +1203,10 @@ "type": "class", "pos": { "x": 666, - "y": 2654 + "y": 2681 }, "width": 686, - "height": 291, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1268,10 +1268,10 @@ "type": "class", "pos": { "x": 666, - "y": 2985 + "y": 3014 }, "width": 686, - "height": 209, + "height": 212, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1323,10 +1323,10 @@ "type": "class", "pos": { "x": 666, - "y": 3234 + "y": 3266 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1373,10 +1373,10 @@ "type": "class", "pos": { "x": 666, - "y": 3442 + "y": 3478 }, "width": 686, - "height": 168, + "height": 171, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1426,7 +1426,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1478,10 +1478,10 @@ "type": "class", "pos": { "x": 1392, - "y": 274 + "y": 278 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1528,7 +1528,7 @@ "type": "class", "pos": { "x": 1392, - "y": 527 + "y": 537 }, "width": 650, "height": 276, @@ -1593,10 +1593,10 @@ "type": "class", "pos": { "x": 1392, - "y": 843 + "y": 853 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1643,10 +1643,10 @@ "type": "class", "pos": { "x": 1392, - "y": 1097 + "y": 1112 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1703,7 +1703,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1392 + "y": 1409 }, "width": 650, "height": 276, @@ -1768,7 +1768,7 @@ "type": "class", "pos": { "x": 1392, - "y": 1708 + "y": 1725 }, "width": 650, "height": 276, @@ -1833,10 +1833,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2024 + "y": 2041 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1888,10 +1888,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2299 + "y": 2319 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1943,10 +1943,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2573 + "y": 2597 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1993,10 +1993,10 @@ "type": "class", "pos": { "x": 1392, - "y": 2826 + "y": 2856 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2043,7 +2043,7 @@ "type": "class", "pos": { "x": 1392, - "y": 3080 + "y": 3115 }, "width": 650, "height": 276, @@ -2108,10 +2108,10 @@ "type": "class", "pos": { "x": 1392, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2161,7 +2161,7 @@ "y": 0 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2208,10 +2208,10 @@ "type": "class", "pos": { "x": 2082, - "y": 242 + "y": 247 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2258,10 +2258,10 @@ "type": "class", "pos": { "x": 2082, - "y": 484 + "y": 494 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2308,10 +2308,10 @@ "type": "class", "pos": { "x": 2082, - "y": 727 + "y": 741 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2358,10 +2358,10 @@ "type": "class", "pos": { "x": 2082, - "y": 969 + "y": 988 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2423,10 +2423,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1318 + "y": 1339 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2488,10 +2488,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1666 + "y": 1689 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2538,10 +2538,10 @@ "type": "class", "pos": { "x": 2082, - "y": 1908 + "y": 1937 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2603,10 +2603,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2257 + "y": 2287 }, "width": 927, - "height": 202, + "height": 207, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2653,10 +2653,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2499 + "y": 2534 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2718,10 +2718,10 @@ "type": "class", "pos": { "x": 2082, - "y": 2847 + "y": 2885 }, "width": 927, - "height": 308, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2783,7 +2783,7 @@ "type": "class", "pos": { "x": 2082, - "y": 3196 + "y": 3235 }, "width": 927, "height": 414, @@ -2866,7 +2866,7 @@ "y": 0 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2918,7 +2918,7 @@ "type": "class", "pos": { "x": 3049, - "y": 269 + "y": 272 }, "width": 686, "height": 414, @@ -2998,10 +2998,10 @@ "type": "class", "pos": { "x": 3049, - "y": 723 + "y": 726 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3053,10 +3053,10 @@ "type": "class", "pos": { "x": 3049, - "y": 992 + "y": 999 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3118,10 +3118,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1336 + "y": 1344 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3168,10 +3168,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1568 + "y": 1581 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3223,10 +3223,10 @@ "type": "class", "pos": { "x": 3049, - "y": 1837 + "y": 1853 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3273,10 +3273,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2070 + "y": 2090 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3323,10 +3323,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2302 + "y": 2326 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3378,10 +3378,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2572 + "y": 2599 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3428,10 +3428,10 @@ "type": "class", "pos": { "x": 3049, - "y": 2804 + "y": 2835 }, "width": 686, - "height": 303, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3493,10 +3493,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3148 + "y": 3180 }, "width": 686, - "height": 229, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3548,10 +3548,10 @@ "type": "class", "pos": { "x": 3049, - "y": 3417 + "y": 3453 }, "width": 686, - "height": 192, + "height": 196, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3601,7 +3601,7 @@ "y": 0 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3663,7 +3663,7 @@ "type": "class", "pos": { "x": 3775, - "y": 354 + "y": 358 }, "width": 927, "height": 460, @@ -3748,10 +3748,10 @@ "type": "class", "pos": { "x": 3775, - "y": 854 + "y": 858 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3813,10 +3813,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1208 + "y": 1216 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3883,10 +3883,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1598 + "y": 1610 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3948,10 +3948,10 @@ "type": "class", "pos": { "x": 3775, - "y": 1952 + "y": 1968 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4018,10 +4018,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2343 + "y": 2362 }, "width": 927, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4088,10 +4088,10 @@ "type": "class", "pos": { "x": 3775, - "y": 2733 + "y": 2756 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4143,10 +4143,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3014 + "y": 3044 }, "width": 927, - "height": 314, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4208,10 +4208,10 @@ "type": "class", "pos": { "x": 3775, - "y": 3368 + "y": 3402 }, "width": 927, - "height": 241, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4266,7 +4266,7 @@ "y": 0 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4328,10 +4328,10 @@ "type": "class", "pos": { "x": 4742, - "y": 414 + "y": 420 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4383,10 +4383,10 @@ "type": "class", "pos": { "x": 4742, - "y": 760 + "y": 774 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4448,10 +4448,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1174 + "y": 1194 }, "width": 627, - "height": 340, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4508,10 +4508,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1555 + "y": 1581 }, "width": 627, - "height": 374, + "height": 380, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4573,10 +4573,10 @@ "type": "class", "pos": { "x": 4742, - "y": 1969 + "y": 2001 }, "width": 627, - "height": 610, + "height": 611, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4673,7 +4673,7 @@ "type": "class", "pos": { "x": 4742, - "y": 2619 + "y": 2652 }, "width": 627, "height": 644, @@ -4778,10 +4778,10 @@ "type": "class", "pos": { "x": 4742, - "y": 3303 + "y": 3336 }, "width": 627, - "height": 306, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4836,7 +4836,7 @@ "y": 0 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4898,10 +4898,10 @@ "type": "class", "pos": { "x": 5409, - "y": 353 + "y": 357 }, "width": 578, - "height": 274, + "height": 280, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4958,10 +4958,10 @@ "type": "class", "pos": { "x": 5409, - "y": 668 + "y": 677 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5013,10 +5013,10 @@ "type": "class", "pos": { "x": 5409, - "y": 944 + "y": 960 }, "width": 578, - "height": 390, + "height": 393, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5088,10 +5088,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1375 + "y": 1393 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5153,10 +5153,10 @@ "type": "class", "pos": { "x": 5409, - "y": 1728 + "y": 1750 }, "width": 578, - "height": 313, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5218,10 +5218,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2082 + "y": 2108 }, "width": 578, - "height": 197, + "height": 204, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5268,10 +5268,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2320 + "y": 2353 }, "width": 578, - "height": 467, + "height": 468, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5353,10 +5353,10 @@ "type": "class", "pos": { "x": 5409, - "y": 2827 + "y": 2861 }, "width": 578, - "height": 236, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5408,7 +5408,7 @@ "type": "class", "pos": { "x": 5409, - "y": 3104 + "y": 3144 }, "width": 578, "height": 506, @@ -5501,7 +5501,7 @@ "y": 0 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5553,10 +5553,10 @@ "type": "class", "pos": { "x": 6027, - "y": 306 + "y": 312 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5608,10 +5608,10 @@ "type": "class", "pos": { "x": 6027, - "y": 613 + "y": 624 }, "width": 626, - "height": 403, + "height": 405, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5683,10 +5683,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1057 + "y": 1070 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5748,10 +5748,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1432 + "y": 1449 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5813,10 +5813,10 @@ "type": "class", "pos": { "x": 6027, - "y": 1807 + "y": 1828 }, "width": 626, - "height": 335, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5878,10 +5878,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2183 + "y": 2207 }, "width": 626, - "height": 266, + "height": 272, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5933,10 +5933,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2490 + "y": 2519 }, "width": 626, - "height": 232, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5983,10 +5983,10 @@ "type": "class", "pos": { "x": 6027, - "y": 2762 + "y": 2798 }, "width": 626, - "height": 301, + "height": 305, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6043,7 +6043,7 @@ "type": "class", "pos": { "x": 6027, - "y": 3104 + "y": 3144 }, "width": 626, "height": 506, @@ -6136,7 +6136,7 @@ "y": 0 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6188,7 +6188,7 @@ "type": "class", "pos": { "x": 6693, - "y": 274 + "y": 278 }, "width": 650, "height": 276, @@ -6253,10 +6253,10 @@ "type": "class", "pos": { "x": 6693, - "y": 590 + "y": 594 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6313,10 +6313,10 @@ "type": "class", "pos": { "x": 6693, - "y": 885 + "y": 891 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6368,10 +6368,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1159 + "y": 1169 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6418,10 +6418,10 @@ "type": "class", "pos": { "x": 6693, - "y": 1413 + "y": 1428 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6473,7 +6473,7 @@ "type": "class", "pos": { "x": 6693, - "y": 1687 + "y": 1706 }, "width": 650, "height": 276, @@ -6538,10 +6538,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2003 + "y": 2022 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6588,10 +6588,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2257 + "y": 2281 }, "width": 650, - "height": 255, + "height": 257, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6648,7 +6648,7 @@ "type": "class", "pos": { "x": 6693, - "y": 2552 + "y": 2578 }, "width": 650, "height": 276, @@ -6713,10 +6713,10 @@ "type": "class", "pos": { "x": 6693, - "y": 2868 + "y": 2894 }, "width": 650, - "height": 234, + "height": 238, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6768,10 +6768,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3142 + "y": 3172 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6818,10 +6818,10 @@ "type": "class", "pos": { "x": 6693, - "y": 3396 + "y": 3431 }, "width": 650, - "height": 213, + "height": 219, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6871,7 +6871,7 @@ "y": 0 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6918,10 +6918,10 @@ "type": "class", "pos": { "x": 7383, - "y": 230 + "y": 268 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6983,10 +6983,10 @@ "type": "class", "pos": { "x": 7383, - "y": 559 + "y": 607 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7033,10 +7033,10 @@ "type": "class", "pos": { "x": 7383, - "y": 789 + "y": 875 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7083,7 +7083,7 @@ "type": "class", "pos": { "x": 7383, - "y": 1019 + "y": 1144 }, "width": 578, "height": 322, @@ -7153,10 +7153,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1381 + "y": 1506 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7203,10 +7203,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1611 + "y": 1774 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7268,10 +7268,10 @@ "type": "class", "pos": { "x": 7383, - "y": 1940 + "y": 2113 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7328,10 +7328,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2236 + "y": 2428 }, "width": 578, - "height": 256, + "height": 275, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7388,10 +7388,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2532 + "y": 2744 }, "width": 578, - "height": 190, + "height": 228, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7438,10 +7438,10 @@ "type": "class", "pos": { "x": 7383, - "y": 2762 + "y": 3012 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7503,10 +7503,10 @@ "type": "class", "pos": { "x": 7383, - "y": 3091 + "y": 3351 }, "width": 578, - "height": 289, + "height": 298, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7567,11 +7567,11 @@ "id": "127", "type": "class", "pos": { - "x": 7383, - "y": 3420 + "x": 8001, + "y": 0 }, "width": 578, - "height": 190, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7618,10 +7618,10 @@ "type": "class", "pos": { "x": 8001, - "y": 0 + "y": 178 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7683,10 +7683,10 @@ "type": "class", "pos": { "x": 8001, - "y": 350 + "y": 494 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7748,10 +7748,10 @@ "type": "class", "pos": { "x": 8001, - "y": 700 + "y": 810 }, "width": 578, - "height": 219, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7803,10 +7803,10 @@ "type": "class", "pos": { "x": 8001, - "y": 959 + "y": 1034 }, "width": 578, - "height": 310, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -7868,7 +7868,7 @@ "type": "class", "pos": { "x": 8001, - "y": 1310 + "y": 1350 }, "width": 578, "height": 2300, @@ -8156,7 +8156,7 @@ "y": 0 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8223,10 +8223,10 @@ "type": "class", "pos": { "x": 8619, - "y": 405 + "y": 410 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8278,10 +8278,10 @@ "type": "class", "pos": { "x": 8619, - "y": 811 + "y": 820 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8343,10 +8343,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1216 + "y": 1230 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8408,10 +8408,10 @@ "type": "class", "pos": { "x": 8619, - "y": 1622 + "y": 1640 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8473,10 +8473,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2027 + "y": 2050 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8538,10 +8538,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2433 + "y": 2460 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8598,10 +8598,10 @@ "type": "class", "pos": { "x": 8619, - "y": 2838 + "y": 2870 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8663,10 +8663,10 @@ "type": "class", "pos": { "x": 8619, - "y": 3244 + "y": 3280 }, "width": 590, - "height": 365, + "height": 370, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8721,7 +8721,7 @@ "y": 0 }, "width": 650, - "height": 138, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8768,10 +8768,10 @@ "type": "class", "pos": { "x": 9249, - "y": 178 + "y": 188 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8833,10 +8833,10 @@ "type": "class", "pos": { "x": 9249, - "y": 494 + "y": 514 }, "width": 650, - "height": 276, + "height": 286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8898,10 +8898,10 @@ "type": "class", "pos": { "x": 9249, - "y": 810 + "y": 840 }, "width": 650, - "height": 460, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8983,7 +8983,7 @@ "type": "class", "pos": { "x": 9249, - "y": 1310 + "y": 1350 }, "width": 650, "height": 2300, @@ -9271,7 +9271,7 @@ "y": 0 }, "width": 626, - "height": 329, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9328,10 +9328,10 @@ "type": "class", "pos": { "x": 9939, - "y": 369 + "y": 373 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9393,10 +9393,10 @@ "type": "class", "pos": { "x": 9939, - "y": 759 + "y": 766 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9458,10 +9458,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1150 + "y": 1159 }, "width": 626, - "height": 350, + "height": 353, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9523,10 +9523,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1540 + "y": 1552 }, "width": 626, - "height": 308, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9578,10 +9578,10 @@ "type": "class", "pos": { "x": 9939, - "y": 1888 + "y": 1905 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9628,10 +9628,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2215 + "y": 2238 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9678,7 +9678,7 @@ "type": "class", "pos": { "x": 9939, - "y": 2542 + "y": 2570 }, "width": 626, "height": 414, @@ -9758,10 +9758,10 @@ "type": "class", "pos": { "x": 9939, - "y": 2996 + "y": 3024 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -9808,10 +9808,10 @@ "type": "class", "pos": { "x": 9939, - "y": 3323 + "y": 3357 }, "width": 626, - "height": 286, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg index a4d7f9d353..3086e7093e 100644 --- a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- - + .d2-110778175 .fill-N1{fill:#0A0F25;} + .d2-110778175 .fill-N2{fill:#676C7E;} + .d2-110778175 .fill-N3{fill:#9499AB;} + .d2-110778175 .fill-N4{fill:#CFD2DD;} + .d2-110778175 .fill-N5{fill:#DEE1EB;} + .d2-110778175 .fill-N6{fill:#EEF1F8;} + .d2-110778175 .fill-N7{fill:#FFFFFF;} + .d2-110778175 .fill-B1{fill:#0D32B2;} + .d2-110778175 .fill-B2{fill:#0D32B2;} + .d2-110778175 .fill-B3{fill:#E3E9FD;} + .d2-110778175 .fill-B4{fill:#E3E9FD;} + .d2-110778175 .fill-B5{fill:#EDF0FD;} + .d2-110778175 .fill-B6{fill:#F7F8FE;} + .d2-110778175 .fill-AA2{fill:#4A6FF3;} + .d2-110778175 .fill-AA4{fill:#EDF0FD;} + .d2-110778175 .fill-AA5{fill:#F7F8FE;} + .d2-110778175 .fill-AB4{fill:#EDF0FD;} + .d2-110778175 .fill-AB5{fill:#F7F8FE;} + .d2-110778175 .stroke-N1{stroke:#0A0F25;} + .d2-110778175 .stroke-N2{stroke:#676C7E;} + .d2-110778175 .stroke-N3{stroke:#9499AB;} + .d2-110778175 .stroke-N4{stroke:#CFD2DD;} + .d2-110778175 .stroke-N5{stroke:#DEE1EB;} + .d2-110778175 .stroke-N6{stroke:#EEF1F8;} + .d2-110778175 .stroke-N7{stroke:#FFFFFF;} + .d2-110778175 .stroke-B1{stroke:#0D32B2;} + .d2-110778175 .stroke-B2{stroke:#0D32B2;} + .d2-110778175 .stroke-B3{stroke:#E3E9FD;} + .d2-110778175 .stroke-B4{stroke:#E3E9FD;} + .d2-110778175 .stroke-B5{stroke:#EDF0FD;} + .d2-110778175 .stroke-B6{stroke:#F7F8FE;} + .d2-110778175 .stroke-AA2{stroke:#4A6FF3;} + .d2-110778175 .stroke-AA4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AA5{stroke:#F7F8FE;} + .d2-110778175 .stroke-AB4{stroke:#EDF0FD;} + .d2-110778175 .stroke-AB5{stroke:#F7F8FE;} + .d2-110778175 .background-color-N1{background-color:#0A0F25;} + .d2-110778175 .background-color-N2{background-color:#676C7E;} + .d2-110778175 .background-color-N3{background-color:#9499AB;} + .d2-110778175 .background-color-N4{background-color:#CFD2DD;} + .d2-110778175 .background-color-N5{background-color:#DEE1EB;} + .d2-110778175 .background-color-N6{background-color:#EEF1F8;} + .d2-110778175 .background-color-N7{background-color:#FFFFFF;} + .d2-110778175 .background-color-B1{background-color:#0D32B2;} + .d2-110778175 .background-color-B2{background-color:#0D32B2;} + .d2-110778175 .background-color-B3{background-color:#E3E9FD;} + .d2-110778175 .background-color-B4{background-color:#E3E9FD;} + .d2-110778175 .background-color-B5{background-color:#EDF0FD;} + .d2-110778175 .background-color-B6{background-color:#F7F8FE;} + .d2-110778175 .background-color-AA2{background-color:#4A6FF3;} + .d2-110778175 .background-color-AA4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AA5{background-color:#F7F8FE;} + .d2-110778175 .background-color-AB4{background-color:#EDF0FD;} + .d2-110778175 .background-color-AB5{background-color:#F7F8FE;} + .d2-110778175 .color-N1{color:#0A0F25;} + .d2-110778175 .color-N2{color:#676C7E;} + .d2-110778175 .color-N3{color:#9499AB;} + .d2-110778175 .color-N4{color:#CFD2DD;} + .d2-110778175 .color-N5{color:#DEE1EB;} + .d2-110778175 .color-N6{color:#EEF1F8;} + .d2-110778175 .color-N7{color:#FFFFFF;} + .d2-110778175 .color-B1{color:#0D32B2;} + .d2-110778175 .color-B2{color:#0D32B2;} + .d2-110778175 .color-B3{color:#E3E9FD;} + .d2-110778175 .color-B4{color:#E3E9FD;} + .d2-110778175 .color-B5{color:#EDF0FD;} + .d2-110778175 .color-B6{color:#F7F8FE;} + .d2-110778175 .color-AA2{color:#4A6FF3;} + .d2-110778175 .color-AA4{color:#EDF0FD;} + .d2-110778175 .color-AA5{color:#F7F8FE;} + .d2-110778175 .color-AB4{color:#EDF0FD;} + .d2-110778175 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json new file mode 100644 index 0000000000..9e2bb39a3d --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json @@ -0,0 +1,417 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 1 + }, + "width": 260, + "height": 192, + "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": "x", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.a", + "type": "rectangle", + "pos": { + "x": 60, + "y": 61 + }, + "width": 50, + "height": 72, + "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": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "x.b", + "type": "rectangle", + "pos": { + "x": 150, + "y": 61 + }, + "width": 50, + "height": 72, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 320, + "y": 0 + }, + "width": 260, + "height": 193, + "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": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.a", + "type": "rectangle", + "pos": { + "x": 380, + "y": 60 + }, + "width": 50, + "height": 73, + "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": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y.b", + "type": "rectangle", + "pos": { + "x": 470, + "y": 60 + }, + "width": 50, + "height": 73, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": 640, + "y": 16 + }, + "width": 363, + "height": 161, + "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": "z", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "z.lim", + "type": "text", + "pos": { + "x": 700, + "y": 76 + }, + "width": 162, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 162, + "labelHeight": 41, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z.add", + "type": "text", + "pos": { + "x": 902, + "y": 76 + }, + "width": 41, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 14, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "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 + } +} diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg new file mode 100644 index 0000000000..19eb55c2ea --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg @@ -0,0 +1,838 @@ +xyzabab + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json new file mode 100644 index 0000000000..b0873cb79b --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json @@ -0,0 +1,417 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 260, + "height": 192, + "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": "x", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.a", + "type": "rectangle", + "pos": { + "x": 72, + "y": 72 + }, + "width": 50, + "height": 72, + "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": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "x.b", + "type": "rectangle", + "pos": { + "x": 162, + "y": 72 + }, + "width": 50, + "height": 72, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 292, + "y": 12 + }, + "width": 260, + "height": 193, + "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": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.a", + "type": "rectangle", + "pos": { + "x": 352, + "y": 72 + }, + "width": 50, + "height": 73, + "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": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "y.b", + "type": "rectangle", + "pos": { + "x": 442, + "y": 72 + }, + "width": 50, + "height": 73, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": 572, + "y": 28 + }, + "width": 363, + "height": 161, + "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": "z", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "z.lim", + "type": "text", + "pos": { + "x": 632, + "y": 88 + }, + "width": 162, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 162, + "labelHeight": 41, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "z.add", + "type": "text", + "pos": { + "x": 834, + "y": 88 + }, + "width": 41, + "height": 41, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 14, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "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 + } +} diff --git a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg new file mode 100644 index 0000000000..0c95f71be9 --- /dev/null +++ b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg @@ -0,0 +1,838 @@ +xyzabab + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json index 15c3df1499..7b3ccd502f 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json @@ -2634,7 +2634,7 @@ "x": 3548, "y": 212 }, - "width": 359, + "width": 358, "height": 398, "opacity": 1, "strokeDash": 0, @@ -2675,7 +2675,7 @@ "x": 3608, "y": 272 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2713,10 +2713,10 @@ "id": "rows 3.b", "type": "rectangle", "pos": { - "x": 3701, + "x": 3747, "y": 272 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2754,10 +2754,10 @@ "id": "rows 3.c", "type": "rectangle", "pos": { - "x": 3794, - "y": 272 + "x": 3608, + "y": 378 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2795,7 +2795,7 @@ "id": "rows 3.d", "type": "rectangle", "pos": { - "x": 3608, + "x": 3747, "y": 378 }, "width": 99, @@ -2836,10 +2836,10 @@ "id": "rows 3.e", "type": "rectangle", "pos": { - "x": 3747, - "y": 378 + "x": 3608, + "y": 484 }, - "width": 99, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2877,10 +2877,10 @@ "id": "rows 3.f", "type": "rectangle", "pos": { - "x": 3608, + "x": 3701, "y": 484 }, - "width": 99, + "width": 51, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2918,10 +2918,10 @@ "id": "rows 3.g", "type": "rectangle", "pos": { - "x": 3747, + "x": 3792, "y": 484 }, - "width": 99, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2959,7 +2959,7 @@ "id": "columns 3", "type": "rectangle", "pos": { - "x": 3967, + "x": 3966, "y": 212 }, "width": 361, @@ -3000,7 +3000,7 @@ "id": "columns 3.a", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 272 }, "width": 53, @@ -3041,7 +3041,7 @@ "id": "columns 3.b", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 378 }, "width": 53, @@ -3082,7 +3082,7 @@ "id": "columns 3.c", "type": "rectangle", "pos": { - "x": 4027, + "x": 4026, "y": 484 }, "width": 53, @@ -3123,7 +3123,7 @@ "id": "columns 3.d", "type": "rectangle", "pos": { - "x": 4120, + "x": 4119, "y": 272 }, "width": 54, @@ -3164,7 +3164,7 @@ "id": "columns 3.e", "type": "rectangle", "pos": { - "x": 4120, + "x": 4119, "y": 431 }, "width": 54, @@ -3205,7 +3205,7 @@ "id": "columns 3.f", "type": "rectangle", "pos": { - "x": 4214, + "x": 4213, "y": 272 }, "width": 54, @@ -3246,7 +3246,7 @@ "id": "columns 3.g", "type": "rectangle", "pos": { - "x": 4214, + "x": 4213, "y": 431 }, "width": 54, @@ -3287,7 +3287,7 @@ "id": "widths heights", "type": "rectangle", "pos": { - "x": 4388, + "x": 4387, "y": 28 }, "width": 886, @@ -3328,7 +3328,7 @@ "id": "widths heights.a w200", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 88 }, "width": 200, @@ -3369,7 +3369,7 @@ "id": "widths heights.b h300", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 88 }, "width": 86, @@ -3410,7 +3410,7 @@ "id": "widths heights.c", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 88 }, "width": 400, @@ -3451,7 +3451,7 @@ "id": "widths heights.d h200", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 428 }, "width": 200, @@ -3492,7 +3492,7 @@ "id": "widths heights.e", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 428 }, "width": 86, @@ -3533,7 +3533,7 @@ "id": "widths heights.f w400", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 428 }, "width": 400, @@ -3574,7 +3574,7 @@ "id": "widths heights.g", "type": "rectangle", "pos": { - "x": 4448, + "x": 4447, "y": 668 }, "width": 200, @@ -3615,7 +3615,7 @@ "id": "widths heights.h", "type": "rectangle", "pos": { - "x": 4688, + "x": 4687, "y": 668 }, "width": 86, @@ -3656,7 +3656,7 @@ "id": "widths heights.i", "type": "rectangle", "pos": { - "x": 4814, + "x": 4813, "y": 668 }, "width": 400, diff --git a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg index f19b8aca89..c2b4234c80 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - + .d2-2040055327 .fill-N1{fill:#0A0F25;} + .d2-2040055327 .fill-N2{fill:#676C7E;} + .d2-2040055327 .fill-N3{fill:#9499AB;} + .d2-2040055327 .fill-N4{fill:#CFD2DD;} + .d2-2040055327 .fill-N5{fill:#DEE1EB;} + .d2-2040055327 .fill-N6{fill:#EEF1F8;} + .d2-2040055327 .fill-N7{fill:#FFFFFF;} + .d2-2040055327 .fill-B1{fill:#0D32B2;} + .d2-2040055327 .fill-B2{fill:#0D32B2;} + .d2-2040055327 .fill-B3{fill:#E3E9FD;} + .d2-2040055327 .fill-B4{fill:#E3E9FD;} + .d2-2040055327 .fill-B5{fill:#EDF0FD;} + .d2-2040055327 .fill-B6{fill:#F7F8FE;} + .d2-2040055327 .fill-AA2{fill:#4A6FF3;} + .d2-2040055327 .fill-AA4{fill:#EDF0FD;} + .d2-2040055327 .fill-AA5{fill:#F7F8FE;} + .d2-2040055327 .fill-AB4{fill:#EDF0FD;} + .d2-2040055327 .fill-AB5{fill:#F7F8FE;} + .d2-2040055327 .stroke-N1{stroke:#0A0F25;} + .d2-2040055327 .stroke-N2{stroke:#676C7E;} + .d2-2040055327 .stroke-N3{stroke:#9499AB;} + .d2-2040055327 .stroke-N4{stroke:#CFD2DD;} + .d2-2040055327 .stroke-N5{stroke:#DEE1EB;} + .d2-2040055327 .stroke-N6{stroke:#EEF1F8;} + .d2-2040055327 .stroke-N7{stroke:#FFFFFF;} + .d2-2040055327 .stroke-B1{stroke:#0D32B2;} + .d2-2040055327 .stroke-B2{stroke:#0D32B2;} + .d2-2040055327 .stroke-B3{stroke:#E3E9FD;} + .d2-2040055327 .stroke-B4{stroke:#E3E9FD;} + .d2-2040055327 .stroke-B5{stroke:#EDF0FD;} + .d2-2040055327 .stroke-B6{stroke:#F7F8FE;} + .d2-2040055327 .stroke-AA2{stroke:#4A6FF3;} + .d2-2040055327 .stroke-AA4{stroke:#EDF0FD;} + .d2-2040055327 .stroke-AA5{stroke:#F7F8FE;} + .d2-2040055327 .stroke-AB4{stroke:#EDF0FD;} + .d2-2040055327 .stroke-AB5{stroke:#F7F8FE;} + .d2-2040055327 .background-color-N1{background-color:#0A0F25;} + .d2-2040055327 .background-color-N2{background-color:#676C7E;} + .d2-2040055327 .background-color-N3{background-color:#9499AB;} + .d2-2040055327 .background-color-N4{background-color:#CFD2DD;} + .d2-2040055327 .background-color-N5{background-color:#DEE1EB;} + .d2-2040055327 .background-color-N6{background-color:#EEF1F8;} + .d2-2040055327 .background-color-N7{background-color:#FFFFFF;} + .d2-2040055327 .background-color-B1{background-color:#0D32B2;} + .d2-2040055327 .background-color-B2{background-color:#0D32B2;} + .d2-2040055327 .background-color-B3{background-color:#E3E9FD;} + .d2-2040055327 .background-color-B4{background-color:#E3E9FD;} + .d2-2040055327 .background-color-B5{background-color:#EDF0FD;} + .d2-2040055327 .background-color-B6{background-color:#F7F8FE;} + .d2-2040055327 .background-color-AA2{background-color:#4A6FF3;} + .d2-2040055327 .background-color-AA4{background-color:#EDF0FD;} + .d2-2040055327 .background-color-AA5{background-color:#F7F8FE;} + .d2-2040055327 .background-color-AB4{background-color:#EDF0FD;} + .d2-2040055327 .background-color-AB5{background-color:#F7F8FE;} + .d2-2040055327 .color-N1{color:#0A0F25;} + .d2-2040055327 .color-N2{color:#676C7E;} + .d2-2040055327 .color-N3{color:#9499AB;} + .d2-2040055327 .color-N4{color:#CFD2DD;} + .d2-2040055327 .color-N5{color:#DEE1EB;} + .d2-2040055327 .color-N6{color:#EEF1F8;} + .d2-2040055327 .color-N7{color:#FFFFFF;} + .d2-2040055327 .color-B1{color:#0D32B2;} + .d2-2040055327 .color-B2{color:#0D32B2;} + .d2-2040055327 .color-B3{color:#E3E9FD;} + .d2-2040055327 .color-B4{color:#E3E9FD;} + .d2-2040055327 .color-B5{color:#EDF0FD;} + .d2-2040055327 .color-B6{color:#F7F8FE;} + .d2-2040055327 .color-AA2{color:#4A6FF3;} + .d2-2040055327 .color-AA4{color:#EDF0FD;} + .d2-2040055327 .color-AA5{color:#F7F8FE;} + .d2-2040055327 .color-AB4{color:#EDF0FD;} + .d2-2040055327 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/elk/board.exp.json b/e2etests/testdata/stable/grid_tests/elk/board.exp.json index 95b4c1c125..a0054417bd 100644 --- a/e2etests/testdata/stable/grid_tests/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/elk/board.exp.json @@ -2634,7 +2634,7 @@ "x": 3240, "y": 224 }, - "width": 359, + "width": 358, "height": 398, "opacity": 1, "strokeDash": 0, @@ -2675,7 +2675,7 @@ "x": 3300, "y": 284 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2713,10 +2713,10 @@ "id": "rows 3.b", "type": "rectangle", "pos": { - "x": 3393, + "x": 3439, "y": 284 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2754,10 +2754,10 @@ "id": "rows 3.c", "type": "rectangle", "pos": { - "x": 3486, - "y": 284 + "x": 3300, + "y": 390 }, - "width": 53, + "width": 99, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2795,7 +2795,7 @@ "id": "rows 3.d", "type": "rectangle", "pos": { - "x": 3300, + "x": 3439, "y": 390 }, "width": 99, @@ -2836,10 +2836,10 @@ "id": "rows 3.e", "type": "rectangle", "pos": { - "x": 3439, - "y": 390 + "x": 3300, + "y": 496 }, - "width": 99, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2877,10 +2877,10 @@ "id": "rows 3.f", "type": "rectangle", "pos": { - "x": 3300, + "x": 3393, "y": 496 }, - "width": 99, + "width": 51, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2918,10 +2918,10 @@ "id": "rows 3.g", "type": "rectangle", "pos": { - "x": 3439, + "x": 3484, "y": 496 }, - "width": 99, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2959,7 +2959,7 @@ "id": "columns 3", "type": "rectangle", "pos": { - "x": 3619, + "x": 3618, "y": 224 }, "width": 361, @@ -3000,7 +3000,7 @@ "id": "columns 3.a", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 284 }, "width": 53, @@ -3041,7 +3041,7 @@ "id": "columns 3.b", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 390 }, "width": 53, @@ -3082,7 +3082,7 @@ "id": "columns 3.c", "type": "rectangle", "pos": { - "x": 3679, + "x": 3678, "y": 496 }, "width": 53, @@ -3123,7 +3123,7 @@ "id": "columns 3.d", "type": "rectangle", "pos": { - "x": 3772, + "x": 3771, "y": 284 }, "width": 54, @@ -3164,7 +3164,7 @@ "id": "columns 3.e", "type": "rectangle", "pos": { - "x": 3772, + "x": 3771, "y": 443 }, "width": 54, @@ -3205,7 +3205,7 @@ "id": "columns 3.f", "type": "rectangle", "pos": { - "x": 3866, + "x": 3865, "y": 284 }, "width": 54, @@ -3246,7 +3246,7 @@ "id": "columns 3.g", "type": "rectangle", "pos": { - "x": 3866, + "x": 3865, "y": 443 }, "width": 54, @@ -3287,7 +3287,7 @@ "id": "widths heights", "type": "rectangle", "pos": { - "x": 4000, + "x": 3999, "y": 40 }, "width": 886, @@ -3328,7 +3328,7 @@ "id": "widths heights.a w200", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 100 }, "width": 200, @@ -3369,7 +3369,7 @@ "id": "widths heights.b h300", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 100 }, "width": 86, @@ -3410,7 +3410,7 @@ "id": "widths heights.c", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 100 }, "width": 400, @@ -3451,7 +3451,7 @@ "id": "widths heights.d h200", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 440 }, "width": 200, @@ -3492,7 +3492,7 @@ "id": "widths heights.e", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 440 }, "width": 86, @@ -3533,7 +3533,7 @@ "id": "widths heights.f w400", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 440 }, "width": 400, @@ -3574,7 +3574,7 @@ "id": "widths heights.g", "type": "rectangle", "pos": { - "x": 4060, + "x": 4059, "y": 680 }, "width": 200, @@ -3615,7 +3615,7 @@ "id": "widths heights.h", "type": "rectangle", "pos": { - "x": 4300, + "x": 4299, "y": 680 }, "width": 86, @@ -3656,7 +3656,7 @@ "id": "widths heights.i", "type": "rectangle", "pos": { - "x": 4426, + "x": 4425, "y": 680 }, "width": 400, diff --git a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg index 8fa5cd3a47..c39ec3d644 100644 --- a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - + .d2-1810002325 .fill-N1{fill:#0A0F25;} + .d2-1810002325 .fill-N2{fill:#676C7E;} + .d2-1810002325 .fill-N3{fill:#9499AB;} + .d2-1810002325 .fill-N4{fill:#CFD2DD;} + .d2-1810002325 .fill-N5{fill:#DEE1EB;} + .d2-1810002325 .fill-N6{fill:#EEF1F8;} + .d2-1810002325 .fill-N7{fill:#FFFFFF;} + .d2-1810002325 .fill-B1{fill:#0D32B2;} + .d2-1810002325 .fill-B2{fill:#0D32B2;} + .d2-1810002325 .fill-B3{fill:#E3E9FD;} + .d2-1810002325 .fill-B4{fill:#E3E9FD;} + .d2-1810002325 .fill-B5{fill:#EDF0FD;} + .d2-1810002325 .fill-B6{fill:#F7F8FE;} + .d2-1810002325 .fill-AA2{fill:#4A6FF3;} + .d2-1810002325 .fill-AA4{fill:#EDF0FD;} + .d2-1810002325 .fill-AA5{fill:#F7F8FE;} + .d2-1810002325 .fill-AB4{fill:#EDF0FD;} + .d2-1810002325 .fill-AB5{fill:#F7F8FE;} + .d2-1810002325 .stroke-N1{stroke:#0A0F25;} + .d2-1810002325 .stroke-N2{stroke:#676C7E;} + .d2-1810002325 .stroke-N3{stroke:#9499AB;} + .d2-1810002325 .stroke-N4{stroke:#CFD2DD;} + .d2-1810002325 .stroke-N5{stroke:#DEE1EB;} + .d2-1810002325 .stroke-N6{stroke:#EEF1F8;} + .d2-1810002325 .stroke-N7{stroke:#FFFFFF;} + .d2-1810002325 .stroke-B1{stroke:#0D32B2;} + .d2-1810002325 .stroke-B2{stroke:#0D32B2;} + .d2-1810002325 .stroke-B3{stroke:#E3E9FD;} + .d2-1810002325 .stroke-B4{stroke:#E3E9FD;} + .d2-1810002325 .stroke-B5{stroke:#EDF0FD;} + .d2-1810002325 .stroke-B6{stroke:#F7F8FE;} + .d2-1810002325 .stroke-AA2{stroke:#4A6FF3;} + .d2-1810002325 .stroke-AA4{stroke:#EDF0FD;} + .d2-1810002325 .stroke-AA5{stroke:#F7F8FE;} + .d2-1810002325 .stroke-AB4{stroke:#EDF0FD;} + .d2-1810002325 .stroke-AB5{stroke:#F7F8FE;} + .d2-1810002325 .background-color-N1{background-color:#0A0F25;} + .d2-1810002325 .background-color-N2{background-color:#676C7E;} + .d2-1810002325 .background-color-N3{background-color:#9499AB;} + .d2-1810002325 .background-color-N4{background-color:#CFD2DD;} + .d2-1810002325 .background-color-N5{background-color:#DEE1EB;} + .d2-1810002325 .background-color-N6{background-color:#EEF1F8;} + .d2-1810002325 .background-color-N7{background-color:#FFFFFF;} + .d2-1810002325 .background-color-B1{background-color:#0D32B2;} + .d2-1810002325 .background-color-B2{background-color:#0D32B2;} + .d2-1810002325 .background-color-B3{background-color:#E3E9FD;} + .d2-1810002325 .background-color-B4{background-color:#E3E9FD;} + .d2-1810002325 .background-color-B5{background-color:#EDF0FD;} + .d2-1810002325 .background-color-B6{background-color:#F7F8FE;} + .d2-1810002325 .background-color-AA2{background-color:#4A6FF3;} + .d2-1810002325 .background-color-AA4{background-color:#EDF0FD;} + .d2-1810002325 .background-color-AA5{background-color:#F7F8FE;} + .d2-1810002325 .background-color-AB4{background-color:#EDF0FD;} + .d2-1810002325 .background-color-AB5{background-color:#F7F8FE;} + .d2-1810002325 .color-N1{color:#0A0F25;} + .d2-1810002325 .color-N2{color:#676C7E;} + .d2-1810002325 .color-N3{color:#9499AB;} + .d2-1810002325 .color-N4{color:#CFD2DD;} + .d2-1810002325 .color-N5{color:#DEE1EB;} + .d2-1810002325 .color-N6{color:#EEF1F8;} + .d2-1810002325 .color-N7{color:#FFFFFF;} + .d2-1810002325 .color-B1{color:#0D32B2;} + .d2-1810002325 .color-B2{color:#0D32B2;} + .d2-1810002325 .color-B3{color:#E3E9FD;} + .d2-1810002325 .color-B4{color:#E3E9FD;} + .d2-1810002325 .color-B5{color:#EDF0FD;} + .d2-1810002325 .color-B6{color:#F7F8FE;} + .d2-1810002325 .color-AA2{color:#4A6FF3;} + .d2-1810002325 .color-AA4{color:#EDF0FD;} + .d2-1810002325 .color-AA5{color:#F7F8FE;} + .d2-1810002325 .color-AB4{color:#EDF0FD;} + .d2-1810002325 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + \ No newline at end of file