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.

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

Basic Visualisation #15

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
04722ad
First pass at state machite visualisation
danpalmer Dec 27, 2017
5929e3c
Merge branch 'master' into visualisation
danpalmer Dec 27, 2017
9f15757
Improve styling
danpalmer Dec 27, 2017
5d1f35e
Merge branch 'master' into visualisation
PeterJCLaw Jan 22, 2018
293b056
Merge branch 'master' into visualisation
PeterJCLaw Apr 18, 2018
83ee7ac
Clarify that this is a collection
PeterJCLaw Apr 18, 2018
698f2f8
Expect this endpoint to exist too
PeterJCLaw Apr 18, 2018
9a531b4
These are collections too
PeterJCLaw Apr 18, 2018
2767516
Merge branch 'master' into visualisation
PeterJCLaw Apr 25, 2018
331a351
Add alternative using Cytoscape
PeterJCLaw Apr 25, 2018
b51c976
Don't need to prettify this
PeterJCLaw Apr 25, 2018
28846c7
Drop draw_state_machine
PeterJCLaw Apr 25, 2018
ba45628
Simplify the return type
PeterJCLaw Apr 25, 2018
70bfa80
Type signature here
PeterJCLaw Apr 25, 2018
a52bc9b
isort
PeterJCLaw Apr 25, 2018
ead96ab
Drop redundant inline style
PeterJCLaw Apr 25, 2018
7c83fc8
Fix indentation
PeterJCLaw Apr 25, 2018
a712785
Slightly better colours
PeterJCLaw Apr 25, 2018
345837a
Drop more dead code
PeterJCLaw Apr 25, 2018
16e0b18
Merge branch 'master' into visualisation
PeterJCLaw May 2, 2018
021f0c4
Template this properly
PeterJCLaw May 2, 2018
2c48ba1
Actually template in the state machine name
PeterJCLaw May 2, 2018
0335279
Add a smoke test for the visualisation endpoint
PeterJCLaw May 2, 2018
284a79f
Explicitly annotate this
PeterJCLaw May 2, 2018
2ab8943
We don't need pydot now that we're using cytoscape
PeterJCLaw May 2, 2018
ed5f4dd
No need to duplicate the id as the name
PeterJCLaw May 2, 2018
13cb98f
Make this test pass
PeterJCLaw May 2, 2018
8722e5b
Expand these tests to check the result
PeterJCLaw May 2, 2018
ce5a5da
Rename for clarity
PeterJCLaw May 2, 2018
f09da3f
Drop unused styling
PeterJCLaw May 2, 2018
5a53abc
Just drop this inline; no need to parse it separately
PeterJCLaw May 2, 2018
0028822
Drop default values
PeterJCLaw May 2, 2018
338ac6a
Drop comments
PeterJCLaw May 2, 2018
8c58dd1
Link to relevant docs
PeterJCLaw May 2, 2018
ce917ee
Add a legend for the node types
PeterJCLaw May 2, 2018
5520840
Let the user choose the spacing
PeterJCLaw May 2, 2018
f76ebcc
Calculate an initial spacing based on the number of nodes
PeterJCLaw May 2, 2018
3230375
Fade the control bar some more
PeterJCLaw May 2, 2018
63ede8c
Add an instruction
PeterJCLaw May 2, 2018
6a2a22a
Simplify this lookup
PeterJCLaw May 2, 2018
4849134
Remove unused imports
PeterJCLaw May 2, 2018
a8eb759
isort
PeterJCLaw May 2, 2018
956c59e
Add a zoom slider too
PeterJCLaw May 2, 2018
82a75ae
Configure scroll zooming sensitivity instead of providing our own
PeterJCLaw May 2, 2018
4dca5d4
Allow an adjustment once layed out
PeterJCLaw May 2, 2018
aaf1ec8
Fit to the display window
PeterJCLaw May 2, 2018
92416b9
Also test the 404 case
PeterJCLaw May 2, 2018
a2f3e85
Extract fixture for the root path of the repo
PeterJCLaw May 2, 2018
11a9e81
Rename for clarity
PeterJCLaw May 2, 2018
1171013
Use system fonts
PeterJCLaw May 2, 2018
00a0eb3
Indentation
PeterJCLaw May 2, 2018
f98ad5f
Rename file to clarify rendering
PeterJCLaw May 2, 2018
fd2c457
Include the template in the manifest
PeterJCLaw May 2, 2018
db7f349
Simplify this
PeterJCLaw May 2, 2018
f891b93
Not SVG
PeterJCLaw May 2, 2018
dcbc51f
Assert the content type
PeterJCLaw May 2, 2018
4b9d8c0
Name this type for clarity when used
PeterJCLaw May 2, 2018
8c07681
This isn't just HTML any more
PeterJCLaw May 2, 2018
4b5d3a7
Switch to the minified version of the library
PeterJCLaw May 2, 2018
b0b05cb
Subresource integrity the external library
PeterJCLaw May 2, 2018
7d4edd2
No need to return false here
PeterJCLaw May 2, 2018
d5c676d
Explicitly parse the config as JSON
PeterJCLaw Apr 3, 2022
b24c25d
Merge branch 'master' into visualisation
PeterJCLaw Apr 3, 2022
0e9e49c
Connect event up in JS rather than inline
PeterJCLaw Apr 3, 2022
23689dc
Fix lints
PeterJCLaw Apr 3, 2022
fd59e2f
Update visualisation test for data loading changes on master branch
PeterJCLaw Apr 3, 2022
e146e8a
Update cytoscape
PeterJCLaw Apr 3, 2022
f717068
Adjust spacing presets to cope with larger workflows
PeterJCLaw Apr 3, 2022
277c214
Add labels for exit conditions to edges between nodes
PeterJCLaw Apr 3, 2022
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
Prev Previous commit
Next Next commit
Adjust spacing presets to cope with larger workflows
PeterJCLaw committed Apr 3, 2022
commit f7170682db96b3cf3ce9623a673826e90f7b651d
4 changes: 2 additions & 2 deletions routemaster/config/visualisation.jinja
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@
<label>
Spacing:
<span class="range-input-container">
<input id="spacing-factor" type="range" min="1" max="20" step="0.1">
<input id="spacing-factor" type="range" min="1" max="50" step="0.1">
</span>
<span id="spacing-factor-display"></span>
</label>
@@ -157,7 +157,7 @@
cy.layout(layoutOptions).run();
}
var initialSpacingFactor = 0.35 + cy.nodes().length * 0.029;
var initialSpacingFactor = 0.4 + cy.nodes().length * 0.04;
var spacingFactorElem = document.getElementById('spacing-factor');
spacingFactorElem.addEventListener('change', function() {
changeSpacing(spacingFactorElem.value / 10);