Skip to content

C
CurvedLines
Commit bef80155 authored by MichaelZinsmaier's avatar MichaelZinsmaier
Browse files
Options

Merge branch 'fastFixes'

parents 64c5b94e 89483ad4
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 335 deletions
curvedLines.js
View file @ bef80155
/* The MIT License /* The MIT License
Copyright (c) 2011 by Michael Zinsmaier and nergal.dev Copyright (c) 2011 by Michael Zinsmaier and nergal.dev
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
Permission is hereby granted, free of charge, to any person obtaining a copy /*
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in ____________________________________________________
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR what it is:
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ____________________________________________________
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
curvedLines is a plugin for flot, that tries to display lines in a smoother way.
The plugin is based on nergal.dev's work https://code.google.com/p/flot/issues/detail?id=226
and further extended with a mode that forces the min/max points of the curves to be on the
points. Both modes are achieved through adding of more data points
=> 1) with large data sets you may get trouble
=> 2) if you want to display the points too, you have to plot them as 2nd data series over the lines
/* This is version 0.3 of curvedLines so it will probably not work in every case. However
the basic form of use descirbed next works (:
Feel free to further improve the code
____________________________________________________
how to use it:
____________________________________________________
var d1 = [[5,5],[7,3],[9,12]];
____________________________________________________ var options = { series: { curvedLines: { active: true }}};
what it is: $.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options);
____________________________________________________ _____________________________________________________
curvedLines is a plugin for flot, that tries to display lines in a smoother way. options:
The plugin is based on nergal.dev's work https://code.google.com/p/flot/issues/detail?id=226 _____________________________________________________
and further extended with a mode that forces the min/max points of the curves to be on the
points. Both modes are achieved through adding of more data points fill: bool true => lines get filled
=> 1) with large data sets you may get trouble fillColor: null or the color that should be used for filling
=> 2) if you want to display the points too, you have to plot them as 2nd data series over the lines active: bool true => plugin can be used
show: bool true => series will be drawn as curved line
This is version 0.1 of curvedLines so it will probably not work in every case. However fit: bool true => forces the max,mins of the curve to be on the datapoints
the basic form of use descirbed next works (: lineWidth: int width of the line
curvePointFactor int defines how many "virtual" points are used per "real" data point to
Feel free to further improve the code emulate the curvedLines
fitPointDist: int defines the x axis distance of the additional two points that are used
____________________________________________________ to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints|
"virtual" points if fit is true)
how to use it: */
____________________________________________________
/*
* v0.1 initial commit
var d1 = [[5,5],[7,3],[9,12]]; * v0.15 negative values should work now (outcommented a negative -> 0 hook hope it does no harm)
* v0.2 added fill option (thanks to monemihir) and multi axis support (thanks to soewono effendi)
var options = { series: { curvedLines: { active: true }}}; * v0.3 improved saddle handling and added basic handling of Dates
*
$.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options);
_____________________________________________________
options:
_____________________________________________________
fill: bool true => lines get filled
fillColor: null or the color that should be used for filling
active: bool true => plugin can be used
show: bool true => series will be drawn as curved line
fit: bool true => forces the max,mins of the curve to be on the datapoints
lineWidth: int width of the line
curvePointFactor int defines how many "virtual" points are used per "real" data point to
emulate the curvedLines
fitPointDist: int defines the x axis distance of the additional two points that are used
to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints|
"virtual" points if fit is true)
*/
/*
* v0.1 initial commit
* v0.15 negative values should work now (outcommented a negative -> 0 hook hope it does no harm)
* v0.2 added fill option (thanks to monemihir) and multi axis support (thanks to soewono effendi)
*
*
*/ */
(function ($) { (function($) {
var options = {
series : {
var options = { series: { curvedLines: { active: false, curvedLines : {
show: false, active : false,
fit: false, show : false,
fill: false, fit : false,
fillColor: null, fill : false,
lineWidth: 2, fillColor : null,
curvePointFactor: 20, lineWidth : 2,
fitPointDist: 0.0001 curvePointFactor : 20,
}}}; fitPointDist : 0.0001
}
}
function init(plot) { };
plot.hooks.processOptions.push(processOptions); function init(plot) {
plot.hooks.processOptions.push(processOptions);
//if the plugin is active register draw method //if the plugin is active register draw method
function processOptions(plot,options) { function processOptions(plot, options) {
if (options.series.curvedLines.active) { if (options.series.curvedLines.active) {
plot.hooks.draw.push(draw); plot.hooks.draw.push(draw);
} }
}
//select the data sets that should be drawn with curved lines and draws them
function draw(plot, ctx) {
var series;
var sdata = plot.getData();
var offset = plot.getPlotOffset();
for (var i = 0; i < sdata.length; i++) {
series = sdata[i];
if (series.curvedLines.show && series.curvedLines.lineWidth > 0) {
axisx = series.xaxis;
axisy = series.yaxis;
ctx.save();
ctx.translate(offset.left, offset.top);
ctx.lineJoin = "round";
ctx.strokeStyle = series.color;
if(series.curvedLines.fill) {
var fillColor = series.curvedLines.fillColor == null ? series.color : series.curvedLines.fillColor;
var c = $.color.parse(fillColor);
c.a = typeof fill == "number" ? fill : 0.4;
c.normalize();
ctx.fillStyle = c.toString();
}
ctx.lineWidth = series.curvedLines.lineWidth;
var points = calculateCurvePoints(series.data, series.curvedLines);
plotLine(ctx, points, axisx, axisy, series.curvedLines.fill);
ctx.restore();
}
}
}
//nearly the same as in the core library
//only ps is adjusted to 2
function plotLine(ctx, points, axisx, axisy, fill) {
var ps = 2;
var prevx = null;
var prevy = null;
var firsty = 0;
ctx.beginPath();
for (var i = ps; i < points.length; i += ps) {
var x1 = points[i - ps], y1 = points[i - ps + 1];
var x2 = points[i], y2 = points[i + 1];
if (x1 == null || x2 == null)
continue;
// clip with ymin
if (y1 <= y2 && y1 < axisy.min) {
if (y2 < axisy.min)
continue; // line segment is outside
// compute new intersection point
x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.min;
}
else if (y2 <= y1 && y2 < axisy.min) {
if (y1 < axisy.min)
continue;
x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.min;
}
// clip with ymax
if (y1 >= y2 && y1 > axisy.max) {
if (y2 > axisy.max)
continue;
x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.max;
}
else if (y2 >= y1 && y2 > axisy.max) {
if (y1 > axisy.max)
continue;
x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.max;
}
// clip with xmin
if (x1 <= x2 && x1 < axisx.min) {
if (x2 < axisx.min)
continue;
y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.min;
}
else if (x2 <= x1 && x2 < axisx.min) {
if (x1 < axisx.min)
continue;
y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
x2 = axisx.min;
}
// clip with xmax
if (x1 >= x2 && x1 > axisx.max) {
if (x2 > axisx.max)
continue;
y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.max;
}
else if (x2 >= x1 && x2 > axisx.max) {
if (x1 > axisx.max)
continue;
y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x2 = axisx.max;
}
if (x1 != prevx || y1 != prevy)
ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
if (prevx == null) {
firsty = y2;
}
prevx = x2;
prevy = y2;
ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
}
if (fill) {
ctx.lineTo(axisx.p2c(axisx.max), axisy.p2c(axisy.min));
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(axisy.min));
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(firsty));
ctx.fill();
}
ctx.stroke();
} }
//select the data sets that should be drawn with curved lines and draws them
function draw(plot, ctx) {
var series;
var sdata = plot.getData();
var offset = plot.getPlotOffset();
for (var i = 0; i < sdata.length; i++) {
series = sdata[i];
if (series.curvedLines.show && series.curvedLines.lineWidth > 0) {
axisx = series.xaxis;
axisy = series.yaxis;
ctx.save();
ctx.translate(offset.left, offset.top);
ctx.lineJoin = "round";
ctx.strokeStyle = series.color;
if (series.curvedLines.fill) {
var fillColor = series.curvedLines.fillColor == null ? series.color : series.curvedLines.fillColor;
var c = $.color.parse(fillColor);
c.a = typeof fill == "number" ? fill : 0.4;
c.normalize();
ctx.fillStyle = c.toString();
}
ctx.lineWidth = series.curvedLines.lineWidth;
var points, dataX, dataY, data;
//convenience check for x or y values if they are Dates if so apply .getTime()
//only check on first value mixing numeric and Date fields in one input array is not allowed
if (series.data[0][0] instanceof Date || series.data[0][1] instanceof Date) {
data = series.data.map(getTimeFromDate);
} else {
//default case
data = series.data;
}
var points = calculateCurvePoints(data, series.curvedLines);
plotLine(ctx, points, axisx, axisy, series.curvedLines.fill);
ctx.restore();
}
}
}
//no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226 //helper method that convertes Dates to a numeric representation
//I don't understand what nergal computes here and to be honest I didn't even try function getTimeFromDate(timeElement) {
function calculateCurvePoints(data, curvedLinesOptions) { var xVal = timeElement[0];
var yVal = timeElement[1];
var ret = new Array;
var num = curvedLinesOptions.curvePointFactor * data.length; if (timeElement[0] instanceof Date) {
var xdata = new Array; ret[0] = xVal.getTime();
var ydata = new Array; } else {
ret[0] = xVal;
}
if (curvedLinesOptions.fit) { if (timeElement[1] instanceof Date) {
//insert a point before and after the "real" data point to force the line ret[1] = yVal.getTime();
//to have a max,min at the data point
var neigh = curvedLinesOptions.fitPointDist;
var j=0;
for(var i = 0; i < data.length; i++) {
//smooth front
xdata[j] = data[i][0]-0.1;
if (i > 0) {
ydata[j] = data[i-1][1]*neigh + data[i][1] * (1 - neigh);
} else {
ydata[j] = data[i][1];
}
j++;
xdata[j] = data[i][0];
ydata[j] = data[i][1];
j++;
//smooth back
xdata[j] = data[i][0]+0.1;
if ((i+1) < data.length) {
ydata[j] = data[i+1][1]*neigh + data[i][1] * (1 - neigh);
} else {
ydata[j] = data[i][1];
}
j++;
}
} else { } else {
//just use the datapoints ret[1] = yVal;
for(var i = 0; i < data.length; i++) {
xdata[i] = data[i][0];
ydata[i] = data[i][1];
}
} }
var n = xdata.length; return ret;
}
var y2 = new Array(); //nearly the same as in the core library
var delta = new Array(); //only ps is adjusted to 2
y2[0] = 0; function plotLine(ctx, points, axisx, axisy, fill) {
y2[n - 1] = 0;
delta[0] = 0;
for(var i = 1; i < n - 1; ++i) { var ps = 2;
var d = (xdata[i + 1] - xdata[i - 1]); var prevx = null;
if(d == 0) { var prevy = null;
return null; var firsty = 0;
}
ctx.beginPath();
for (var i = ps; i < points.length; i += ps) {
var x1 = points[i - ps], y1 = points[i - ps + 1];
var x2 = points[i], y2 = points[i + 1];
if (x1 == null || x2 == null)
continue;
// clip with ymin
if (y1 <= y2 && y1 < axisy.min) {
if (y2 < axisy.min)
continue;
// line segment is outside
// compute new intersection point
x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.min;
} else if (y2 <= y1 && y2 < axisy.min) {
if (y1 < axisy.min)
continue;
x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.min;
}
// clip with ymax
if (y1 >= y2 && y1 > axisy.max) {
if (y2 > axisy.max)
continue;
x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.max;
} else if (y2 >= y1 && y2 > axisy.max) {
if (y1 > axisy.max)
continue;
x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.max;
}
// clip with xmin
if (x1 <= x2 && x1 < axisx.min) {
if (x2 < axisx.min)
continue;
y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.min;
} else if (x2 <= x1 && x2 < axisx.min) {
if (x1 < axisx.min)
continue;
y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
x2 = axisx.min;
}
// clip with xmax
if (x1 >= x2 && x1 > axisx.max) {
if (x2 > axisx.max)
continue;
y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.max;
} else if (x2 >= x1 && x2 > axisx.max) {
if (x1 > axisx.max)
continue;
y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x2 = axisx.max;
}
if (x1 != prevx || y1 != prevy)
ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
if (prevx == null) {
firsty = y2;
}
prevx = x2;
prevy = y2;
ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
}
if (fill) {
ctx.lineTo(axisx.p2c(axisx.max), axisy.p2c(axisy.min));
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(axisy.min));
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(firsty));
ctx.fill();
}
ctx.stroke();
}
var s = (xdata[i] - xdata[i - 1]) / d; //no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226
var p = s * y2[i - 1] + 2; //if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code.
y2[i] = (s - 1) / p; function calculateCurvePoints(data, curvedLinesOptions) {
delta[i] = (ydata[i + 1] - ydata[i]) / (xdata[i + 1] - xdata[i]) - (ydata[i] - ydata[i - 1]) / (xdata[i] - xdata[i - 1]);
delta[i] = (6 * delta[i] / (xdata[i + 1] - xdata[i - 1]) - s * delta[i - 1]) / p;
}
for(var j = n - 2; j >= 0; --j) { var num = curvedLinesOptions.curvePointFactor * data.length;
y2[j] = y2[j] * y2[j + 1] + delta[j]; var xdata = new Array;
} var ydata = new Array;
var X = 0;
var Y = 1;
var step = (xdata[n - 1] - xdata[0]) / (num - 1); if (curvedLinesOptions.fit) {
//insert a point before and after the "real" data point to force the line
var xnew = new Array; //to have a max,min at the data point however only if it is a lowest or highest point of the
var ynew = new Array; //curve => avoid saddles
var result = new Array; var neigh = curvedLinesOptions.fitPointDist;
var j = 0;
for (var i = 0; i < data.length; i++) {
var front = new Array;
var back = new Array;
//smooth front
front[X] = data[i][X] - 0.1;
if (i > 0) {
front[Y] = data[i-1][Y] * neigh + data[i][Y] * (1 - neigh);
} else {
front[Y] = data[i][Y];
}
//smooth back
back[X] = data[i][X] + 0.1;
if ((i + 1) < data.length) {
back[Y] = data[i+1][Y] * neigh + data[i][Y] * (1 - neigh);
} else {
back[Y] = data[i][Y];
}
//test for a saddle
if ((front[Y] <= data[i][Y] && back[Y] <= data[i][Y]) || //max or partial horizontal
(front[Y] >= data[i][Y] && back[Y] >= data[i][Y])) { //min or partial horizontal
//add curve points
xdata[j] = front[X];
ydata[j] = front[Y];
j++;
xdata[j] = data[i][0];
ydata[j] = data[i][1];
j++;
xdata[j] = back[X];
ydata[j] = back[Y];
j++;
} else { //saddle
//use original point only
xdata[j] = data[i][0];
ydata[j] = data[i][1];
j++;
}
}
} else {
//just use the datapoints
for (var i = 0; i < data.length; i++) {
xdata[i] = data[i][0];
ydata[i] = data[i][1];
}
}
xnew[0] = xdata[0]; var n = xdata.length;
ynew[0] = ydata[0];
var y2 = new Array();
var delta = new Array();
y2[0] = 0;
y2[n - 1] = 0;
delta[0] = 0;
for (var i = 1; i < n - 1; ++i) {
var d = (xdata[i + 1] - xdata[i - 1]);
if (d == 0) {
return null;
}
var s = (xdata[i] - xdata[i - 1]) / d;
var p = s * y2[i - 1] + 2;
y2[i] = (s - 1) / p;
delta[i] = (ydata[i + 1] - ydata[i]) / (xdata[i + 1] - xdata[i]) - (ydata[i] - ydata[i - 1]) / (xdata[i] - xdata[i - 1]);
delta[i] = (6 * delta[i] / (xdata[i + 1] - xdata[i - 1]) - s * delta[i - 1]) / p;
}
for (var j = n - 2; j >= 0; --j) {
y2[j] = y2[j] * y2[j + 1] + delta[j];
}
for(j = 1; j < num; ++j) { var step = (xdata[n - 1] - xdata[0]) / (num - 1);
xnew[j] = xnew[0] + j * step;
var max = n - 1; var xnew = new Array;
var min = 0; var ynew = new Array;
var result = new Array;
while(max - min > 1) { xnew[0] = xdata[0];
var k = Math.round((max + min) / 2); ynew[0] = ydata[0];
if(xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
}
}
var h = (xdata[max] - xdata[min]); for ( j = 1; j < num; ++j) {
xnew[j] = xnew[0] + j * step;
if(h == 0) { var max = n - 1;
return null; var min = 0;
}
var a = (xdata[max] - xnew[j]) / h; while (max - min > 1) {
var b = (xnew[j] - xdata[min]) / h; var k = Math.round((max + min) / 2);
if (xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
}
}
ynew[j] = a * ydata[min] + b * ydata[max] + ((a * a * a - a) * y2[min] + (b * b * b - b) * y2[max]) * (h * h) / 6; var h = (xdata[max] - xdata[min]);
// if (ynew[j] < 0.01){
// ynew[j] = 0;
// }
result.push(xnew[j]);
result.push(ynew[j]);
}
return result; if (h == 0) {
} return null;
}
var a = (xdata[max] - xnew[j]) / h;
var b = (xnew[j] - xdata[min]) / h;
ynew[j] = a * ydata[min] + b * ydata[max] + ((a * a * a - a) * y2[min] + (b * b * b - b) * y2[max]) * (h * h) / 6;
// if (ynew[j] < 0.01){
// ynew[j] = 0;
// }
result.push(xnew[j]);
result.push(ynew[j]);
}
return result;
}
}//end init }//end init
$.plot.plugins.push({ $.plot.plugins.push({
init: init, init : init,
options: options, options : options,
name: 'curvedLines', name : 'curvedLines',
version: '0.2' version : '0.3'
}); });
})(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