From d62aab85ea6307d11c735ccee94f694cc5109d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Mon, 3 Feb 2025 16:01:52 +0100 Subject: [PATCH] FIX: voltageStr shows absolute values now --- src/main/angular/src/app/editor/parts/battery/Battery.ts | 5 ++--- src/main/angular/src/app/editor/parts/light/Light.ts | 5 ++--- src/main/angular/src/app/editor/parts/relay/Relay.ts | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/angular/src/app/editor/parts/battery/Battery.ts b/src/main/angular/src/app/editor/parts/battery/Battery.ts index 78d1f3f..00071e1 100644 --- a/src/main/angular/src/app/editor/parts/battery/Battery.ts +++ b/src/main/angular/src/app/editor/parts/battery/Battery.ts @@ -26,7 +26,7 @@ export class Battery extends Part { } get voltageStr(): string { - return siPrefix(this.voltage, 'V', 2); + return siPrefix(Math.abs(this.voltage), 'V', 2); } get current(): number { @@ -34,8 +34,7 @@ export class Battery extends Part { } get currentStr(): string { - const current = Math.abs(this.current) || 0; - return siPrefix(current, 'A', 2); + return siPrefix(Math.abs(this.current) || 0, 'A', 2); } } diff --git a/src/main/angular/src/app/editor/parts/light/Light.ts b/src/main/angular/src/app/editor/parts/light/Light.ts index dc0a76a..0e0bad3 100644 --- a/src/main/angular/src/app/editor/parts/light/Light.ts +++ b/src/main/angular/src/app/editor/parts/light/Light.ts @@ -39,7 +39,7 @@ export class Light extends Part { } get voltageStr(): string { - return siPrefix(this.voltage, 'V', 2); + return siPrefix(Math.abs(this.voltage), 'V', 2); } get current(): number { @@ -50,8 +50,7 @@ export class Light extends Part { } get currentStr(): string { - const current = Math.abs(this.current) || 0; - return siPrefix(current, 'A', 2); + return siPrefix(Math.abs(this.current) || 0, 'A', 2); } fill(): string { diff --git a/src/main/angular/src/app/editor/parts/relay/Relay.ts b/src/main/angular/src/app/editor/parts/relay/Relay.ts index d362229..3c6a9fe 100644 --- a/src/main/angular/src/app/editor/parts/relay/Relay.ts +++ b/src/main/angular/src/app/editor/parts/relay/Relay.ts @@ -53,7 +53,7 @@ export class Relay extends Part { } get voltageStr(): string { - return siPrefix(this.voltage, 'V', 2); + return siPrefix(Math.abs(this.voltage), 'V', 2); } get current(): number { @@ -64,8 +64,7 @@ export class Relay extends Part { } get currentStr(): string { - const current = Math.abs(this.current) || 0; - return siPrefix(current, 'A', 2); + return siPrefix(Math.abs(this.current) || 0, 'A', 2); } override loop(): boolean {