Commit 3db2c2ee authored by Michael Zinsmaier's avatar Michael Zinsmaier

API break refactored the code to prepare it for a new algorithmic core

parent 3fa41abe
This diff is collapsed.
...@@ -121,10 +121,12 @@ ...@@ -121,10 +121,12 @@
}, },
curvedLines: { curvedLines: {
apply: true, apply: true,
legacyOverride: {
/*play with parameters (lines)*/ /*play with parameters (lines)*/
//fitPointDist: 86400, //fitPointDist: 86400,
//curvePointFactor: 200, //curvePointFactor: 200,
fit: true fit: true
}
}, },
clickable: false, clickable: false,
hoverable: false, hoverable: false,
...@@ -138,10 +140,12 @@ ...@@ -138,10 +140,12 @@
}, },
curvedLines: { curvedLines: {
apply: true, apply: true,
legacyOverride: {
/*play with parameters (points)*/ /*play with parameters (points)*/
//fitPointDist: 86400, //fitPointDist: 86400,
//curvePointFactor: 200, //curvePointFactor: 200,
fit: true fit: true
}
}, },
color:'#FF0000' color:'#FF0000'
}; };
......
...@@ -47,7 +47,11 @@ $(function() { ...@@ -47,7 +47,11 @@ $(function() {
], ],
{ {
series: { series: {
curvedLines: { active: true, fit: true} curvedLines: {
active: true,
apply: true,
legacyOverride : { fit: true }
}
} }
} }
); );
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
}, },
curvedLines : { curvedLines : {
apply : true, apply : true,
legacyOverride: true
} }
}, { }, {
data : d1, data : d1,
...@@ -87,6 +88,7 @@ ...@@ -87,6 +88,7 @@
}, },
curvedLines : { curvedLines : {
apply : true, apply : true,
legacyOverride: true
} }
}, { }, {
data : d1, data : d1,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
yaxis: { min:10, max: 90} yaxis: { min:10, max: 90}
}; };
$.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true}}, {data: d1, points: { show: true }}], options); $.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true, legacyOverride: true}}, {data: d1, points: { show: true }}], options);
}); });
</script> </script>
</body> </body>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
$.plot($("#fillAndMultiAxis"), $.plot($("#fillAndMultiAxis"),
[ [
{data: d1, lines: { show: true, fill: true, fillColor: "rgba(195, 195, 195, 0.4)", lineWidth: 3}, curvedLines: {apply: true}}, {data: d1, points: { show: true }}, {data: d1, lines: { show: true, fill: true, fillColor: "rgba(195, 195, 195, 0.4)", lineWidth: 3}, curvedLines: {apply: true, legacyOverride: true}}, {data: d1, points: { show: true }},
{data: d2, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true}, yaxis:2}, {data: d2, points: { show: true }, yaxis:2} {data: d2, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true, legacyOverride: true}, yaxis:2}, {data: d2, points: { show: true }, yaxis:2}
], options); ], options);
}); });
</script> </script>
......
...@@ -36,9 +36,13 @@ ...@@ -36,9 +36,13 @@
show : true, show : true,
lineWidth : 3 lineWidth : 3
}, },
curvedLines: {apply: true, curvedLines:
fit : true, {
apply: true,
legacyOverride: {
fit : true,
} }
}
}, { }, {
data : d1, data : d1,
points : { points : {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
yaxis: { min:10, max: 45} yaxis: { min:10, max: 45}
}; };
$.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true}}, {data: d1, points: { show: true }}], options); $.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true, legacyOverride: true}}, {data: d1, points: { show: true }}], options);
}); });
</script> </script>
</body> </body>
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
show : true show : true
}, },
curvedLines : { curvedLines : {
apply : true apply : true,
legacyOverride: true
} }
}, { }, {
data : d1, data : d1,
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
lineWidth : 3 lineWidth : 3
}, },
curvedLines : { curvedLines : {
apply : true apply : true,
legacyOverride: true
} }
}, { }, {
data : d1, data : d1,
......
...@@ -50,7 +50,8 @@ $(function () { ...@@ -50,7 +50,8 @@ $(function () {
//general options //general options
var options = { var options = {
series: {curvedLines : { series: {curvedLines : {
active : true active : true,
legacyOverride: true
}, },
lines: { lineWidth: 5}, lines: { lineWidth: 5},
points: { radius: 4 } points: { radius: 4 }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
yaxis: { min:0, max: 10} yaxis: { min:0, max: 10}
}; };
$.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true}}, {data: d1, points: { show: true }}], options); $.plot($("#flotOrig"), [{data: d1, lines: { show: true, lineWidth: 3}, curvedLines: {apply: true, legacyOverride: true}}, {data: d1, points: { show: true }}], options);
}); });
</script> </script>
</body> </body>
......
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