Repository: ignite Updated Branches: refs/heads/ignite-843 9faf20391 -> d30f163f6
IGNITE-843: WIP preview. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d30f163f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d30f163f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d30f163f Branch: refs/heads/ignite-843 Commit: d30f163f63b4912d23c3654a0a5d95ecf3340525 Parents: 9faf203 Author: Alexey Kuznetsov <[email protected]> Authored: Thu Sep 3 14:22:13 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Sep 3 14:22:13 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 14 +++++++++----- .../src/main/js/views/includes/controls.jade | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d30f163f/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 a23d8ab..7325a36 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 @@ -337,16 +337,20 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle nv.addGraph(function() { var chart = nv.models.discreteBarChart() - .x(function (row) { - return (row.length > 1) ? row[1] : index++; + .x(function (d) { + return d.label; }) - .y(function (row) { - return (row.length > 0) ? row[0] : 0; + .y(function (d) { + return d.value; }); + var values = _.map(paragraph.rows, function (row) { + return {label: (row.length > 1) ? row[1] : index++, value: (row.length > 0) ? row[0] : 0} + }); + d3.selectAll("#chart svg > *").remove(); d3.select('#chart svg') - .datum({key: 'bar', values: paragraph.rows}) + .datum({key: 'bar', values: values}) .call(chart); nv.utils.windowResize(chart.update); http://git-wip-us.apache.org/repos/asf/ignite/blob/d30f163f/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index dcbb066..cd628af 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -463,9 +463,9 @@ mixin preview-content(preview, state, mode) -var previewState = preview + 'State' if state - .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", rendererOptions: {showGutter: false, showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') + .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') else - .preview-content(ng-if='!preview[#{preview}].allDefaults && !#{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", rendererOptions: {showGutter: false, showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') + .preview-content(ng-if='!preview[#{preview}].allDefaults && !#{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') mixin preview(preview, id) -var previewState = preview + 'State'
