Skip to content

F
flot
Commit 78ee3c70 authored by David Schnur's avatar David Schnur
Browse files
Options

Updated code style to match Flot's guidelines.

parent a10206c1
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 180 deletions
jquery.flot.fillbetween.js
View file @ 78ee3c70
/* /* Flot plugin for computing bottoms for filled line and bar charts.
Flot plugin for computing bottoms for filled line and bar charts.
Copyright (c) 2007-2012 IOLA and Ole Laursen.
The case: you've got two series that you want to fill the area Licensed under the MIT license.
between. In Flot terms, you need to use one as the fill bottom of the
other. You can specify the bottom of each data point as the third The case: you've got two series that you want to fill the area between. In Flot
coordinate manually, or you can use this plugin to compute it for you. terms, you need to use one as the fill bottom of the other. You can specify the
bottom of each data point as the third coordinate manually, or you can use this
In order to name the other series, you need to give it an id, like this plugin to compute it for you.
var dataset = [ In order to name the other series, you need to give it an id, like this:
{ data: [ ... ], id: "foo" } , // use default bottom
{ data: [ ... ], fillBetween: "foo" }, // use first dataset as bottom var dataset = [
]; { data: [ ... ], id: "foo" } , // use default bottom
{ data: [ ... ], fillBetween: "foo" }, // use first dataset as bottom
$.plot($("#placeholder"), dataset, { lines: { show: true, fill: true }}); ];
As a convenience, if the id given is a number that doesn't appear as $.plot($("#placeholder"), dataset, { lines: { show: true, fill: true }});
an id in the series, it is interpreted as the index in the array
instead (so fillBetween: 0 can also mean the first series). As a convenience, if the id given is a number that doesn't appear as an id in
the series, it is interpreted as the index in the array instead (so fillBetween:
Internally, the plugin modifies the datapoints in each series. For 0 can also mean the first series).
line series, extra data points might be inserted through
interpolation. Note that at points where the bottom line is not Internally, the plugin modifies the datapoints in each series. For line series,
defined (due to a null point or start/end of line), the current line extra data points might be inserted through interpolation. Note that at points
will show a gap too. The algorithm comes from the jquery.flot.stack.js where the bottom line is not defined (due to a null point or start/end of line),
plugin, possibly some code could be shared. the current line will show a gap too. The algorithm comes from the
jquery.flot.stack.js plugin, possibly some code could be shared.
*/ */
(function ($) { (function ( $ ) {
var options = {
series: { fillBetween: null } // or number var options = {
}; series: {
fillBetween: null // or number
function init(plot) { }
function findBottomSeries(s, allseries) { };
var i;
for (i = 0; i < allseries.length; ++i) { function init( plot ) {
if (allseries[i].id == s.fillBetween)
return allseries[i]; function findBottomSeries( s, allseries ) {
}
var i;
if (typeof s.fillBetween == "number") {
i = s.fillBetween; for ( i = 0; i < allseries.length; ++i ) {
if ( allseries[ i ].id === s.fillBetween ) {
if (i < 0 || i >= allseries.length) return allseries[ i ];
return null; }
}
return allseries[i];
} if ( typeof s.fillBetween === "number" ) {
if ( s.fillBetween < 0 || s.fillBetween >= allseries.length ) {
return null; return null;
} }
return allseries[ s.fillBetween ];
function computeFillBottoms(plot, s, datapoints) { }
if (s.fillBetween == null)
return; return null;
}
var other = findBottomSeries(s, plot.getData());
if (!other) function computeFillBottoms( plot, s, datapoints ) {
return;
if ( s.fillBetween == null ) {
var ps = datapoints.pointsize, return;
points = datapoints.points, }
otherps = other.datapoints.pointsize,
otherpoints = other.datapoints.points, var other = findBottomSeries( s, plot.getData() );
newpoints = [],
px, py, intery, qx, qy, bottom, if ( !other ) {
withlines = s.lines.show, return;
withbottom = ps > 2 && datapoints.format[2].y, }
withsteps = withlines && s.lines.steps,
fromgap = true, var ps = datapoints.pointsize,
i = 0, j = 0, l, m; points = datapoints.points,
otherps = other.datapoints.pointsize,
while (true) { otherpoints = other.datapoints.points,
if (i >= points.length) newpoints = [],
break; px, py, intery, qx, qy, bottom,
withlines = s.lines.show,
l = newpoints.length; withbottom = ps > 2 && datapoints.format[2].y,
withsteps = withlines && s.lines.steps,
if (points[i] == null) { fromgap = true,
// copy gaps i = 0,
for (m = 0; m < ps; ++m) j = 0,
newpoints.push(points[i + m]); l, m;
i += ps;
} while ( true ) {
else if (j >= otherpoints.length) {
// for lines, we can't use the rest of the points if ( i >= points.length ) {
if (!withlines) { break;
for (m = 0; m < ps; ++m) }
newpoints.push(points[i + m]);
} l = newpoints.length;
i += ps;
} if ( points[ i ] == null ) {
else if (otherpoints[j] == null) {
// oops, got a gap // copy gaps
for (m = 0; m < ps; ++m)
newpoints.push(null); for ( m = 0; m < ps; ++m ) {
fromgap = true; newpoints.push( points[ i + m ] );
j += otherps; }
}
else { i += ps;
// cases where we actually got two points
px = points[i]; } else if ( j >= otherpoints.length ) {
py = points[i + 1];
qx = otherpoints[j]; // for lines, we can't use the rest of the points
qy = otherpoints[j + 1];
bottom = 0; if ( !withlines ) {
for ( m = 0; m < ps; ++m ) {
if (px == qx) { newpoints.push( points[ i + m ] );
for (m = 0; m < ps; ++m) }
newpoints.push(points[i + m]); }
//newpoints[l + 1] += qy; i += ps;
bottom = qy;
} else if ( otherpoints[ j ] == null ) {
i += ps;
j += otherps; // oops, got a gap
}
else if (px > qx) { for ( m = 0; m < ps; ++m ) {
// we got past point below, might need to newpoints.push( null );
// insert interpolated extra point }
if (withlines && i > 0 && points[i - ps] != null) {
intery = py + (points[i - ps + 1] - py) * (qx - px) / (points[i - ps] - px); fromgap = true;
newpoints.push(qx); j += otherps;
newpoints.push(intery);
for (m = 2; m < ps; ++m) } else {
newpoints.push(points[i + m]);
bottom = qy; // cases where we actually got two points
}
px = points[ i ];
j += otherps; py = points[ i + 1 ];
} qx = otherpoints[ j ];
else { // px < qx qy = otherpoints[ j + 1 ];
if (fromgap && withlines) { bottom = 0;
// if we come from a gap, we just skip this point
i += ps; if ( px === qx ) {
continue;
} for ( m = 0; m < ps; ++m ) {
newpoints.push( points[ i + m ] );
for (m = 0; m < ps; ++m) }
newpoints.push(points[i + m]);
//newpoints[ l + 1 ] += qy;
// we might be able to interpolate a point below, bottom = qy;
// this can give us a better y
if (withlines && j > 0 && otherpoints[j - otherps] != null) i += ps;
bottom = qy + (otherpoints[j - otherps + 1] - qy) * (px - qx) / (otherpoints[j - otherps] - qx); j += otherps;
//newpoints[l + 1] += bottom; } else if ( px > qx ) {
i += ps; // we got past point below, might need to
} // insert interpolated extra point
fromgap = false; if ( withlines && i > 0 && points[ i - ps ] != null ) {
intery = py + ( points[ i - ps + 1 ] - py ) * ( qx - px ) / ( points[ i - ps ] - px );
if (l != newpoints.length && withbottom) newpoints.push( qx );
newpoints[l + 2] = bottom; newpoints.push( intery );
} for ( m = 2; m < ps; ++m ) {
newpoints.push( points[ i + m ] );
// maintain the line steps invariant }
if (withsteps && l != newpoints.length && l > 0 bottom = qy;
&& newpoints[l] != null }
&& newpoints[l] != newpoints[l - ps]
&& newpoints[l + 1] != newpoints[l - ps + 1]) { j += otherps;
for (m = 0; m < ps; ++m)
newpoints[l + ps + m] = newpoints[l + m]; } else { // px < qx
newpoints[l + 1] = newpoints[l - ps + 1];
} // if we come from a gap, we just skip this point
}
if ( fromgap && withlines ) {
datapoints.points = newpoints; i += ps;
} continue;
}
plot.hooks.processDatapoints.push(computeFillBottoms);
} for ( m = 0; m < ps; ++m ) {
newpoints.push( points[ i + m ] );
$.plot.plugins.push({ }
init: init,
options: options, // we might be able to interpolate a point below,
name: 'fillbetween', // this can give us a better y
version: '1.0'
}); if ( withlines && j > 0 && otherpoints[ j - otherps ] != null ) {
bottom = qy + ( otherpoints[ j - otherps + 1 ] - qy ) * ( px - qx ) / ( otherpoints[ j - otherps ] - qx );
}
//newpoints[l + 1] += bottom;
i += ps;
}
fromgap = false;
if ( l !== newpoints.length && withbottom ) {
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) {
newpoints[ l + ps + m ] = newpoints[ l + m ];
}
newpoints[ l + 1 ] = newpoints[ l - ps + 1 ];
}
}
datapoints.points = newpoints;
}
plot.hooks.processDatapoints.push( computeFillBottoms );
}
$.plot.plugins.push({
init: init,
options: options,
name: "fillbetween",
version: "1.0"
});
})(jQuery); })(jQuery);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment