From 622eeb23698fb1983f889acf2b832780c36bec1a Mon Sep 17 00:00:00 2001 From: Ivan Shubin Date: Sat, 25 Jan 2025 10:10:39 +0100 Subject: [PATCH] added font arg, node labels to sankey diagram and text measuring to templates --- assets/templates/diagrams/sankey.json | 2 +- assets/templates/diagrams/sankey.yaml | 23 +++++++- assets/templates/diagrams/src/sankey.sch | 52 ++++++++++++++++--- src/ui/components/editor/ArgumentsEditor.vue | 33 +++++++----- .../components/editor/items/ItemTemplate.js | 3 ++ .../editor/items/ItemTemplateFunctions.js | 9 ++++ src/ui/typedef.js | 1 + 7 files changed, 101 insertions(+), 22 deletions(-) diff --git a/assets/templates/diagrams/sankey.json b/assets/templates/diagrams/sankey.json index cc45a7ac4..eceb97bf2 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}, "colorTheme": {"type": "choice", "value": "default", "options": ["default", "light", "dark"], "name": "Color theme"}, "diagramCode": {"type": "string", "value": "Wages [2000] Budget\n //Comment\n\nOther [120] Budget\nInvalid line\n", "name": "Diagram", "textarea": true, "rows": 15}}, "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": "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": "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"}}}]}, "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\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 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}\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 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 connections.add(c)\n }\n }\n })\n connections\n}\n\nfunc extractNodesFromConnections(connections) {\n local nodeIds = Set()\n\n connections.forEach(c => {\n nodeIds.add(c.srcId)\n nodeIds.add(c.dstId)\n })\n\n local list = List()\n\n nodeIds.forEach(id => {\n list.add(Node(id, id))\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 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(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', 0)\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) {\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.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 item.shapeProps.set('fill', Map(\n 'type', 'solid',\n 'color', 'rgba(200, 160, 180, 1)'\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\nallConnections = parseConnections(diagramCode)\nallNodes = extractNodesFromConnections(allConnections)\n\nlocal levels = buildLevels(allNodes, allConnections)\n\nnodeItems = buildNodeItems(levels)\nconnectorItems = buildConnectorItems(levels, allConnections)\n\n\n"} \ No newline at end of file +{"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"}, "fontSize": {"type": "number", "value": 14, "name": "Font size", "min": 1}, "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 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}\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 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 connections.add(c)\n }\n }\n })\n connections\n}\n\nfunc extractNodesFromConnections(connections) {\n local nodeIds = Set()\n\n connections.forEach(c => {\n nodeIds.add(c.srcId)\n nodeIds.add(c.dstId)\n })\n\n local list = List()\n\n nodeIds.forEach(id => {\n list.add(Node(id, id))\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 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) {\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.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 item.shapeProps.set('fill', Fill.linearGradient(90, 0, srcNode.color, 100, dstNode.color))\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 buildNodeLabels(nodes) {\n local labelItems = List()\n nodes.forEach(node => {\n local item = Item('ln-' + node.id, node.name, 'none')\n local textSize = calculateTextSize(node.name, font, fontSize)\n item.w = textSize.w + 4\n item.h = textSize.h + 4\n local halign = 'left'\n if (node.dstNodes.size > 0) {\n item.x = node.position + node.width + labelPadding\n } else {\n item.x = node.position - item.w - labelPadding\n halign = 'right'\n }\n\n item.y = node.offset + node.height / 2 - item.h / 2\n\n item.args.set('templateForceText', true)\n item.textSlots.set('body', Map(\n 'text', node.name,\n 'font', font,\n 'fontSize', fontSize,\n 'halign', halign,\n 'valign', 'middle',\n 'paddingLeft', 0,\n 'paddingRight', 0,\n 'paddingTop', 0,\n 'paddingBottom', 0,\n 'whiteSpace', 'nowrap'\n ))\n labelItems.add(item)\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)\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 c206b2d38..b33e613b0 100644 --- a/assets/templates/diagrams/sankey.yaml +++ b/assets/templates/diagrams/sankey.yaml @@ -3,8 +3,11 @@ 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"} - diagramCode: {type: "string", value: "Wages [2000] Budget\n //Comment\n\nOther [120] Budget\nInvalid line\n", name: "Diagram", textarea: true, rows: 15} + fontSize: {type: number, value: 14, name: "Font size", min: 1} + 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} @@ -30,6 +33,20 @@ item: 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"} @@ -44,7 +61,7 @@ item: w: {$-expr: "it.w"} h: {$-expr: "it.h"} - - $-foreach: {source: "connectorItems", it: "it"} + - $-foreach: {source: "nodeLabels", it: "it"} id: {$-expr: "it.id"} name: {$-expr: "it.name"} shape: {$-expr: "it.shape"} @@ -57,3 +74,5 @@ item: y: {$-expr: "it.y"} w: {$-expr: "it.w"} h: {$-expr: "it.h"} + + diff --git a/assets/templates/diagrams/src/sankey.sch b/assets/templates/diagrams/src/sankey.sch index cce950669..0a4508ada 100644 --- a/assets/templates/diagrams/src/sankey.sch +++ b/assets/templates/diagrams/src/sankey.sch @@ -1,5 +1,9 @@ gapRatio = 0.40 nodeWidth = 20 +labelPadding = 5 + +labelFontSize = max(1, round(fontSize * (100 - magnify) / 100)) +valueFontSize = max(1, round(fontSize * (100 + magnify) / 100)) colorThemes = Map( @@ -293,12 +297,14 @@ func buildNodeItems(levels) { node.color = colorPalette.get(abs(hashCode) % colorPalette.size) - local nodeItem = Item(node.id, node.name, 'rect') + 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.shapeProps.set('strokeSize', 0) + nodeItem.shapeProps.set('strokeSize', 1) + nodeItem.shapeProps.set('strokeColor', '#ffffff') + nodeItem.shapeProps.set('cornerRadius', 2) nodeItem.shapeProps.set('fill', Fill.solid(node.color)) nodeItems.add(nodeItem) @@ -389,10 +395,7 @@ func buildSingleConnectorItem(connector, srcNode, dstNode) { item.w = dx item.h = dy - item.shapeProps.set('fill', Map( - 'type', 'solid', - 'color', 'rgba(200, 160, 180, 1)' - )) + item.shapeProps.set('fill', Fill.linearGradient(90, 0, srcNode.color, 100, dstNode.color)) item.shapeProps.set('strokeSize', 0) item.shapeProps.set('paths', List(Map( 'id', 'p-' + connector.id, @@ -403,6 +406,42 @@ func buildSingleConnectorItem(connector, srcNode, dstNode) { item } +func buildNodeLabels(nodes) { + local labelItems = List() + nodes.forEach(node => { + local item = Item('ln-' + node.id, node.name, 'none') + local textSize = calculateTextSize(node.name, font, fontSize) + item.w = textSize.w + 4 + item.h = textSize.h + 4 + local halign = 'left' + if (node.dstNodes.size > 0) { + item.x = node.position + node.width + labelPadding + } else { + item.x = node.position - item.w - labelPadding + halign = 'right' + } + + item.y = node.offset + node.height / 2 - item.h / 2 + + item.args.set('templateForceText', true) + item.textSlots.set('body', Map( + 'text', node.name, + 'font', font, + 'fontSize', fontSize, + 'halign', halign, + 'valign', 'middle', + 'paddingLeft', 0, + 'paddingRight', 0, + 'paddingTop', 0, + 'paddingBottom', 0, + 'whiteSpace', 'nowrap' + )) + labelItems.add(item) + }) + labelItems +} + + allConnections = parseConnections(diagramCode) allNodes = extractNodesFromConnections(allConnections) @@ -410,3 +449,4 @@ local levels = buildLevels(allNodes, allConnections) nodeItems = buildNodeItems(levels) connectorItems = buildConnectorItems(levels, allConnections) +nodeLabels = buildNodeLabels(allNodes) diff --git a/src/ui/components/editor/ArgumentsEditor.vue b/src/ui/components/editor/ArgumentsEditor.vue index 464c02c21..f0783b825 100644 --- a/src/ui/components/editor/ArgumentsEditor.vue +++ b/src/ui/components/editor/ArgumentsEditor.vue @@ -20,7 +20,7 @@ :borderless="true" :options="argumentBindStates[argName].options" title="Bind argument" - @selected="onArgumentBindSelected(argName, arguments[0])" + @selected="onArgumentBindSelected(argName, $event)" > @@ -39,32 +39,37 @@ class="textfield" :value="argumentValues[argName]" :disabled="!argumentControlStates[argName].shown" - @input="onValueChange(argName, arguments[0].target.value)"/> + @input="onValueChange(argName, $event.target.value)"/> + + + @changed="onValueChange(argName, $event)"/> + @input="onValueChange(argName, $event)"/> + @input="onValueChange(argName, $event.target.checked)"/> @@ -74,13 +79,13 @@ :element="argumentValues[argName]" :disabled="!argumentControlStates[argName].shown" :use-self="false" - @selected="onValueChange(argName, arguments[0])" + @selected="onValueChange(argName, $event)" /> + @selected="onValueChange(argName, $event)"/> @@ -107,7 +112,7 @@ :value="argumentValues[argName]" :schemeContainer="schemeContainer" :previousScripts="[schemeContainer.scheme.scripts.main.source]" - @changed="onValueChange(argName, arguments[0])" + @changed="onValueChange(argName, $event)" /> @@ -119,7 +124,7 @@ @@ -130,7 +135,7 @@