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

Upgrade to Graphviz 9.0.0 #294

Merged
merged 5 commits into from
Nov 5, 2023
Merged

Upgrade to Graphviz 9.0.0 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b06f3f0
change to upgrade to minor versions of @hpcc-js/wasm in package.json
magjac Nov 5, 2023
0c5107b
upgrade @hpcc-js/wasm to 2.14.1 (Graphviz 9.0.0)
magjac Nov 5, 2023
8882151
update data in graphviz-test.js to Graphviz version 9.0.0 format
magjac Nov 5, 2023
76a1929
update data in dot-data-test.js to Graphviz version 9.0.0 format
magjac Nov 5, 2023
e277902
update data in drawEdge-test.js to Graphviz version 9.0.0 format
magjac Nov 5, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
* Upgrade @hpcc-js/wasm to 2.14.1 (Graphviz 9.0.0)

## [5.1.0] – 2023-08-01

### Changed
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"tiny-worker": "^2.3.0"
},
"dependencies": {
"@hpcc-js/wasm": "2.13.1",
"@hpcc-js/wasm": "^2.14.1",
"d3-dispatch": "^3.0.1",
"d3-format": "^3.1.0",
"d3-interpolate": "^3.0.1",
Expand Down
12 changes: 6 additions & 6 deletions test/dot-data-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,17 +458,17 @@ var basic_data = {
"attributes": {
"fill": "none",
"stroke": "black",
"d": "M27,-71.7C27,-64.24 27,-55.32 27,-46.97"
"d": "M27,-71.7C27,-64.41 27,-55.73 27,-47.54"
},
"bbox": {
"x": 27,
"y": -71.7,
"width": 0,
"height": 24.730000000000004
"height": 24.160000000000004
},
"center": {
"x": 27,
"y": -59.335
"y": -59.620000000000005
},
"totalLength": 100,
"parent": "[Circular ~.children.1.children.15]",
Expand All @@ -490,17 +490,17 @@ var basic_data = {
"attributes": {
"fill": "black",
"stroke": "black",
"points": "30.5,-47.1 27,-37.1 23.5,-47.1 30.5,-47.1"
"points": "30.5,-47.62 27,-37.62 23.5,-47.62 30.5,-47.62"
},
"bbox": {
"x": 23.5,
"y": -47.1,
"y": -47.62,
"width": 7,
"height": 10
},
"center": {
"x": 27,
"y": -42.1
"y": -42.62
},
"parent": "[Circular ~.children.1.children.15]",
"children": [],
Expand Down
8 changes: 4 additions & 4 deletions test/drawEdge-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ it("Check our understanding of how Graphviz draws edges.", async () => {
assert.equal(d3.selectAll('path').size(), num_edges, 'Number of initial paths');
const arrowHeadLength = 10;
const arrowHeadWidth = 7;
const margin = -0.14;
const margin = -0.1;
// start of edge tail
const x1 = 54.4;
const y1 = -18;
// end of edge arrowhead
const x2 = 88.62;
const x2 = 88.1;
const y2 = -18.000;

const line = d3.selectAll('.edge').selectAll('path').filter(function (d) {
Expand All @@ -55,9 +55,9 @@ it("Check our understanding of how Graphviz draws edges.", async () => {
var expected_y = [];
expected_x.push(x1);
expected_y.push(y1);
expected_x.push(62.06);
expected_x.push(61.89);
expected_y.push(y1);
expected_x.push(70.57);
expected_x.push(70.18);
expected_y.push(y1);
expected_x.push(Math.round((x2 - margin - arrowHeadLength) * 1000) / 1000);
expected_y.push(y2);
Expand Down
4 changes: 2 additions & 2 deletions test/graphviz-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ it("graphviz().render() renders an SVG from graphviz DOT.", async () => {
<!-- a&#45;&gt;b -->
<g id="edge1" class="edge">
<title>a-&gt;b</title>
<path fill="none" stroke="black" d="M27,-71.7C27,-64.24 27,-55.32 27,-46.97"></path>
<polygon fill="black" stroke="black" points="30.5,-47.1 27,-37.1 23.5,-47.1 30.5,-47.1"></polygon>
<path fill="none" stroke="black" d="M27,-71.7C27,-64.41 27,-55.73 27,-47.54"></path>
<polygon fill="black" stroke="black" points="30.5,-47.62 27,-37.62 23.5,-47.62 30.5,-47.62"></polygon>
</g>
</g>
</svg>`;
Expand Down