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

Tried making values equal to TS project.

Browse source
This commit is contained in:
Paracelsus-Rose 2023-01-15 01:36:58 -05:00
parent 75c0dee349
commit 5cfc71f271
No known key found for this signature in database
GPG key ID: FAF65C0792F4524E
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
d2renderers/d2svg/d2svg.go
View file

@ -115,8 +115,8 @@ func arrowheadDimensions(arrowhead d2target.Arrowhead, strokeWidth float64) (wid
widthMultiplier = 11 widthMultiplier = 11
heightMultiplier = 9 heightMultiplier = 9
case d2target.FilledCircleArrowhead, d2target.CircleArrowhead: case d2target.FilledCircleArrowhead, d2target.CircleArrowhead:
widthMultiplier = 14 widthMultiplier = 12
heightMultiplier = 14 heightMultiplier = 12
case d2target.CfOne, d2target.CfMany, d2target.CfOneRequired, d2target.CfManyRequired: case d2target.CfOne, d2target.CfMany, d2target.CfOneRequired, d2target.CfManyRequired:
widthMultiplier = 14 widthMultiplier = 14
heightMultiplier = 15 heightMultiplier = 15
@ -230,16 +230,19 @@ func arrowheadMarker(isTarget bool, id string, connection d2target.Connection) s
case d2target.FilledCircleArrowhead: case d2target.FilledCircleArrowhead:
attrs := fmt.Sprintf(`class="connection" fill="%s" stroke-width="%d"`, connection.Stroke, connection.StrokeWidth) attrs := fmt.Sprintf(`class="connection" fill="%s" stroke-width="%d"`, connection.Stroke, connection.StrokeWidth)
if isTarget { if isTarget {
path = fmt.Sprintf(`<circle %s clip-path="circle()" cx="%f" cy="%f" r="%f"/>`, path = fmt.Sprintf(`<circle %s clip-path="circle()" cx="%f" cy="%f" r="%f"/>`,
attrs, attrs,
width-10.3+strokeWidth/3, height/2, 3.2*4+2.2,
width/2.9, (height/1.6)/strokeWidth*2,
(width/3.2)/strokeWidth*2,
) )
} else { } else {
path = fmt.Sprintf(`<circle %s clip-path="circle()" cx="%f" cy="%f" r="%f"/>`, path = fmt.Sprintf(`<circle %s clip-path="circle()" cx="%f" cy="%f" r="%f"/>`,
attrs, attrs,
width-19+strokeWidth/3, height/2, 3.2*4+2.2,
width/2.9, (height/1.6)/strokeWidth*2,
(width/3.2)/strokeWidth*2,
) )
} }
case d2target.CircleArrowhead: case d2target.CircleArrowhead:
@ -247,14 +250,16 @@ func arrowheadMarker(isTarget bool, id string, connection d2target.Connection) s
if isTarget { if isTarget {
path = fmt.Sprintf(`<circle %s cx="%f" cy="%f" r="%f"/>`, path = fmt.Sprintf(`<circle %s cx="%f" cy="%f" r="%f"/>`,
attrs, attrs,
width/2+3.6+strokeWidth/3, height/2, 3.2*4+2.2,
width/3.2, (height/1.6)/strokeWidth*2,
(width/3.2)/strokeWidth*2,
) )
} else { } else {
path = fmt.Sprintf(`<circle %s cx="%f" cy="%f" r="%f"/>`, path = fmt.Sprintf(`<circle %s cx="%f" cy="%f" r="%f"/>`,
attrs, attrs,
width/2-4.9+strokeWidth/3, height/2, 3.2*4+2.2,
width/3.2, (height/1.6)/strokeWidth*2,
(width/3.2)/strokeWidth*2,
) )
} }
@ -304,7 +309,7 @@ func arrowheadMarker(isTarget bool, id string, connection d2target.Connection) s
var refX float64 var refX float64
refY := height / 2 refY := height / 2
switch arrowhead { switch arrowhead {
case d2target.DiamondArrowhead: case d2target.DiamondArrowhead, d2target.CircleArrowhead:
if isTarget { if isTarget {
refX = width - 0.6*strokeWidth refX = width - 0.6*strokeWidth
} else { } else {