diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..72037ad46
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.go.formatter.settings.were.checked": "true",
+ "RunOnceActivity.go.migrated.go.modules.settings": "true",
+ "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "go.import.settings.migrated": "true",
+ "go.sdk.automatically.set": "true",
+ "last_opened_file_path": "/home/onerain233",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "settings.editor.selected.configurable": "reference.settings.ide.settings.new.ui"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
\ No newline at end of file
diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go
index 20eaeb364..e95a6fe5a 100644
--- a/d2renderers/d2sketch/sketch.go
+++ b/d2renderers/d2sketch/sketch.go
@@ -98,7 +98,7 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) {
strokeWidth: %d,
%s
});`, shape.Width, shape.Height, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps)
- pathsBigRect, err := computeRoughPaths(r, jsBigRect)
+ pathsBigRect, err := computeRoughPathData(r, jsBigRect)
if err != nil {
return "", err
}
@@ -108,7 +108,7 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) {
strokeWidth: %d,
%s
});`, shape.Width-d2target.INNER_BORDER_OFFSET*2, shape.Height-d2target.INNER_BORDER_OFFSET*2, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps)
- pathsSmallRect, err := computeRoughPaths(r, jsSmallRect)
+ pathsSmallRect, err := computeRoughPathData(r, jsSmallRect)
if err != nil {
return "", err
}
@@ -116,13 +116,13 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) {
for _, p := range pathsBigRect {
output += fmt.Sprintf(
``,
- shape.Pos.X, shape.Pos.Y, p, shapeStyle(shape),
+ shape.Pos.X, shape.Pos.Y, p, shape.CSSStyle(),
)
}
for _, p := range pathsSmallRect {
output += fmt.Sprintf(
``,
- shape.Pos.X+d2target.INNER_BORDER_OFFSET, shape.Pos.Y+d2target.INNER_BORDER_OFFSET, p, shapeStyle(shape),
+ shape.Pos.X+d2target.INNER_BORDER_OFFSET, shape.Pos.Y+d2target.INNER_BORDER_OFFSET, p, shape.CSSStyle(),
)
}
output += fmt.Sprintf(
@@ -170,11 +170,11 @@ func DoubleOval(r *Runner, shape d2target.Shape) (string, error) {
strokeWidth: %d,
%s
});`, shape.Width/2, shape.Height/2, shape.Width-d2target.INNER_BORDER_OFFSET*2, shape.Height-d2target.INNER_BORDER_OFFSET*2, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps)
- pathsBigCircle, err := computeRoughPaths(r, jsBigCircle)
+ pathsBigCircle, err := computeRoughPathData(r, jsBigCircle)
if err != nil {
return "", err
}
- pathsSmallCircle, err := computeRoughPaths(r, jsSmallCircle)
+ pathsSmallCircle, err := computeRoughPathData(r, jsSmallCircle)
if err != nil {
return "", err
}
@@ -182,13 +182,13 @@ func DoubleOval(r *Runner, shape d2target.Shape) (string, error) {
for _, p := range pathsBigCircle {
output += fmt.Sprintf(
``,
- shape.Pos.X, shape.Pos.Y, p, shapeStyle(shape),
+ shape.Pos.X, shape.Pos.Y, p, shape.CSSStyle(),
)
}
for _, p := range pathsSmallCircle {
output += fmt.Sprintf(
``,
- shape.Pos.X, shape.Pos.Y, p, shapeStyle(shape),
+ shape.Pos.X, shape.Pos.Y, p, shape.CSSStyle(),
)
}
output += fmt.Sprintf(
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index 229f9b2fd..e5a3412e4 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -794,6 +794,7 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske
fmt.Fprint(writer, renderOval(tl, width, height, style))
}
}
+
case d2target.ShapeImage:
fmt.Fprintf(writer, ``,
html.EscapeString(targetShape.Icon.String()),