You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/10 11:56:26 UTC
ignite git commit: IGNITE-843 Fixed bar and pie chart.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 db03da69f -> 2c01dd811
IGNITE-843 Fixed bar and pie chart.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c01dd81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c01dd81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c01dd81
Branch: refs/heads/ignite-843
Commit: 2c01dd81157cd58af28790bfdc6cce6baa1bac2e
Parents: db03da6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 10 16:56:54 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 10 16:56:54 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 6 +++---
modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c01dd81/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 0f9ec31..81bdbd1 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
@@ -613,8 +613,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
var values = _.map(paragraph.rows, function (row) {
return {
- label: _chartLabel(row, paragraph.chartColY, index++),
- value: _chartNumber(row, paragraph.chartColX, 0)
+ label: _chartLabel(row, paragraph.chartColX, index++),
+ value: _chartNumber(row, paragraph.chartColY, 0)
}
});
@@ -631,7 +631,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
return _chartLabel(row, paragraph.chartColX, index++);
})
.y(function (row) {
- return _chartNumber(row, paragraph.chartColX, 0);
+ return _chartNumber(row, paragraph.chartColY, 0);
})
.showLabels(true)
.labelThreshold(.05)
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c01dd81/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 34c3b15..0686fa4 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
@@ -64,7 +64,7 @@ block container
.btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()' style='float: right')
+btn-toolbar-data('fa-table', 'table', 'Show data in tabular form.')
+btn-toolbar-data('fa-bar-chart', 'bar', 'Show bar chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
- +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie values, second column - pie labels.<br/>In case of one column it will be treated as pie values.')
+ +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie labels, second column - pie values.<br/>In case of one column it will be treated as pie values.')
+btn-toolbar-data('fa-line-chart', 'line', 'Show line chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
+btn-toolbar-data('fa-area-chart', 'area', 'Show area chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
div(ng-show='paragraph.edit')