Skip to content

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

v0.5 api break

parents fb596bd5 3c5463a0
Show whitespace changes
Inline Side-by-side
Showing with 266 additions and 344 deletions
curvedLines.js
View file @ bb64fec4
/* 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 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
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
*/ */
/* /*
____________________________________________________ ____________________________________________________
...@@ -35,8 +36,9 @@ ...@@ -35,8 +36,9 @@
=> 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.5 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
____________________________________________________ ____________________________________________________
...@@ -48,44 +50,46 @@ ...@@ -48,44 +50,46 @@
var options = { series: { curvedLines: { active: true }}}; var options = { series: { curvedLines: { active: true }}};
$.plot($("#placeholder"), [{data = d1, curvedLines: { show: true}}], options); $.plot($("#placeholder"), [{data = d1, lines: { show: true}, curvedLines: {apply: 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 active: bool true => plugin can be used
show: bool true => series will be drawn as curved line apply: bool true => series will be drawn as curved line
fit: bool true => forces the max,mins of the curve to be on the datapoints 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 curvePointFactor int defines how many "virtual" points are used per "real" data point to
emulate the curvedLines emulate the curvedLines
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)
+ line options (since v0.5 curved lines use flots line implementation for drawing
=> line options like fill, show ... are supported out of the box)
*/ */
/* /*
* 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
* v0.5 rewritten instead of implementing a own draw function CurvedLines is now based on the processDatapoints flot hook (credits go to thomas ritou).
* This change breakes existing code however CurvedLines are now just many tiny straight lines to flot and therefore all flot lines options (like gradient fill,
* shadow) are now supported out of the box
*/ */
(function($) { (function($) {
var options = { var options = {
series : { series : {
curvedLines : { curvedLines : {
active : false, active : false,
show : false, apply: false,
fit : false, fit : false,
fill : false,
fillColor : null,
lineWidth : 2,
curvePointFactor : 20, curvePointFactor : 20,
fitPointDist : 0.0001 fitPointDist : 0.0001
} }
...@@ -96,239 +100,163 @@ ...@@ -96,239 +100,163 @@
plot.hooks.processOptions.push(processOptions); plot.hooks.processOptions.push(processOptions);
//if the plugin is active register draw method //if the plugin is active register processDatapoints 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.processDatapoints.push(processDatapoints);
} }
} }
//select the data sets that should be drawn with curved lines and draws them //only if the plugin is active
function draw(plot, ctx) { function processDatapoints(plot, series, datapoints) {
var series; if (series.curvedLines.apply == true) {
var sdata = plot.getData(); if (series.lines.fill) {
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 fill = 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() var pointsTop = calculateCurvePoints(datapoints, series.curvedLines, 1)
//only check on first value mixing numeric and Date fields in one input array is not allowed ,pointsBottom = calculateCurvePoints(datapoints, series.curvedLines, 2); //flot makes sur for us that we've got a second y point if fill is true !
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); //Merge top and bottom curve
plotLine(ctx, points, axisx, axisy, series.curvedLines.fill); datapoints.pointsize = 3;
ctx.restore(); datapoints.points = [];
} var j = 0;
} var k = 0;
} var i = 0;
var ps = 2;
//helper method that convertes Dates to a numeric representation while (i < pointsTop.length || j < pointsBottom.length) {
function getTimeFromDate(timeElement) { if (pointsTop[i] == pointsBottom[j]) {
var xVal = timeElement[0]; datapoints.points[k] = pointsTop[i];
var yVal = timeElement[1]; datapoints.points[k + 1] = pointsTop[i + 1];
var ret = new Array; datapoints.points[k + 2] = pointsBottom[j + 1];
j += ps;
if (timeElement[0] instanceof Date) { i += ps;
ret[0] = xVal.getTime();
} else if (pointsTop[i] < pointsBottom[j]) {
datapoints.points[k] = pointsTop[i];
datapoints.points[k + 1] = pointsTop[i + 1];
datapoints.points[k + 2] = k > 0 ? datapoints.points[k-1] : null;
i += ps;
} else { } else {
ret[0] = xVal; datapoints.points[k] = pointsBottom[j];
datapoints.points[k + 1] = k > 1 ? datapoints.points[k-2] : null;
datapoints.points[k + 2] = pointsBottom[j + 1];
j += ps;
} }
k += 3;
if (timeElement[1] instanceof Date) {
ret[1] = yVal.getTime();
} else {
ret[1] = yVal;
} }
return ret; if (series.lines.lineWidth > 0) {//Let's draw line in separate series
var newSerie = $.extend({}, series);
newSerie.lines = $.extend({}, series.lines);
newSerie.lines.fill = undefined;
newSerie.label = undefined;
newSerie.datapoints = {};
//Redefine datapoints to top only (else it can have null values which will open the cruve !)
newSerie.datapoints.points = pointsTop;
newSerie.datapoints.pointsize = 2;
newSerie.curvedLines.apply = false;
//Don't redo curve point calculation as datapoint is copied to this new serie
//We find our series to add the line just after the fill (so other series you wanted above this one will still be)
var allSeries = plot.getData();
for ( i = 0; i < allSeries.length; i++) {
if (allSeries[i] == series) {
plot.getData().splice(i + 1, 0, newSerie);
break;
} }
//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 series.lines.lineWidth = 0;
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 } else if (series.lines.lineWidth > 0) {
if (x1 <= x2 && x1 < axisx.min) { datapoints.points = calculateCurvePoints(datapoints, series.curvedLines, 1);
if (x2 < axisx.min) datapoints.pointsize = 2;
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();
} }
//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. //if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code.
function calculateCurvePoints(data, curvedLinesOptions) { function calculateCurvePoints(datapoints, curvedLinesOptions, yPos) {
var points = datapoints.points, ps = datapoints.pointsize;
var num = curvedLinesOptions.curvePointFactor * (points.length / ps);
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;
var curX = -1;
var curY = -1;
var j = 0;
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 however only if it is a lowest or highest point of the //to have a max,min at the data point however only if it is a lowest or highest point of the
//curve => avoid saddles //curve => avoid saddles
var neigh = curvedLinesOptions.fitPointDist; var fpDist = curvedLinesOptions.fitPointDist;
var j = 0;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < points.length; i += ps) {
var front = new Array; var front = new Array;
var back = new Array; var back = new Array;
curX = i;
curY = i + yPos;
//smooth front //add point to front
front[X] = data[i][X] - 0.1; front[X] = points[curX] - fpDist;
if (i > 0) { front[Y] = points[curY];
front[Y] = data[i-1][Y] * neigh + data[i][Y] * (1 - neigh);
} else {
front[Y] = data[i][Y];
}
//add point to back
back[X] = points[curX] + fpDist;
back[Y] = points[curY];
//smooth back
back[X] = data[i][X] + 0.1; //get points (front and back) Y value for saddle test
if ((i + 1) < data.length) { var frontPointY = points[curY];
back[Y] = data[i+1][Y] * neigh + data[i][Y] * (1 - neigh); var backPointY = points[curY];
} else { if (i >= ps) {
back[Y] = data[i][Y]; frontPointY = points[curY - ps];
}
if ((i + ps) < points.length) {
backPointY = points[curY + ps];
} }
//test for a saddle //test for a saddle
if ((front[Y] <= data[i][Y] && back[Y] <= data[i][Y]) || //max or partial horizontal if ((frontPointY <= points[curY] && backPointY <= points[curY]) || //max or partial horizontal
(front[Y] >= data[i][Y] && back[Y] >= data[i][Y])) { //min or partial horizontal (frontPointY >= points[curY] && backPointY >= points[curY])) {//min or partial horizontal
//add curve points //add curve points
xdata[j] = front[X]; xdata[j] = front[X];
ydata[j] = front[Y]; ydata[j] = front[Y];
j++; j++;
xdata[j] = data[i][0]; xdata[j] = points[curX];
ydata[j] = data[i][1]; ydata[j] = points[curY];
j++; j++;
xdata[j] = back[X]; xdata[j] = back[X];
ydata[j] = back[Y]; ydata[j] = back[Y];
j++; j++;
} else { //saddle } else {//saddle
//use original point only //use original point only
xdata[j] = data[i][0]; xdata[j] = points[curX];
ydata[j] = data[i][1]; ydata[j] = points[curY];
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 < points.length; i += ps) {
xdata[i] = data[i][0]; curX = i;
ydata[i] = data[i][1]; curY = i + yPos;
xdata[j] = points[curX];
ydata[j] = points[curY];
j++;
} }
} }
...@@ -394,9 +322,7 @@ ...@@ -394,9 +322,7 @@
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){
// ynew[j] = 0;
// }
result.push(xnew[j]); result.push(xnew[j]);
result.push(ynew[j]); result.push(ynew[j]);
} }
...@@ -406,12 +332,12 @@ ...@@ -406,12 +332,12 @@
}//end init }//end init
$.plot.plugins.push({ $.plot.plugins.push({
init : init, init : init,
options : options, options : options,
name : 'curvedLines', name : 'curvedLines',
version : '0.3' version : '0.5'
}); });
})(jQuery); })(jQuery);
example.js
View file @ bb64fec4
<div id="flotOrig"></div>
<script id="source" language="javascript" type="text/javascript">
$(function () { $(function () {
//<div id="flotOrig" style="width: 800;height: 400;"></div>
var d1 = [[20,20], [42,60], [54, 20], [80,80]]; var d1 = [[20,20], [42,60], [54, 20], [80,80]];
var options = { series: { var options = { series: {
...@@ -14,6 +14,5 @@ $(function () { ...@@ -14,6 +14,5 @@ $(function () {
yaxis: { min:10, max: 90} yaxis: { min:10, max: 90}
}; };
$.plot($("#flotOrig"), [{data: d1, curvedLines: { show: true, lineWidth: 3}}, {data: d1, points: { show: true }}], options); $.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply:true}}, {data: d1, points: { show: true }}], options);
}); });
\ No newline at end of file
</script>
\ No newline at end of file
exampleFillMultiAxis.js
View file @ bb64fec4
<div id="fillAndMultiAxis"></div>
<script id="source" language="javascript" type="text/javascript">
$(function () { $(function () {
//<div id="fillAndMultiAxis" style="width: 800;height: 400;"></div>
var d1 = [[20,20], [42,60], [54, 20], [80,80]]; var d1 = [[20,20], [42,60], [54, 20], [80,80]];
var d2 = [[20,700], [80,300]]; var d2 = [[20,700], [80,300]];
...@@ -17,8 +16,7 @@ ...@@ -17,8 +16,7 @@
$.plot($("#fillAndMultiAxis"), $.plot($("#fillAndMultiAxis"),
[ [
{data: d1, curvedLines: { show: true, fill: true, fillColor: "#C3C3C3", lineWidth: 3}}, {data: d1, points: { show: true }}, {data: d1, lines: { show: true, fill: true, fillColor: "#C3C3C3", lineWidth: 3}, curvedLines: {apply:true}}, {data: d1, points: { show: true }},
{data: d2, curvedLines: { show: true, lineWidth: 3}, yaxis:2}, {data: d2, points: { show: true }, yaxis:2} {data: d2, lines: { show: true, lineWidth: 3}, curvedLines: {apply:true}, yaxis:2}, {data: d2, points: { show: true }, yaxis:2}
], options); ], options);
}); });
\ No newline at end of file
</script>
\ No newline at end of file
exampleFit.js
View file @ bb64fec4
<div id="flotFit"></div>
<script id="source" language="javascript" type="text/javascript">
$(function () { $(function () {
//<div id="flotFit" style="width: 800;height: 400;"></div>
var d1 = [[20,20], [42,60], [54, 30], [80,80]]; var d1 = [[20,20], [42,60], [54, 30], [80,80]];
var options = { series: { var options = { series: {
...@@ -13,6 +13,5 @@ $(function () { ...@@ -13,6 +13,5 @@ $(function () {
yaxis: { min:10, max: 90} yaxis: { min:10, max: 90}
}; };
$.plot($("#flotFit"), [{data: d1, curvedLines: { show: true, fit: true, fitPointDist: 0.000001, lineWidth: 3}}, {data: d1, points: { show: true }}], options); $.plot($("#flotFit"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply:true, fit: true, fitPointDist: 0.000001}}, {data: d1, points: { show: true }}], options);
}); });
\ No newline at end of file
</script>
\ No newline at end of file
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