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