--- a/src/pyams_skin/resources/js/ext/flot/jquery.flot.stack.js Thu Sep 26 11:55:17 2019 +0200
+++ b/src/pyams_skin/resources/js/ext/flot/jquery.flot.stack.js Wed Oct 16 13:00:43 2019 +0200
@@ -1,4 +1,4 @@
-/* Flot plugin for stacking data sets rather than overlyaing them.
+/* Flot plugin for stacking data sets rather than overlaying them.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
@@ -14,16 +14,16 @@
key (which can be any number or string or just "true"). To specify the default
stack, you can set the stack option like this:
- series: {
- stack: null/false, true, or a key (number/string)
- }
+ series: {
+ stack: null/false, true, or a key (number/string)
+ }
You can also specify it for a single series, like this:
- $.plot( $("#placeholder"), [{
- data: [ ... ],
- stack: true
- }])
+ $.plot( $("#placeholder"), [{
+ data: [ ... ],
+ stack: true
+ }])
The stacking order is determined by the order of the data series in the array
(later series end up on top of the previous).
@@ -39,28 +39,53 @@
var options = {
series: { stack: null } // or number/string
};
-
+
function init(plot) {
function findMatchingSeries(s, allseries) {
var res = null;
for (var i = 0; i < allseries.length; ++i) {
- if (s == allseries[i])
- break;
-
- if (allseries[i].stack == s.stack)
+ if (s === allseries[i]) break;
+
+ if (allseries[i].stack === s.stack) {
res = allseries[i];
+ }
}
-
+
return res;
}
-
+
+ function addBottomPoints (s, datapoints) {
+ var formattedPoints = [];
+ for (var i = 0; i < datapoints.points.length; i += 2) {
+ formattedPoints.push(datapoints.points[i]);
+ formattedPoints.push(datapoints.points[i + 1]);
+ formattedPoints.push(0);
+ }
+
+ datapoints.format.push({
+ x: false,
+ y: true,
+ number: true,
+ required: false,
+ computeRange: s.yaxis.options.autoScale !== 'none',
+ defaultValue: 0
+ });
+ datapoints.points = formattedPoints;
+ datapoints.pointsize = 3;
+ }
+
function stackData(plot, s, datapoints) {
- if (s.stack == null || s.stack === false)
- return;
+ if (s.stack == null || s.stack === false) return;
+
+ var needsBottom = s.bars.show || (s.lines.show && s.lines.fill);
+ var hasBottom = datapoints.pointsize > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y);
+ // Series data is missing bottom points - need to format
+ if (needsBottom && !hasBottom) {
+ addBottomPoints(s, datapoints);
+ }
var other = findMatchingSeries(s, plot.getData());
- if (!other)
- return;
+ if (!other) return;
var ps = datapoints.pointsize,
points = datapoints.points,
@@ -70,7 +95,6 @@
px, py, intery, qx, qy, bottom,
withlines = s.lines.show,
horizontal = s.bars.horizontal,
- withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
withsteps = withlines && s.lines.steps,
fromgap = true,
keyOffset = horizontal ? 1 : 0,
@@ -78,33 +102,35 @@
i = 0, j = 0, l, m;
while (true) {
- if (i >= points.length)
- break;
+ if (i >= points.length) break;
l = newpoints.length;
if (points[i] == null) {
// copy gaps
- for (m = 0; m < ps; ++m)
+ for (m = 0; m < ps; ++m) {
newpoints.push(points[i + m]);
+ }
+
i += ps;
- }
- else if (j >= otherpoints.length) {
+ } else if (j >= otherpoints.length) {
// for lines, we can't use the rest of the points
if (!withlines) {
- for (m = 0; m < ps; ++m)
+ for (m = 0; m < ps; ++m) {
newpoints.push(points[i + m]);
+ }
}
+
i += ps;
- }
- else if (otherpoints[j] == null) {
+ } else if (otherpoints[j] == null) {
// oops, got a gap
- for (m = 0; m < ps; ++m)
+ for (m = 0; m < ps; ++m) {
newpoints.push(null);
+ }
+
fromgap = true;
j += otherps;
- }
- else {
+ } else {
// cases where we actually got two points
px = points[i + keyOffset];
py = points[i + accumulateOffset];
@@ -112,73 +138,79 @@
qy = otherpoints[j + accumulateOffset];
bottom = 0;
- if (px == qx) {
- for (m = 0; m < ps; ++m)
+ if (px === qx) {
+ for (m = 0; m < ps; ++m) {
newpoints.push(points[i + m]);
+ }
newpoints[l + accumulateOffset] += qy;
bottom = qy;
-
+
i += ps;
j += otherps;
- }
- else if (px > qx) {
+ } else if (px > qx) {
// we got past point below, might need to
// insert interpolated extra point
if (withlines && i > 0 && points[i - ps] != null) {
intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
newpoints.push(qx);
newpoints.push(intery + qy);
- for (m = 2; m < ps; ++m)
+ for (m = 2; m < ps; ++m) {
newpoints.push(points[i + m]);
- bottom = qy;
+ }
+
+ bottom = qy;
}
j += otherps;
- }
- else { // px < qx
+ } else { // px < qx
if (fromgap && withlines) {
// if we come from a gap, we just skip this point
i += ps;
continue;
}
-
- for (m = 0; m < ps; ++m)
+
+ for (m = 0; m < ps; ++m) {
newpoints.push(points[i + m]);
-
+ }
+
// we might be able to interpolate a point below,
// this can give us a better y
- if (withlines && j > 0 && otherpoints[j - otherps] != null)
+ if (withlines && j > 0 && otherpoints[j - otherps] != null) {
bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
+ }
newpoints[l + accumulateOffset] += bottom;
-
+
i += ps;
}
fromgap = false;
-
- if (l != newpoints.length && withbottom)
+
+ if (l !== newpoints.length && needsBottom) {
newpoints[l + 2] += bottom;
+ }
}
// maintain the line steps invariant
- if (withsteps && l != newpoints.length && l > 0
- && newpoints[l] != null
- && newpoints[l] != newpoints[l - ps]
- && newpoints[l + 1] != newpoints[l - ps + 1]) {
- for (m = 0; m < ps; ++m)
+ if (withsteps && l !== newpoints.length && l > 0 &&
+ newpoints[l] !== null &&
+ newpoints[l] !== newpoints[l - ps] &&
+ newpoints[l + 1] !== newpoints[l - ps + 1]) {
+ for (m = 0; m < ps; ++m) {
newpoints[l + ps + m] = newpoints[l + m];
+ }
+
newpoints[l + 1] = newpoints[l - ps + 1];
}
}
datapoints.points = newpoints;
}
-
+
plot.hooks.processDatapoints.push(stackData);
}
-
+
$.plot.plugins.push({
init: init,
options: options,