Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0

This commit is contained in:
Igor Kulikov 2020-03-05 14:16:17 +02:00
commit d21752e35f

View File

@ -247,18 +247,18 @@ export class CanvasDigitalGauge extends BaseGauge {
if (levelColor !== null) { if (levelColor !== null) {
let percentage = isColorProperty ? inc * i : CanvasDigitalGauge.normalizeValue(levelColor.value, options.minValue, options.maxValue); let percentage = isColorProperty ? inc * i : CanvasDigitalGauge.normalizeValue(levelColor.value, options.minValue, options.maxValue);
let tColor = tinycolor(isColorProperty ? levelColor : levelColor.color); let tColor = tinycolor(isColorProperty ? levelColor : levelColor.color);
options.colorsRange[i] = { options.colorsRange.push({
pct: percentage, pct: percentage,
color: tColor.toRgb(), color: tColor.toRgb(),
rgbString: tColor.toRgbString() rgbString: tColor.toRgbString()
}; });
if (options.neonGlowBrightness) { if (options.neonGlowBrightness) {
tColor = tinycolor(isColorProperty ? levelColor : levelColor.color).brighten(options.neonGlowBrightness); tColor = tinycolor(isColorProperty ? levelColor : levelColor.color).brighten(options.neonGlowBrightness);
options.neonColorsRange[i] = { options.neonColorsRange.push({
pct: percentage, pct: percentage,
color: tColor.toRgb(), color: tColor.toRgb(),
rgbString: tColor.toRgbString() rgbString: tColor.toRgbString()
}; });
} }
} }
} }