Skip to content

C
CurvedLines
Commit 56b37176 authored by Thomas-git's avatar Thomas-git
Browse files
Options

Proper curves filling and require.js module 

Small bug fixes
- fill opacity always defaulted to 0
- check of Array.map
parent bef80155
Show whitespace changes
Inline Side-by-side
Showing with 550 additions and 377 deletions
curvedLines.js
View file @ 56b37176
define(['jquery','jquery.flot'],function(jQuery,jflot){
/* The MIT License /* The MIT License
Copyright (c) 2011 by Michael Zinsmaier and nergal.dev Copyright (c) 2011 by Michael Zinsmaier and nergal.dev
Copyright (c) 2012 by Thomas Ritou
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal Permission is hereby granted, free of charge, to any person obtaining a copy
in the Software without restriction, including without limitation the rights of this software and associated documentation files (the "Software"), to deal
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell in the Software without restriction, including without limitation the rights
copies of the Software, and to permit persons to whom the Software is to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
furnished to do so, subject to the following conditions: 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 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, THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
THE SOFTWARE. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
*/ THE SOFTWARE.
*/
/* /*
____________________________________________________ ____________________________________________________
what it is: what it is:
____________________________________________________ ____________________________________________________
curvedLines is a plugin for flot, that tries to display lines in a smoother way. 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 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 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 points. Both modes are achieved through adding of more data points
=> 1) with large data sets you may get trouble => 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 => 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 This is version 0.4 of curvedLines so it will probably not work in every case. However
the basic form of use descirbed next works (: the basic form of use descirbed next works (:
Feel free to further improve the code
____________________________________________________ Feel free to further improve the code
____________________________________________________
how to use it:
____________________________________________________
how to use it:
____________________________________________________
var d1 = [[5,5],[7,3],[9,12]]; var d1 = [[5,5],[7,3],[9,12]];
var options = { series: { curvedLines: { active: true }}}; var options = { series: { curvedLines: { active: true }}};
$.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options); $.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options);
_____________________________________________________
options: _____________________________________________________
_____________________________________________________
options:
_____________________________________________________
fill: bool true => lines get filled fill: bool true => lines get filled
fillColor: null or the color that should be used for filling fillColor: null or the color that should be used for filling
...@@ -65,44 +72,46 @@ ...@@ -65,44 +72,46 @@
fitPointDist: int defines the x axis distance of the additional two points that are used 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| to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints|
"virtual" points if fit is true) "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)
* v0.3 improved saddle handling and added basic handling of Dates * v0.3 improved saddle handling and added basic handling of Dates
* v0.4 rewritten fill option (thomas ritou) mostly from original flot code (now fill between points rather than to graph bottom), corrected fill Opacity bug
* *
*/ */
(function($) { (function ($) {
var options = { series: { curvedLines: { active: false,
show: false,
fit: false,
fill: false,
fillColor: null,
lineWidth: 2,
curvePointFactor: 20,
fitPointDist: 0.0001
}}};
var options = {
series : {
curvedLines : {
active : false,
show : false,
fit : false,
fill : false,
fillColor : null,
lineWidth : 2,
curvePointFactor : 20,
fitPointDist : 0.0001
}
}
};
function init(plot) { function init(plot) {
plot.hooks.processOptions.push(processOptions); 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;
...@@ -111,7 +120,7 @@ ...@@ -111,7 +120,7 @@
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) {
axisx = series.xaxis; axisx = series.xaxis;
axisy = series.yaxis; axisy = series.yaxis;
...@@ -120,27 +129,42 @@ ...@@ -120,27 +129,42 @@
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) {
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; ctx.lineWidth = series.curvedLines.lineWidth;
var points, dataX, dataY, data;
var points,data;
if(series.curvedLines.fill || series.curvedLines.lineWidth) {
//convenience check for x or y values if they are Dates if so apply .getTime() //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 //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) { if ('map' in Array.prototype && (series.data[0][0] instanceof Date || series.data[0][1] instanceof Date)) {
data = series.data.map(getTimeFromDate); data = series.data.map(getTimeFromDate);
} else { } else {
//default case //default case
data = series.data; data = series.data;
} }
var points = calculateCurvePoints(data, series.curvedLines); points= calculateCurvePoints(data, series.curvedLines,1);
plotLine(ctx, points, axisx, axisy, 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 series.curvedLines.fill == "number" ? series.curvedLines.fill : 0.4;
c.normalize();
ctx.fillStyle = c.toString();
//Make sure we've got a second y point for filling area
for (var j=0;j<data.length;j++){
if (data[j].length==2) data[j][2]=0;
}
var pointsFill = calculateCurvePoints(data, series.curvedLines,2);
plotLineArea(ctx,points,pointsFill,axisx,axisy);
}
if (series.curvedLines.lineWidth>0)
plotLine(ctx, points, axisx, axisy,2);
ctx.restore(); ctx.restore();
} }
} }
...@@ -167,14 +191,156 @@ ...@@ -167,14 +191,156 @@
return ret; return ret;
} }
function plotLineArea(ctx,points2,points3, axisx, axisy) {
var points = points2,
ps = 2,
bottom = Math.min(Math.max(0, axisy.min), axisy.max),
i = 0, top, areaOpen = false,
ypos = 1, segmentStart = 0, segmentEnd = 0;
// we process each segment in two turns, first forward
// direction to sketch out top, then once we hit the
// end we go backwards to sketch the bottom
while (true) {
if (ps > 0 && i > points.length + ps)
break;
i += ps; // ps is negative if going backwards
var x1 = points[i - ps],
y1 = points[i - ps + ypos],
x2 = points[i], y2 = points[i + ypos];
if (areaOpen) {
if (ps > 0 && x1 != null && x2 == null) {
// at turning point
segmentEnd = i;
ps = -ps;
ypos = 1;
points=points3;
continue;
}
if (ps < 0 && i == segmentStart + ps) {
// done with the reverse sweep
ctx.fill();
areaOpen = false;
ps = -ps;
ypos = 1;
points=points2;
i = segmentStart = segmentEnd + ps;
continue;
}
}
if (x1 == null || x2 == null)
continue;
// clip x values
// 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 (!areaOpen) {
// open area
ctx.beginPath();
ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
areaOpen = true;
}
// now first check the case where both is outside
if (y1 >= axisy.max && y2 >= axisy.max) {
ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
continue;
}
else if (y1 <= axisy.min && y2 <= axisy.min) {
ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
continue;
}
// else it's a bit more complicated, there might
// be a flat maxed out rectangle first, then a
// triangular cutout or reverse; to find these
// keep track of the current x values
var x1old = x1, x2old = x2;
// clip the y values, without shortcutting, we
// go through all cases in turn
// clip with ymin
if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.min;
}
else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.min;
}
// clip with ymax
if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.max;
}
else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
y2 = axisy.max;
}
// if the x value was changed we got a rectangle
// to fill
if (x1 != x1old) {
ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
// it goes to (x1, y1), but we fill that below
}
// fill triangular section, this sometimes result
// in redundant points if (x1, y1) hasn't changed
// from previous line to, but we just ignore that
ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
// fill the other rectangle if it's there
if (x2 != x2old) {
ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2));
}
}
}
//nearly the same as in the core library //nearly the same as in the core library
//only ps is adjusted to 2 function plotLine(ctx, points, axisx, axisy,ps) {
function plotLine(ctx, points, axisx, axisy, fill) {
var ps = 2;
var prevx = null; var prevx = null;
var prevy = null; var prevy = null;
var firsty = 0;
ctx.beginPath(); ctx.beginPath();
...@@ -188,12 +354,12 @@ ...@@ -188,12 +354,12 @@
// 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; continue; // line segment is outside
// line segment is outside
// compute new intersection point // compute new intersection point
x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
y1 = axisy.min; 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;
...@@ -206,7 +372,8 @@ ...@@ -206,7 +372,8 @@
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;
...@@ -219,7 +386,8 @@ ...@@ -219,7 +386,8 @@
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) { }
else if (x2 <= x1 && x2 < axisx.min) {
if (x1 < axisx.min) if (x1 < axisx.min)
continue; continue;
y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
...@@ -232,7 +400,8 @@ ...@@ -232,7 +400,8 @@
continue; continue;
y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
x1 = axisx.max; x1 = axisx.max;
} else if (x2 >= x1 && x2 > axisx.max) { }
else if (x2 >= x1 && x2 > axisx.max) {
if (x1 > axisx.max) if (x1 > axisx.max)
continue; continue;
y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
...@@ -242,32 +411,26 @@ ...@@ -242,32 +411,26 @@
if (x1 != prevx || y1 != prevy) if (x1 != prevx || y1 != prevy)
ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
if (prevx == null) {
firsty = y2;
}
prevx = x2; prevx = x2;
prevy = y2; prevy = y2;
ctx.lineTo(axisx.p2c(x2), axisy.p2c(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(); 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
//if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code. //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,yPos) {
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;
var X = 0; var X = 0;
var Y = 1; var Y = yPos;
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
...@@ -307,8 +470,8 @@ ...@@ -307,8 +470,8 @@
ydata[j] = front[Y]; ydata[j] = front[Y];
j++; j++;
xdata[j] = data[i][0]; xdata[j] = data[i][X];
ydata[j] = data[i][1]; ydata[j] = data[i][Y];
j++; j++;
xdata[j] = back[X]; xdata[j] = back[X];
...@@ -316,8 +479,8 @@ ...@@ -316,8 +479,8 @@
j++; j++;
} else { //saddle } else { //saddle
//use original point only //use original point only
xdata[j] = data[i][0]; xdata[j] = data[i][X];
ydata[j] = data[i][1]; ydata[j] = data[i][Y];
j++; j++;
} }
...@@ -326,8 +489,8 @@ ...@@ -326,8 +489,8 @@
} 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][X];
ydata[i] = data[i][1]; ydata[i] = data[i][Y];
} }
} }
...@@ -339,9 +502,9 @@ ...@@ -339,9 +502,9 @@
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;
} }
...@@ -352,7 +515,7 @@ ...@@ -352,7 +515,7 @@
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) { for(var j = n - 2; j >= 0; --j) {
y2[j] = y2[j] * y2[j + 1] + delta[j]; y2[j] = y2[j] * y2[j + 1] + delta[j];
} }
...@@ -365,15 +528,16 @@ ...@@ -365,15 +528,16 @@
xnew[0] = xdata[0]; xnew[0] = xdata[0];
ynew[0] = ydata[0]; ynew[0] = ydata[0];
for ( j = 1; j < num; ++j) {
for(j = 1; j < num; ++j) {
xnew[j] = xnew[0] + j * step; xnew[j] = xnew[0] + j * step;
var max = n - 1; var max = n - 1;
var min = 0; var min = 0;
while (max - min > 1) { while(max - min > 1) {
var k = Math.round((max + min) / 2); var k = Math.round((max + min) / 2);
if (xdata[k] > xnew[j]) { if(xdata[k] > xnew[j]) {
max = k; max = k;
} else { } else {
min = k; min = k;
...@@ -382,7 +546,7 @@ ...@@ -382,7 +546,7 @@
var h = (xdata[max] - xdata[min]); var h = (xdata[max] - xdata[min]);
if (h == 0) { if(h == 0) {
return null; return null;
} }
...@@ -390,9 +554,9 @@ ...@@ -390,9 +554,9 @@
var b = (xnew[j] - xdata[min]) / 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; 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){ // if (ynew[j] < 0.01){
// ynew[j] = 0; // ynew[j] = 0;
// } // }
result.push(xnew[j]); result.push(xnew[j]);
result.push(ynew[j]); result.push(ynew[j]);
} }
...@@ -400,14 +564,23 @@ ...@@ -400,14 +564,23 @@
return result; return result;
} }
}//end init }//end init
$.plot.plugincurvedLines=true;
$.plot.plugins.push({ $.plot.plugins.push({
init : init, init: init,
options : options, options: options,
name : 'curvedLines', name: 'curvedLines',
version : '0.3' version: '0.4'
}); });
})(jQuery); })(jQuery);
return jQuery.plot.plugincurvedLines;
});
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