yaroslav
/
SequenceDiagram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify bounds calculations

This commit is contained in:
David Evans 2017-10-26 19:28:43 +01:00
parent 258aad04e5
commit 94b41000bb
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scripts/sequence/Renderer.js
View File

@ -319,18 +319,16 @@ define(['./ArrayUtilities', './SVGUtilities'], (array, svg) => {
this.title.appendChild(this.titleText); this.title.appendChild(this.titleText);
this.base.appendChild(this.title); this.base.appendChild(this.title);
this.diagram = svg.make('g');
this.agentLines = svg.make('g'); this.agentLines = svg.make('g');
this.blocks = svg.make('g'); this.blocks = svg.make('g');
this.sections = svg.make('g'); this.sections = svg.make('g');
this.agentDecor = svg.make('g'); this.agentDecor = svg.make('g');
this.actions = svg.make('g'); this.actions = svg.make('g');
this.diagram.appendChild(this.agentLines); this.base.appendChild(this.agentLines);
this.diagram.appendChild(this.blocks); this.base.appendChild(this.blocks);
this.diagram.appendChild(this.sections); this.base.appendChild(this.sections);
this.diagram.appendChild(this.agentDecor); this.base.appendChild(this.agentDecor);
this.diagram.appendChild(this.actions); this.base.appendChild(this.actions);
this.base.appendChild(this.diagram);
this.testers = svg.make('g'); this.testers = svg.make('g');
this.testersCache = new Map(); this.testersCache = new Map();
@ -938,7 +936,7 @@ define(['./ArrayUtilities', './SVGUtilities'], (array, svg) => {
buildAgentInfos(agents, stages) { buildAgentInfos(agents, stages) {
svg.empty(this.testers); svg.empty(this.testers);
this.testersCache.clear(); this.testersCache.clear();
this.diagram.appendChild(this.testers); this.base.appendChild(this.testers);
this.agentInfos = new Map(); this.agentInfos = new Map();
agents.forEach((agent, index) => { agents.forEach((agent, index) => {
@ -959,7 +957,7 @@ define(['./ArrayUtilities', './SVGUtilities'], (array, svg) => {
this.visibleAgents = ['[', ']']; this.visibleAgents = ['[', ']'];
traverse(stages, this.separationTraversalFns); traverse(stages, this.separationTraversalFns);
this.diagram.removeChild(this.testers); this.base.removeChild(this.testers);
agents.forEach((agent) => { agents.forEach((agent) => {
const agentInfo = this.agentInfos.get(agent); const agentInfo = this.agentInfos.get(agent);
@ -978,31 +976,26 @@ define(['./ArrayUtilities', './SVGUtilities'], (array, svg) => {
updateBounds(stagesHeight) { updateBounds(stagesHeight) {
const titleWidth = this.title.getComputedTextLength(); const titleWidth = this.title.getComputedTextLength();
const stagesWidth = (this.maxX - this.minX);
const width = Math.ceil( const cx = (this.minX + this.maxX) / 2;
Math.max(stagesWidth, titleWidth) + this.title.setAttribute('x', cx);
OUTER_MARGIN * 2 this.title.setAttribute('y', -TITLE_MARGIN);
);
const height = Math.ceil(
ATTRS.TITLE['font-size'] * LINE_HEIGHT +
TITLE_MARGIN +
stagesHeight +
OUTER_MARGIN * 2
);
this.diagram.setAttribute('transform', const x0 = Math.min(this.minX, cx - titleWidth / 2) - OUTER_MARGIN;
'translate(' + ((width - stagesWidth) / 2 - this.minX) + ',' + ( const x1 = Math.max(this.maxX, cx + titleWidth / 2) + OUTER_MARGIN;
OUTER_MARGIN + const y0 = (
ATTRS.TITLE['font-size'] * LINE_HEIGHT + -TITLE_MARGIN
TITLE_MARGIN - ATTRS.TITLE['font-size'] * LINE_HEIGHT
) + ')' - OUTER_MARGIN
); );
const y1 = stagesHeight + OUTER_MARGIN;
this.title.setAttribute('x', width / 2); this.base.setAttribute('viewBox', (
this.base.setAttribute('viewBox', '0 0 ' + width + ' ' + height); x0 + ' ' + y0 + ' ' +
this.width = width; (x1 - x0) + ' ' + (y1 - y0)
this.height = height; ));
this.width = (x1 - x0);
this.height = (y1 - y0);
} }
render({meta, agents, stages}) { render({meta, agents, stages}) {
@ -1021,7 +1014,8 @@ define(['./ArrayUtilities', './SVGUtilities'], (array, svg) => {
this.currentY = 0; this.currentY = 0;
traverse(stages, this.renderTraversalFns); traverse(stages, this.renderTraversalFns);
this.updateBounds(Math.max(this.currentY - ACTION_MARGIN, 0)); const stagesHeight = Math.max(this.currentY - ACTION_MARGIN, 0);
this.updateBounds(stagesHeight);
} }
getAgentX(name) { getAgentX(name) {