', {
- 'class': 'col-3 attr-table-cell',
+ 'class': 'attr-table-cell ' + (invertedSpacing ? 'col-9' : 'col-3'),
}).appendTo(row);
const keyInput = $('
', {
'type': 'text',
@@ -903,7 +904,9 @@ export function attributeTablePutEntry(
keyProp = new KeyProperty(elem, xform, target, key, keyInput);
} else {
keyCell = $('
', {
- 'class': 'col-3 attr-table-heading attr-table-cell',
+ 'class': 'attr-table-heading attr-table-cell ' + (
+ invertedSpacing ? 'col-9' : 'col-3'
+ ),
'text': key,
}).appendTo(row);
}
@@ -921,7 +924,7 @@ export function attributeTablePutEntry(
}
const valueCell = $('
', {
- 'class': 'col-9 attr-table-cell',
+ 'class': 'attr-table-cell ' + (invertedSpacing ? 'col-3' : 'col-9'),
}).appendTo(row);
if (key === 'constants_prop') {
@@ -1364,7 +1367,7 @@ export function appendDataDescriptorTable(
if (wholeSdfg)
vscodeWriteGraph(wholeSdfg);
}
- }
+ }, undefined, true
);
if (res.deleteBtn)
diff --git a/src/webclients/components/sdfv/utils/helpers.ts b/src/webclients/components/sdfv/utils/helpers.ts
index b76c5dc..4c1371e 100644
--- a/src/webclients/components/sdfv/utils/helpers.ts
+++ b/src/webclients/components/sdfv/utils/helpers.ts
@@ -8,9 +8,12 @@ import {
find_graph_element_by_uuid,
get_uuid_graph_element,
JsonSDFG,
+ JsonSDFGEdge,
JsonSDFGNode,
+ JsonSDFGState,
ScopeNode,
SDFGElement,
+ SDFGElementType,
sdfg_range_elem_to_string,
} from '@spcl/sdfv/out';
import { VSCodeRenderer } from '../renderer/vscode_renderer';
@@ -18,6 +21,77 @@ import { VSCodeSDFV } from '../vscode_sdfv';
declare const vscode: any;
+export function findMaximumSdfgId(sdfg: JsonSDFG): number {
+ let maxId = sdfg.sdfg_list_id;
+ for (const node of sdfg.nodes) {
+ if (node.type === SDFGElementType.SDFGState)
+ for (const n of node.nodes) {
+ if (n.type === SDFGElementType.NestedSDFG)
+ maxId = Math.max(
+ findMaximumSdfgId(n.attributes.sdfg), maxId
+ );
+ }
+ }
+ return maxId;
+}
+
+export function findSdfgById(sdfg: JsonSDFG, id: number): JsonSDFG | undefined {
+ if (sdfg.sdfg_list_id === id)
+ return sdfg;
+
+ for (const node of sdfg.nodes) {
+ if (node.type === SDFGElementType.SDFGState)
+ for (const n of node.nodes) {
+ if (n.type === SDFGElementType.NestedSDFG) {
+ const ret = findSdfgById(n.attributes.sdfg, id);
+ if (ret)
+ return ret;
+ }
+ }
+ }
+ return undefined;
+}
+
+export function findJsonSDFGElementByUUID(
+ rootSdfg: JsonSDFG, uuid: string
+): [
+ JsonSDFG | JsonSDFGState | JsonSDFGNode | JsonSDFGEdge | undefined,
+ JsonSDFG
+] {
+ const parts = uuid?.split('/');
+ if (!parts || parts.length < 2 || parts.length > 4)
+ return [undefined, rootSdfg];
+
+ const sdfgId = parseInt(parts[0]);
+ if (sdfgId >= 0 && rootSdfg) {
+ const sdfg = findSdfgById(rootSdfg, sdfgId);
+ const stateId = parseInt(parts[1]);
+ if (stateId >= 0 && sdfg?.nodes) {
+ const state = sdfg.nodes[stateId];
+ if (state) {
+ if (parts.length > 2) {
+ const nodeId = parseInt(parts[2]);
+ if (nodeId >= 0) {
+ return [state.nodes[nodeId], sdfg];
+ } else if (parts.length === 4) {
+ const edgeId = parseInt(parts[3]);
+ if (edgeId >= 0)
+ return [state.edges[edgeId], sdfg];
+ }
+ }
+
+ return [state, sdfg];
+ }
+ } else if (parts.length === 4 && sdfg?.edges) {
+ const edgeId = parseInt(parts[3]);
+ if (edgeId > 0)
+ return [sdfg.edges[edgeId], sdfg];
+ }
+ return [sdfg, rootSdfg];
+ }
+ return [undefined, rootSdfg];
+}
+
/**
* Perform an action for each element in an array given by their uuids.
*/
@@ -259,7 +333,7 @@ export function unGraphiphySdfg(g: JsonSDFG): void {
if (v.attributes.layout)
delete v.attributes.layout;
- if (v.type === 'NestedSDFG')
+ if (v.type === SDFGElementType.NestedSDFG)
unGraphiphySdfg(v.attributes.sdfg);
});
});
diff --git a/src/webclients/components/sdfv/vscode_sdfv.ts b/src/webclients/components/sdfv/vscode_sdfv.ts
index 1b6a24a..e22fc44 100644
--- a/src/webclients/components/sdfv/vscode_sdfv.ts
+++ b/src/webclients/components/sdfv/vscode_sdfv.ts
@@ -45,6 +45,7 @@ import {
SDFGElement,
SDFGNode,
SDFGRenderer,
+ SDFGRendererEvent,
SDFV,
State,
StaticFlopsOverlay,
@@ -73,6 +74,7 @@ import {
vscodeWriteGraph,
} from './utils/helpers';
import Split from 'split.js';
+import { LViewRenderer } from '@spcl/sdfv/out/local_view/lview_renderer';
declare const vscode: any;
declare const SPLIT_DIRECTION: 'vertical' | 'horizontal';
@@ -560,10 +562,8 @@ export class VSCodeSDFV extends SDFV {
preventRefreshes: boolean = false
): void {
const parsedSdfg = parse_sdfg(sdfgString);
- let renderer = VSCodeRenderer.getInstance();
-
- if (renderer) {
- renderer.set_sdfg(parsedSdfg);
+ if (this.renderer) {
+ this.renderer.set_sdfg(parsedSdfg);
} else {
const contentsElem = document.getElementById('contents');
if (contentsElem === null) {
@@ -572,7 +572,7 @@ export class VSCodeSDFV extends SDFV {
}
if (parsedSdfg !== null)
- renderer = VSCodeRenderer.init(
+ this.renderer = VSCodeRenderer.init(
parsedSdfg, contentsElem,
this.onMouseEvent, null, VSCodeSDFV.DEBUG_DRAW, null, null
);
@@ -586,23 +586,23 @@ export class VSCodeSDFV extends SDFV {
getApplicableTransformations();
}
- const graph = renderer.get_graph();
+ const graph = this.renderer.get_graph();
if (graph)
- this.outline(renderer, graph);
+ this.outline(this.renderer, graph);
refreshAnalysisPane();
refreshBreakpoints();
- const selectedElements = renderer.get_selected_elements();
+ const selectedElements = this.renderer.get_selected_elements();
if (selectedElements && selectedElements.length === 1)
reselectRendererElement(selectedElements[0]);
else if (!selectedElements || selectedElements.length === 0)
this.fillInfo(
- new SDFG(renderer.get_sdfg())
+ new SDFG(this.renderer.get_sdfg())
);
vscode.postMessage({
type: 'sdfv.process_queued_messages',
- sdfgName: renderer.get_sdfg().attributes.name,
+ sdfgName: this.renderer.get_sdfg().attributes.name,
});
}
@@ -787,6 +787,22 @@ export class VSCodeSDFV extends SDFV {
this.selectedTransformation = selectedTransformation;
}
+ public set_renderer(renderer: SDFGRenderer | null): void {
+ if (renderer) {
+ this.localViewRenderer?.destroy();
+ this.localViewRenderer = null;
+ }
+ this.renderer = renderer;
+ }
+
+ public setLocalViewRenderer(localViewRenderer: LViewRenderer | null): void {
+ if (localViewRenderer) {
+ this.renderer?.destroy();
+ this.renderer = null;
+ }
+ this.localViewRenderer = localViewRenderer;
+ }
+
}
export function vscodeHandleEvent(event: string, data: any): void {
@@ -795,14 +811,16 @@ export function vscodeHandleEvent(event: string, data: any): void {
if (data && data.nodes)
VSCodeRenderer.getInstance()?.removeGraphNodes(data.nodes);
break;
- case 'add_graph_node':
+ case SDFGRendererEvent.ADD_ELEMENT:
if (data && data.type !== undefined && data.parent !== undefined &&
- data.edgeA !== undefined)
+ data.lib !== undefined && data.edgeA !== undefined)
VSCodeRenderer.getInstance()?.addNodeToGraph(
- data.type, data.parent, data.edgeA
+ data.type, data.parent, data.lib, data.edgeA,
+ data.edgeAConn ? data.edgeAConn : null,
+ data.conn ? data.conn : null
);
break;
- case 'libnode_select':
+ case SDFGRendererEvent.QUERY_LIBNODE:
if (data && data.callback)
VSCodeRenderer.getInstance()?.showSelectLibraryNodeDialog(
data.callback