From 21084b2de20ba6e88946a0b65de71039c4b4f6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Mon, 3 Feb 2025 13:06:47 +0100
Subject: [PATCH] default electrical characteristics for parts

---
 src/main/angular/src/app/editor/circuit/DEMO_001.ts      | 6 +++---
 src/main/angular/src/app/editor/circuit/DEMO_002.ts      | 8 ++++----
 src/main/angular/src/app/editor/circuit/Parts.ts         | 6 +++---
 src/main/angular/src/app/editor/parts/battery/Battery.ts | 4 ++--
 src/main/angular/src/app/editor/parts/light/Light.ts     | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/angular/src/app/editor/circuit/DEMO_001.ts b/src/main/angular/src/app/editor/circuit/DEMO_001.ts
index ba60021..e98cf9a 100644
--- a/src/main/angular/src/app/editor/circuit/DEMO_001.ts
+++ b/src/main/angular/src/app/editor/circuit/DEMO_001.ts
@@ -4,14 +4,14 @@ import {Light} from '../parts/light/Light';
 import {Wire} from '../wire/Wire';
 import {RESISTANCE_MIN} from './Calculation';
 
-const battery = new Battery(1, 3, "Batterie", 3, 0.5);
+const battery = new Battery(1, 3, "Batterie");
 
-const light = new Light(1, 1, "Licht", 3, 150);
+const light = new Light(1, 1, "Licht");
 
 export const DEMO_001 = new Circuit(
   "DEMO_001",
   "1. Batterie und Licht",
-  [battery, light,],
+  [battery, light],
   [
     new Wire(battery.minus, light.a, RESISTANCE_MIN, ""),
     new Wire(battery.plus, light.b, RESISTANCE_MIN, ""),
diff --git a/src/main/angular/src/app/editor/circuit/DEMO_002.ts b/src/main/angular/src/app/editor/circuit/DEMO_002.ts
index 96313ae..0ae3b7b 100644
--- a/src/main/angular/src/app/editor/circuit/DEMO_002.ts
+++ b/src/main/angular/src/app/editor/circuit/DEMO_002.ts
@@ -6,12 +6,12 @@ import {RESISTANCE_MIN} from './Calculation';
 
 const battery0 = new Battery(1, 3, "Batterie 1", 1.5, 0.5);
 const battery1 = new Battery(3, 3, "Batterie 2", 1.5, 0.5);
-const light0 = new Light(1, 1, "Licht 1", 3, 150);
-const light1 = new Light(3, 1, "Licht 2", 3, 150);
-const light2 = new Light(2, 5, "Licht 3", 3, 150);
+const light0 = new Light(1, 1, "Licht 1");
+const light1 = new Light(3, 1, "Licht 2");
+const light2 = new Light(2, 5, "Licht 3");
 
 export const DEMO_002 = new Circuit(
-  "DEMO_001",
+  "DEMO_002",
   "2. Reihe und Parallel",
   [battery0, battery1, light0, light1, light2],
   [
diff --git a/src/main/angular/src/app/editor/circuit/Parts.ts b/src/main/angular/src/app/editor/circuit/Parts.ts
index 7975ace..2ddf520 100644
--- a/src/main/angular/src/app/editor/circuit/Parts.ts
+++ b/src/main/angular/src/app/editor/circuit/Parts.ts
@@ -41,12 +41,12 @@ export class Parts {
     this.dragCursor = Point.fromEvent($event);
   }
 
-  newBattery(rasterX: number, rasterY: number, voltage: number): Battery {
-    return this.add(new Battery(rasterX, rasterY, this.generateName("Batterie"), voltage, 0.5));
+  newBattery(rasterX: number, rasterY: number): Battery {
+    return this.add(new Battery(rasterX, rasterY, this.generateName("Batterie")));
   }
 
   newLight(rasterX: number, rasterY: number): Light {
-    return this.add(new Light(rasterX, rasterY, this.generateName("Licht"), 3, 150));
+    return this.add(new Light(rasterX, rasterY, this.generateName("Licht")));
   }
 
   private generateName(baseName: string) {
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 42f2a60..78d1f3f 100644
--- a/src/main/angular/src/app/editor/parts/battery/Battery.ts
+++ b/src/main/angular/src/app/editor/parts/battery/Battery.ts
@@ -14,8 +14,8 @@ export class Battery extends Part {
     rasterX: number,
     rasterY: number,
     name: string,
-    public voltage: number,
-    public resistance: number,
+    public voltage: number = 3,
+    public resistance: number = 0.5,
   ) {
     super(PartType.Battery, name, rasterX, rasterY);
     new Wire(this.minus, this.plus, resistance, "Innenwiderstand");
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 45bfcae..dc0a76a 100644
--- a/src/main/angular/src/app/editor/parts/light/Light.ts
+++ b/src/main/angular/src/app/editor/parts/light/Light.ts
@@ -16,8 +16,8 @@ export class Light extends Part {
     rasterX: number,
     rasterY: number,
     name: string,
-    public voltageMax: number,
-    public resistance: number,
+    public voltageMax: number = 3,
+    public resistance: number = 100,
   ) {
     super(PartType.Light, name, rasterX, rasterY);
     new Wire(this.a, this.b, resistance, "Glühdraht");