Merge branch 'refs/heads/demos'

# Conflicts:
#	src/main/java/de/ph87/electro/circuit/CircuitPanel.java
#	src/main/java/de/ph87/electro/demo/DemoAll.java
This commit is contained in:
Patrick Haßel 2024-05-16 11:56:06 +02:00
commit be46107eb5

View File

@ -8,7 +8,9 @@ import static de.ph87.electro.CONFIG.VOLTAGE;
public class DemoAll {
public static Circuit create() {
public static Circuit complexTrippleAndSimple() {
final double voltage = 3.0;
final Circuit circuit = new Circuit();
final PartBattery battery = circuit.addBattery("Batterie", 0, 0, Orientation.R2, VOLTAGE);
@ -32,4 +34,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, Orientation.R1, voltage);
final PartLight light0 = circuit.addLight("Licht 0", 4, 2, Orientation.R1, voltage);
final PartLight light1 = circuit.addLight("Licht 1", 0, 2, Orientation.R1, voltage);
final PartSwitch1x2 switcher0 = circuit.addSwitch1x2("Wechselschalter 0", 2, 2, Orientation.R1, 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;
}
}