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

The option of gantt for the spaces for the section names. #353

Merged
merged 4 commits into from
May 25, 2016
Merged

The option of gantt for the spaces for the section names. #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd04af
Replace sidePadding with left/rightPadding
ymgch May 23, 2016
e8be61e
Add example for side span of gantt
ymgch May 23, 2016
a7e5db6
Fix API: gantt's side paddings
ymgch May 23, 2016
f2e4b92
Fix tests
ymgch May 23, 2016
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
23 changes: 12 additions & 11 deletions src/diagrams/gantt/ganttRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ var conf = {
barHeight: 20,
barGap: 4,
topPadding: 50,
sidePadding: 75,
rightPadding: 75,
leftPadding: 75,
gridLineStartPadding: 35,
fontSize: 11,
fontFamily: '"Open-Sans", "sans-serif"'
Expand Down Expand Up @@ -68,7 +69,7 @@ module.exports.draw = function (text, id) {
d3.max(taskArray, function (d) {
return d.endTime;
})])
.rangeRound([0, w - 150]);
.rangeRound([0, w - conf.leftPadding - conf.rightPadding]);
//.nice(d3.time.monday);

var categories = [];
Expand Down Expand Up @@ -102,17 +103,17 @@ module.exports.draw = function (text, id) {
var barHeight = conf.barHeight;
var gap = barHeight + conf.barGap;
var topPadding = conf.topPadding;
var sidePadding = conf.sidePadding;
var leftPadding = conf.leftPadding;

var colorScale = d3.scale.linear()
.domain([0, categories.length])
.range(['#00B9FA', '#F95002'])
.interpolate(d3.interpolateHcl);

makeGrid(sidePadding, topPadding, pageWidth, pageHeight);
drawRects(tasks, gap, topPadding, sidePadding, barHeight, colorScale, pageWidth, pageHeight);
vertLabels(gap, topPadding, sidePadding, barHeight, colorScale);
drawToday(sidePadding, topPadding, pageWidth, pageHeight);
makeGrid(leftPadding, topPadding, pageWidth, pageHeight);
drawRects(tasks, gap, topPadding, leftPadding, barHeight, colorScale, pageWidth, pageHeight);
vertLabels(gap, topPadding, leftPadding, barHeight, colorScale);
drawToday(leftPadding, topPadding, pageWidth, pageHeight);

}

Expand All @@ -129,7 +130,7 @@ module.exports.draw = function (text, id) {
return i * theGap + theTopPad - 2;
})
.attr('width', function () {
return w - theSidePad / 2;
return w - conf.rightPadding / 2;
})
.attr('height', theGap)
.attr('class', function (d) { //eslint-disable-line no-unused-vars
Expand Down Expand Up @@ -211,7 +212,7 @@ module.exports.draw = function (text, id) {

// Check id text width > width of rectangle
if (textWidth > (endX - startX)) {
if (endX + textWidth + 1.5*conf.sidePadding> w) {
if (endX + textWidth + 1.5*conf.leftPadding> w) {
return startX + theSidePad - 5;
} else {
return endX + theSidePad + 5;
Expand Down Expand Up @@ -259,7 +260,7 @@ module.exports.draw = function (text, id) {

// Check id text width > width of rectangle
if (textWidth > (endX - startX)) {
if (endX + textWidth + 1.5*conf.sidePadding > w) {
if (endX + textWidth + 1.5*conf.leftPadding > w) {
return 'taskTextOutsideLeft taskTextOutside' + secNum + ' ' + taskType;
} else {
return 'taskTextOutsideRight taskTextOutside' + secNum+ ' ' + taskType;
Expand Down Expand Up @@ -424,4 +425,4 @@ module.exports.draw = function (text, id) {
function getCount(word, arr) {
return getCounts(arr)[word] || 0;
}
};
};
4 changes: 2 additions & 2 deletions src/mermaidAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ var config = {
topPadding: 50,

/**
* **sidePadding** - the space allocated for the section name to the left of the activities.
* **leftPadding** - the space allocated for the section name to the left of the activities.
*/
sidePadding: 75,
leftPadding: 75,

/**
* **gridLineStartPadding** - Vertical starting position of the grid lines
Expand Down
29 changes: 29 additions & 0 deletions test/examples/ganttSideSpan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">

<link rel="stylesheet" href="dist/mermaid.css"/>

<script src="dist/mermaid.js"></script>
<script>
mermaid.initialize({
gantt: {
leftPadding: 400
}
});
</script>
</head>
<body>
<div class="mermaid" id="i211">
gantt
dateFormat YYYY-MM-DD
title My Project

section Long Long Long Long Task Name
Completed task :done, des1, 2016-04-25, 2016-05-21
Active task :active, des1, 2016-04-25, 2016-04-30
Future task : des1, 2016-04-25, 2016-05-30
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion test/gantt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
barHeight:20,
barGap:4,
topPadding:50,
sidePadding:75,
leftPadding:75,
gridLineStartPadding:5,
fontSize:11,
numberSectionStyles:3,
Expand Down
4 changes: 2 additions & 2 deletions test/gconf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"barHeight":20,
"barGap":4,
"topPadding":50,
"sidePadding":75,
"leftPadding":75,
"gridLineStartPadding":35,
"fontSize":11,
"numberSectionStyles":3
}
}
2 changes: 1 addition & 1 deletion test/mix-dark-theme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
barHeight:20,
barGap:4,
topPadding:50,
sidePadding:100,
leftPadding:100,
gridLineStartPadding:35,
fontSize:11,
numberSectionStyles:4,
Expand Down
2 changes: 1 addition & 1 deletion test/mix.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
barHeight:20,
barGap:4,
topPadding:50,
sidePadding:100,
leftPadding:100,
gridLineStartPadding:35,
fontSize:11,
numberSectionStyles:4,
Expand Down
2 changes: 1 addition & 1 deletion test/web_render.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
barHeight:20,
barGap:4,
topPadding:50,
sidePadding:75,
leftPadding:75,
gridLineStartPadding:35,
fontSize:11,
numberSectionStyles:3,
Expand Down