Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 61f03923e -> 7d080e46c
IGNITE-1595 WIP on charts with time line. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d080e46 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d080e46 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d080e46 Branch: refs/heads/ignite-843-rc1 Commit: 7d080e46ce295d68060db574534c4673e1520400 Parents: 61f0392 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Oct 14 18:24:14 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 14 18:24:14 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 37 ++++++++++++-------- .../src/main/js/views/sql/sql.jade | 4 +-- 2 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d080e46/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 94034d1..f4106fc 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -794,17 +794,7 @@ consoleModule.controller('sqlController', chartData.shift(); } else { - var tm = new Date(); - - var span = parseInt(paragraph.timeLineSpan); - - tm.setMinutes(tm.getMinutes() - span); - - var filteredChartHistory = _.filter(chartHistory, function (history) { - return history.tm > tm; - }); - - values = _.map(filteredChartHistory, function (history) { + values = _.map(chartHistory, function (history) { return { x: history.tm, y: _chartNumber(history.rows[0], valCol.value, index++) @@ -925,6 +915,14 @@ consoleModule.controller('sqlController', } }; + function timeAdd(shift) { + var t = new Date(); + + t.setMinutes(t.getMinutes() + shift); + + return t; + } + function _barChart(paragraph) { var datum = _chartDatum(paragraph); @@ -958,8 +956,15 @@ consoleModule.controller('sqlController', } else $timeout(function () { - if (paragraph.chartTimeLineEnabled()) - paragraph.charts[0].api.update(); + if (paragraph.chartTimeLineEnabled()) { + var tm = timeAdd(-10); + var z = timeAdd(10); + + paragraph.charts[0].options.chart.xDomain = [tm.getMilliseconds(), z.getMilliseconds()]; + paragraph.charts[0].api.updateWithOptions(paragraph.charts[0].options); + + //paragraph.charts[0].api.update(); + } else paragraph.charts[0].api.updateWithData(datum); }); @@ -1033,8 +1038,10 @@ consoleModule.controller('sqlController', } else $timeout(function () { - if (paragraph.chartTimeLineEnabled()) - paragraph.charts[0].api.update(); + if (paragraph.chartTimeLineEnabled()) { + paragraph.charts[0].options.chart.xDomain = [timeAdd(-parseInt(paragraph.timeLineSpan)), timeAdd(1)]; + paragraph.charts[0].api.updateWithOptions(paragraph.charts[0].options); + } else paragraph.charts[0].api.updateWithData(datum); }); http://git-wip-us.apache.org/repos/asf/ignite/blob/7d080e46/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 0bad548..19fb06d 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -20,8 +20,8 @@ append scripts script(src='//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/mode-sql.js') script(src='//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ext-language_tools.js') - script(src='//cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js') - script(src='//cdnjs.cloudflare.com/ajax/libs/nvd3/1.8.1/nv.d3.min.js') + script(src='//cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.js') + script(src='//cdnjs.cloudflare.com/ajax/libs/nvd3/1.8.1/nv.d3.js') script(src='/sql-controller.js')
