Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

October Improvements 2/2 #119

Merged
merged 4 commits into from
Nov 2, 2023
Merged

October Improvements 2/2 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfd45a7
Adapt to change in naming
phschaad Oct 24, 2023
a41a381
amend
phschaad Oct 24, 2023
d552e90
Improve permanent interstate edge labels
phschaad Nov 1, 2023
b77bd3d
Add proper multiline support
phschaad Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spcl/sdfv",
"version": "1.1.1",
"version": "1.1.2",
"description": "A standalone viewer for SDFGs",
"homepage": "https://github.com/spcl/dace-webclient",
"main": "out/index.js",
Expand Down
31 changes: 16 additions & 15 deletions src/renderer/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ import { deepCopy, intersectRect, showErrorModal } from '../utils/utils';
import { CanvasManager } from './canvas_manager';
import {
AccessNode, Connector,
Edge, EntryNode, InterstateEdge, LoopScopeBlock, Memlet, NestedSDFG,
Edge, EntryNode, InterstateEdge, LoopRegion, Memlet, NestedSDFG,
SDFG,
SDFGElement,
SDFGElementType,
SDFGElements,
SDFGNode,
ScopeBlock,
ControlFlowRegion,
State,
Tasklet,
drawSDFG,
Expand Down Expand Up @@ -2651,7 +2651,7 @@ export class SDFGRenderer extends EventEmitter {
let sdfg_elem = null;
if (foreground_elem instanceof State)
sdfg_elem = foreground_elem.data.state;
else if (foreground_elem instanceof ScopeBlock)
else if (foreground_elem instanceof ControlFlowRegion)
sdfg_elem = foreground_elem.data.block;
else if (foreground_elem instanceof SDFGNode) {
sdfg_elem = foreground_elem.data.node;
Expand Down Expand Up @@ -3337,9 +3337,9 @@ function relayoutStateMachine(
let blockGraph = null;
if (block.attributes.is_collapsed) {
blockInfo.height = SDFV.LINEHEIGHT;
if (blockElem instanceof LoopScopeBlock) {
if (blockElem instanceof LoopRegion) {
const oldFont = ctx.font;
ctx.font = LoopScopeBlock.LOOP_STATEMENT_FONT;
ctx.font = LoopRegion.LOOP_STATEMENT_FONT;
const labelWidths = [
ctx.measureText(
(block.attributes.scope_condition?.string_data ?? '') +
Expand All @@ -3358,7 +3358,7 @@ function relayoutStateMachine(
ctx.font = oldFont;
blockInfo.width = Math.max(
maxLabelWidth, ctx.measureText(block.label).width
) + 3 * LoopScopeBlock.META_LABEL_MARGIN;
) + 3 * LoopRegion.META_LABEL_MARGIN;
} else if (blockElem instanceof State) {
blockInfo.width = ctx.measureText(blockInfo.label).width;
}
Expand All @@ -3373,16 +3373,16 @@ function relayoutStateMachine(
blockInfo.width += 2 * BLOCK_MARGIN;
blockInfo.height += 2 * BLOCK_MARGIN;

if (blockElem instanceof LoopScopeBlock) {
if (blockElem instanceof LoopRegion) {
// Add spacing for the condition if the loop is not inverted.
if (!block.attributes.inverted)
blockInfo.height += LoopScopeBlock.CONDITION_SPACING;
blockInfo.height += LoopRegion.CONDITION_SPACING;
// If there's an init statement, add space for it.
if (block.attributes.init_statement)
blockInfo.height += LoopScopeBlock.INIT_SPACING;
blockInfo.height += LoopRegion.INIT_SPACING;
// If there's an update statement, also add space for it.
if (block.attributes.update_statement)
blockInfo.height += LoopScopeBlock.UPDATE_SPACING;
blockInfo.height += LoopRegion.UPDATE_SPACING;
}

blockElem.data.layout = blockInfo;
Expand All @@ -3394,7 +3394,8 @@ function relayoutStateMachine(
for (let id = 0; id < stateMachine.edges.length; id++) {
const edge = stateMachine.edges[id];
g.setEdge(edge.src, edge.dst, new InterstateEdge(
edge.attributes.data, id, sdfg
edge.attributes.data, id, sdfg, parent.id, parent, edge.src,
edge.dst
));
}

Expand Down Expand Up @@ -3454,13 +3455,13 @@ function relayoutStateMachine(
// Base spacing for the inside.
let topSpacing = BLOCK_MARGIN;

if (gBlock instanceof LoopScopeBlock) {
if (gBlock instanceof LoopRegion) {
// Add spacing for the condition if the loop isn't inverted.
if (!block.attributes.inverted)
topSpacing += LoopScopeBlock.CONDITION_SPACING;
topSpacing += LoopRegion.CONDITION_SPACING;
// If there's an init statement, add space for it.
if (block.attributes.init_statement)
topSpacing += LoopScopeBlock.INIT_SPACING;
topSpacing += LoopRegion.INIT_SPACING;
}
offset_sdfg(block as any, gBlock.data.graph, {
x: topleft.x + BLOCK_MARGIN,
Expand Down Expand Up @@ -3861,7 +3862,7 @@ function relayoutSDFGBlock(
omitAccessNodes: boolean, parent: SDFGElement
): DagreSDFG | null {
switch (block.type) {
case SDFGElementType.LoopScopeBlock:
case SDFGElementType.LoopRegion:
return relayoutStateMachine(
ctx, block as StateMachineType, sdfg, sdfgList, stateParentList,
omitAccessNodes, parent
Expand Down
Loading