Commit ea198fea by Torkel Ödegaard

fix(graph): fixed legend color when having many many series, fixes #2359

parent 666013b0
...@@ -230,17 +230,17 @@ function (angular, _, kbn) { ...@@ -230,17 +230,17 @@ function (angular, _, kbn) {
this.addAllOption = function(variable) { this.addAllOption = function(variable) {
var allValue = ''; var allValue = '';
switch(variable.allFormat) { switch(variable.allFormat) {
case 'wildcard': case 'wildcard':
allValue = '*'; allValue = '*';
break; break;
case 'regex wildcard': case 'regex wildcard':
allValue = '.*'; allValue = '.*';
break; break;
case 'regex values': case 'regex values':
allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')'; allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')';
break; break;
default: default:
allValue = '{'; allValue = '{';
allValue += _.pluck(variable.options, 'text').join(','); allValue += _.pluck(variable.options, 'text').join(',');
allValue += '}'; allValue += '}';
} }
......
...@@ -175,7 +175,8 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { ...@@ -175,7 +175,8 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
$scope.seriesHandler = function(seriesData, index) { $scope.seriesHandler = function(seriesData, index) {
var datapoints = seriesData.datapoints; var datapoints = seriesData.datapoints;
var alias = seriesData.target; var alias = seriesData.target;
var color = $scope.panel.aliasColors[alias] || $rootScope.colors[index]; var colorIndex = index % $rootScope.colors.length;
var color = $scope.panel.aliasColors[alias] || $rootScope.colors[colorIndex];
var series = new TimeSeries({ var series = new TimeSeries({
datapoints: datapoints, datapoints: datapoints,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment