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

Remove double circle shape

Browse source
This commit is contained in:
OneRain2333 2022-12-31 15:33:16 +08:00
parent 9575c768dc
commit 344718dad3
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2compiler/compile.go
View file

@ -806,7 +806,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, m *d2ast.Map, mk *d2ast.Key)
if reserved == "" { if reserved == "" {
c.errorf(mk.Range.Start, mk.Range.End, "image shapes cannot have children.") c.errorf(mk.Range.Start, mk.Range.End, "image shapes cannot have children.")
} }
case d2target.ShapeCircle, d2target.ShapeSquare, d2target.ShapeDoubleCircle: case d2target.ShapeCircle, d2target.ShapeSquare:
checkEqual := (reserved == "width" && obj.Attributes.Height != nil) || checkEqual := (reserved == "width" && obj.Attributes.Height != nil) ||
(reserved == "height" && obj.Attributes.Width != nil) (reserved == "height" && obj.Attributes.Width != nil)

4
d2graph/d2graph.go
View file

@ -363,7 +363,7 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string {
shape := obj.Attributes.Shape.Value shape := obj.Attributes.Shape.Value
if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeDoubleCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) { if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) {
if level == 1 { if level == 1 {
if !obj.IsContainer() { if !obj.IsContainer() {
return theme.Colors.B6 return theme.Colors.B6
@ -1148,7 +1148,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
paddingX, paddingY := obj.GetPadding() paddingX, paddingY := obj.GetPadding()
switch shapeType { switch shapeType {
case d2target.ShapeSquare, d2target.ShapeCircle, d2target.ShapeDoubleCircle: case d2target.ShapeSquare, d2target.ShapeCircle:
if desiredWidth != 0 || desiredHeight != 0 { if desiredWidth != 0 || desiredHeight != 0 {
paddingX = 0. paddingX = 0.
paddingY = 0. paddingY = 0.

14
d2renderers/d2svg/d2svg.go
View file

@ -791,20 +791,6 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske
fmt.Fprint(writer, renderDoubleOval(tl, width, height, style)) fmt.Fprint(writer, renderDoubleOval(tl, width, height, style))
} }
} }
// case d2target.ShapeDoubleCircle:
// if targetShape.Multiple {
// fmt.Fprint(writer, renderDoubleCircle(multipleTL, width, height, style))
// }
// if sketchRunner != nil {
// out, err := d2sketch.DoubleOval(sketchRunner, targetShape)
// if err != nil {
// return "", err
// }
// fmt.Fprintf(writer, out)
// } else {
// fmt.Fprint(writer, renderDoubleCircle(tl, width, height, style))
// }
case d2target.ShapeImage: case d2target.ShapeImage:
fmt.Fprintf(writer, `<image href="%s" x="%d" y="%d" width="%d" height="%d" style="%s" />`, fmt.Fprintf(writer, `<image href="%s" x="%d" y="%d" width="%d" height="%d" style="%s" />`,
html.EscapeString(targetShape.Icon.String()), html.EscapeString(targetShape.Icon.String()),

2
d2target/d2target.go
View file

@ -428,7 +428,6 @@ const (
ShapeSQLTable = "sql_table" ShapeSQLTable = "sql_table"
ShapeImage = "image" ShapeImage = "image"
ShapeSequenceDiagram = "sequence_diagram" ShapeSequenceDiagram = "sequence_diagram"
ShapeDoubleCircle = "double_circle"
) )
var Shapes = []string{ var Shapes = []string{
@ -455,7 +454,6 @@ var Shapes = []string{
ShapeSQLTable, ShapeSQLTable,
ShapeImage, ShapeImage,
ShapeSequenceDiagram, ShapeSequenceDiagram,
ShapeDoubleCircle,
} }
func IsShape(s string) bool { func IsShape(s string) bool {