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

Sort layouted machines alphabetical by default #23

Merged
merged 2 commits into from
Jun 1, 2024
Merged

Sort layouted machines alphabetical by default #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6111b10
sort layouted machines alphabetical by default
fechan Jun 1, 2024
9f17d3c
ignore edges
fechan Jun 1, 2024
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
35 changes: 33 additions & 2 deletions client/src/Layouting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,36 @@ const elkOptions: LayoutOptions = {
"elk.layered.cycleBreaking.strategy": "INTERACTIVE",
"elk.layered.spacing.nodeNodeBetweenLayers": "100",
"elk.layered.spacing.baseValue": "60",
"elk.layered.crossingMinimization.semiInteractive": "true", // allows machines to "position" themselves with elk.position
};

/**
* Get a dictionary that maps each string in a string array to their position if
* the array were sorted.
*
* @param strings String array
* @returns String position map
*/
function stringOrder(strings: string[]) {
let stringOrder = {} as {[string: string]: number};

strings = [...strings].sort()
strings.forEach((str, i) => stringOrder[str] = i);

return stringOrder;
}

/**
* Lay out elements using ELK
*
* @note ELK is kinda huge and it doesn't even handle fixed positions very well.
* Should consider replacing it with another layout module.
*
* @param nodes List of React Flow nodes to lay out
* @param edges List of React Flow edges between nodes
* @param factory State of the factory
* @returns List of Reace Flow nodes with their layouted `position`s set
*/
export async function getLayoutedElements(nodes: Node[], edges: Edge[], factory: Factory) {
const nodeMap: {[nodeId: string]: Node} = {};
for (let node of nodes) {
Expand All @@ -25,18 +53,21 @@ export async function getLayoutedElements(nodes: Node[], edges: Edge[], factory:
const graph: ElkNode = {
id: "root",
layoutOptions: elkOptions,
edges: edges.map(edge => ({ ...edge, sources: [edge.source], targets: [edge.target]})),
//edges: edges.map(edge => ({ ...edge, sources: [edge.source], targets: [edge.target]})),
children: [],
}

// convert React Flow graph to ELK graph format
let machineOrder = stringOrder(Object.keys(factory.machines));

for (let [machineId, machine] of Object.entries(factory.machines)) {
const machineNodeFlow = nodeMap[machineId];
const machineNodeElk: ElkNode = {
...machineNodeFlow,
layoutOptions: {
"elk.padding": "[top=30,right=30,bottom=30,left=30]",
"elk.layered.crossingMinimization.semiInteractive": "true", // allows groups to "position" themselves with elk.position
"elk.position": `(${machineOrder[machineId]},1)`,
},
width: 1,
height: 1,
Expand All @@ -53,7 +84,7 @@ export async function getLayoutedElements(nodes: Node[], edges: Edge[], factory:
const groupNodeElk: ElkNode = {
...groupNodeFlow,
layoutOptions: {
"elk.position": `(${group.slots[0].slot * 100},1)`,
"elk.position": `(${group.slots[0].slot},1)`,
},
width: getWidth(group.slots.length),
height: getHeight(group.slots.length),
Expand Down
Loading