dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix loop and remove default color

Browse Source
This commit is contained in:
ArtemDzhereleiko 2021-09-22 13:39:23 +03:00
parent bbea48215e
commit 7e91f2c5e2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/modules/home/components/widget/lib/canvas-digital-gauge.ts
View File

@ -466,9 +466,9 @@ export class CanvasDigitalGauge extends BaseGauge {
const progress = (Drawings.normalizedValue(options).normal - options.minValue) / const progress = (Drawings.normalizedValue(options).normal - options.minValue) /
(options.maxValue - options.minValue); (options.maxValue - options.minValue);
if (options.neonGlowBrightness) { if (options.neonGlowBrightness) {
color = getProgressColor(progress, options.neonColorsRange, options.neonColorValue); color = getProgressColor(progress, options.neonColorsRange);
} else { } else {
color = getProgressColor(progress, options.colorsRange, options.neonColorValue); color = getProgressColor(progress, options.colorsRange);
} }
} }
return color; return color;
@ -814,14 +814,14 @@ function drawDigitalValue(context: DigitalGaugeCanvasRenderingContext2D, options
drawText(context, options, 'Value', text, textX, textY); drawText(context, options, 'Value', text, textX, textY);
} }
function getProgressColor(progress: number, colorsRange: DigitalGaugeColorRange[], defaultColor: string): string { function getProgressColor(progress: number, colorsRange: DigitalGaugeColorRange[]): string {
if (progress === 0 || colorsRange.length === 1) { if (progress === 0 || colorsRange.length === 1) {
return defaultColor; return colorsRange[0].rgbString;
} }
for (let j = 1; j < colorsRange.length; j += 2) { for (let j = 1; j < colorsRange.length; j++) {
if (progress >= colorsRange[j - 1].pct && progress <= colorsRange[j].pct) { if (progress <= colorsRange[j].pct) {
const lower = colorsRange[j - 1]; const lower = colorsRange[j - 1];
const upper = colorsRange[j]; const upper = colorsRange[j];
const range = upper.pct - lower.pct; const range = upper.pct - lower.pct;
@ -836,7 +836,6 @@ function getProgressColor(progress: number, colorsRange: DigitalGaugeColorRange[
return color.toRgbString(); return color.toRgbString();
} }
} }
return defaultColor;
} }
function drawArcGlow(context: DigitalGaugeCanvasRenderingContext2D, function drawArcGlow(context: DigitalGaugeCanvasRenderingContext2D,
@ -946,9 +945,9 @@ function drawProgress(context: DigitalGaugeCanvasRenderingContext2D,
options: CanvasDigitalGaugeOptions, progress: number) { options: CanvasDigitalGaugeOptions, progress: number) {
let neonColor; let neonColor;
if (options.neonGlowBrightness) { if (options.neonGlowBrightness) {
context.currentColor = neonColor = getProgressColor(progress, options.neonColorsRange, options.neonColorValue); context.currentColor = neonColor = getProgressColor(progress, options.neonColorsRange);
} else { } else {
context.currentColor = context.strokeStyle = getProgressColor(progress, options.colorsRange, options.neonColorValue); context.currentColor = context.strokeStyle = getProgressColor(progress, options.colorsRange);
} }
const {barLeft, barRight, barTop, baseX, width, barBottom, Cx, Cy, Rm, Ro, Ri, strokeWidth} = const {barLeft, barRight, barTop, baseX, width, barBottom, Cx, Cy, Rm, Ro, Ri, strokeWidth} =