Skip to content

Commit

Permalink
Improve rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbeers
jbeers committed Nov 28, 2023
1 parent 1647015 commit 6f5abd3
Showing 1 changed file with 114 additions and 102 deletions.
216 changes: 114 additions & 102 deletions grapher/graph-app.js
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@


function setup(){
const inputs = Array.from( document.querySelectorAll( "a.fileName" ) )

inputs.forEach( a => {
a.addEventListener( "click", async (e) => {
e.preventDefault();
loadSelection( a );
} );
});

if( inputs.length ){
loadSelection( inputs[ 0 ] )
}
const inputs = Array.from( document.querySelectorAll( "a.fileName" ) )
inputs.forEach( a => {
a.addEventListener( "click", async (e) => {
e.preventDefault();
loadSelection( a );
} );
});
if( inputs.length ){
loadSelection( inputs[ 0 ] )
}
}

function loadSelection( aTag ){
fetchFile( aTag ).then( redrawGraph );

Array.from(document.querySelectorAll( "a.file--selected" )).forEach( a => a.classList.remove( "file--selected" ) );

aTag.classList.add( "file--selected" );
fetchFile( aTag ).then( redrawGraph );
Array.from(document.querySelectorAll( "a.file--selected" )).forEach( a => a.classList.remove( "file--selected" ) );
aTag.classList.add( "file--selected" );
}



const fetchFile = async ( aTag ) => {
const res = await fetch( "/data/" + aTag.innerText );
const data = await res.json();

return data;
const res = await fetch( "/data/" + aTag.innerText );
const data = await res.json();
return data;
};

function redrawGraph( rawAST ){
const oldGraph = document.querySelector( "svg#astGraph" );

if( oldGraph ){
oldGraph.remove();
}

const graphNode = setupChart( convertRawASTNode(rawAST) );

document.querySelector( '#display-panel' ).appendChild( graphNode );
const oldGraph = document.querySelector( "svg#astGraph" );
if( oldGraph ){
oldGraph.remove();
}
const graphNode = setupChart( convertRawASTNode(rawAST) );
document.querySelector( '#display-panel' ).appendChild( graphNode );
}


Expand All @@ -50,127 +50,139 @@ function convertRawASTNode( rawNode ){
return rawNode.map( convertRawASTNode );
}
else if( typeof rawNode === 'object' ){
return Object.keys( rawNode ).reduce( ( acc, key ) => {
const node = Object.keys( rawNode ).reduce( ( acc, key ) => {
if( key.match( /ASTType|sourceText|position|safe/i ) ){
acc[ key ] = rawNode[ key ];
}
else if( typeof rawNode[ key ] === 'object' ){
const val = convertRawASTNode( rawNode[ key ] );
acc.children.push({
ASTType: key,
children: Array.isArray( val ) ? val : [ val ]
});
let val = convertRawASTNode( rawNode[ key ] );
val = Array.isArray( val ) ? val : [ val ];

if( val.length == 1 ){
val = val[ 0 ];
val.ASTType = key + '/' + val.ASTType;

acc.children.push( val );
}
else {
acc.children.push({
ASTType: key,
children: val
});
}

}

return acc;
}, { children: [] } );

if( !node.sourceText && node.children.length == 1 ){
const newNode = Object.assign( {}, node.children[ 0 ] );

newNode.ASTType = node.ASTType + '/' + newNode.ASTType
return newNode;
}

return node;
}

return rawNode;
}




function setupChart( data ){
// debugger;
// const width = 928;

// Compute the tree height; this approach will allow the height of the
// SVG to scale according to the breadth (width) of the tree layout.
const root = d3.hierarchy(data);
const dx = 10;
// const dy = width / (root.height + 1);
const dy = 50;

// Create a tree layout.
const tree = d3.tree().nodeSize([dx, dy]);

tree.separation( (a,b) => {
return a.parent == b.parent ? 8 : 16;
let sep = b.data.ASTType.length;

sep /= 2;

sep += a.parent == b.parent ? 5 : 10;


return sep
});

// Sort the tree and apply the layout.
root.sort((a, b) => d3.ascending(a.data.ASTType, b.data.ASTType));
tree(root);

// Compute the extent of the tree. Note that x and y are swapped here
// because in the tree layout, x is the breadth, but when displayed, the
// tree extends right rather than down.
let y0 = Infinity;
let y1 = -y0;
root.each(d => {
if (d.y > y1) y1 = d.y;
if (d.y < y0) y0 = d.y;
});

let x0 = Infinity;
let x1 = -y0;
root.each(d => {
if (d.y > y1) y1 = d.y;
if (d.y < y0) y0 = d.y;
if (d.x > x1) x1 = d.x;
if (d.x < x0) x0 = d.x;
});

// Compute the adjusted height of the tree.
const height = y1 - y0 + dy * 2;
const width = (x1 - x0 + dx * 2) + 300;
const width = x1 + ( 0 - x0 ) + 200;

const svg = d3.create("svg")
.attr("overflow", "scroll")
.attr( "id", "astGraph" )
.attr("width", width)
.attr("height", height)
.attr("viewBox", [ 0 - ( width / 2 ) , y0 - dy, width, height])
.attr("style", "max-width: 100%; height: auto; font: 10px sans-serif; background: white;");
.attr("overflow", "scroll")
.attr( "id", "astGraph" )
.attr("width", width)
.attr("height", height)
.attr("viewBox", [ x0 - 100 , y0 - dy, width, height])
.attr("style", "max-width: 100%; height: auto; font: 10px sans-serif; background: white;");

const link = svg.append("g")
.attr("fill", "none")
.attr("stroke", "#555")
.attr("stroke-opacity", 0.4)
.attr("stroke-width", 1.5)
.selectAll()
.data(root.links())
.join("path")
.attr("d", d3.linkVertical()
.x(d => d.x )
.y(d => d.y ));
.attr("fill", "none")
.attr("stroke", "#555")
.attr("stroke-opacity", 0.4)
.attr("stroke-width", 1.5)
.selectAll()
.data(root.links())
.join("path")
.attr("d", d3.linkVertical()
.x(d => d.x )
.y(d => d.y ));

const node = svg.append("g")
.attr("stroke-linejoin", "round")
.attr("stroke-width", 3)
.selectAll()
.data(root.descendants())
.join("g")
.attr("transform", d => {
return `translate(${d.x},${d.y})`;
});

node
.append( "title" )
.text( d => d.data.sourceText )
.attr("stroke-linejoin", "round")
.attr("stroke-width", 3)
.selectAll()
.data(root.descendants())
.join("g")
.attr("transform", d => {
return `translate(${d.x},${d.y})`;
});

node.append( "title" )
.text( d => d.data.sourceText )

node.append("circle")
.attr("fill", d => d.children ? "#555" : "#999")
.attr("r", 2.5);
.attr("fill", d => d.children ? "#555" : "#999")
.attr("r", 2.5);

node.append("text")
.attr("dy", "0.31em")
.attr("x", d => 6)
.attr("text-anchor", d => "start" )
.attr( "class", d => d.data.sourceText ? 'node-hasSourceText' : '' )
.text(d => `${d.data.ASTType}`)
.clone(true).lower()
.attr("stroke", "white");

node.append("text")
.attr("dy", "0.31em")
.attr("y", "15px")
.attr("text-anchor", d => "middle" )
.attr( "class", d=> d.data.children && d.data.children.length || !(d.data.sourceText) ? 'node-hidden' : '' )
.text(d => `${d.data.sourceText}`)
.attr( "fill", "red" )
.clone(true).lower();

.attr("dy", "0.31em")
.attr("x", d => 6)
.attr("text-anchor", d => "start" )
.attr( "class", d => d.data.sourceText ? 'node-hasSourceText' : '' )
.text(d => `${d.data.ASTType}`)
.clone(true).lower()
.attr("stroke", "white");

node.append("text")
.attr("y", "20")
.attr("text-anchor", d => "middle" )
.attr( "class", d=> d.data.children && d.data.children.length || !(d.data.sourceText) ? 'node-hidden' : '' )
.text(d => `${d.data.sourceText}`)
.attr( "fill", "red" )
.clone(true).lower();


return svg.node();
}
Expand Down

0 comments on commit 6f5abd3

Please sign in to comment.