Skip to content

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

- switched to data hook 

- removed require.js stuff
- moved options from line: {} back to curvedLine: {}
- resolved a bug with the fit option
- updated examples
parent 0c30f6cb
Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 367 deletions
curvedLines.js
View file @ ec3a333f
/* 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 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
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 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/
define(['jquery','jquery.flot'],function(jQuery,jflot){
/*
____________________________________________________
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
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 (:
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 }}};
$.plot($("#placeholder"), [{data = d1, lines: { show: true,curved:true}}], options);
_____________________________________________________
options:
_____________________________________________________
active: bool true => plugin can be used
curved: bool true => series will be drawn as curved line
fit: bool true => forces the max,mins of the curve to be on the datapoints
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)
* 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 completly rewritten to let flot do the hard work. CurvedLines usage changed and will require code change but is more straightforward to use for new users (so all flot lines options (gradient fill, shadow are now supported)
*/ */
(function ($) { /*
____________________________________________________
var options = { series: { curvedLines: { active: false, what it is:
show: false, ____________________________________________________
fit: false,
fill: false, curvedLines is a plugin for flot, that tries to display lines in a smoother way.
fillColor: null, The plugin is based on nergal.dev's work https://code.google.com/p/flot/issues/detail?id=226
lineWidth: 2, and further extended with a mode that forces the min/max points of the curves to be on the
curvePointFactor: 20, points. Both modes are achieved through adding of more data points
fitPointDist: 0.0001 => 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.5 of curvedLines so it will probably not work in every case. However
function init(plot) { the basic form of use descirbed next works (:
plot.hooks.processOptions.push(processOptions); Feel free to further improve the code
//if the plugin is active register processDatapoints method ____________________________________________________
function processOptions(plot,options) {
if (options.series.curvedLines.active) { how to use it:
____________________________________________________
plot.hooks.processDatapoints.push(processDatapoints);
var d1 = [[5,5],[7,3],[9,12]];
}
} var options = { series: { curvedLines: { active: true }}};
function processDatapoints(plot, series, datapoints) { $.plot($("#placeholder"), [{data = d1, lines: { show: true}, curvedLines: {apply: true}}], options);
if (series.lines.curved==true){
if (series.lines.fill){ _____________________________________________________
var pointsTop=calculateCurvePoints2(datapoints, series.curvedLines,1); options:
_____________________________________________________
//Make sure we've got a second y point for filling area
for (var j=0;j<datapoints.length;j+=3){ active: bool true => plugin can be used
if (data[j]==null) data[j]=series.yaxis.min; //If second y point is null, let it be zero (else no curve !) 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
var pointsBottom = calculateCurvePoints2(datapoints, series.curvedLines,2); curvePointFactor int defines how many "virtual" points are used per "real" data point to
emulate the curvedLines
//Merge top and bottom curve fitPointDist: int defines the x axis distance of the additional two points that are used
datapoints.pointsize=3; to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints|
datapoints.points=[]; "virtual" points if fit is true)
var j=0;
var k=0; + line options (since v0.5 curved lines use flots line implementation for drawing
var i=0; => line options like fill, show ... are supported out of the box)
var ps=2;
while (i<pointsTop.length || j<pointsBottom.length){ */
if (pointsTop[i]==pointsBottom[j]){
datapoints.points[k]=pointsTop[i]; /*
datapoints.points[k+1]=pointsTop[i+1]; * v0.1 initial commit
datapoints.points[k+2]=pointsBottom[j+1]; * v0.15 negative values should work now (outcommented a negative -> 0 hook hope it does no harm)
j+=ps; * v0.2 added fill option (thanks to monemihir) and multi axis support (thanks to soewono effendi)
i+=ps; * 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
}else if (pointsTop[i]<pointsBottom[j]){ * v0.5 rewritten instead of implementing a own draw function CurvedLines is now based on the processDatapoints flot hook (credits go to thomas ritou).
datapoints.points[k]=pointsTop[i]; * 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,
datapoints.points[k+1]=pointsTop[i+1]; * shadow) are now supported out of the box
datapoints.points[k+2]=null; */
i+=ps;
}else{ (function($) {
datapoints.points[k]=pointsBottom[j];
datapoints.points[k+1]=null; var options = {
datapoints.points[k+2]=pointsBottom[j+1]; series : {
j+=ps; curvedLines : {
} active : false,
k+=3; apply: false,
} fit : false,
curvePointFactor : 20,
fitPointDist : 0.0001
}
}
if (series.lines.lineWidth>0){ //Let's draw line in separate series };
var newSerie=$.extend({},series);
newSerie.lines=$.extend({},series.lines); function init(plot) {
newSerie.lines.fill=undefined;
newSerie.label=undefined; plot.hooks.processOptions.push(processOptions);
newSerie.datapoints={};//Redefine datapoints to top only (else it can have null values which will open the cruve !)
newSerie.datapoints.points=pointsTop; //if the plugin is active register processDatapoints method
newSerie.datapoints.pointsize=2; function processOptions(plot, options) {
newSerie.lines.curved=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) if (options.series.curvedLines.active) {
var allSeries=plot.getData(); plot.hooks.processDatapoints.push(processDatapoints);
for (i=0;i<allSeries.length;i++){ }
if (allSeries[i]==series){ }
plot.getData().splice(i+1,0,newSerie);
break; //only if the plugin is active
} function processDatapoints(plot, series, datapoints) {
} if (series.curvedLines.apply == true) {
if (series.lines.fill) {
series.lines.lineWidth=0;
} var pointsTop = calculateCurvePoints(datapoints, series.curvedLines, 1);
}else if (series.lines.lineWidth>0){ //Make sure we've got a second y point for filling area
datapoints.points=calculateCurvePoints2(datapoints, series.curvedLines,1); for (var j = 0; j < datapoints.length; j += 3) {
datapoints.pointsize=2; if (data[j] == null)
} data[j] = series.yaxis.min;
} //If second y point is null, let it be zero (else no curve !)
} }
var pointsBottom = calculateCurvePoints(datapoints, series.curvedLines, 2);
//Merge top and bottom curve
//no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226 datapoints.pointsize = 3;
//I don't understand what nergal computes here and to be honest I didn't even try datapoints.points = [];
function calculateCurvePoints2(datapoints, curvedLinesOptions,yPos) { var j = 0;
var k = 0;
var points = datapoints.points, ps = datapoints.pointsize; var i = 0;
var num = curvedLinesOptions.curvePointFactor * (points.length/ps); var ps = 2;
while (i < pointsTop.length || j < pointsBottom.length) {
var xdata = new Array; if (pointsTop[i] == pointsBottom[j]) {
var ydata = new Array; datapoints.points[k] = pointsTop[i];
datapoints.points[k + 1] = pointsTop[i + 1];
var X = 0; datapoints.points[k + 2] = pointsBottom[j + 1];
var Y = yPos; j += ps;
i += ps;
if (curvedLinesOptions.fit) {
//insert a point before and after the "real" data point to force the line } else if (pointsTop[i] < pointsBottom[j]) {
//to have a max,min at the data point however only if it is a lowest or highest point of the datapoints.points[k] = pointsTop[i];
//curve => avoid saddles datapoints.points[k + 1] = pointsTop[i + 1];
var neigh = curvedLinesOptions.fitPointDist; datapoints.points[k + 2] = null;
var j = 0; i += ps;
} else {
for (var i = 0; i < points.length; i+=ps) { datapoints.points[k] = pointsBottom[j];
datapoints.points[k + 1] = null;
var front = new Array; datapoints.points[k + 2] = pointsBottom[j + 1];
var back = new Array; j += ps;
var curX=i; }
var curY=i+yPos; k += 3;
}
//smooth front
front[X] = points[curX] - 0.1; if (series.lines.lineWidth > 0) {//Let's draw line in separate series
if (i >= ps) { var newSerie = $.extend({}, series);
front[Y] = points[curY-ps] * neigh + points[curY] * (1 - neigh); newSerie.lines = $.extend({}, series.lines);
} else { newSerie.lines.fill = undefined;
front[Y] = points[curY]; 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;
//smooth back newSerie.datapoints.pointsize = 2;
back[X] = points[curX] + 0.1; newSerie.lines.curved = false;
if ((i + ps) < points.length) { //Don't redo curve point calculation as datapoint is copied to this new serie
back[Y] = points[curY+ps] * neigh + points[curY] * (1 - neigh); //We find our series to add the line just after the fill (so other series you wanted above this one will still be)
} else { var allSeries = plot.getData();
back[Y] = points[curY]; for ( i = 0; i < allSeries.length; i++) {
} if (allSeries[i] == series) {
plot.getData().splice(i + 1, 0, newSerie);
//test for a saddle break;
if ((front[Y] <= points[curY] && back[Y] <= points[curY]) || //max or partial horizontal }
(front[Y] >= points[curY] && back[Y] >= points[curY])) { //min or partial horizontal }
//add curve points series.lines.lineWidth = 0;
xdata[j] = front[X]; }
ydata[j] = front[Y];
j++; } else if (series.lines.lineWidth > 0) {
datapoints.points = calculateCurvePoints(datapoints, series.curvedLines, 1);
xdata[j] = points[curX]; datapoints.pointsize = 2;
ydata[j] = points[curY]; }
j++; }
}
xdata[j] = back[X];
ydata[j] = back[Y]; //no real idea whats going on here code mainly from https://code.google.com/p/flot/issues/detail?id=226
j++; //if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code.
} else { //saddle function calculateCurvePoints(datapoints, curvedLinesOptions, yPos) {
//use original point only
xdata[j] = points[curX]; var points = datapoints.points, ps = datapoints.pointsize;
ydata[j] = points[curY]; var num = curvedLinesOptions.curvePointFactor * (points.length / ps);
j++;
} var xdata = new Array;
var ydata = new Array;
} var X = 0;
} else { var Y = yPos;
//just use the datapoints
for (var i = 0; i < data.length; i++) { var curX = -1;
xdata[i] = points[curX]; var curY = -1;
ydata[i] = points[curY]; var j = 0;
}
} if (curvedLinesOptions.fit) {
//insert a point before and after the "real" data point to force the line
var n = xdata.length; //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 y2 = new Array(); var neigh = curvedLinesOptions.fitPointDist;
var delta = new Array();
y2[0] = 0; for (var i = 0; i < points.length; i += ps) {
y2[n - 1] = 0;
delta[0] = 0; var front = new Array;
var back = new Array;
for(var i = 1; i < n - 1; ++i) { curX = i;
var d = (xdata[i + 1] - xdata[i - 1]); curY = i + yPos;
if(d == 0) {
return null; //smooth front
} front[X] = points[curX] - 0.1;
if (i >= ps) {
var s = (xdata[i] - xdata[i - 1]) / d; front[Y] = points[curY - ps] * neigh + points[curY] * (1 - neigh);
var p = s * y2[i - 1] + 2; } else {
y2[i] = (s - 1) / p; front[Y] = points[curY];
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;
} //smooth back
back[X] = points[curX] + 0.1;
for(var j = n - 2; j >= 0; --j) { if ((i + ps) < points.length) {
y2[j] = y2[j] * y2[j + 1] + delta[j]; back[Y] = points[curY + ps] * neigh + points[curY] * (1 - neigh);
} } else {
back[Y] = points[curY];
var step = (xdata[n - 1] - xdata[0]) / (num - 1); }
var xnew = new Array; //test for a saddle
var ynew = new Array; if ((front[Y] <= points[curY] && back[Y] <= points[curY]) || //max or partial horizontal
var result = new Array; (front[Y] >= points[curY] && back[Y] >= points[curY])) {//min or partial horizontal
xnew[0] = xdata[0]; //add curve points
ynew[0] = ydata[0]; xdata[j] = front[X];
ydata[j] = front[Y];
j++;
for(j = 1; j < num; ++j) {
xnew[j] = xnew[0] + j * step; xdata[j] = points[curX];
ydata[j] = points[curY];
var max = n - 1; j++;
var min = 0;
xdata[j] = back[X];
while(max - min > 1) { ydata[j] = back[Y];
var k = Math.round((max + min) / 2); j++;
if(xdata[k] > xnew[j]) { } else {//saddle
max = k; //use original point only
} else { xdata[j] = points[curX];
min = k; ydata[j] = points[curY];
} j++;
} }
var h = (xdata[max] - xdata[min]); }
} else {
if(h == 0) { //just use the datapoints
return null; for (var i = 0; i < points.length; i += ps) {
} curX = i;
curY = i + yPos;
var a = (xdata[max] - xnew[j]) / h;
var b = (xnew[j] - xdata[min]) / h; xdata[j] = points[curX];
ydata[j] = points[curY];
ynew[j] = a * ydata[min] + b * ydata[max] + ((a * a * a - a) * y2[min] + (b * b * b - b) * y2[max]) * (h * h) / 6; j++;
// if (ynew[j] < 0.01){ }
// ynew[j] = 0; }
// }
result.push(xnew[j]); var n = xdata.length;
result.push(ynew[j]);
} var y2 = new Array();
var delta = new Array();
return result; 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]);
}//end init if (d == 0) {
return null;
$.plot.plugincurvedLines=true; }
$.plot.plugins.push({ var s = (xdata[i] - xdata[i - 1]) / d;
init: init, var p = s * y2[i - 1] + 2;
options: options, y2[i] = (s - 1) / p;
name: 'curvedLines', delta[i] = (ydata[i + 1] - ydata[i]) / (xdata[i + 1] - xdata[i]) - (ydata[i] - ydata[i - 1]) / (xdata[i] - xdata[i - 1]);
version: '0.5' delta[i] = (6 * delta[i] / (xdata[i + 1] - xdata[i - 1]) - s * delta[i - 1]) / p;
}); }
for (var j = n - 2; j >= 0; --j) {
})(jQuery); y2[j] = y2[j] * y2[j + 1] + delta[j];
}
return jQuery.plot.plugincurvedLines;
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];
ynew[0] = ydata[0];
for ( j = 1; j < num; ++j) {
xnew[j] = xnew[0] + j * step;
var max = n - 1;
var min = 0;
while (max - min > 1) {
var k = Math.round((max + min) / 2);
if (xdata[k] > xnew[j]) {
max = k;
} else {
min = k;
}
}
var h = (xdata[max] - xdata[min]);
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;
result.push(xnew[j]);
result.push(ynew[j]);
}
return result;
}
}//end init
$.plot.plugincurvedLines = true;
$.plot.plugins.push({
init : init,
options : options,
name : 'curvedLines',
version : '0.5'
});
})(jQuery);
});
example.js
View file @ ec3a333f
<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);
}); });
</script> \ No newline at end of file
\ No newline at end of file
exampleFillMultiAxis.js
View file @ ec3a333f
<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);
}); });
</script> \ No newline at end of file
\ No newline at end of file
exampleFit.js
View file @ ec3a333f
<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);
}); });
</script> \ No newline at end of file
\ 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