Commit 46ab621f authored by MichaelZinsmaier's avatar MichaelZinsmaier

formatting

parent 64c5b94e
/* 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software. 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.
*/
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.
*/
____________________________________________________
/* what it is:
____________________________________________________
____________________________________________________ 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
what it is: This is version 0.1 of curvedLines so it will probably not work in every case. However
____________________________________________________ the basic form of use descirbed next works (:
curvedLines is a plugin for flot, that tries to display lines in a smoother way. Feel free to further improve the code
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.1 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:
____________________________________________________
how to use it: var d1 = [[5,5],[7,3],[9,12]];
____________________________________________________
var options = { series: { curvedLines: { active: true }}};
var d1 = [[5,5],[7,3],[9,12]]; $.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options);
var options = { series: { curvedLines: { active: true }}}; _____________________________________________________
$.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options); 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)
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.1 initial commit
* v0.15 negative values should work now (outcommented a negative -> 0 hook hope it does no harm) * 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) * 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
//select the data sets that should be drawn with curved lines and draws them function draw(plot, ctx) {
function draw(plot, ctx) { var series;
var series; var sdata = plot.getData();
var sdata = plot.getData(); var offset = plot.getPlotOffset();
var offset = plot.getPlotOffset();
for (var i = 0; i < sdata.length; i++) {
for (var i = 0; i < sdata.length; i++) { series = sdata[i];
series = sdata[i]; if (series.curvedLines.show && series.curvedLines.lineWidth > 0) {
if (series.curvedLines.show && series.curvedLines.lineWidth > 0) {
axisx = series.xaxis;
axisx = series.xaxis; axisy = series.yaxis;
axisy = series.yaxis;
ctx.save();
ctx.save(); ctx.translate(offset.left, offset.top);
ctx.translate(offset.left, offset.top); ctx.lineJoin = "round";
ctx.lineJoin = "round"; ctx.strokeStyle = series.color;
ctx.strokeStyle = series.color; if (series.curvedLines.fill) {
if(series.curvedLines.fill) { var fillColor = series.curvedLines.fillColor == null ? series.color : series.curvedLines.fillColor;
var fillColor = series.curvedLines.fillColor == null ? series.color : series.curvedLines.fillColor; var c = $.color.parse(fillColor);
var c = $.color.parse(fillColor); c.a = typeof fill == "number" ? fill : 0.4;
c.a = typeof fill == "number" ? fill : 0.4; c.normalize();
c.normalize(); ctx.fillStyle = c.toString();
ctx.fillStyle = c.toString(); }
} ctx.lineWidth = series.curvedLines.lineWidth;
ctx.lineWidth = series.curvedLines.lineWidth;
var points = calculateCurvePoints(series.data, series.curvedLines);
var points = calculateCurvePoints(series.data, series.curvedLines); plotLine(ctx, points, axisx, axisy, series.curvedLines.fill);
plotLine(ctx, points, axisx, axisy, series.curvedLines.fill); ctx.restore();
ctx.restore(); }
} }
} }
}
//nearly the same as in the core library
//only ps is adjusted to 2
//nearly the same as in the core library
//only ps is adjusted to 2
function plotLine(ctx, points, axisx, axisy, fill) { function plotLine(ctx, points, axisx, axisy, fill) {
var ps = 2; var ps = 2;
var prevx = null; var prevx = null;
var prevy = null; var prevy = null;
var firsty = 0; var firsty = 0;
ctx.beginPath(); ctx.beginPath();
for (var i = ps; i < points.length; i += ps) { for (var i = ps; i < points.length; i += ps) {
var x1 = points[i - ps], y1 = points[i - ps + 1]; var x1 = points[i - ps], y1 = points[i - ps + 1];
var x2 = points[i], y2 = points[i + 1]; var x2 = points[i], y2 = points[i + 1];
if (x1 == null || x2 == null) if (x1 == null || x2 == null)
continue; continue;
// clip with ymin // clip with ymin
if (y1 <= y2 && y1 < axisy.min) { if (y1 <= y2 && y1 < axisy.min) {
if (y2 < axisy.min) if (y2 < axisy.min)
continue; // line segment is outside continue;
// compute new intersection point // line segment is outside
x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; // compute new intersection point
y1 = axisy.min; x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
} y1 = axisy.min;
else if (y2 <= y1 && y2 < axisy.min) { } else if (y2 <= y1 && y2 < axisy.min) {
if (y1 < axisy.min) if (y1 < axisy.min)
continue; continue;
x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.min; y2 = axisy.min;
} }
// clip with ymax // clip with ymax
if (y1 >= y2 && y1 > axisy.max) { if (y1 >= y2 && y1 > axisy.max) {
if (y2 > axisy.max) if (y2 > axisy.max)
continue; continue;
x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.max; y1 = axisy.max;
} } else if (y2 >= y1 && y2 > axisy.max) {
else if (y2 >= y1 && y2 > axisy.max) { if (y1 > axisy.max)
if (y1 > axisy.max) continue;
continue; x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.max;
y2 = axisy.max; }
}
// clip with xmin
// clip with xmin if (x1 <= x2 && x1 < axisx.min) {
if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min)
if (x2 < axisx.min) continue;
continue; y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.min;
x1 = axisx.min; } else if (x2 <= x1 && x2 < axisx.min) {
} if (x1 < axisx.min)
else if (x2 <= x1 && x2 < axisx.min) { continue;
if (x1 < axisx.min) y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
continue; x2 = axisx.min;
y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; }
x2 = axisx.min;
} // clip with xmax
if (x1 >= x2 && x1 > axisx.max) {
// clip with xmax if (x2 > axisx.max)
if (x1 >= x2 && x1 > axisx.max) { continue;
if (x2 > axisx.max) y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
continue; x1 = axisx.max;
y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; } else if (x2 >= x1 && x2 > axisx.max) {
x1 = axisx.max; if (x1 > axisx.max)
} continue;
else if (x2 >= x1 && x2 > axisx.max) { y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
if (x1 > axisx.max) x2 = 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 (x1 != prevx || y1 != prevy) if (prevx == null) {
ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); firsty = y2;
}
if (prevx == null) { prevx = x2;
firsty = y2; prevy = y2;
} ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
prevx = x2; }
prevy = y2; if (fill) {
ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); ctx.lineTo(axisx.p2c(axisx.max), axisy.p2c(axisy.min));
} ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(axisy.min));
if (fill) { ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(firsty));
ctx.lineTo(axisx.p2c(axisx.max), axisy.p2c(axisy.min)); ctx.fill();
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(axisy.min)); }
ctx.lineTo(axisx.p2c(axisx.min), axisy.p2c(firsty)); ctx.stroke();
ctx.fill();
}
ctx.stroke();
} }
//no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226 //no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226
//I don't understand what nergal computes here and to be honest I didn't even try //I don't understand what nergal computes here and to be honest I didn't even try
function calculateCurvePoints(data, curvedLinesOptions) { function calculateCurvePoints(data, curvedLinesOptions) {
var num = curvedLinesOptions.curvePointFactor * data.length; var num = curvedLinesOptions.curvePointFactor * data.length;
var xdata = new Array; var xdata = new Array;
var ydata = new Array; var ydata = new Array;
if (curvedLinesOptions.fit) { if (curvedLinesOptions.fit) {
//insert a point before and after the "real" data point to force the line //insert a point before and after the "real" data point to force the line
//to have a max,min at the data point //to have a max,min at the data point
var neigh = curvedLinesOptions.fitPointDist; var neigh = curvedLinesOptions.fitPointDist;
var j=0; var j = 0;
for(var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
//smooth front //smooth front
xdata[j] = data[i][0]-0.1; xdata[j] = data[i][0] - 0.1;
if (i > 0) { if (i > 0) {
ydata[j] = data[i-1][1]*neigh + data[i][1] * (1 - neigh); ydata[j] = data[i-1][1] * neigh + data[i][1] * (1 - neigh);
} else { } else {
ydata[j] = data[i][1]; ydata[j] = data[i][1];
} }
j++; j++;
xdata[j] = data[i][0];
xdata[j] = data[i][0]; ydata[j] = data[i][1];
ydata[j] = data[i][1]; j++;
j++;
//smooth back
xdata[j] = data[i][0] + 0.1;
//smooth back if ((i + 1) < data.length) {
xdata[j] = data[i][0]+0.1; ydata[j] = data[i+1][1] * neigh + data[i][1] * (1 - neigh);
if ((i+1) < data.length) { } else {
ydata[j] = data[i+1][1]*neigh + data[i][1] * (1 - neigh); ydata[j] = data[i][1];
} else { }
ydata[j] = data[i][1];
} j++;
}
j++;
}
} else { } else {
//just use the datapoints //just use the datapoints
for(var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
xdata[i] = data[i][0]; xdata[i] = data[i][0];
ydata[i] = data[i][1]; ydata[i] = data[i][1];
} }
} }
var n = xdata.length; var n = xdata.length;
var y2 = new Array(); var y2 = new Array();
var delta = new Array(); var delta = new Array();
y2[0] = 0; y2[0] = 0;
y2[n - 1] = 0; y2[n - 1] = 0;
delta[0] = 0; delta[0] = 0;
for(var i = 1; i < n - 1; ++i) { for (var i = 1; i < n - 1; ++i) {
var d = (xdata[i + 1] - xdata[i - 1]); var d = (xdata[i + 1] - xdata[i - 1]);
if(d == 0) { if (d == 0) {
return null; return null;
} }
var s = (xdata[i] - xdata[i - 1]) / d; var s = (xdata[i] - xdata[i - 1]) / d;
var p = s * y2[i - 1] + 2; var p = s * y2[i - 1] + 2;
y2[i] = (s - 1) / p; 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] = (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; 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];
}
var step = (xdata[n - 1] - xdata[0]) / (num - 1);
var xnew = new Array;
var ynew = new Array;
var result = new Array;
xnew[0] = xdata[0]; for (var j = n - 2; j >= 0; --j) {
ynew[0] = ydata[0]; y2[j] = y2[j] * y2[j + 1] + delta[j];
}
var step = (xdata[n - 1] - xdata[0]) / (num - 1);
for(j = 1; j < num; ++j) { var xnew = new Array;
xnew[j] = xnew[0] + j * step; var ynew = new Array;
var result = new Array;
var max = n - 1; xnew[0] = xdata[0];
var min = 0; ynew[0] = ydata[0];
while(max - min > 1) { for ( j = 1; j < num; ++j) {
var k = Math.round((max + min) / 2); xnew[j] = xnew[0] + j * step;
if(xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
}
}
var h = (xdata[max] - xdata[min]); var max = n - 1;
var min = 0;
if(h == 0) { while (max - min > 1) {
return null; var k = Math.round((max + min) / 2);
} if (xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
}
}
var a = (xdata[max] - xnew[j]) / h; var h = (xdata[max] - xdata[min]);
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 (h == 0) {
// if (ynew[j] < 0.01){ return null;
// ynew[j] = 0; }
// }
result.push(xnew[j]);
result.push(ynew[j]);
}
return result; 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({
init : init,
options : options,
name : 'curvedLines',
version : '0.2'
});
$.plot.plugins.push({
init: init,
options: options,
name: 'curvedLines',
version: '0.2'
});
})(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