This commit is contained in:
Alexander Wang 2022-12-30 12:40:52 -08:00
parent 761d399d3a
commit 3f540809ac
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
2 changed files with 5 additions and 5 deletions

View file

@ -18,7 +18,7 @@ func init() {
} }
type dagrePlugin struct { type dagrePlugin struct {
opts *d2dagrelayout.Opts opts *d2dagrelayout.ConfigurableOpts
} }
func (p dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) { func (p dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
@ -42,7 +42,7 @@ func (p dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
func (p *dagrePlugin) HydrateOpts(opts []byte) error { func (p *dagrePlugin) HydrateOpts(opts []byte) error {
if opts != nil { if opts != nil {
var dagreOpts d2dagrelayout.Opts var dagreOpts d2dagrelayout.ConfigurableOpts
err := json.Unmarshal(opts, &dagreOpts) err := json.Unmarshal(opts, &dagreOpts)
if err != nil { if err != nil {
return xmain.UsageErrorf("non-dagre layout options given for dagre") return xmain.UsageErrorf("non-dagre layout options given for dagre")

View file

@ -33,7 +33,7 @@ func (p elkPlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
{ {
Name: "elk-nodeNodeBetweenLayers", Name: "elk-nodeNodeBetweenLayers",
Type: "int64", Type: "int64",
Default: d2elklayout.DefaultOpts.NodeSpacing, Default: int64(d2elklayout.DefaultOpts.NodeSpacing),
Usage: "the spacing to be preserved between any pair of nodes of two adjacent layers. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-layered-spacing-nodeNodeBetweenLayers.html", Usage: "the spacing to be preserved between any pair of nodes of two adjacent layers. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-layered-spacing-nodeNodeBetweenLayers.html",
Tag: "spacing.nodeNodeBetweenLayers", Tag: "spacing.nodeNodeBetweenLayers",
}, },
@ -47,14 +47,14 @@ func (p elkPlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
{ {
Name: "elk-edgeNodeBetweenLayers", Name: "elk-edgeNodeBetweenLayers",
Type: "int64", Type: "int64",
Default: d2elklayout.DefaultOpts.EdgeNodeSpacing, Default: int64(d2elklayout.DefaultOpts.EdgeNodeSpacing),
Usage: "the spacing to be preserved between nodes and edges that are routed next to the nodes layer. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-layered-spacing-edgeNodeBetweenLayers.html", Usage: "the spacing to be preserved between nodes and edges that are routed next to the nodes layer. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-layered-spacing-edgeNodeBetweenLayers.html",
Tag: "spacing.edgeNodeBetweenLayers", Tag: "spacing.edgeNodeBetweenLayers",
}, },
{ {
Name: "elk-nodeSelfLoop", Name: "elk-nodeSelfLoop",
Type: "int64", Type: "int64",
Default: d2elklayout.DefaultOpts.SelfLoopSpacing, Default: int64(d2elklayout.DefaultOpts.SelfLoopSpacing),
Usage: "spacing to be preserved between a node and its self loops. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-spacing-nodeSelfLoop.html", Usage: "spacing to be preserved between a node and its self loops. https://www.eclipse.org/elk/reference/options/org-eclipse-elk-spacing-nodeSelfLoop.html",
Tag: "elk.spacing.nodeSelfLoop", Tag: "elk.spacing.nodeSelfLoop",
}, },