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/10/22 08:21:50 UTC
ignite git commit: IGNITE-843 Distinct colors for charts.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 db6563522 -> 1f2760c18
IGNITE-843 Distinct colors for charts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f2760c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f2760c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f2760c1
Branch: refs/heads/ignite-843-rc1
Commit: 1f2760c180afecb2a797bb11f9424603dc800bb5
Parents: db656352
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Oct 22 13:21:48 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Oct 22 13:21:48 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f2760c1/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 9b74762..213f64d 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
@@ -1015,6 +1015,11 @@ consoleModule.controller('sqlController',
});
}
+ var CHART_COLORS = [
+ '#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd', '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf',
+ '#ffbb78', '#98df8a', '#ff9896', '#c5b0d5', '#aec7e8', '#c49c94', '#f7b6d2', '#c7c7c7', '#dbdb8d', '#9edae5'
+ ];
+
function _barChart(paragraph) {
var datum = _chartDatum(paragraph);
@@ -1036,6 +1041,7 @@ consoleModule.controller('sqlController',
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
tickFormat: d3.format(',.2f')
},
+ color: CHART_COLORS,
showControls: true
}
};
@@ -1102,6 +1108,7 @@ consoleModule.controller('sqlController',
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
tickFormat: d3.format(',.2f')
},
+ color: CHART_COLORS,
useInteractiveGuideline: true
}
};
@@ -1134,7 +1141,8 @@ consoleModule.controller('sqlController',
yAxis: {
axisLabel: _chartAxisLabel(paragraph.chartValCols, 'Y'),
tickFormat: d3.format(',.2f')
- }
+ },
+ color: CHART_COLORS
}
};