marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-18 23:09:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue where some sequence number would be skipped

Browse Source
This commit is contained in:
Bland, Paul
2018-08-17 10:25:06 -04:00
parent 568c0318be
commit f87c503d5e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/diagrams/sequence/sequenceRenderer.js
View File

@@ -205,7 +205,7 @@ const drawNote = function (elem, startx, verticalPos, msg, forceWidth) {
* @param txtCenter * @param txtCenter
* @param msg * @param msg
*/ */
const drawMessage = function (elem, startx, stopx, verticalPos, msg, nodeIndex) { const drawMessage = function (elem, startx, stopx, verticalPos, msg, sequenceIndex) {
const g = elem.append('g') const g = elem.append('g')
const txtCenter = startx + (stopx - startx) / 2 const txtCenter = startx + (stopx - startx) / 2
@@ -272,9 +272,8 @@ const drawMessage = function (elem, startx, stopx, verticalPos, msg, nodeIndex)
.attr('font-size', '16px') .attr('font-size', '16px')
.attr('text-anchor', 'middle') .attr('text-anchor', 'middle')
.attr('textLength', '16px') .attr('textLength', '16px')
.attr('lengthAdjust', '0')
.attr('class', 'sequenceNumber') .attr('class', 'sequenceNumber')
.text(nodeIndex + 1) .text(sequenceIndex)
} }
} }
@@ -364,7 +363,8 @@ export const draw = function (text, id) {
// const lastMsg // const lastMsg
// Draw the messages/signals // Draw the messages/signals
messages.forEach(function (msg, nodeIndex) { let sequenceIndex = 1;
messages.forEach(function (msg) {
let loopData let loopData
switch (msg.type) { switch (msg.type) {
case parser.yy.LINETYPE.NOTE: case parser.yy.LINETYPE.NOTE:
@@ -458,13 +458,24 @@ export const draw = function (text, id) {
stopx = toBounds[toIdx] stopx = toBounds[toIdx]
const verticalPos = bounds.getVerticalPos() const verticalPos = bounds.getVerticalPos()
drawMessage(diagram, startx, stopx, verticalPos, msg, nodeIndex) drawMessage(diagram, startx, stopx, verticalPos, msg, sequenceIndex)
const allBounds = fromBounds.concat(toBounds) const allBounds = fromBounds.concat(toBounds)
bounds.insert(Math.min.apply(null, allBounds), verticalPos, Math.max.apply(null, allBounds), verticalPos) bounds.insert(Math.min.apply(null, allBounds), verticalPos, Math.max.apply(null, allBounds), verticalPos)
} catch (e) { } catch (e) {
logger.error('error while drawing message', e) logger.error('error while drawing message', e)
} }
} }
// Increment sequence counter if msg.type is a line (and not another event like activation or note, etc)
if ([
parser.yy.LINETYPE.SOLID_OPEN,
parser.yy.LINETYPE.DOTTED_OPEN,
parser.yy.LINETYPE.SOLID,
parser.yy.LINETYPE.DOTTED,
parser.yy.LINETYPE.SOLID_CROSS,
parser.yy.LINETYPE.DOTTED_CROSS
].includes(msg.type)) {
sequenceIndex++
}
}) })
if (conf.mirrorActors) { if (conf.mirrorActors) {