Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 7d080e46c -> 0fe14d336
IGNITE-843 Implemented last time frame selection. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0fe14d33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0fe14d33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0fe14d33 Branch: refs/heads/ignite-843-rc1 Commit: 0fe14d3366a384363f72b2a85eeb722431b7738d Parents: 7d080e4 Author: AKuznetsov <[email protected]> Authored: Wed Oct 14 23:44:29 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Wed Oct 14 23:44:29 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 47 ++++++++++---------- .../src/main/js/views/sql/sql.jade | 2 +- 2 files changed, 24 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0fe14d33/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 f4106fc..a600ba3 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 @@ -915,17 +915,28 @@ consoleModule.controller('sqlController', } }; - function timeAdd(shift) { + function _filterDatum(paragraph, datum) { var t = new Date(); - t.setMinutes(t.getMinutes() + shift); + t.setMinutes(t.getMinutes() - parseInt(paragraph.timeLineSpan)); - return t; + return _.map(datum, function (series) { + return { + key: series.key, + values: _.filter(series.values, function (v) { + return v.x > t; + }) + }; + } + ); } function _barChart(paragraph) { var datum = _chartDatum(paragraph); + if (paragraph.chartTimeLineEnabled()) + datum = _filterDatum(paragraph, datum); + if ($common.isEmptyArray(paragraph.charts)) { var options = { chart: { @@ -956,17 +967,7 @@ consoleModule.controller('sqlController', } else $timeout(function () { - 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); + paragraph.charts[0].api.updateWithData(datum); }); } @@ -1008,6 +1009,9 @@ consoleModule.controller('sqlController', function _lineChart(paragraph) { var datum = _chartDatum(paragraph); + if (paragraph.chartTimeLineEnabled()) + datum = _filterDatum(paragraph, datum); + if ($common.isEmptyArray(paragraph.charts)) { var options = { chart: { @@ -1038,18 +1042,16 @@ consoleModule.controller('sqlController', } else $timeout(function () { - 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); + paragraph.charts[0].api.updateWithData(datum); }); } function _areaChart(paragraph) { var datum = _chartDatum(paragraph); + if (paragraph.chartTimeLineEnabled()) + datum = _filterDatum(paragraph, datum); + if ($common.isEmptyArray(paragraph.charts)) { var options = { chart: { @@ -1079,10 +1081,7 @@ consoleModule.controller('sqlController', } else $timeout(function () { - if (paragraph.chartTimeLineEnabled()) - paragraph.charts[0].api.update(); - else - paragraph.charts[0].api.updateWithData(datum); + paragraph.charts[0].api.updateWithData(datum); }); } http://git-wip-us.apache.org/repos/asf/ignite/blob/0fe14d33/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 19fb06d..359e6d1 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 @@ -37,7 +37,7 @@ mixin chart-settings(mdl) a(ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings div(ng-show='paragraphTimeSpanVisible(paragraph)') label Show - button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') + button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' ng-change='applyChartTimeFrame(paragraph)' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') label min block container
