From 52b242bbe11917adf053a881c8f5a73cc3b77b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Wed, 15 May 2024 19:41:53 +0200 Subject: [PATCH] simpleAlternative --- .../de/ph87/electro/circuit/CircuitPanel.java | 2 +- .../java/de/ph87/electro/demo/DemoAll.java | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ph87/electro/circuit/CircuitPanel.java b/src/main/java/de/ph87/electro/circuit/CircuitPanel.java index 2946994..145da9b 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitPanel.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitPanel.java @@ -81,7 +81,7 @@ public class CircuitPanel extends JPanel { }; addMouseListener(listener); addMouseMotionListener(listener); - circuit = DemoAll.create(); + circuit = DemoAll.simpleAlternative(); } @Override diff --git a/src/main/java/de/ph87/electro/demo/DemoAll.java b/src/main/java/de/ph87/electro/demo/DemoAll.java index 5affdb9..2231356 100644 --- a/src/main/java/de/ph87/electro/demo/DemoAll.java +++ b/src/main/java/de/ph87/electro/demo/DemoAll.java @@ -5,7 +5,7 @@ import de.ph87.electro.circuit.part.impl.*; public class DemoAll { - public static Circuit create() { + public static Circuit complexTrippleAndSimple() { final double voltage = 3.0; final Circuit circuit = new Circuit(); @@ -31,4 +31,25 @@ public class DemoAll { return circuit; } + public static Circuit simpleAlternative() { + final double voltage = 3.0; + + final Circuit circuit = new Circuit(); + + final PartBattery battery = circuit.addBattery("Batterie", 2, 0, 1, voltage); + final PartLight light0 = circuit.addLight("Licht 0", 4, 2, 1, voltage); + final PartLight light1 = circuit.addLight("Licht 1", 0, 2, 1, voltage); + final PartSwitch1x2 switcher0 = circuit.addSwitch1x2("Wechselschalter 0", 2, 2, 1, false); + + circuit.connect(battery.getMinus(), light0.getPin0()); + circuit.connect(battery.getMinus(), light1.getPin0()); + + circuit.connect(battery.getPlus(), switcher0.getCommon()); + circuit.connect(switcher0.getOutput0(), light0.getPin1()); + circuit.connect(switcher0.getOutput1(), light1.getPin1()); + + circuit.evaluate(); + return circuit; + } + }