Skip to content

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

Merge branch 'fastFixes'

parents 64c5b94e 89483ad4
Show whitespace changes
Inline Side-by-side
Showing with 371 additions and 335 deletions
curvedLines.js
View file @ bef80155
/* The MIT License
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.
*/
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.
*/
/*
____________________________________________________
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.
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
Feel free to further improve the code
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:
____________________________________________________
____________________________________________________
how to use it:
____________________________________________________
var d1 = [[5,5],[7,3],[9,12]];
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
......@@ -70,45 +65,44 @@ _____________________________________________________
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)
*
* v0.3 improved saddle handling and added basic handling of Dates
*
*/
(function ($) {
var options = { series: { curvedLines: { active: false,
show: false,
fit: false,
fill: false,
fillColor: null,
lineWidth: 2,
curvePointFactor: 20,
fitPointDist: 0.0001
}}};
(function($) {
var options = {
series : {
curvedLines : {
active : false,
show : false,
fit : false,
fill : false,
fillColor : null,
lineWidth : 2,
curvePointFactor : 20,
fitPointDist : 0.0001
}
}
};
function init(plot) {
plot.hooks.processOptions.push(processOptions);
//if the plugin is active register draw method
function processOptions(plot,options) {
function processOptions(plot, options) {
if (options.series.curvedLines.active) {
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;
......@@ -126,7 +120,7 @@ _____________________________________________________
ctx.translate(offset.left, offset.top);
ctx.lineJoin = "round";
ctx.strokeStyle = series.color;
if(series.curvedLines.fill) {
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;
......@@ -134,14 +128,44 @@ _____________________________________________________
ctx.fillStyle = c.toString();
}
ctx.lineWidth = series.curvedLines.lineWidth;
var points, dataX, dataY, data;
var points = calculateCurvePoints(series.data, series.curvedLines);
//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();
}
}
}
//helper method that convertes Dates to a numeric representation
function getTimeFromDate(timeElement) {
var xVal = timeElement[0];
var yVal = timeElement[1];
var ret = new Array;
if (timeElement[0] instanceof Date) {
ret[0] = xVal.getTime();
} else {
ret[0] = xVal;
}
if (timeElement[1] instanceof Date) {
ret[1] = yVal.getTime();
} else {
ret[1] = yVal;
}
return ret;
}
//nearly the same as in the core library
//only ps is adjusted to 2
......@@ -164,12 +188,12 @@ _____________________________________________________
// clip with ymin
if (y1 <= y2 && y1 < axisy.min) {
if (y2 < axisy.min)
continue; // line segment is outside
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) {
} else if (y2 <= y1 && y2 < axisy.min) {
if (y1 < axisy.min)
continue;
x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
......@@ -182,8 +206,7 @@ _____________________________________________________
continue;
x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.max;
}
else if (y2 >= y1 && y2 > axisy.max) {
} else if (y2 >= y1 && y2 > axisy.max) {
if (y1 > axisy.max)
continue;
x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
......@@ -196,8 +219,7 @@ _____________________________________________________
continue;
y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.min;
}
else if (x2 <= x1 && x2 < axisx.min) {
} else if (x2 <= x1 && x2 < axisx.min) {
if (x1 < axisx.min)
continue;
y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
......@@ -210,8 +232,7 @@ _____________________________________________________
continue;
y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.max;
}
else if (x2 >= x1 && x2 > axisx.max) {
} else if (x2 >= x1 && x2 > axisx.max) {
if (x1 > axisx.max)
continue;
y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
......@@ -237,52 +258,74 @@ _____________________________________________________
ctx.stroke();
}
//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
//if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code.
function calculateCurvePoints(data, curvedLinesOptions) {
var num = curvedLinesOptions.curvePointFactor * data.length;
var xdata = new Array;
var ydata = new Array;
var X = 0;
var Y = 1;
if (curvedLinesOptions.fit) {
//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 however only if it is a lowest or highest point of the
//curve => avoid saddles
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
xdata[j] = data[i][0]-0.1;
var front = new Array;
var back = new Array;
//smooth front
front[X] = data[i][X] - 0.1;
if (i > 0) {
ydata[j] = data[i-1][1]*neigh + data[i][1] * (1 - neigh);
front[Y] = data[i-1][Y] * neigh + data[i][Y] * (1 - neigh);
} else {
ydata[j] = data[i][1];
front[Y] = data[i][Y];
}
j++;
//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++;
//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 {
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++;
}
j++;
}
} else {
//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];
ydata[i] = data[i][1];
}
......@@ -296,9 +339,9 @@ _____________________________________________________
y2[n - 1] = 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]);
if(d == 0) {
if (d == 0) {
return null;
}
......@@ -309,7 +352,7 @@ _____________________________________________________
delta[i] = (6 * delta[i] / (xdata[i + 1] - xdata[i - 1]) - s * delta[i - 1]) / p;
}
for(var j = n - 2; j >= 0; --j) {
for (var j = n - 2; j >= 0; --j) {
y2[j] = y2[j] * y2[j + 1] + delta[j];
}
......@@ -322,16 +365,15 @@ _____________________________________________________
xnew[0] = xdata[0];
ynew[0] = ydata[0];
for(j = 1; j < num; ++j) {
for ( j = 1; j < num; ++j) {
xnew[j] = xnew[0] + j * step;
var max = n - 1;
var min = 0;
while(max - min > 1) {
while (max - min > 1) {
var k = Math.round((max + min) / 2);
if(xdata[k] > xnew[j]) {
if (xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
......@@ -340,7 +382,7 @@ _____________________________________________________
var h = (xdata[max] - xdata[min]);
if(h == 0) {
if (h == 0) {
return null;
}
......@@ -348,9 +390,9 @@ _____________________________________________________
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;
// }
// if (ynew[j] < 0.01){
// ynew[j] = 0;
// }
result.push(xnew[j]);
result.push(ynew[j]);
}
......@@ -358,20 +400,14 @@ _____________________________________________________
return result;
}
}//end init
$.plot.plugins.push({
init: init,
options: options,
name: 'curvedLines',
version: '0.2'
init : init,
options : options,
name : 'curvedLines',
version : '0.3'
});
})(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