diff --git a/Praktikum/VINF_MaerklinControl/.classpath b/Praktikum/VINF_MaerklinControl/.classpath
index fd439d2afa7d4c1a07f8f4145727762b275087a2..423fc1c028e9c1fd9775f261ca668d3c11307374 100644
--- a/Praktikum/VINF_MaerklinControl/.classpath
+++ b/Praktikum/VINF_MaerklinControl/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
- <classpathentry kind="lib" path="/home/lukas/VInf/Praktikum/VINF_MaerklinGUI/controlsfx-8.40.12.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
+ <classpathentry kind="lib" path="D:/Users/Philipp/gitlab/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Praktikum/VINF_MaerklinControl/bin/.gitignore b/Praktikum/VINF_MaerklinControl/bin/.gitignore
index 996b71b41e0929585d0395c5d5442f71d62f00d5..c14b100539d33e27c566ee63e8f25be8379cf169 100644
--- a/Praktikum/VINF_MaerklinControl/bin/.gitignore
+++ b/Praktikum/VINF_MaerklinControl/bin/.gitignore
@@ -1,3 +1 @@
-/server/
/gui/
-/common/
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class
index ebaa98a7d28021eabb4b693116ca3df9ecc659d0..d53c6b3b7e5a6e0dd404dd64afb686d4e4a0c0fb 100644
Binary files a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class and b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class differ
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class
index 0d47ba88ca285c0d68562bba69c84603ac4e3245..ac6c3bc2ed9cfeeccd962c48cd2f8f6d876a5212 100644
Binary files a/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class and b/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class differ
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/Switch.fxml b/Praktikum/VINF_MaerklinControl/bin/gui/view/Switch.fxml
index 30cfb7ef7f749c7e44d38f1b245c53f4e73b80e6..ab56159a5a1986f3f5e401b29d3c6ac34f01253a 100644
--- a/Praktikum/VINF_MaerklinControl/bin/gui/view/Switch.fxml
+++ b/Praktikum/VINF_MaerklinControl/bin/gui/view/Switch.fxml
@@ -15,7 +15,7 @@
</Label>
<ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
- <Image url="@../../../res/MagIcon_00_00_i.png" />
+ <Image url="@../../../res/MagIcon_00_01_i.png" />
</image>
<HBox.margin>
<Insets right="5.0" />
@@ -31,7 +31,7 @@
</ToggleSwitch>
<ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
- <Image url="@../../../res/MagIcon_00_01_i.png" />
+ <Image url="@../../../res/MagIcon_00_00_i.png" />
</image>
<HBox.margin>
<Insets right="5.0" />
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/SwitchControl.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/SwitchControl.class
index 30379206b0fef825fcc180a6f9741131e65d840d..4f6570f76d536d2918fe8ca3a0aa4355e39eb40c 100644
Binary files a/Praktikum/VINF_MaerklinControl/bin/gui/view/SwitchControl.class and b/Praktikum/VINF_MaerklinControl/bin/gui/view/SwitchControl.class differ
diff --git a/Praktikum/VINF_MaerklinControl/bin/server/ServerThread.class b/Praktikum/VINF_MaerklinControl/bin/server/ServerThread.class
new file mode 100644
index 0000000000000000000000000000000000000000..6be948c4b99495eecf0e236214e7c41563a5bc3a
Binary files /dev/null and b/Praktikum/VINF_MaerklinControl/bin/server/ServerThread.class differ
diff --git a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
index 0b22173c20d2da0a9bd458d354426ea8257a89ba..8d7d3b3668711e4465f14c8df8e95322e6e753ae 100644
Binary files a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png and b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png differ
diff --git a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
index 8dbd6c0a4efb0f300ceb7fff831dc5841f34d25f..33f8dda4e9fd0fdd879776581a92c5218182a7a5 100644
Binary files a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png and b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png differ
diff --git a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
index 6384e8650a7898dfc451b9895c1082d24086fce9..1cbaed4e9e8757ea73a758be0d2321f4d42426f2 100644
Binary files a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png and b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png differ
diff --git a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
index a6eb8c64ea1354336ba0e94bb308c6bcafb4d8be..1c8d8dbfba1b1652c6250919a2ccf4fc128dcc1e 100644
Binary files a/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png and b/Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png differ
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
index 153ae1b97ce955bce02a7e273b687456656b4eaa..70a1dbb52811800ffefb424d76a79136322e87fa 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
@@ -102,7 +102,7 @@ public class MainApp extends Application {
@Override
public void start(Stage primaryStage) {
this.primaryStage = primaryStage;
- this.primaryStage.setTitle("M�rklin Control Client");
+ this.primaryStage.setTitle("M�rklin Control Client");
this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
initRootLayout();
initTabs();
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/Switch.fxml b/Praktikum/VINF_MaerklinControl/src/gui/view/Switch.fxml
index 30cfb7ef7f749c7e44d38f1b245c53f4e73b80e6..ab56159a5a1986f3f5e401b29d3c6ac34f01253a 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/Switch.fxml
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/Switch.fxml
@@ -15,7 +15,7 @@
</Label>
<ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
- <Image url="@../../../res/MagIcon_00_00_i.png" />
+ <Image url="@../../../res/MagIcon_00_01_i.png" />
</image>
<HBox.margin>
<Insets right="5.0" />
@@ -31,7 +31,7 @@
</ToggleSwitch>
<ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
- <Image url="@../../../res/MagIcon_00_01_i.png" />
+ <Image url="@../../../res/MagIcon_00_00_i.png" />
</image>
<HBox.margin>
<Insets right="5.0" />
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchControl.java b/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchControl.java
index e614a127c6f7c0801d15bd85026d0cfa36e758af..e14c05fbe2f93d2884930cc518fcc5cee7d41e00 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchControl.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchControl.java
@@ -28,10 +28,10 @@ public class SwitchControl extends HBox{
// Reference to the main application.
private MainApp mainApp;
private Switch sw;
- private Image straightActive = new Image("file:res/MagIcon_00_00_a.png");
- private Image straightInactive = new Image("file:res/MagIcon_00_00_i.png");
- private Image bentActive = new Image("file:res/MagIcon_00_01_a.png");
- private Image bentInactive = new Image("file:res/MagIcon_00_01_i.png");
+ private Image straightActive = new Image("file:res/MagIcon_00_01_a.png");
+ private Image straightInactive = new Image("file:res/MagIcon_00_01_i.png");
+ private Image bentActive = new Image("file:res/MagIcon_00_00_a.png");
+ private Image bentInactive = new Image("file:res/MagIcon_00_00_i.png");
/**
diff --git a/pstenkamp/Doku/scenebuilder_switch.PNG b/pstenkamp/Doku/scenebuilder_switch.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..43783fe4d53b51b0e63b32927675e93971dba061
Binary files /dev/null and b/pstenkamp/Doku/scenebuilder_switch.PNG differ
diff --git a/pstenkamp/Doku/tab_switches.PNG b/pstenkamp/Doku/tab_switches.PNG
index 627c97413c261d10b7f1806b43346ee1425fc925..eaebeae82ba416ef321358b49b57ebd3378d3864 100644
Binary files a/pstenkamp/Doku/tab_switches.PNG and b/pstenkamp/Doku/tab_switches.PNG differ