").text(row.label);
+ content = content.prop('outerHTML');
_ref = row.y;
for (j = _i = 0, _len = _ref.length; _i < _len; j = ++_i) {
y = _ref[j];
- content += "
\n " + this.options.labels[j] + ":\n " + (this.yLabelFormat(y)) + "\n
";
+ if (this.options.labels[j] === false) {
+ continue;
+ }
+ content += "
\n " + this.options.labels[j] + ":\n " + (this.yLabelFormat(y, j)) + "\n
";
}
if (typeof this.options.hoverCallback === 'function') {
content = this.options.hoverCallback(index, this.options, content, row.src);
@@ -954,11 +1060,20 @@ Licensed under the BSD-2-Clause License.
var i, _i, _j, _ref, _ref1, _results;
this.seriesPoints = [];
for (i = _i = _ref = this.options.ykeys.length - 1; _ref <= 0 ? _i <= 0 : _i >= 0; i = _ref <= 0 ? ++_i : --_i) {
- this._drawLineFor(i);
+ if (this.hasToShow(i)) {
+ if (this.options.trendLine !== false && this.options.trendLine === true || this.options.trendLine[i] === true) {
+ this._drawTrendLine(i);
+ }
+ this._drawLineFor(i);
+ }
}
_results = [];
for (i = _j = _ref1 = this.options.ykeys.length - 1; _ref1 <= 0 ? _j <= 0 : _j >= 0; i = _ref1 <= 0 ? ++_j : --_j) {
- _results.push(this._drawPointFor(i));
+ if (this.hasToShow(i)) {
+ _results.push(this._drawPointFor(i));
+ } else {
+ _results.push(void 0);
+ }
}
return _results;
};
@@ -987,6 +1102,38 @@ Licensed under the BSD-2-Clause License.
}
};
+ Line.prototype._drawTrendLine = function(index) {
+ var a, b, data, datapoints, path, sum_x, sum_xx, sum_xy, sum_y, val, x, y, _i, _len, _ref;
+ sum_x = 0;
+ sum_y = 0;
+ sum_xx = 0;
+ sum_xy = 0;
+ datapoints = 0;
+ _ref = this.data;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ val = _ref[_i];
+ x = val.x;
+ y = val.y[index];
+ if (y === void 0) {
+ continue;
+ }
+ datapoints += 1;
+ sum_x += x;
+ sum_y += y;
+ sum_xx += x * x;
+ sum_xy += x * y;
+ }
+ a = (datapoints * sum_xy - sum_x * sum_y) / (datapoints * sum_xx - sum_x * sum_x);
+ b = (sum_y / datapoints) - ((a * sum_x) / datapoints);
+ data = [{}, {}];
+ data[0].x = this.transX(this.data[0].x);
+ data[0].y = this.transY(this.data[0].x * a + b);
+ data[1].x = this.transX(this.data[this.data.length - 1].x);
+ data[1].y = this.transY(this.data[this.data.length - 1].x * a + b);
+ path = Morris.Line.createPath(data, false, this.bottom);
+ return path = this.raphael.path(path).attr('stroke', this.colorFor(null, index, 'trendLine')).attr('stroke-width', this.options.trendLineWidth);
+ };
+
Line.createPath = function(coords, smooth, bottom) {
var coord, g, grads, i, ix, lg, path, prevCoord, x1, x2, y1, y2, _i, _len;
path = "";
@@ -1078,8 +1225,10 @@ Licensed under the BSD-2-Clause License.
return this.options.lineColors.call(this, row, sidx, type);
} else if (type === 'point') {
return this.options.pointFillColors[sidx % this.options.pointFillColors.length] || this.options.lineColors[sidx % this.options.lineColors.length];
- } else {
+ } else if (type === 'line') {
return this.options.lineColors[sidx % this.options.lineColors.length];
+ } else {
+ return this.options.trendLineColors[sidx % this.options.trendLineColors.length];
}
};
@@ -1120,6 +1269,9 @@ Licensed under the BSD-2-Clause License.
};
Line.prototype.pointGrowSeries = function(index) {
+ if (this.pointSizeForSeries(index) === 0) {
+ return;
+ }
return Raphael.animation({
r: this.pointSizeForSeries(index) + 3
}, 25, 'linear');
@@ -1409,7 +1561,9 @@ Licensed under the BSD-2-Clause License.
barColors: ['#0b62a4', '#7a92a3', '#4da74d', '#afd8f8', '#edc240', '#cb4b4b', '#9440ed'],
barOpacity: 1.0,
barRadius: [0, 0, 0, 0],
- xLabelMargin: 50
+ xLabelMargin: 50,
+ horizontal: false,
+ shown: true
};
Bar.prototype.calc = function() {
@@ -1426,7 +1580,7 @@ Licensed under the BSD-2-Clause License.
_results = [];
for (idx = _i = 0, _len = _ref.length; _i < _len; idx = ++_i) {
row = _ref[idx];
- row._x = this.left + this.width * (idx + 0.5) / this.data.length;
+ row._x = this.xStart + this.xSize * (idx + 0.5) / this.data.length;
_results.push(row._y = (function() {
var _j, _len1, _ref1, _results1;
_ref1 = row.y;
@@ -1454,28 +1608,54 @@ Licensed under the BSD-2-Clause License.
};
Bar.prototype.drawXAxis = function() {
- var i, label, labelBox, margin, offset, prevAngleMargin, prevLabelMargin, row, textBox, ypos, _i, _ref, _results;
- ypos = this.bottom + (this.options.xAxisLabelTopPadding || this.options.padding / 2);
+ var angle, basePos, i, label, labelBox, margin, maxSize, offset, prevAngleMargin, prevLabelMargin, row, size, startPos, textBox, _i, _ref, _results;
+ if (!this.options.horizontal) {
+ basePos = this.getXAxisLabelY();
+ } else {
+ basePos = this.getYAxisLabelX();
+ }
prevLabelMargin = null;
prevAngleMargin = null;
_results = [];
for (i = _i = 0, _ref = this.data.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
row = this.data[this.data.length - 1 - i];
- label = this.drawXAxisLabel(row._x, ypos, row.label);
+ if (!this.options.horizontal) {
+ label = this.drawXAxisLabel(row._x, basePos, row.label);
+ } else {
+ label = this.drawYAxisLabel(basePos, row._x - 0.5 * this.options.gridTextSize, row.label);
+ }
+ if (!this.options.horizontal) {
+ angle = this.options.xLabelAngle;
+ } else {
+ angle = 0;
+ }
textBox = label.getBBox();
- label.transform("r" + (-this.options.xLabelAngle));
+ label.transform("r" + (-angle));
labelBox = label.getBBox();
label.transform("t0," + (labelBox.height / 2) + "...");
- if (this.options.xLabelAngle !== 0) {
- offset = -0.5 * textBox.width * Math.cos(this.options.xLabelAngle * Math.PI / 180.0);
+ if (angle !== 0) {
+ offset = -0.5 * textBox.width * Math.cos(angle * Math.PI / 180.0);
label.transform("t" + offset + ",0...");
}
- if (((prevLabelMargin == null) || prevLabelMargin >= labelBox.x + labelBox.width || (prevAngleMargin != null) && prevAngleMargin >= labelBox.x) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < this.el.width()) {
- if (this.options.xLabelAngle !== 0) {
- margin = 1.25 * this.options.gridTextSize / Math.sin(this.options.xLabelAngle * Math.PI / 180.0);
- prevAngleMargin = labelBox.x - margin;
+ if (!this.options.horizontal) {
+ startPos = labelBox.x;
+ size = labelBox.width;
+ maxSize = this.el.width();
+ } else {
+ startPos = labelBox.y;
+ size = labelBox.height;
+ maxSize = this.el.height();
+ }
+ if (((prevLabelMargin == null) || prevLabelMargin >= startPos + size || (prevAngleMargin != null) && prevAngleMargin >= startPos) && startPos >= 0 && (startPos + size) < maxSize) {
+ if (angle !== 0) {
+ margin = 1.25 * this.options.gridTextSize / Math.sin(angle * Math.PI / 180.0);
+ prevAngleMargin = startPos - margin;
+ }
+ if (!this.options.horizontal) {
+ _results.push(prevLabelMargin = startPos - this.options.xLabelMargin);
+ } else {
+ _results.push(prevLabelMargin = startPos);
}
- _results.push(prevLabelMargin = labelBox.x - this.options.xLabelMargin);
} else {
_results.push(label.remove());
}
@@ -1483,10 +1663,23 @@ Licensed under the BSD-2-Clause License.
return _results;
};
+ Bar.prototype.getXAxisLabelY = function() {
+ return this.bottom + (this.options.xAxisLabelTopPadding || this.options.padding / 2);
+ };
+
Bar.prototype.drawSeries = function() {
- var barWidth, bottom, groupWidth, idx, lastTop, left, leftPadding, numBars, row, sidx, size, spaceLeft, top, ypos, zeroPos;
- groupWidth = this.width / this.options.data.length;
- numBars = this.options.stacked ? 1 : this.options.ykeys.length;
+ var barWidth, bottom, groupWidth, i, idx, lastTop, left, leftPadding, numBars, row, sidx, size, spaceLeft, top, ypos, zeroPos, _i, _ref;
+ groupWidth = this.xSize / this.options.data.length;
+ if (this.options.stacked) {
+ numBars = 1;
+ } else {
+ numBars = 0;
+ for (i = _i = 0, _ref = this.options.ykeys.length - 1; 0 <= _ref ? _i <= _ref : _i >= _ref; i = 0 <= _ref ? ++_i : --_i) {
+ if (this.hasToShow(i)) {
+ numBars += 1;
+ }
+ }
+ }
barWidth = (groupWidth * this.options.barSizeRatio - this.options.barGap * (numBars - 1)) / numBars;
if (this.options.barSize) {
barWidth = Math.min(barWidth, this.options.barSize);
@@ -1495,18 +1688,21 @@ Licensed under the BSD-2-Clause License.
leftPadding = spaceLeft / 2;
zeroPos = this.ymin <= 0 && this.ymax >= 0 ? this.transY(0) : null;
return this.bars = (function() {
- var _i, _len, _ref, _results;
- _ref = this.data;
+ var _j, _len, _ref1, _results;
+ _ref1 = this.data;
_results = [];
- for (idx = _i = 0, _len = _ref.length; _i < _len; idx = ++_i) {
- row = _ref[idx];
+ for (idx = _j = 0, _len = _ref1.length; _j < _len; idx = ++_j) {
+ row = _ref1[idx];
lastTop = 0;
_results.push((function() {
- var _j, _len1, _ref1, _results1;
- _ref1 = row._y;
+ var _k, _len1, _ref2, _results1;
+ _ref2 = row._y;
_results1 = [];
- for (sidx = _j = 0, _len1 = _ref1.length; _j < _len1; sidx = ++_j) {
- ypos = _ref1[sidx];
+ for (sidx = _k = 0, _len1 = _ref2.length; _k < _len1; sidx = ++_k) {
+ ypos = _ref2[sidx];
+ if (!this.hasToShow(sidx)) {
+ continue;
+ }
if (ypos !== null) {
if (zeroPos) {
top = Math.min(ypos, zeroPos);
@@ -1515,19 +1711,28 @@ Licensed under the BSD-2-Clause License.
top = ypos;
bottom = this.bottom;
}
- left = this.left + idx * groupWidth + leftPadding;
+ left = this.xStart + idx * groupWidth + leftPadding;
if (!this.options.stacked) {
left += sidx * (barWidth + this.options.barGap);
}
size = bottom - top;
if (this.options.verticalGridCondition && this.options.verticalGridCondition(row.x)) {
- this.drawBar(this.left + idx * groupWidth, this.top, groupWidth, Math.abs(this.top - this.bottom), this.options.verticalGridColor, this.options.verticalGridOpacity, this.options.barRadius);
+ if (!this.options.horizontal) {
+ this.drawBar(this.xStart + idx * groupWidth, this.yEnd, groupWidth, this.ySize, this.options.verticalGridColor, this.options.verticalGridOpacity, this.options.barRadius);
+ } else {
+ this.drawBar(this.yStart, this.xStart + idx * groupWidth, this.ySize, groupWidth, this.options.verticalGridColor, this.options.verticalGridOpacity, this.options.barRadius);
+ }
}
if (this.options.stacked) {
top -= lastTop;
}
- this.drawBar(left, top, barWidth, size, this.colorFor(row, sidx, 'bar'), this.options.barOpacity, this.options.barRadius);
- _results1.push(lastTop += size);
+ if (!this.options.horizontal) {
+ this.drawBar(left, top, barWidth, size, this.colorFor(row, sidx, 'bar'), this.options.barOpacity, this.options.barRadius);
+ _results1.push(lastTop += size);
+ } else {
+ this.drawBar(top, left, size, barWidth, this.colorFor(row, sidx, 'bar'), this.options.barOpacity, this.options.barRadius);
+ _results1.push(lastTop -= size);
+ }
} else {
_results1.push(null);
}
@@ -1558,23 +1763,29 @@ Licensed under the BSD-2-Clause License.
}
};
- Bar.prototype.hitTest = function(x) {
+ Bar.prototype.hitTest = function(x, y) {
+ var pos;
if (this.data.length === 0) {
return null;
}
- x = Math.max(Math.min(x, this.right), this.left);
- return Math.min(this.data.length - 1, Math.floor((x - this.left) / (this.width / this.data.length)));
+ if (!this.options.horizontal) {
+ pos = x;
+ } else {
+ pos = y;
+ }
+ pos = Math.max(Math.min(pos, this.xEnd), this.xStart);
+ return Math.min(this.data.length - 1, Math.floor((pos - this.xStart) / (this.xSize / this.data.length)));
};
Bar.prototype.onGridClick = function(x, y) {
var index;
- index = this.hitTest(x);
+ index = this.hitTest(x, y);
return this.fire('click', index, this.data[index].src, x, y);
};
Bar.prototype.onHoverMove = function(x, y) {
var index, _ref;
- index = this.hitTest(x);
+ index = this.hitTest(x, y);
return (_ref = this.hover).update.apply(_ref, this.hoverContentForRow(index));
};
@@ -1587,17 +1798,27 @@ Licensed under the BSD-2-Clause License.
Bar.prototype.hoverContentForRow = function(index) {
var content, j, row, x, y, _i, _len, _ref;
row = this.data[index];
- content = "
" + row.label + "
";
+ content = $("
").text(row.label);
+ content = content.prop('outerHTML');
_ref = row.y;
for (j = _i = 0, _len = _ref.length; _i < _len; j = ++_i) {
y = _ref[j];
- content += "
\n " + this.options.labels[j] + ":\n " + (this.yLabelFormat(y)) + "\n
";
+ if (this.options.labels[j] === false) {
+ continue;
+ }
+ content += "
\n " + this.options.labels[j] + ":\n " + (this.yLabelFormat(y, j)) + "\n
";
}
if (typeof this.options.hoverCallback === 'function') {
content = this.options.hoverCallback(index, this.options, content, row.src);
}
- x = this.left + (index + 0.5) * this.width / this.data.length;
- return [content, x];
+ if (!this.options.horizontal) {
+ x = this.left + (index + 0.5) * this.width / this.data.length;
+ return [content, x];
+ } else {
+ x = this.left + 0.5 * this.width;
+ y = this.top + (index + 0.5) * this.height / this.data.length;
+ return [content, x, y, true];
+ }
};
Bar.prototype.drawXAxisLabel = function(xPos, yPos, text) {