Browse Source

Cleanups

pull/310/head
danelkhen 11 years ago
parent
commit
f3ce633bef
  1. 42
      htdocs/js/samples/zoom2.js
  2. 2
      htdocs/samples/zoom2.html

42
htdocs/js/samples/zoom2.js

@ -1,8 +1,4 @@
///<reference path="http://localhost/cockpit/js/playground/utils.js"></script> var chart;
var chart;
function refresh() { function refresh() {
if (suspendRefresh) if (suspendRefresh)
return; return;
@ -26,43 +22,20 @@ function main() {
var xColumn = Array.generateNumbers(0, max); var xColumn = Array.generateNumbers(0, max);
var options = { var options = {
bindto: "#divChart", bindto: "#divChart",
//transition: { duration: 0 },
data: { data: {
columns: [ columns: [
["Value"].concat(column), ["Value"].concat(column),
["x"].concat(xColumn), ["x"].concat(xColumn),
],//column ],
type: "line", type: "line",
x: "x" x: "x"
}, },
zoom2: { zoom2: {
enabled: true, enabled: true,
//reducers: {
// col: "t=>Math.round(t.avg())".toLambda(),
// xColumns: "t=>t[0]".toLambda()
//}
} }
}; };
chart = c3ext.generate(options); chart = c3ext.generate(options);
//var deltaY = 0;
//var leftRatio = 0;
//var el = $("#divChart");
//var timer = new Timer(doZoom);
//el.mousewheel(function (e) {
// deltaY += e.deltaY;
// leftRatio = (e.offsetX - 70) / (e.currentTarget.offsetWidth - 70);
// console.log({ "e.offsetX": e.offsetX, "e.currentTarget.offsetWidth": e.currentTarget.offsetWidth, leftRatio: leftRatio });
// timer.set(150);
// e.preventDefault();
// //if(e.deltaY>0)
// // chart.zoom2.zoomIn();
// //else if(e.deltaY<0)
// // chart.zoom2.zoomOut();
// //console.log(e.deltaX, e.deltaY, e.deltaFactor);
//});
window.setInterval(refreshStatus, 1000); window.setInterval(refreshStatus, 1000);
function refreshStatus() { function refreshStatus() {
@ -75,17 +48,6 @@ function main() {
}; };
$("#status").text(JSON.stringify(info, null, " ")); $("#status").text(JSON.stringify(info, null, " "));
} }
//function doZoom() {
// if (deltaY != 0) {
// var maxDelta = 10;
// var multiply = (maxDelta + deltaY) / maxDelta;
// //var factor = chart.zoom2.factor()*multiply;
// //factor= Math.ceil(factor*100) / 100;
// console.log({ deltaY: deltaY, multiply: multiply });
// chart.zoom2.zoomAndPanByRatio(multiply, leftRatio);//0.5);//leftRatio);
// deltaY = 0;
// }
//}
}; };

2
htdocs/samples/zoom2.html

@ -40,6 +40,8 @@
<button onclick="chart.zoom2.reset()">reset</button> <button onclick="chart.zoom2.reset()">reset</button>
</div> </div>
<div id="divChart" style="height:300px"></div> <div id="divChart" style="height:300px"></div>
<h3>Notes</h3>
<p>Only 'columns' data format is supported for now.</p>
</div> </div>
</body> </body>
</html> </html>

Loading…
Cancel
Save