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
Show 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. what it is:
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 curvedLines is a plugin for flot, that tries to display lines in a smoother way.
the basic form of use descirbed next works (: 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.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: ____________________________________________________
____________________________________________________
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, lines: { show: true}, curvedLines: {apply: true}}], options);
$.plot($("#placeholder"), [{data = d1, lines: { show: true,curved:true}}], options); _____________________________________________________
_____________________________________________________
options:
_____________________________________________________
options:
_____________________________________________________
active: bool true => plugin can be used active: bool true => plugin can be used
curved: 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
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
...@@ -70,126 +66,128 @@ _____________________________________________________ ...@@ -70,126 +66,128 @@ _____________________________________________________
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.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) * 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 = { 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,
apply: false,
fit : false,
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 processDatapoints 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.processDatapoints.push(processDatapoints); plot.hooks.processDatapoints.push(processDatapoints);
} }
} }
//only if the plugin is active
function processDatapoints(plot, series, datapoints) { function processDatapoints(plot, series, datapoints) {
if (series.lines.curved==true){ if (series.curvedLines.apply == true) {
if (series.lines.fill){ if (series.lines.fill) {
var pointsTop=calculateCurvePoints2(datapoints, series.curvedLines,1); var pointsTop = calculateCurvePoints(datapoints, series.curvedLines, 1);
//Make sure we've got a second y point for filling area //Make sure we've got a second y point for filling area
for (var j=0;j<datapoints.length;j+=3){ for (var j = 0; j < datapoints.length; j += 3) {
if (data[j]==null) data[j]=series.yaxis.min; //If second y point is null, let it be zero (else no curve !) if (data[j] == null)
data[j] = series.yaxis.min;
//If second y point is null, let it be zero (else no curve !)
} }
var pointsBottom = calculateCurvePoints2(datapoints, series.curvedLines,2); var pointsBottom = calculateCurvePoints(datapoints, series.curvedLines, 2);
//Merge top and bottom curve //Merge top and bottom curve
datapoints.pointsize=3; datapoints.pointsize = 3;
datapoints.points=[]; datapoints.points = [];
var j=0; var j = 0;
var k=0; var k = 0;
var i=0; var i = 0;
var ps=2; var ps = 2;
while (i<pointsTop.length || j<pointsBottom.length){ while (i < pointsTop.length || j < pointsBottom.length) {
if (pointsTop[i]==pointsBottom[j]){ if (pointsTop[i] == pointsBottom[j]) {
datapoints.points[k]=pointsTop[i]; datapoints.points[k] = pointsTop[i];
datapoints.points[k+1]=pointsTop[i+1]; datapoints.points[k + 1] = pointsTop[i + 1];
datapoints.points[k+2]=pointsBottom[j+1]; datapoints.points[k + 2] = pointsBottom[j + 1];
j+=ps; j += ps;
i+=ps; i += ps;
}else if (pointsTop[i]<pointsBottom[j]){ } else if (pointsTop[i] < pointsBottom[j]) {
datapoints.points[k]=pointsTop[i]; datapoints.points[k] = pointsTop[i];
datapoints.points[k+1]=pointsTop[i+1]; datapoints.points[k + 1] = pointsTop[i + 1];
datapoints.points[k+2]=null; datapoints.points[k + 2] = null;
i+=ps; i += ps;
}else{ } else {
datapoints.points[k]=pointsBottom[j]; datapoints.points[k] = pointsBottom[j];
datapoints.points[k+1]=null; datapoints.points[k + 1] = null;
datapoints.points[k+2]=pointsBottom[j+1]; datapoints.points[k + 2] = pointsBottom[j + 1];
j+=ps; j += ps;
} }
k+=3; k += 3;
} }
if (series.lines.lineWidth > 0) {//Let's draw line in separate series
var newSerie = $.extend({}, series);
newSerie.lines = $.extend({}, series.lines);
if (series.lines.lineWidth>0){ //Let's draw line in separate series newSerie.lines.fill = undefined;
var newSerie=$.extend({},series); newSerie.label = undefined;
newSerie.lines=$.extend({},series.lines); newSerie.datapoints = {};
newSerie.lines.fill=undefined; //Redefine datapoints to top only (else it can have null values which will open the cruve !)
newSerie.label=undefined; newSerie.datapoints.points = pointsTop;
newSerie.datapoints={};//Redefine datapoints to top only (else it can have null values which will open the cruve !) newSerie.datapoints.pointsize = 2;
newSerie.datapoints.points=pointsTop; newSerie.lines.curved = false;
newSerie.datapoints.pointsize=2; //Don't redo curve point calculation as datapoint is copied to this new serie
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) //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(); var allSeries = plot.getData();
for (i=0;i<allSeries.length;i++){ for ( i = 0; i < allSeries.length; i++) {
if (allSeries[i]==series){ if (allSeries[i] == series) {
plot.getData().splice(i+1,0,newSerie); plot.getData().splice(i + 1, 0, newSerie);
break; break;
} }
} }
series.lines.lineWidth=0; series.lines.lineWidth = 0;
} }
}else if (series.lines.lineWidth>0){ } else if (series.lines.lineWidth > 0) {
datapoints.points=calculateCurvePoints2(datapoints, series.curvedLines,1); datapoints.points = calculateCurvePoints(datapoints, series.curvedLines, 1);
datapoints.pointsize=2; datapoints.pointsize = 2;
} }
} }
} }
//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 //if fit option is selected additional datapoints get inserted before the curve calculations in nergal.dev s code.
function calculateCurvePoints2(datapoints, curvedLinesOptions,yPos) { function calculateCurvePoints(datapoints, curvedLinesOptions, yPos) {
var points = datapoints.points, ps = datapoints.pointsize; var points = datapoints.points, ps = datapoints.pointsize;
var num = curvedLinesOptions.curvePointFactor * (points.length/ps); var num = curvedLinesOptions.curvePointFactor * (points.length / ps);
var xdata = new Array; var xdata = new Array;
var ydata = new Array; var ydata = new Array;
...@@ -197,40 +195,42 @@ _____________________________________________________ ...@@ -197,40 +195,42 @@ _____________________________________________________
var X = 0; var X = 0;
var Y = yPos; 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 neigh = curvedLinesOptions.fitPointDist;
var j = 0;
for (var i = 0; i < points.length; i+=ps) { 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;
var curX=i; curX = i;
var curY=i+yPos; curY = i + yPos;
//smooth front //smooth front
front[X] = points[curX] - 0.1; front[X] = points[curX] - 0.1;
if (i >= ps) { if (i >= ps) {
front[Y] = points[curY-ps] * neigh + points[curY] * (1 - neigh); front[Y] = points[curY - ps] * neigh + points[curY] * (1 - neigh);
} else { } else {
front[Y] = points[curY]; front[Y] = points[curY];
} }
//smooth back //smooth back
back[X] = points[curX] + 0.1; back[X] = points[curX] + 0.1;
if ((i + ps) < points.length) { if ((i + ps) < points.length) {
back[Y] = points[curY+ps] * neigh + points[curY] * (1 - neigh); back[Y] = points[curY + ps] * neigh + points[curY] * (1 - neigh);
} else { } else {
back[Y] = points[curY]; back[Y] = points[curY];
} }
//test for a saddle //test for a saddle
if ((front[Y] <= points[curY] && back[Y] <= points[curY]) || //max or partial horizontal 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 (front[Y] >= points[curY] && back[Y] >= points[curY])) {//min or partial horizontal
//add curve points //add curve points
xdata[j] = front[X]; xdata[j] = front[X];
...@@ -244,20 +244,23 @@ _____________________________________________________ ...@@ -244,20 +244,23 @@ _____________________________________________________
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] = points[curX]; xdata[j] = points[curX];
ydata[j] = points[curY]; 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] = points[curX]; curX = i;
ydata[i] = points[curY]; curY = i + yPos;
xdata[j] = points[curX];
ydata[j] = points[curY];
j++;
} }
} }
...@@ -269,9 +272,9 @@ _____________________________________________________ ...@@ -269,9 +272,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;
} }
...@@ -282,7 +285,7 @@ _____________________________________________________ ...@@ -282,7 +285,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];
} }
...@@ -295,16 +298,15 @@ _____________________________________________________ ...@@ -295,16 +298,15 @@ _____________________________________________________
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;
...@@ -313,7 +315,7 @@ _____________________________________________________ ...@@ -313,7 +315,7 @@ _____________________________________________________
var h = (xdata[max] - xdata[min]); var h = (xdata[max] - xdata[min]);
if(h == 0) { if (h == 0) {
return null; return null;
} }
...@@ -321,9 +323,7 @@ _____________________________________________________ ...@@ -321,9 +323,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]);
} }
...@@ -331,23 +331,17 @@ _____________________________________________________ ...@@ -331,23 +331,17 @@ _____________________________________________________
return result; return result;
} }
}//end init }//end init
$.plot.plugincurvedLines=true;
$.plot.plugincurvedLines = true;
$.plot.plugins.push({ $.plot.plugins.push({
init: init, init : init,
options: options, options : options,
name: 'curvedLines', name : 'curvedLines',
version: '0.5' version : '0.5'
}); });
})(jQuery);
})(jQuery);
return jQuery.plot.plugincurvedLines;
});
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);
}); });
\ No newline at end of file
</script>
\ 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);
}); });
\ No newline at end of file
</script>
\ 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);
}); });
\ 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