Skip to content
Snippets Groups Projects
Commit 8ec66e47 authored by 's avatar
Browse files

Merge branch 'master' of https://gitlab.cvh-server.de/lf.ps/VInf

parents 644ea7a8 a62a941f
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 56 deletions
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/> <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.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="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="lib" path="D:/Users/Philipp/gitlab/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
/server/
/gui/ /gui/
/common/
No preview for this file type
No preview for this file type
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</Label> </Label>
<ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true"> <ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../../../res/MagIcon_00_00_i.png" /> <Image url="@../../../res/MagIcon_00_01_i.png" />
</image> </image>
<HBox.margin> <HBox.margin>
<Insets right="5.0" /> <Insets right="5.0" />
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</ToggleSwitch> </ToggleSwitch>
<ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true"> <ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../../../res/MagIcon_00_01_i.png" /> <Image url="@../../../res/MagIcon_00_00_i.png" />
</image> </image>
<HBox.margin> <HBox.margin>
<Insets right="5.0" /> <Insets right="5.0" />
......
No preview for this file type
File added
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png

533 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png

532 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png

299 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png

300 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png

534 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png

537 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png

298 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png

298 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -102,7 +102,7 @@ public class MainApp extends Application { ...@@ -102,7 +102,7 @@ public class MainApp extends Application {
@Override @Override
public void start(Stage primaryStage) { public void start(Stage primaryStage) {
this.primaryStage = primaryStage; this.primaryStage = primaryStage;
this.primaryStage.setTitle("Mrklin Control Client"); this.primaryStage.setTitle("Mrklin Control Client");
this.primaryStage.getIcons().add(new Image("file:res/BO.png")); this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
initRootLayout(); initRootLayout();
initTabs(); initTabs();
......
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<AnchorPane prefHeight="600.0" prefWidth="340.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<children>
<TabPane layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<tabs>
<Tab text="Loks">
<content>
<fx:include source="Engine.fxml" />
</content>
</Tab>
<Tab text="Weichen">
<content>
<fx:include source="SwitchList.fxml" />
</content>
</Tab>
<Tab text="Drehscheibe">
<content>
<fx:include source="Turntable.fxml" />
</content>
</Tab>
<Tab text="Verbindung">
<content>
<fx:include source="Settings.fxml" />
</content>
</Tab>
</tabs>
</TabPane>
</children>
</AnchorPane>
...@@ -81,15 +81,15 @@ public class EngineController { ...@@ -81,15 +81,15 @@ public class EngineController {
engineFwdButton.setSelected(eng.getDirection().get()); engineFwdButton.setSelected(eng.getDirection().get());
engineRevButton.setSelected(!eng.getDirection().get()); engineRevButton.setSelected(!eng.getDirection().get());
if (eng.getDirection().get()) if (eng.getDirection().get())
status.append("vorwrts"); status.append("vorwrts");
else else
status.append("rckwrts"); status.append("rckwrts");
mainApp.setStatus(status.toString()); mainApp.setStatus(status.toString());
} }
public void setSelectedEngine(Engine eng){ public void setSelectedEngine(Engine eng){
this.eng = eng; this.eng = eng;
mainApp.setStatus(eng.toString() + " ausgewhlt"); mainApp.setStatus(eng.toString() + " ausgewhlt");
updateEngineStatus(); updateEngineStatus();
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</Label> </Label>
<ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true"> <ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../../../res/MagIcon_00_00_i.png" /> <Image url="@../../../res/MagIcon_00_01_i.png" />
</image> </image>
<HBox.margin> <HBox.margin>
<Insets right="5.0" /> <Insets right="5.0" />
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</ToggleSwitch> </ToggleSwitch>
<ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true"> <ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../../../res/MagIcon_00_01_i.png" /> <Image url="@../../../res/MagIcon_00_00_i.png" />
</image> </image>
<HBox.margin> <HBox.margin>
<Insets right="5.0" /> <Insets right="5.0" />
......
...@@ -28,10 +28,10 @@ public class SwitchControl extends HBox{ ...@@ -28,10 +28,10 @@ public class SwitchControl extends HBox{
// Reference to the main application. // Reference to the main application.
private MainApp mainApp; private MainApp mainApp;
private Switch sw; private Switch sw;
private Image straightActive = new Image("file:res/MagIcon_00_00_a.png"); private Image straightActive = new Image("file:res/MagIcon_00_01_a.png");
private Image straightInactive = new Image("file:res/MagIcon_00_00_i.png"); private Image straightInactive = new Image("file:res/MagIcon_00_01_i.png");
private Image bentActive = new Image("file:res/MagIcon_00_01_a.png"); private Image bentActive = new Image("file:res/MagIcon_00_00_a.png");
private Image bentInactive = new Image("file:res/MagIcon_00_01_i.png"); private Image bentInactive = new Image("file:res/MagIcon_00_00_i.png");
/** /**
......
pstenkamp/Doku/scenebuilder_switch.PNG

27.1 KiB

pstenkamp/Doku/tab_switches.PNG

22.2 KiB | W: | H:

pstenkamp/Doku/tab_switches.PNG

20.3 KiB | W: | H:

pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment