Commit f277e912 authored by MichaelZinsmaier's avatar MichaelZinsmaier

auto guessing for fitPointDist ulp handling ((xValue - fitPointDist == xValue)...

auto guessing for fitPointDist ulp handling ((xValue - fitPointDist == xValue)  => try again with 2,3,.. time fitPointDist
parent 543eb3c1
...@@ -57,14 +57,15 @@ ...@@ -57,14 +57,15 @@
options: options:
_____________________________________________________ _____________________________________________________
active: bool true => plugin can be used active: bool true => plugin can be used
apply: 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 number 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: number guessed by default can be set manually.
to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints| defines the x axis distance of the additional two points that are used
"virtual" points if fit is true) to enforce the min max condition. (you will get curvePointFactor * 3 * |datapoints|
"virtual" points if fit is true)
+ line options (since v0.5 curved lines use flots line implementation for drawing + line options (since v0.5 curved lines use flots line implementation for drawing
=> line options like fill, show ... are supported out of the box) => line options like fill, show ... are supported out of the box)
...@@ -91,7 +92,7 @@ ...@@ -91,7 +92,7 @@
apply: false, apply: false,
fit : false, fit : false,
curvePointFactor : 20, curvePointFactor : 20,
fitPointDist : 0.0001 fitPointDist : undefined
} }
} }
}; };
...@@ -196,7 +197,17 @@ ...@@ -196,7 +197,17 @@
//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 fpDist = curvedLinesOptions.fitPointDist;
var fpDist;
if(typeof curvedLinesOptions.fitPointDist == 'undefined') {
//estimate it
var minX = points[0];
var maxX = points[points.length-ps];
fpDist = (maxX - minX) / (500 * 100); //x range / (estimated pixel length of placeholder * factor)
} else {
//use user defined value
fpDist = curvedLinesOptions.fitPointDist;
}
for (var i = 0; i < points.length; i += ps) { for (var i = 0; i < points.length; i += ps) {
...@@ -205,13 +216,22 @@ ...@@ -205,13 +216,22 @@
curX = i; curX = i;
curY = i + yPos; curY = i + yPos;
//add point to front //add point X s
front[X] = points[curX] - fpDist; front[X] = points[curX] - fpDist;
front[Y] = points[curY];
//add point to back
back[X] = points[curX] + fpDist; back[X] = points[curX] + fpDist;
var factor = 2;
while (front[X] == points[curX] || back[X] == points[curX]) {
//inside the ulp
front[X] = points[curX] - (fpDist * factor);
back[X] = points[curX] + (fpDist * factor);
factor++;
}
//add point Y s
back[Y] = points[curY]; back[Y] = points[curY];
front[Y] = points[curY];
//get points (front and back) Y value for saddle test //get points (front and back) Y value for saddle test
......
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