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

Jump to bottom

Fixed #456 sequenceDiagram: dotted line for alt and empty bracket sho… #477

Merged
merged 2 commits into from
Mar 19, 2017
Merged

Fixed #456 sequenceDiagram: dotted line for alt and empty bracket sho… #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c714a7a
Fixed #456 sequenceDiagram: dotted line for alt and empty bracket sho…
brookhong Feb 16, 2017
4f12596
Update color for label to make it align with loop line
brookhong Feb 16, 2017
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
30 changes: 15 additions & 15 deletions dist/mermaid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57846,6 +57846,7 @@ exports.drawText = function (elem, textData, width) {
//span.attr('x', textData.x);
span.attr('x', textData.x + textData.textMargin * 2);
//span.attr('dy', textData.dy);
span.attr("fill", textData.fill);
span.text(nText);
if (typeof textElem.textwrap !== 'undefined') {

Expand All @@ -57861,17 +57862,16 @@ exports.drawText = function (elem, textData, width) {
};

exports.drawLabel = function (elem, txtObject) {
var rectData = exports.getNoteRect();
rectData.x = txtObject.x;
rectData.y = txtObject.y;
rectData.width = 50;
rectData.height = 20;
rectData.fill = '#526e52';
rectData.stroke = 'none';
rectData['class'] = 'labelBox';
//rectData.color = 'white';

exports.drawRect(elem, rectData);
function genPoints(x, y, width, height, cut) {
return x + "," + y + " " +
(x + width) + "," + y + " " +
(x + width) + "," + (y + height - cut) + " " +
(x + width - cut * 1.2) + "," + (y + height) + " " +
(x) + "," + (y + height);
}
var polygon = elem.append("polygon");
polygon.attr("points" , genPoints(txtObject.x, txtObject.y, 50, 20, 7));
polygon.attr("style", "fill:#526e52;stroke:none");

txtObject.y = txtObject.y + txtObject.labelMargin;
txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin;
Expand Down Expand Up @@ -57938,14 +57938,14 @@ exports.drawActivation = function (elem, bounds, verticalPos) {
exports.drawLoop = function (elem, bounds, labelText, conf) {
var g = elem.append('g');
var drawLoopLine = function drawLoopLine(startx, starty, stopx, stopy) {
g.append('line').attr('x1', startx).attr('y1', starty).attr('x2', stopx).attr('y2', stopy).attr('stroke-width', 2).attr('stroke', '#526e52').attr('class', 'loopLine');
return g.append('line').attr('x1', startx).attr('y1', starty).attr('x2', stopx).attr('y2', stopy).attr('stroke-width', 2).attr('stroke', '#526e52').attr('class', 'loopLine');
};
drawLoopLine(bounds.startx, bounds.starty, bounds.stopx, bounds.starty);
drawLoopLine(bounds.stopx, bounds.starty, bounds.stopx, bounds.stopy);
drawLoopLine(bounds.startx, bounds.stopy, bounds.stopx, bounds.stopy);
drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy);
if (typeof bounds.elsey !== 'undefined') {
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey);
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey).style('stroke-dasharray', '3, 3');
}

var txt = exports.getTextObj();
Expand All @@ -57967,7 +57967,7 @@ exports.drawLoop = function (elem, bounds, labelText, conf) {

exports.drawText(g, txt);

if (typeof bounds.elseText !== 'undefined') {
if (typeof bounds.elseText !== 'undefined' && bounds.elseText !== "") {
txt.text = '[ ' + bounds.elseText + ' ]';
txt.y = bounds.elsey + 1.5 * conf.boxMargin;
exports.drawText(g, txt);
Expand Down Expand Up @@ -59155,4 +59155,4 @@ var isSubstringInArray = function isSubstringInArray(str, arr) {
exports.isSubstringInArray = isSubstringInArray;

},{"./logger":131}]},{},[132])(132)
});
});
32 changes: 16 additions & 16 deletions src/diagrams/sequenceDiagram/svgDraw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ exports.drawText = function(elem, textData, width) {
//span.attr('x', textData.x);
span.attr('x', textData.x+textData.textMargin*2);
//span.attr('dy', textData.dy);
span.attr("fill", textData.fill);
span.text(nText);
if(typeof textElem.textwrap !== 'undefined'){

Expand All @@ -58,21 +59,20 @@ exports.drawText = function(elem, textData, width) {
return textElem;
};

exports.drawLabel = function(elem , txtObject){
var rectData = exports.getNoteRect();
rectData.x = txtObject.x;
rectData.y = txtObject.y;
rectData.width = 50;
rectData.height = 20;
rectData.fill = '#526e52';
rectData.stroke = 'none';
rectData.class = 'labelBox';
//rectData.color = 'white';

exports.drawRect(elem, rectData);
exports.drawLabel = function (elem, txtObject) {
function genPoints(x, y, width, height, cut) {
return x + "," + y + " " +
(x + width) + "," + y + " " +
(x + width) + "," + (y + height - cut) + " " +
(x + width - cut * 1.2) + "," + (y + height) + " " +
(x) + "," + (y + height);
}
var polygon = elem.append("polygon");
polygon.attr("points" , genPoints(txtObject.x, txtObject.y, 50, 20, 7));
polygon.attr("style", "fill:#526e52;stroke:none");

txtObject.y = txtObject.y + txtObject.labelMargin;
txtObject.x = txtObject.x + 0.5*txtObject.labelMargin;
txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin;
txtObject.fill = 'white';
exports.drawText(elem, txtObject);

Expand Down Expand Up @@ -145,7 +145,7 @@ exports.drawActivation = function(elem,bounds,verticalPos){
exports.drawLoop = function(elem,bounds,labelText, conf){
var g = elem.append('g');
var drawLoopLine = function(startx,starty,stopx,stopy){
g.append('line')
return g.append('line')
.attr('x1', startx)
.attr('y1', starty)
.attr('x2', stopx )
Expand All @@ -159,7 +159,7 @@ exports.drawLoop = function(elem,bounds,labelText, conf){
drawLoopLine(bounds.startx, bounds.stopy , bounds.stopx , bounds.stopy );
drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy );
if(typeof bounds.elsey !== 'undefined'){
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey );
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey).style('stroke-dasharray', '3, 3');
}

var txt = exports.getTextObj();
Expand All @@ -181,7 +181,7 @@ exports.drawLoop = function(elem,bounds,labelText, conf){

exports.drawText(g,txt);

if(typeof bounds.elseText !== 'undefined') {
if (typeof bounds.elseText !== 'undefined' && bounds.elseText !== "") {
txt.text = '[ ' + bounds.elseText + ' ]';
txt.y = bounds.elsey + 1.5 * conf.boxMargin;
exports.drawText(g, txt);
Expand Down
16 changes: 16 additions & 0 deletions test/web.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,22 @@ <h1>Sequence diagrams </h1>

</div>

<div class="mermaid">
sequenceDiagram
loop Daily query
Alice->>Bob: Hello Bob, how are you?
alt is sick
Bob->>Alice: Not so good :(
else
Bob->>Alice: Feeling fresh like a daisy
end
opt Extra response
Bob->>Alice: Thanks for asking
end

end
</div>

<div class="mermaid">
graph LR;
A[Start]-->B{a = '1,2'}
Expand Down