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/11/03 12:36:50 UTC
ignite git commit: IGNITE-1764 Fixed Y-axis large values.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 a0f8887ba -> cb1dea7c0
IGNITE-1764 Fixed Y-axis large values.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb1dea7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb1dea7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb1dea7c
Branch: refs/heads/ignite-843-rc1
Commit: cb1dea7c066ac5702f44fed26072f1926032bc0d
Parents: a0f8887
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Nov 3 18:36:59 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 3 18:36:59 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb1dea7c/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 f25eef1..616a2cd 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
@@ -1078,6 +1078,12 @@ consoleModule.controller('sqlController',
}
};
+ var _yAxisFormat = function(d) {
+ var fmt = d < 1000 ? ',.2f' : '.3s';
+
+ return d3.format(fmt)(d);
+ };
+
function _updateCharts(paragraph) {
$timeout(function () {
_.forEach(paragraph.charts, function (chart) {
@@ -1142,7 +1148,7 @@ consoleModule.controller('sqlController',
},
yAxis: {
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
- tickFormat: d3.format(',.2f')
+ tickFormat: _yAxisFormat
},
color: CHART_COLORS,
stacked: true,
@@ -1210,7 +1216,7 @@ consoleModule.controller('sqlController',
},
yAxis: {
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
- tickFormat: d3.format(',.2f')
+ tickFormat: _yAxisFormat
},
color: CHART_COLORS,
useInteractiveGuideline: true
@@ -1244,7 +1250,7 @@ consoleModule.controller('sqlController',
},
yAxis: {
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
- tickFormat: d3.format(',.2f')
+ tickFormat: _yAxisFormat
},
color: CHART_COLORS
}