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 13:53:10 UTC
ignite git commit: IGNITE-843 Added axises labels.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 ab444b436 -> d6dce4a59
IGNITE-843 Added axises labels.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6dce4a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6dce4a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6dce4a5
Branch: refs/heads/ignite-843
Commit: d6dce4a597ddc93052eabfc0af3bb1ee7c55ec93
Parents: ab444b4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Sep 10 18:53:04 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Sep 10 18:53:04 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 32 +++++++++++++++-----
.../control-center-web/src/main/js/package.json | 2 +-
2 files changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6dce4a5/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 5ad5c73..dd26858 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
@@ -570,9 +570,26 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
function _insertChart(paragraph, datum, chart) {
var chartId = 'chart-' + paragraph.id;
+ var xAxisLabel = 'X';
+ var yAxisLabel = 'Y';
+
+ _.forEach(paragraph.chartColumns, function (col) {
+ if (col.value == paragraph.chartColX)
+ xAxisLabel = col.label;
+
+ if (col.value == paragraph.chartColY)
+ yAxisLabel = col.label;
+ });
+
$timeout(function() {
chart.height(400);
+ if (chart.xAxis)
+ chart.xAxis.axisLabel(xAxisLabel);
+
+ if (chart.yAxis)
+ chart.yAxis.axisLabel(yAxisLabel);
+
// Remove previous chart.
d3.selectAll('#' + chartId + ' svg > *').remove();
@@ -613,12 +630,9 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
nv.addGraph(function() {
var chart = nv.models.discreteBarChart()
- .x(function (d) {
- return d.label;
- })
- .y(function (d) {
- return d.value;
- });
+ .x(function (d) { return d.label; })
+ .y(function (d) { return d.value;})
+ .margin({left: 70});
var values = _.map(paragraph.rows, function (row) {
return {
@@ -664,7 +678,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
nv.addGraph(function() {
var chart = nv.models.lineChart()
.x(_x)
- .y(_y);
+ .y(_y)
+ .margin({left: 70});
_insertChart(paragraph, _chartDatum('Line chart', paragraph), chart);
});
@@ -674,7 +689,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
nv.addGraph(function() {
var chart = nv.models.stackedAreaChart()
.x(_x)
- .y(_y);
+ .y(_y)
+ .margin({left: 70});
_insertChart(paragraph, _chartDatum('Area chart', paragraph), chart);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6dce4a5/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 8e18c0d..f584a68 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -20,7 +20,7 @@
"node": ">=0.12.4"
},
"dependencies": {
- "archiver": "^0.15.0",
+ "archiver": "^0.15.1",
"body-parser": "~1.13.3",
"bootstrap-sass": "^3.3.5",
"compression": "1.5.2",