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

Jump to bottom

New graph layout algorithm + ELK layout engine #5

Merged
merged 10 commits into from
Nov 2, 2023
Merged

New graph layout algorithm + ELK layout engine #5

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8273ed
work on writing JSDoc typedefs for data types used in graph viz
dandelany Jul 26, 2023
416b86e
refactor JS code, move basic layout to its own file, use es6 imports
dandelany Jul 26, 2023
2835e2a
add ID to graph canvas
dandelany Jul 31, 2023
4fc248a
add elkjs layout engine library
dandelany Jul 31, 2023
ec86631
work on refactor, new ELK layout & folder structure
dandelany Sep 27, 2023
83f23ec
finished refactor, enabled different layout options to be selected
dandelany Sep 27, 2023
8a20125
cleanup, add new example files
dandelany Oct 18, 2023
732fdcd
cleanup, add new example files
dandelany Oct 19, 2023
5f3f9a8
cleanup & fix bug with folder selection
dandelany Oct 19, 2023
cde7c6b
Fixing UT
LeStarch 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# VisualStudio Code
**/.vscode

# Webstorm/Jetbrains
.idea/

# Dependency directories
/node_modules

Expand Down
76 changes: 76 additions & 0 deletions examples/cmd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"columns" : [
[
{
"instanceName" : "deframer",
"inputPorts" : [
{
"name" : "cmdResponseIn",
"portNumbers" : [
0
]
}
],
"outputPorts" : [
{
"name" : "comOut",
"portNumbers" : [
0
]
}
]
}
],
[
{
"instanceName" : "cmdDisp",
"inputPorts" : [
{
"name" : "seqCmdBuff",
"portNumbers" : [
0
]
}
],
"outputPorts" : [
{
"name" : "compCmdStat",
"portNumbers" : [
0
]
}
]
}
]
],
"connections" : [
[
[
0,
0,
0,
0
],
[
1,
0,
0,
0
]
],
[
[
1,
0,
0,
0
],
[
0,
0,
0,
0
]
]
]
}
129 changes: 129 additions & 0 deletions examples/deframer-file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"columns" : [
[
{
"instanceName" : "deframer",
"inputPorts" : [],
"outputPorts" : [
{
"name" : "bufferOut",
"portNumbers" : [
0
]
},
{
"name" : "bufferDeallocate",
"portNumbers" : [
0
]
},
{
"name" : "bufferAllocate",
"portNumbers" : [
0
]
}
]
}
],
[
{
"instanceName" : "fileUplink",
"inputPorts" : [
{
"name" : "bufferSendIn",
"portNumbers" : [
0
]
}
],
"outputPorts" : [
{
"name" : "bufferSendOut",
"portNumbers" : [
0
]
}
]
}
],
[
{
"instanceName" : "buffMgr",
"inputPorts" : [
{
"name" : "bufferSendIn",
"portNumbers" : [
0
]
},
{
"name" : "bufferGetCallee",
"portNumbers" : [
0
]
}
],
"outputPorts" : []
}
]
],
"connections" : [
[
[
0,
0,
0,
0
],
[
1,
0,
0,
0
]
],
[
[
1,
0,
0,
0
],
[
2,
0,
0,
0
]
],
[
[
0,
0,
2,
0
],
[
2,
0,
1,
0
]
],
[
[
0,
0,
1,
0
],
[
2,
0,
0,
0
]
]
]
}
109 changes: 109 additions & 0 deletions examples/framed-active.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"columns" : [
[
{
"instanceName" : "activeComm",
"inputPorts" : [],
"outputPorts" : [
{
"name" : "recv",
"portNumbers" : [
0
]
},
{
"name" : "allocate",
"portNumbers" : [
0
]
}
]
}
],
[
{
"instanceName" : "deframer",
"inputPorts" : [
{
"name" : "framedIn",
"portNumbers" : [
0
]
}
],
"outputPorts" : [
{
"name" : "framedDeallocate",
"portNumbers" : [
0
]
}
]
}
],
[
{
"instanceName" : "buffMgr",
"inputPorts" : [
{
"name" : "bufferSendIn",
"portNumbers" : [
0
]
},
{
"name" : "bufferGetCallee",
"portNumbers" : [
0
]
}
],
"outputPorts" : []
}
]
],
"connections" : [
[
[
0,
0,
1,
0
],
[
2,
0,
1,
0
]
],
[
[
0,
0,
0,
0
],
[
1,
0,
0,
0
]
],
[
[
1,
0,
0,
0
],
[
2,
0,
0,
0
]
]
]
}
10 changes: 5 additions & 5 deletions src/fprime_visual/flask/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
font-family: "Roboto Mono", monospace;
}

body{
body {
margin: 0;
padding-top: 43px;
padding-top: 53px;
min-height: 100vh;
background: rgba(21, 26, 42, 1.00);
/* display: flex;
Expand Down Expand Up @@ -47,15 +47,15 @@ header .header-button:hover {
}


canvas, #alert {
#canvas-container, #alert {
display: none;
}

canvas {
#canvas-container {
width: 100%;
}

canvas.show {
#canvas-container.show {
display: block;
}

Expand Down
Loading
Loading