From 9b03fea3d4543e43801e803d03437ccfe3b57d33 Mon Sep 17 00:00:00 2001 From: Ivan Shubin Date: Tue, 28 Jan 2025 21:06:44 +0100 Subject: [PATCH] added dragging of nodes in sankey diagram --- assets/templates/diagrams/sankey.json | 2 +- assets/templates/diagrams/sankey.yaml | 18 +++- assets/templates/diagrams/src/sankey.sch | 132 ++++++++++++----------- 3 files changed, 84 insertions(+), 68 deletions(-) diff --git a/assets/templates/diagrams/sankey.json b/assets/templates/diagrams/sankey.json index c0e67953..7547104f 100644 --- a/assets/templates/diagrams/sankey.json +++ b/assets/templates/diagrams/sankey.json @@ -1 +1 @@ -{"name": "Sankey diagram", "description": "", "args": {"nodes": {"type": "string", "value": "a1_1;x=0;y=0;|a1_2|a2", "name": "Nodes encoded", "hidden": true}, "connections": {"type": "string", "value": "a1_1-a2;s=a1_1;d=a2;v=100|a1_2-a2;s=a1_2;d=a2;v=30", "name": "Connections encoded", "hidden": true}, "diagramCode": {"type": "string", "value": "Wages [2000] Budget\nOther [120] Budget\nBudget [1000] Housing\nBudget [450] Taxes\n", "name": "Diagram", "textarea": true, "rows": 15}, "font": {"type": "font", "value": "Arial", "name": "Font"}, "colorTheme": {"type": "choice", "value": "default", "options": ["default", "light", "dark"], "name": "Color theme"}, "connectorColorType": {"type": "choice", "value": "gradient", "options": ["gradient", "source", "destination", "custom"], "name": "Connection color type"}, "connectorColor": {"type": "color", "value": "#aaaaaa", "name": "Connection color", "depends": {"connectorColorType": "custom"}}, "fontSize": {"type": "number", "value": 14, "name": "Font size", "min": 1}, "labelColor": {"type": "color", "value": "#222222", "name": "Label color"}, "magnify": {"type": "number", "value": 0, "name": "Magnify value", "min": -50, "max": 50}}, "preview": "/assets/templates/previews/mind-map.svg", "defaultArea": {"x": 0, "y": 0, "w": 200, "h": 60}, "import": ["./src/item.sch", "./src/control.sch", "./src/sankey.sch"], "item": {"id": "root", "name": "Sankey diagram", "shape": "rect", "shapeProps": {"fill": {"type": "none"}, "strokeColor": "rgba(200,200,200,1)"}, "locked": false, "area": {"x": 0, "y": 0, "w": {"$-expr": "width"}, "h": {"$-expr": "height"}}, "childItems": [{"$-foreach": {"source": "connectorItems", "it": "it"}, "id": {"$-expr": "it.id"}, "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}, {"$-foreach": {"source": "nodeItems", "it": "it"}, "id": {"$-expr": "it.id"}, "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}, {"$-foreach": {"source": "nodeLabels", "it": "it"}, "id": {"$-expr": "it.id"}, "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}]}, "init": "\nstruct Item {\n id: uid()\n name: ''\n shape: 'rect'\n x: 0\n y: 0\n w: 100\n h: 50\n shapeProps: Map()\n childItems: List()\n args: Map()\n locked: true\n textSlots: Map()\n\n\n traverse(callback) {\n this.childItems.forEach((childItem) => {\n childItem.traverse(callback)\n })\n callback(this)\n }\n\n getArgs() {\n toJSON(this.args)\n }\n\n setText(slotName, text) {\n if (!this.textSlots.has(slotName)) {\n this.textSlots.set(slotName, Map('text', text))\n } else {\n this.textSlots.get(slotName).set('text', text)\n }\n }\n\n toJSON() {\n childItems = this.childItems.map((childItem) => { childItem.toJSON() })\n result = toJSON(Map(\n 'id', this.id,\n 'childItems', childItems,\n 'name', this.name,\n 'shape', this.shape,\n 'area', Map('x', this.x, 'y', this.y, 'w', this.w, 'h', this.h, 'r', 0, 'sx', 1, 'sy', 1, 'px', 0.5, 'py', 0.5),\n 'shapeProps', this.shapeProps,\n 'args', this.args,\n 'locked', this.locked,\n 'textSlots', this.textSlots,\n ))\n\n result\n }\n}\n\n\n\nstruct Control {\n name: \"\"\n data: Map()\n click: \"log('control clicked')\"\n x: 0\n y: 0\n width: 20\n height: 20\n text: \"+\"\n placement: \"TL\"\n selectedItemId: \"\"\n type: 'button'\n}\n\ngapRatio = 0.40\nnodeWidth = 20\nlabelPadding = 5\n\nlabelFontSize = max(1, round(fontSize * (100 - magnify) / 100))\nvalueFontSize = max(1, round(fontSize * (100 + magnify) / 100))\n\n\ncolorThemes = Map(\n 'default', List('#F16161', '#F1A261', '#F1EB61', '#71EB57', '#57EBB1', '#57C2EB', '#576BEB', '#A557EB', '#EB57C8', '#EB578E'),\n 'light', List('#FD9999', '#FDCA99', '#F9FD99', '#C2FD99', '#99FDA6', '#99FDE2', '#99EAFD', '#99BEFD', '#AE99FD', '#FD99F6'),\n 'dark', List('#921515', '#924E15', '#899215', '#4E9215', '#15922B', '#15926B', '#157F92', '#153F92', '#491592', '#921575')\n)\n\nstruct Node {\n id: uid()\n name: 'Unnamed'\n value: 0\n inValue: 0\n outValue: 0\n color: '#FD9999'\n x: 0\n y: 0\n level: 0\n sortOrder: 0 // Position inside of its level\n srcNodes: List()\n dstNodes: List()\n width: 0\n height: 0\n position: 0\n offset: 0\n unitSize: 1\n reservedIn: 0\n reservedOut: 0\n}\n\nfunc encodeNodes(nodes) {\n local result = ''\n\n nodes.forEach((n, i) => {\n if (i > 0) {\n result += '|'\n }\n result += `${n.id};v=${n.value};x=${n.x};y=${n.y}`\n })\n result\n}\n\nfunc decodeListOfObjects(text, constructorCallback, paramSetterCallback) {\n local nodes = List()\n splitString(text, '|').forEach(singleNodeText => {\n local node = constructorCallback()\n local parts = splitString(singleNodeText, ';')\n for (local i = 0; i < parts.size; i++) {\n if (i == 0) {\n node.id = parts.get(0)\n } else {\n local varValue = splitString(parts.get(i), '=')\n if (varValue.size == 2) {\n local name = varValue.get(0)\n local value = varValue.get(1)\n paramSetterCallback(node, name, value)\n }\n }\n }\n nodes.add(node)\n })\n nodes\n}\n\nfunc decodeNodes(text) {\n decodeListOfObjects(text, () => {\n Node()\n }, (node, name, value) => {\n if (name == 'x') {\n node.x = value\n } else if (name == 'y') {\n node.y = value\n }\n })\n}\n\n\nstruct Connection {\n id: uid()\n srcId: ''\n dstId: ''\n value: 0\n srcNode: null\n dstNode: null\n}\n\nfunc encodeConnections(connections) {\n local result = ''\n\n connections.forEach((c, i) => {\n if (i > 0) {\n result += '|'\n }\n result += `${c.id};s=${c.srcId};d=${c.dstId};v=${c.value}`\n })\n result\n}\n\nfunc decodeConnections(text) {\n decodeListOfObjects(text, () => {\n Connection()\n }, (node, name, value) => {\n if (name == 'v') {\n node.value = value\n } else if (name == 's') {\n node.srcId = value\n } else if (name == 'd') {\n node.dstId = value\n }\n })\n}\n\n\nfunc parseConnection(line) {\n local s1 = line.indexOf('[')\n local s2 = line.indexOf(']')\n\n if (s1 > 0 && s2 > s1) {\n local nodeName1 = line.substring(0, s1).trim()\n local nodeName2 = line.substring(s2+1).trim()\n local valueText = line.substring(s1+1, s2)\n\n if (nodeName1 != '' && nodeName2 != '') {\n local value = parseFloat(valueText)\n local id = nodeName1 + '[]' + nodeName2\n Connection(id, nodeName1, nodeName2, value)\n } else {\n null\n }\n } else {\n null\n }\n}\n\nfunc parseConnections(text) {\n local nodesById = Map()\n\n getOrCreateNode = (id) => {\n local node = nodesById.get(id)\n if (!node) {\n node = Node(id, id)\n nodesById.set(id, node)\n }\n node\n }\n\n local connections = List()\n splitString(text, '\\n').forEach(line => {\n line = line.trim()\n if (line != '' && !line.startsWith('//')) {\n local c = parseConnection(line)\n\n c.srcNode = getOrCreateNode(c.srcId)\n c.dstNode = getOrCreateNode(c.dstId)\n if (c) {\n connections.add(c)\n }\n }\n })\n connections\n}\n\nfunc extractNodesFromConnections(connections) {\n local nodeIds = Set()\n local list = List()\n\n connections.forEach(c => {\n if (!nodeIds.has(c.srcNode.id)) {\n nodeIds.add(c.srcNode.id)\n list.add(c.srcNode)\n }\n if (!nodeIds.has(c.dstNode.id)) {\n nodeIds.add(c.dstNode.id)\n list.add(c.dstNode)\n }\n })\n\n list\n}\n\n\n\n// Performs a recursive tree iteration and updates the levels in nodes\n// maxVisitCount is used in order to prevent from infinite loop in case there is a cyclic dependency\nfunc updateLevels(node, maxVisitCount) {\n if (maxVisitCount >= 0) {\n node.dstNodes.forEach(dstNode => {\n local newLevel = node.level + 1\n if (dstNode.level < newLevel) {\n dstNode.level = newLevel\n updateLevels(dstNode, maxVisitCount - 1)\n }\n dstNode.level = node.level + 1\n })\n }\n}\n\nstruct Level {\n idx: 0\n nodes: List()\n nodesMap: Map()\n totalValue: 0\n height: 0\n}\n\nfunc buildLevels(allNodes, allConnections) {\n local nodesMap = Map()\n allNodes.forEach(node => {\n nodesMap.set(node.id, node)\n })\n\n allConnections.forEach(c => {\n if (c.srcId != c.dstId) {\n local srcNode = nodesMap.get(c.srcId)\n if (!srcNode) {\n srcNode = Node(c.srcId)\n nodesMap.set(c.srcId, srcNode)\n }\n local dstNode = nodesMap.get(c.dstId)\n if (!dstNode) {\n dstNode = Node(c.dstId)\n nodesMap.set(c.dstId, dstNode)\n }\n\n local value = abs(c.value)\n srcNode.outValue += value\n dstNode.inValue += value\n srcNode.dstNodes.add(dstNode)\n dstNode.srcNodes.add(srcNode)\n }\n })\n\n nodesMap.forEach(node => {\n if (node.srcNodes.size == 0) {\n node.level = 0\n updateLevels(node, nodesMap.size)\n }\n })\n\n local levels = Map()\n local maxLevel = 0\n nodesMap.forEach(node => {\n node.value = max(node.inValue, node.outValue)\n local level = levels.get(node.level)\n if (level) {\n level.nodes.add(node)\n } else {\n levels.set(node.level, Level(node.level, List(node), nodesMap))\n }\n if (maxLevel < node.level) {\n maxLevel = node.level\n }\n })\n\n local allLevels = List()\n for (local i = 0; i <= maxLevel; i++) {\n local level = levels.get(i)\n if (level) {\n level.nodes.sort((a, b) => {\n b.value - a.value\n })\n level.nodes.forEach((n, idx) => {\n n.sortOrder = idx\n })\n allLevels.add(level)\n level.totalValue = 0\n level.nodes.forEach(node => {\n level.totalValue += node.value\n })\n }\n }\n\n allLevels\n}\n\n\nfunc buildNodeItems(levels) {\n local colorPalette = colorThemes.get(colorTheme)\n if (!colorPalette) {\n colorPalette = colorThemes.get('default')\n }\n\n local maxLevelValue = 0\n local maxNodesPerLevel = 0\n levels.forEach(level => {\n if (maxLevelValue < level.totalValue) {\n maxLevelValue = level.totalValue\n }\n if (maxNodesPerLevel < level.nodes.size) {\n maxNodesPerLevel = level.nodes.size\n }\n })\n\n local nodeItems = List()\n\n if (maxLevelValue > 0 && maxNodesPerLevel > 0) {\n local unitSize = height * (1 - gapRatio) / maxLevelValue\n local singleGap = height * gapRatio / maxNodesPerLevel\n\n levels.forEach(level => {\n local levelPosition = level.idx * max(1, width - nodeWidth) / (levels.size - 1)\n local levelSize = level.totalValue * unitSize + singleGap * (level.nodes.size - 1)\n local levelOffset = height / 2 - levelSize / 2\n\n local currentY = levelOffset\n level.nodes.forEach(node => {\n node.unitSize = unitSize\n node.height = unitSize * node.value\n node.width = nodeWidth\n node.position = levelPosition\n node.offset = currentY\n local hashCode = Strings.hashCode(node.name)\n node.color = colorPalette.get(abs(hashCode) % colorPalette.size)\n\n\n local nodeItem = Item('n-' + node.id, node.name, 'rect')\n nodeItem.w = node.width\n nodeItem.h = node.height\n nodeItem.x = node.position\n nodeItem.y = node.offset\n nodeItem.shapeProps.set('strokeSize', 1)\n nodeItem.shapeProps.set('strokeColor', '#ffffff')\n nodeItem.shapeProps.set('cornerRadius', 2)\n nodeItem.shapeProps.set('fill', Fill.solid(node.color))\n nodeItems.add(nodeItem)\n\n currentY += nodeItem.h + singleGap\n })\n })\n }\n nodeItems\n}\n\nfunc buildConnectorItems(levels, allConnections, allNodes) {\n local k2 = max(allConnections.size, allNodes.size)\n local k1 = k2 ^ 2\n local connectorItems = List()\n local connectionsBySource = Map()\n allConnections.forEach(c => {\n if (c.srcId != c.dstId) {\n local cs = connectionsBySource.get(c.srcId)\n if (cs) {\n cs.add(c)\n } else {\n connectionsBySource.set(c.srcId, List(c))\n }\n }\n })\n\n levels.forEach(level => {\n level.nodes.forEach(node => {\n local connections = connectionsBySource.get(node.id)\n if (connections) {\n connections.sort((a, b) => {\n a.dstNode.level * k1 + a.dstNode.sortOrder * k2 - (b.dstNode.level * k1 + b.dstNode.sortOrder * k2)\n })\n connections.forEach(c => {\n local dstNode = level.nodesMap.get(c.dstId)\n if (dstNode) {\n connectorItems.add(buildSingleConnectorItem(c, node, dstNode))\n }\n })\n }\n })\n })\n\n connectorItems\n}\n\nstruct PathPoint {\n t: 'B'\n x: 0\n y: 0\n x1: 0\n y1: 0\n x2: 0\n y2: 0\n}\n\nfunc buildSingleConnectorItem(connector, srcNode, dstNode) {\n local item = Item(connector.id, 'Connection', 'path')\n local connectorSize = srcNode.unitSize * connector.value\n local xs = srcNode.position + srcNode.width\n local ys1 = srcNode.offset + srcNode.reservedOut\n local ys2 = ys1 + connectorSize\n srcNode.reservedOut += connectorSize\n\n local xd = dstNode.position\n local yd1 = dstNode.offset + dstNode.reservedIn\n local yd2 = yd1 + connectorSize\n dstNode.reservedIn += connectorSize\n\n local minX = min(xs, xd)\n local maxX = max(xs, xd)\n local minY = min(ys1, ys2, yd1, yd2)\n local maxY = max(ys1, ys2, yd1, yd2)\n\n local dx = max(0.001, maxX - minX)\n local dy = max(0.001, maxY - minY)\n\n local points = List(\n PathPoint('B', xs, ys1, 0, (ys2 - ys1) / 3, (xd - xs) / 3, 0),\n PathPoint('B', xd, yd1, (xs - xd) / 3, 0, 0, (yd2 - yd1) / 3),\n PathPoint('B', xd, yd2, 0, (yd1 - yd2) / 3, (xs - xd) / 3, 0),\n PathPoint('B', xs, ys2, (xd - xs) / 3, 0, 0, (ys1 - ys2) / 3),\n ).map(p => {\n PathPoint('B',\n 100 * (p.x - minX) / dx, 100 * (p.y - minY) / dy,\n 100 * p.x1 / dx, 100 * p.y1 / dy,\n 100 * p.x2 / dx, 100 * p.y2 / dy\n )\n })\n\n item.x = minX\n item.y = minY\n item.w = dx\n item.h = dy\n\n if (connectorColorType == 'gradient') {\n item.shapeProps.set('fill', Fill.linearGradient(90, 0, srcNode.color, 100, dstNode.color))\n } else if (connectorColorType == 'source') {\n item.shapeProps.set('fill', Fill.solid(srcNode.color))\n } else if (connectorColorType == 'destination') {\n item.shapeProps.set('fill', Fill.solid(dstNode.color))\n } else {\n item.shapeProps.set('fill', Fill.solid(connectorColor))\n }\n item.shapeProps.set('strokeSize', 0)\n item.shapeProps.set('paths', List(Map(\n 'id', 'p-' + connector.id,\n 'closed', true,\n 'pos', 'relative',\n 'points', points\n )))\n item\n}\n\nfunc buildLabel(id, text, font, fontSize, halign, valign) {\n local item = Item(id, text, 'none')\n item.args.set('templateForceText', true)\n item.textSlots.set('body', Map(\n 'text', text,\n 'font', font,\n 'color', labelColor,\n 'fontSize', fontSize,\n 'halign', halign,\n 'valign', valign,\n 'paddingLeft', 0,\n 'paddingRight', 0,\n 'paddingTop', 0,\n 'paddingBottom', 0,\n 'whiteSpace', 'nowrap'\n ))\n item\n}\n\nfunc buildNodeLabels(nodes) {\n local labelItems = List()\n nodes.forEach(node => {\n local textSize = calculateTextSize(node.name, font, labelFontSize)\n local valueTextSize = calculateTextSize('' + node.value, font, valueFontSize)\n local totalHeight = (textSize.h + valueTextSize.h)*1.8 + 8\n local isLeft = node.dstNodes.size == 0\n local halign = 'left'\n if (!isLeft) {\n halign = 'right'\n }\n local item = buildLabel('ln-' + node.id, node.name, font, labelFontSize, halign, 'bottom')\n item.w = textSize.w + 4\n item.h = textSize.h * 1.8 + 4\n if (isLeft) {\n item.x = node.position - item.w - labelPadding\n } else {\n item.x = node.position + node.width + labelPadding\n }\n item.y = node.offset + node.height / 2 - totalHeight / 2\n\n labelItems.add(item)\n\n local valueLabel = buildLabel('lv-' + node.id, '' + node.value, font, valueFontSize, halign, 'top')\n valueLabel.w = valueTextSize.w + 4\n valueLabel.h = valueTextSize.h * 1.8 + 4\n if (isLeft) {\n valueLabel.x = node.position - valueLabel.w - labelPadding\n } else {\n valueLabel.x = node.position + node.width + labelPadding\n }\n valueLabel.y = item.y + item.h\n\n labelItems.add(valueLabel)\n })\n labelItems\n}\n\n\nallConnections = parseConnections(diagramCode)\nallNodes = extractNodesFromConnections(allConnections)\n\nlocal levels = buildLevels(allNodes, allConnections)\n\nnodeItems = buildNodeItems(levels)\nconnectorItems = buildConnectorItems(levels, allConnections, allNodes)\nnodeLabels = buildNodeLabels(allNodes)\n\n\n"} \ No newline at end of file +{"name": "Sankey diagram", "description": "", "args": {"nodesData": {"type": "string", "value": "a1_1;x=0;y=0;|a1_2|a2", "name": "Nodes encoded", "hidden": true}, "diagramCode": {"type": "string", "value": "Wages [2000] Budget\nOther [120] Budget\nBudget [1000] Housing\nBudget [450] Taxes\n", "name": "Diagram", "textarea": true, "rows": 15}, "font": {"type": "font", "value": "Arial", "name": "Font"}, "colorTheme": {"type": "choice", "value": "default", "options": ["default", "light", "dark"], "name": "Color theme"}, "connectorColorType": {"type": "choice", "value": "gradient", "options": ["gradient", "source", "destination", "custom"], "name": "Connection color type"}, "connectorColor": {"type": "color", "value": "#aaaaaa", "name": "Connection color", "depends": {"connectorColorType": "custom"}}, "fontSize": {"type": "number", "value": 14, "name": "Font size", "min": 1}, "labelColor": {"type": "color", "value": "#222222", "name": "Label color"}, "magnify": {"type": "number", "value": 0, "name": "Magnify value", "min": -50, "max": 50}, "connectorOpacity": {"type": "number", "value": 60, "name": "Connector opacity", "min": 0, "max": 100}}, "preview": "/assets/templates/previews/mind-map.svg", "defaultArea": {"x": 0, "y": 0, "w": 200, "h": 60}, "import": ["./src/item.sch", "./src/control.sch", "./src/sankey.sch"], "handlers": {"area": "onAreaUpdate(itemId, item, area)"}, "item": {"id": "root", "name": "Sankey diagram", "shape": "rect", "shapeProps": {"fill": {"type": "none"}, "strokeColor": "rgba(200,200,200,1)"}, "locked": false, "area": {"x": 0, "y": 0, "w": {"$-expr": "width"}, "h": {"$-expr": "height"}}, "childItems": [{"$-foreach": {"source": "connectorItems", "it": "it"}, "id": {"$-expr": "it.id"}, "tags": ["sankey-connector"], "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "opacity": {"$-expr": "connectorOpacity"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}, {"$-foreach": {"source": "nodeItems", "it": "it"}, "id": {"$-expr": "it.id"}, "tags": ["sankey-node"], "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}, {"$-foreach": {"source": "nodeLabels", "it": "it"}, "id": {"$-expr": "it.id"}, "name": {"$-expr": "it.name"}, "shape": {"$-expr": "it.shape"}, "shapeProps": {"$-expr": "toJSON(it.shapeProps)"}, "args": {"$-expr": "it.getArgs()"}, "locked": {"$-expr": "it.locked"}, "textSlots": {"$-expr": "toJSON(it.textSlots)"}, "area": {"x": {"$-expr": "it.x"}, "y": {"$-expr": "it.y"}, "w": {"$-expr": "it.w"}, "h": {"$-expr": "it.h"}}}]}, "init": "\nstruct Item {\n id: uid()\n name: ''\n shape: 'rect'\n x: 0\n y: 0\n w: 100\n h: 50\n shapeProps: Map()\n childItems: List()\n args: Map()\n locked: true\n textSlots: Map()\n\n\n traverse(callback) {\n this.childItems.forEach((childItem) => {\n childItem.traverse(callback)\n })\n callback(this)\n }\n\n getArgs() {\n toJSON(this.args)\n }\n\n setText(slotName, text) {\n if (!this.textSlots.has(slotName)) {\n this.textSlots.set(slotName, Map('text', text))\n } else {\n this.textSlots.get(slotName).set('text', text)\n }\n }\n\n toJSON() {\n childItems = this.childItems.map((childItem) => { childItem.toJSON() })\n result = toJSON(Map(\n 'id', this.id,\n 'childItems', childItems,\n 'name', this.name,\n 'shape', this.shape,\n 'area', Map('x', this.x, 'y', this.y, 'w', this.w, 'h', this.h, 'r', 0, 'sx', 1, 'sy', 1, 'px', 0.5, 'py', 0.5),\n 'shapeProps', this.shapeProps,\n 'args', this.args,\n 'locked', this.locked,\n 'textSlots', this.textSlots,\n ))\n\n result\n }\n}\n\n\n\nstruct Control {\n name: \"\"\n data: Map()\n click: \"log('control clicked')\"\n x: 0\n y: 0\n width: 20\n height: 20\n text: \"+\"\n placement: \"TL\"\n selectedItemId: \"\"\n type: 'button'\n}\n\ngapRatio = 0.4\nnodeWidth = 20\nlabelPadding = 5\n\nlabelFontSize = max(1, round(fontSize * (100 - magnify) / 100))\nvalueFontSize = max(1, round(fontSize * (100 + magnify) / 100))\n\nlocal nodesById = Map()\n\ncolorThemes = Map(\n 'default', List('#F16161', '#F1A261', '#F1EB61', '#71EB57', '#57EBB1', '#57C2EB', '#576BEB', '#A557EB', '#EB57C8', '#EB578E'),\n 'light', List('#FD9999', '#FDCA99', '#F9FD99', '#C2FD99', '#99FDA6', '#99FDE2', '#99EAFD', '#99BEFD', '#AE99FD', '#FD99F6'),\n 'dark', List('#921515', '#924E15', '#899215', '#4E9215', '#15922B', '#15926B', '#157F92', '#153F92', '#491592', '#921575')\n)\n\nstruct Node {\n id: uid()\n name: 'Unnamed'\n value: 0\n inValue: 0\n outValue: 0\n color: '#FD9999'\n x: 0\n y: 0\n level: 0\n sortOrder: 0 // Position inside of its level\n srcNodes: List()\n dstNodes: List()\n width: 0\n height: 0\n position: 0\n offset: 0\n unitSize: 1\n reservedIn: 0\n reservedOut: 0\n}\n\nfunc encodeNodes(nodes) {\n local result = ''\n\n nodes.forEach(n => {\n if (result != '') {\n result += '|'\n }\n result += `${n.id};x=${n.x};y=${n.y}`\n })\n result\n}\n\nfunc decodeNodesData(text) {\n local nodesById = Map()\n splitString(text, '|').forEach(singleNodeText => {\n local node = Node()\n local parts = splitString(singleNodeText, ';')\n for (local i = 0; i < parts.size; i++) {\n if (i == 0) {\n node.id = parts.get(0)\n } else {\n local varValue = splitString(parts.get(i), '=')\n if (varValue.size == 2) {\n local name = varValue.get(0)\n local value = varValue.get(1)\n if (name == 'x') {\n node.x = value\n } else if (name == 'y') {\n node.y = value\n }\n }\n }\n }\n nodesById.set(node.id, node)\n })\n nodesById\n}\n\n\nstruct Connection {\n id: uid()\n srcId: ''\n dstId: ''\n value: 0\n srcNode: null\n dstNode: null\n}\n\n\nfunc parseConnection(line) {\n local s1 = line.indexOf('[')\n local s2 = line.indexOf(']')\n\n if (s1 > 0 && s2 > s1) {\n local nodeName1 = line.substring(0, s1).trim()\n local nodeName2 = line.substring(s2+1).trim()\n local valueText = line.substring(s1+1, s2)\n\n if (nodeName1 != '' && nodeName2 != '') {\n local value = parseFloat(valueText)\n local id = nodeName1 + '[]' + nodeName2\n Connection(id, nodeName1, nodeName2, value)\n } else {\n null\n }\n } else {\n null\n }\n}\n\nfunc parseConnections(text, nodesData) {\n getOrCreateNode = (id) => {\n local node = nodesById.get(id)\n if (!node) {\n node = Node(id, id)\n nodesById.set(id, node)\n }\n local nData = nodesData.get(id)\n if (nData) {\n node.x = nData.x\n node.y = nData.y\n }\n node\n }\n\n local connections = List()\n splitString(text, '\\n').forEach(line => {\n line = line.trim()\n if (line != '' && !line.startsWith('//')) {\n local c = parseConnection(line)\n if (c) {\n c.srcNode = getOrCreateNode(c.srcId)\n c.dstNode = getOrCreateNode(c.dstId)\n if (c) {\n connections.add(c)\n }\n }\n }\n })\n connections\n}\n\nfunc extractNodesFromConnections(connections) {\n local nodeIds = Set()\n local list = List()\n\n connections.forEach(c => {\n if (!nodeIds.has(c.srcNode.id)) {\n nodeIds.add(c.srcNode.id)\n list.add(c.srcNode)\n }\n if (!nodeIds.has(c.dstNode.id)) {\n nodeIds.add(c.dstNode.id)\n list.add(c.dstNode)\n }\n })\n\n list\n}\n\n\n\n// Performs a recursive tree iteration and updates the levels in nodes\n// maxVisitCount is used in order to prevent from infinite loop in case there is a cyclic dependency\nfunc updateLevels(node, maxVisitCount) {\n if (maxVisitCount >= 0) {\n node.dstNodes.forEach(dstNode => {\n local newLevel = node.level + 1\n if (dstNode.level < newLevel) {\n dstNode.level = newLevel\n updateLevels(dstNode, maxVisitCount - 1)\n }\n })\n }\n}\n\nstruct Level {\n idx: 0\n nodes: List()\n nodesMap: Map()\n totalValue: 0\n height: 0\n}\n\nfunc buildLevels(allNodes, allConnections) {\n local nodesMap = Map()\n allNodes.forEach(node => {\n nodesMap.set(node.id, node)\n })\n\n allConnections.forEach(c => {\n if (c.srcId != c.dstId) {\n local srcNode = nodesMap.get(c.srcId)\n if (!srcNode) {\n srcNode = Node(c.srcId)\n nodesMap.set(c.srcId, srcNode)\n }\n local dstNode = nodesMap.get(c.dstId)\n if (!dstNode) {\n dstNode = Node(c.dstId)\n nodesMap.set(c.dstId, dstNode)\n }\n\n local value = abs(c.value)\n srcNode.outValue += value\n dstNode.inValue += value\n srcNode.dstNodes.add(dstNode)\n dstNode.srcNodes.add(srcNode)\n }\n })\n\n nodesMap.forEach(node => {\n if (node.srcNodes.size == 0) {\n node.level = 0\n updateLevels(node, nodesMap.size)\n }\n })\n\n local levels = Map()\n local maxLevel = 0\n nodesMap.forEach(node => {\n node.value = max(node.inValue, node.outValue)\n local level = levels.get(node.level)\n if (level) {\n level.nodes.add(node)\n } else {\n levels.set(node.level, Level(node.level, List(node), nodesMap))\n }\n if (maxLevel < node.level) {\n maxLevel = node.level\n }\n })\n\n local allLevels = List()\n for (local i = 0; i <= maxLevel; i++) {\n local level = levels.get(i)\n if (level) {\n level.nodes.sort((a, b) => {\n b.value - a.value\n })\n level.nodes.forEach((n, idx) => {\n n.sortOrder = idx\n })\n allLevels.add(level)\n level.totalValue = 0\n level.nodes.forEach(node => {\n level.totalValue += node.value\n })\n }\n }\n\n allLevels\n}\n\n\nfunc buildNodeItems(levels) {\n local colorPalette = colorThemes.get(colorTheme)\n if (!colorPalette) {\n colorPalette = colorThemes.get('default')\n }\n\n local maxLevelValue = 0\n local maxNodesPerLevel = 0\n levels.forEach(level => {\n if (maxLevelValue < level.totalValue) {\n maxLevelValue = level.totalValue\n }\n if (maxNodesPerLevel < level.nodes.size) {\n maxNodesPerLevel = level.nodes.size\n }\n })\n\n local nodeItems = List()\n\n if (maxLevelValue > 0 && maxNodesPerLevel > 0) {\n local unitSize = height * (1 - gapRatio) / maxLevelValue\n local singleGap = height * gapRatio / maxNodesPerLevel\n\n levels.forEach(level => {\n local levelPosition = level.idx * max(1, width - nodeWidth) / (levels.size - 1)\n local levelSize = level.totalValue * unitSize + singleGap * (level.nodes.size - 1)\n local levelOffset = height / 2 - levelSize / 2\n\n local currentY = levelOffset\n level.nodes.forEach(node => {\n node.unitSize = unitSize\n node.height = unitSize * node.value\n node.width = nodeWidth\n node.position = levelPosition\n node.offset = currentY\n local hashCode = Strings.hashCode(node.name)\n node.color = colorPalette.get(abs(hashCode) % colorPalette.size)\n\n\n local nodeItem = Item('n-' + node.id, node.name, 'rect')\n nodeItem.w = node.width\n nodeItem.h = node.height\n nodeItem.x = node.position + node.x * width\n nodeItem.y = node.offset + node.y * height\n nodeItem.shapeProps.set('strokeSize', 1)\n nodeItem.shapeProps.set('strokeColor', '#ffffff')\n nodeItem.shapeProps.set('cornerRadius', 2)\n nodeItem.shapeProps.set('fill', Fill.solid(node.color))\n nodeItem.args.set('tplArea', 'controlled')\n nodeItem.args.set('tplConnector', 'off')\n nodeItem.args.set('tplRotation', 'off')\n nodeItem.locked = false\n nodeItems.add(nodeItem)\n\n currentY += nodeItem.h + singleGap\n })\n })\n }\n nodeItems\n}\n\n/*\nRanked diagram:\nA1 [0, 0] A2 [1, 2] A3 [2, 1]\nB1 [0, 3] B2 [1, 4] B3 [2, 5]\nC1 [0, 6] C2 [1, 7]\nD1 [0, 9] NF [2, 8]\n\nOriginal with error in D1->NF:\nA1 [0, 0] -> A2 [1, 2] = 1, 2\nB1 [0, 3] -> B2 [1, 4] = 1, 1\nC1 [0, 6] -> C2 [1, 7] = 1, 1\nD1 [0, 9] -> A2 [1, 2] = 1, -7\nD1 [0, 9] -> B2 [1, 4] = 1, -5\nD1 [0, 9] -> C2 [1, 7] = 1, -2\nD1 [0, 9] -> NF [2, 8] = 2, -1\nA2 [1, 2] -> A3 [2, 1] = 1, -1\nB2 [1, 4] -> B3 [2, 5] = 1, 1\nC2 [1, 7] -> A3 [2, 1] = 1, -6\nC2 [1, 7] -> B3 [2, 5] = 1, -2\nC2 [1, 7] -> NF [2, 8] = 1, 1\n\n\nA1 [0, 0] -> A2 [1, 2]\nD1 [0, 9] -> A2 [1, 2]\nB1 [0, 3] -> B2 [1, 4]\nD1 [0, 9] -> B2 [1, 4]\nC1 [0, 6] -> C2 [1, 7]\nD1 [0, 9] -> C2 [1, 7]\nA2 [1, 2] -> A3 [2, 1]\nC2 [1, 7] -> A3 [2, 1]\nB2 [1, 4] -> B3 [2, 5]\nC2 [1, 7] -> B3 [2, 5]\nC2 [1, 7] -> NF [2, 8]\nD1 [0, 9] -> NF [2, 8]\n\n\nA1 [0, 0] -> A2 [1, 2] = 1, 2\nD1 [0, 9] -> A2 [1, 2] = 1, -7\nB1 [0, 3] -> B2 [1, 4] = 1, 1\nC1 [0, 6] -> C2 [1, 7] = 1, 1\nD1 [0, 9] -> B2 [1, 4] = 1, -5\nD1 [0, 9] -> C2 [1, 7] = 1, -2\nA2 [1, 2] -> A3 [2, 1] = 1, -1\nB2 [1, 4] -> B3 [2, 5] = 1, 1\nC2 [1, 7] -> A3 [2, 1] = 1, -6\nC2 [1, 7] -> B3 [2, 5] = 1, -2\nC2 [1, 7] -> NF [2, 8] = 1, 1\nD1 [0, 9] -> NF [2, 8] = 2, -1\n*/\n\nfunc buildConnectorItems(levels, allConnections, allNodes) {\n local k2 = max(allConnections.size, allNodes.size)\n local k1 = k2 ^ 2\n local connectorItems = List()\n local connectionsBySource = Map()\n allConnections.forEach(c => {\n if (c.srcId != c.dstId) {\n local cs = connectionsBySource.get(c.srcId)\n if (cs) {\n cs.add(c)\n } else {\n connectionsBySource.set(c.srcId, List(c))\n }\n }\n })\n\n local cs = List()\n\n levels.forEach(level => {\n level.nodes.forEach(node => {\n local connections = connectionsBySource.get(node.id)\n if (connections) {\n connections.sort((a, b) => {\n a.dstNode.level * k1 + a.dstNode.sortOrder * k2 - (b.dstNode.level * k1 + b.dstNode.sortOrder * k2)\n })\n connections.forEach(c => {\n local dstNode = level.nodesMap.get(c.dstId)\n if (dstNode) {\n cs.add(c)\n }\n })\n }\n })\n })\n\n cs.sort((a, b) => {\n a.srcNode.offset - b.srcNode.offset\n })\n\n cs.forEach(c => {\n connectorItems.add(buildSingleConnectorItem(c, c.srcNode, c.dstNode))\n })\n\n connectorItems\n}\n\nstruct PathPoint {\n t: 'B'\n x: 0\n y: 0\n x1: 0\n y1: 0\n x2: 0\n y2: 0\n}\n\nfunc buildSingleConnectorItem(connector, srcNode, dstNode) {\n local item = Item(connector.id, 'Connection', 'path')\n local connectorSize = srcNode.unitSize * connector.value\n\n local xs = srcNode.position + srcNode.x * width + srcNode.width\n local ys1 = srcNode.offset + srcNode.y * height + srcNode.reservedOut\n local ys2 = ys1 + connectorSize\n srcNode.reservedOut += connectorSize\n\n local xd = dstNode.position + dstNode.x * width\n local yd1 = dstNode.offset + dstNode.y * height + dstNode.reservedIn\n local yd2 = yd1 + connectorSize\n dstNode.reservedIn += connectorSize\n\n local minX = min(xs, xd)\n local maxX = max(xs, xd)\n local minY = min(ys1, ys2, yd1, yd2)\n local maxY = max(ys1, ys2, yd1, yd2)\n\n local dx = max(0.001, maxX - minX)\n local dy = max(0.001, maxY - minY)\n\n local points = List(\n PathPoint('B', xs, ys1, 0, (ys2 - ys1) / 3, (xd - xs) / 3, 0),\n PathPoint('B', xd, yd1, (xs - xd) / 3, 0, 0, (yd2 - yd1) / 3),\n PathPoint('B', xd, yd2, 0, (yd1 - yd2) / 3, (xs - xd) / 3, 0),\n PathPoint('B', xs, ys2, (xd - xs) / 3, 0, 0, (ys1 - ys2) / 3),\n ).map(p => {\n PathPoint('B',\n 100 * (p.x - minX) / dx, 100 * (p.y - minY) / dy,\n 100 * p.x1 / dx, 100 * p.y1 / dy,\n 100 * p.x2 / dx, 100 * p.y2 / dy\n )\n })\n\n item.x = minX\n item.y = minY\n item.w = dx\n item.h = dy\n\n if (connectorColorType == 'gradient') {\n item.shapeProps.set('fill', Fill.linearGradient(90, 0, srcNode.color, 100, dstNode.color))\n } else if (connectorColorType == 'source') {\n item.shapeProps.set('fill', Fill.solid(srcNode.color))\n } else if (connectorColorType == 'destination') {\n item.shapeProps.set('fill', Fill.solid(dstNode.color))\n } else {\n item.shapeProps.set('fill', Fill.solid(connectorColor))\n }\n item.shapeProps.set('strokeSize', 0)\n item.shapeProps.set('paths', List(Map(\n 'id', 'p-' + connector.id,\n 'closed', true,\n 'pos', 'relative',\n 'points', points\n )))\n item\n}\n\nfunc buildLabel(id, text, font, fontSize, halign, valign) {\n local item = Item(id, text, 'none')\n item.args.set('templateForceText', true)\n item.textSlots.set('body', Map(\n 'text', text,\n 'font', font,\n 'color', labelColor,\n 'fontSize', fontSize,\n 'halign', halign,\n 'valign', valign,\n 'paddingLeft', 0,\n 'paddingRight', 0,\n 'paddingTop', 0,\n 'paddingBottom', 0,\n 'whiteSpace', 'nowrap'\n ))\n item\n}\n\nfunc buildNodeLabels(nodes) {\n local labelItems = List()\n nodes.forEach(node => {\n local textSize = calculateTextSize(node.name, font, labelFontSize)\n local valueTextSize = calculateTextSize('' + node.value, font, valueFontSize)\n local totalHeight = (textSize.h + valueTextSize.h)*1.8 + 8\n local isLeft = node.dstNodes.size == 0\n local halign = 'left'\n if (!isLeft) {\n halign = 'right'\n }\n local item = buildLabel('ln-' + node.id, node.name, font, labelFontSize, halign, 'bottom')\n item.w = textSize.w + 4\n item.h = textSize.h * 1.8 + 4\n\n if (isLeft) {\n item.x = node.position - item.w - labelPadding\n } else {\n item.x = node.position + node.width + labelPadding\n }\n item.x += node.x * width\n item.y = node.offset + node.y * height + node.height / 2 - totalHeight / 2\n\n labelItems.add(item)\n\n local valueLabel = buildLabel('lv-' + node.id, '' + node.value, font, valueFontSize, halign, 'top')\n valueLabel.w = valueTextSize.w + 4\n valueLabel.h = valueTextSize.h * 1.8 + 4\n if (isLeft) {\n valueLabel.x = node.position - valueLabel.w - labelPadding\n } else {\n valueLabel.x = node.position + node.width + labelPadding\n }\n valueLabel.x += node.x * width\n valueLabel.y = item.y + item.h\n\n labelItems.add(valueLabel)\n })\n labelItems\n}\n\n\nfunc onAreaUpdate(itemId, item, area) {\n local node = null\n if (itemId.startsWith('n-')) {\n node = nodesById.get(itemId.substring(2))\n }\n if (node) {\n node.x = (area.x - node.position) / max(1, width)\n node.y = (area.y - node.offset) / max(1, height)\n\n nodesData = encodeNodes(nodesById)\n }\n}\n\nlocal nodesDataById = decodeNodesData(nodesData)\nallConnections = parseConnections(diagramCode, nodesDataById)\nallNodes = extractNodesFromConnections(allConnections)\n\nlocal levels = buildLevels(allNodes, allConnections)\n\nnodeItems = buildNodeItems(levels)\nconnectorItems = buildConnectorItems(levels, allConnections, allNodes)\nnodeLabels = buildNodeLabels(allNodes)\n\n\n"} \ No newline at end of file diff --git a/assets/templates/diagrams/sankey.yaml b/assets/templates/diagrams/sankey.yaml index 4b5acf00..f8429b1e 100644 --- a/assets/templates/diagrams/sankey.yaml +++ b/assets/templates/diagrams/sankey.yaml @@ -1,8 +1,7 @@ name: Sankey diagram description: "" args: - nodes: {type: "string", value: "a1_1;x=0;y=0;|a1_2|a2", name: "Nodes encoded", hidden: true} - connections: {type: "string", value: "a1_1-a2;s=a1_1;d=a2;v=100|a1_2-a2;s=a1_2;d=a2;v=30", name: "Connections encoded", hidden: true} + nodesData: {type: "string", value: "a1_1;x=0;y=0;|a1_2|a2", name: "Nodes encoded", hidden: true} diagramCode: {type: "string", value: "Wages [2000] Budget\nOther [120] Budget\nBudget [1000] Housing\nBudget [450] Taxes\n", name: "Diagram", textarea: true, rows: 15} font: {type: font, value: Arial, name: Font} colorTheme: {type: "choice", value: "default", options: ["default", "light", "dark"], name: "Color theme"} @@ -11,6 +10,7 @@ args: fontSize: {type: number, value: 14, name: "Font size", min: 1} labelColor: {type: color, value: '#222222', name: 'Label color'} magnify: {type: number, value: 0, name: "Magnify value", min: -50, max: 50} + connectorOpacity: {type: number, value: 60, name: "Connector opacity", min: 0, max: 100} preview: "/assets/templates/previews/mind-map.svg" defaultArea: {x: 0, y: 0, w: 200, h: 60} @@ -21,6 +21,9 @@ import: - ./src/sankey.sch +handlers: + area: onAreaUpdate(itemId, item, area) + item: id: root name: Sankey diagram @@ -38,12 +41,14 @@ item: childItems: - $-foreach: {source: "connectorItems", it: "it"} id: {$-expr: "it.id"} + tags: ['sankey-connector'] name: {$-expr: "it.name"} shape: {$-expr: "it.shape"} shapeProps: {$-expr: "toJSON(it.shapeProps)"} args: {$-expr: "it.getArgs()"} locked: {$-expr: "it.locked"} textSlots: {$-expr: "toJSON(it.textSlots)"} + opacity: {$-expr: connectorOpacity} area: x: {$-expr: "it.x"} y: {$-expr: "it.y"} @@ -52,6 +57,7 @@ item: - $-foreach: {source: "nodeItems", it: "it"} id: {$-expr: "it.id"} + tags: ['sankey-node'] name: {$-expr: "it.name"} shape: {$-expr: "it.shape"} shapeProps: {$-expr: "toJSON(it.shapeProps)"} @@ -63,6 +69,13 @@ item: y: {$-expr: "it.y"} w: {$-expr: "it.w"} h: {$-expr: "it.h"} + # behavior: + # events: + # - id: click + # event: clicked + # actions: + # - id: a1 + - $-foreach: {source: "nodeLabels", it: "it"} id: {$-expr: "it.id"} @@ -79,3 +92,4 @@ item: h: {$-expr: "it.h"} + diff --git a/assets/templates/diagrams/src/sankey.sch b/assets/templates/diagrams/src/sankey.sch index 145b49b9..bc973902 100644 --- a/assets/templates/diagrams/src/sankey.sch +++ b/assets/templates/diagrams/src/sankey.sch @@ -1,10 +1,11 @@ -gapRatio = 0.40 +gapRatio = 0.4 nodeWidth = 20 labelPadding = 5 labelFontSize = max(1, round(fontSize * (100 - magnify) / 100)) valueFontSize = max(1, round(fontSize * (100 + magnify) / 100)) +local nodesById = Map() colorThemes = Map( 'default', List('#F16161', '#F1A261', '#F1EB61', '#71EB57', '#57EBB1', '#57C2EB', '#576BEB', '#A557EB', '#EB57C8', '#EB578E'), @@ -37,19 +38,19 @@ struct Node { func encodeNodes(nodes) { local result = '' - nodes.forEach((n, i) => { - if (i > 0) { + nodes.forEach(n => { + if (result != '') { result += '|' } - result += `${n.id};v=${n.value};x=${n.x};y=${n.y}` + result += `${n.id};x=${n.x};y=${n.y}` }) result } -func decodeListOfObjects(text, constructorCallback, paramSetterCallback) { - local nodes = List() +func decodeNodesData(text) { + local nodesById = Map() splitString(text, '|').forEach(singleNodeText => { - local node = constructorCallback() + local node = Node() local parts = splitString(singleNodeText, ';') for (local i = 0; i < parts.size; i++) { if (i == 0) { @@ -59,25 +60,17 @@ func decodeListOfObjects(text, constructorCallback, paramSetterCallback) { if (varValue.size == 2) { local name = varValue.get(0) local value = varValue.get(1) - paramSetterCallback(node, name, value) + if (name == 'x') { + node.x = value + } else if (name == 'y') { + node.y = value + } } } } - nodes.add(node) - }) - nodes -} - -func decodeNodes(text) { - decodeListOfObjects(text, () => { - Node() - }, (node, name, value) => { - if (name == 'x') { - node.x = value - } else if (name == 'y') { - node.y = value - } + nodesById.set(node.id, node) }) + nodesById } @@ -90,32 +83,6 @@ struct Connection { dstNode: null } -func encodeConnections(connections) { - local result = '' - - connections.forEach((c, i) => { - if (i > 0) { - result += '|' - } - result += `${c.id};s=${c.srcId};d=${c.dstId};v=${c.value}` - }) - result -} - -func decodeConnections(text) { - decodeListOfObjects(text, () => { - Connection() - }, (node, name, value) => { - if (name == 'v') { - node.value = value - } else if (name == 's') { - node.srcId = value - } else if (name == 'd') { - node.dstId = value - } - }) -} - func parseConnection(line) { local s1 = line.indexOf('[') @@ -138,15 +105,18 @@ func parseConnection(line) { } } -func parseConnections(text) { - local nodesById = Map() - +func parseConnections(text, nodesData) { getOrCreateNode = (id) => { local node = nodesById.get(id) if (!node) { node = Node(id, id) nodesById.set(id, node) } + local nData = nodesData.get(id) + if (nData) { + node.x = nData.x + node.y = nData.y + } node } @@ -155,11 +125,12 @@ func parseConnections(text) { line = line.trim() if (line != '' && !line.startsWith('//')) { local c = parseConnection(line) - - c.srcNode = getOrCreateNode(c.srcId) - c.dstNode = getOrCreateNode(c.dstId) if (c) { - connections.add(c) + c.srcNode = getOrCreateNode(c.srcId) + c.dstNode = getOrCreateNode(c.dstId) + if (c) { + connections.add(c) + } } } }) @@ -196,7 +167,6 @@ func updateLevels(node, maxVisitCount) { dstNode.level = newLevel updateLevels(dstNode, maxVisitCount - 1) } - dstNode.level = node.level + 1 }) } } @@ -322,12 +292,16 @@ func buildNodeItems(levels) { local nodeItem = Item('n-' + node.id, node.name, 'rect') nodeItem.w = node.width nodeItem.h = node.height - nodeItem.x = node.position - nodeItem.y = node.offset + nodeItem.x = node.position + node.x * width + nodeItem.y = node.offset + node.y * height nodeItem.shapeProps.set('strokeSize', 1) nodeItem.shapeProps.set('strokeColor', '#ffffff') nodeItem.shapeProps.set('cornerRadius', 2) nodeItem.shapeProps.set('fill', Fill.solid(node.color)) + nodeItem.args.set('tplArea', 'controlled') + nodeItem.args.set('tplConnector', 'off') + nodeItem.args.set('tplRotation', 'off') + nodeItem.locked = false nodeItems.add(nodeItem) currentY += nodeItem.h + singleGap @@ -353,6 +327,8 @@ func buildConnectorItems(levels, allConnections, allNodes) { } }) + local cs = List() + levels.forEach(level => { level.nodes.forEach(node => { local connections = connectionsBySource.get(node.id) @@ -363,13 +339,21 @@ func buildConnectorItems(levels, allConnections, allNodes) { connections.forEach(c => { local dstNode = level.nodesMap.get(c.dstId) if (dstNode) { - connectorItems.add(buildSingleConnectorItem(c, node, dstNode)) + cs.add(c) } }) } }) }) + cs.sort((a, b) => { + a.srcNode.offset - b.srcNode.offset + }) + + cs.forEach(c => { + connectorItems.add(buildSingleConnectorItem(c, c.srcNode, c.dstNode)) + }) + connectorItems } @@ -386,13 +370,14 @@ struct PathPoint { func buildSingleConnectorItem(connector, srcNode, dstNode) { local item = Item(connector.id, 'Connection', 'path') local connectorSize = srcNode.unitSize * connector.value - local xs = srcNode.position + srcNode.width - local ys1 = srcNode.offset + srcNode.reservedOut + + local xs = srcNode.position + srcNode.x * width + srcNode.width + local ys1 = srcNode.offset + srcNode.y * height + srcNode.reservedOut local ys2 = ys1 + connectorSize srcNode.reservedOut += connectorSize - local xd = dstNode.position - local yd1 = dstNode.offset + dstNode.reservedIn + local xd = dstNode.position + dstNode.x * width + local yd1 = dstNode.offset + dstNode.y * height + dstNode.reservedIn local yd2 = yd1 + connectorSize dstNode.reservedIn += connectorSize @@ -474,12 +459,14 @@ func buildNodeLabels(nodes) { local item = buildLabel('ln-' + node.id, node.name, font, labelFontSize, halign, 'bottom') item.w = textSize.w + 4 item.h = textSize.h * 1.8 + 4 + if (isLeft) { item.x = node.position - item.w - labelPadding } else { item.x = node.position + node.width + labelPadding } - item.y = node.offset + node.height / 2 - totalHeight / 2 + item.x += node.x * width + item.y = node.offset + node.y * height + node.height / 2 - totalHeight / 2 labelItems.add(item) @@ -491,6 +478,7 @@ func buildNodeLabels(nodes) { } else { valueLabel.x = node.position + node.width + labelPadding } + valueLabel.x += node.x * width valueLabel.y = item.y + item.h labelItems.add(valueLabel) @@ -499,7 +487,21 @@ func buildNodeLabels(nodes) { } -allConnections = parseConnections(diagramCode) +func onAreaUpdate(itemId, item, area) { + local node = null + if (itemId.startsWith('n-')) { + node = nodesById.get(itemId.substring(2)) + } + if (node) { + node.x = (area.x - node.position) / max(1, width) + node.y = (area.y - node.offset) / max(1, height) + + nodesData = encodeNodes(nodesById) + } +} + +local nodesDataById = decodeNodesData(nodesData) +allConnections = parseConnections(diagramCode, nodesDataById) allNodes = extractNodesFromConnections(allConnections) local levels = buildLevels(allNodes, allConnections)