diff --git a/src/app/widget-config/modal-widget-config/modal-widget-config.component.html b/src/app/widget-config/modal-widget-config/modal-widget-config.component.html index 3e30f2b6..fe43dae9 100644 --- a/src/app/widget-config/modal-widget-config/modal-widget-config.component.html +++ b/src/app/widget-config/modal-widget-config/modal-widget-config.component.html @@ -62,12 +62,12 @@ } - Minimum Integer Places - + Integer Places + - - Maximum Decimal Places - + + Decimal Places + ; @Input('title') title: string; @Input('units') units: string; @@ -92,6 +93,7 @@ export class GaugeSteelComponent implements OnInit, OnChanges, OnDestroy { //minMax this.gaugeOptions['minValue'] = this.minValue; this.gaugeOptions['maxValue'] = this.maxValue; + this.gaugeOptions['lcdDecimals'] = this.decimals !== undefined && this.decimals !== null ? this.decimals : 2; //labels this.gaugeOptions['titleString'] = this.title; diff --git a/src/app/widgets/widget-gauge-ng-linear/widget-gauge-ng-linear.component.ts b/src/app/widgets/widget-gauge-ng-linear/widget-gauge-ng-linear.component.ts index 823a88d4..a04f8d6c 100644 --- a/src/app/widgets/widget-gauge-ng-linear/widget-gauge-ng-linear.component.ts +++ b/src/app/widgets/widget-gauge-ng-linear/widget-gauge-ng-linear.component.ts @@ -161,8 +161,9 @@ export class WidgetGaugeNgLinearComponent extends BaseWidgetComponent implements const defaultOptions = { minValue: scale.min, maxValue: scale.max, - valueInt: this.widgetProperties.config.numInt, - valueDec: this.widgetProperties.config.numDecimal, + + valueInt: this.widgetProperties.config.numInt !== undefined && this.widgetProperties.config.numInt !== null ? this.widgetProperties.config.numInt : 1, + valueDec: this.widgetProperties.config.numDecimal !== undefined && this.widgetProperties.config.numDecimal !== null ? this.widgetProperties.config.numDecimal : 2, title: this.widgetProperties.config.displayName, fontTitleSize: 40, @@ -227,8 +228,10 @@ export class WidgetGaugeNgLinearComponent extends BaseWidgetComponent implements colorNeedleShadowDown: "black", majorTicks: scale.majorTicks, - majorTicksInt: this.widgetProperties.config.numInt, - majorTicksDec: this.widgetProperties.config.numDecimal, + + + majorTicksInt: this.widgetProperties.config.numInt !== undefined && this.widgetProperties.config.numInt !== null ? this.widgetProperties.config.numInt : 1, + majorTicksDec: this.widgetProperties.config.numDecimal !== undefined && this.widgetProperties.config.numDecimal !== null ? this.widgetProperties.config.numDecimal : 2, numberSide: "left", fontNumbersSize: 25, numbersMargin: isVertical ? 8 : 4, diff --git a/src/app/widgets/widget-gauge-ng-radial/widget-gauge-ng-radial.component.ts b/src/app/widgets/widget-gauge-ng-radial/widget-gauge-ng-radial.component.ts index e354785e..94e16258 100644 --- a/src/app/widgets/widget-gauge-ng-radial/widget-gauge-ng-radial.component.ts +++ b/src/app/widgets/widget-gauge-ng-radial/widget-gauge-ng-radial.component.ts @@ -167,10 +167,10 @@ export class WidgetGaugeNgRadialComponent extends BaseWidgetComponent implements this.gaugeOptions.fontNumbers="arial"; this.gaugeOptions.fontNumbersWeight="bold"; - this.gaugeOptions.valueInt = this.widgetProperties.config.numInt; - this.gaugeOptions.valueDec = this.widgetProperties.config.numDecimal; - this.gaugeOptions.majorTicksInt = this.widgetProperties.config.numInt; - this.gaugeOptions.majorTicksDec = this.widgetProperties.config.numDecimal; + this.gaugeOptions.valueInt = this.widgetProperties.config.numInt !== undefined && this.widgetProperties.config.numInt !== null ? this.widgetProperties.config.numInt : 1; + this.gaugeOptions.valueDec = this.widgetProperties.config.numDecimal !== undefined && this.widgetProperties.config.numDecimal !== null ? this.widgetProperties.config.numDecimal : 2; + this.gaugeOptions.majorTicksInt = this.widgetProperties.config.numInt !== undefined && this.widgetProperties.config.numInt !== null ? this.widgetProperties.config.numInt : 1; + this.gaugeOptions.majorTicksDec = this.widgetProperties.config.numDecimal !== undefined && this.widgetProperties.config.numDecimal !== null ? this.widgetProperties.config.numDecimal : 2; this.gaugeOptions.highlightsWidth = 0; this.gaugeOptions.animation = true; diff --git a/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.html b/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.html index 318954c3..a3b0cfe4 100644 --- a/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.html +++ b/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.html @@ -11,6 +11,7 @@ [minValue]="widgetProperties.config.displayScale.lower" [maxValue]="widgetProperties.config.displayScale.upper" + [decimals]="widgetProperties.config.numDecimal" [zones]="this.zones" [title]="widgetProperties.config.displayName" diff --git a/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.ts b/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.ts index dfa9a1d8..9cbff309 100644 --- a/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.ts +++ b/src/app/widgets/widget-gauge-steel/widget-gauge-steel.component.ts @@ -55,7 +55,7 @@ export class WidgetGaugeComponent extends BaseWidgetComponent implements OnInit, digitalMeter: false, }, // numInt: 1, - // numDecimal: 1, + numDecimal: 2, enableTimeout: false, dataTimeout: 5 };