From b7feb37c71e38a2a25780357d72babe2e41a3a36 Mon Sep 17 00:00:00 2001
From: pstenkamp <philipp.stenkamp@hs-bochum.de>
Date: Fri, 13 Jan 2017 16:55:12 +0100
Subject: [PATCH] Minor cleanup. Added most basic functionality to the
turntable controller (turn CW / turn CCW).
---
.../bin/gui/MainApp.class | Bin 10848 -> 10970 bytes
.../bin/gui/view/EngineController.class | Bin 5416 -> 5416 bytes
.../bin/gui/view/RootLayoutController.class | Bin 1344 -> 1258 bytes
.../bin/gui/view/Turntable.fxml | 10 +--
.../bin/gui/view/TurntableController.class | Bin 852 -> 1254 bytes
.../VINF_MaerklinControl/src/gui/MainApp.java | 13 ++--
.../src/gui/view/EngineController.java | 4 +-
.../src/gui/view/RootLayoutController.java | 21 ------
.../src/gui/view/SwitchListController.java | 2 +-
.../src/gui/view/Turntable.fxml | 10 +--
.../src/gui/view/TurntableController.java | 62 ++++++++++--------
11 files changed, 49 insertions(+), 73 deletions(-)
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class
index d53c6b3b7e5a6e0dd404dd64afb686d4e4a0c0fb..58bed3efc17a1abc3ea3c7b715371bce1fcc873c 100644
GIT binary patch
literal 10970
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
I<2eQf0BfDWga7~l
literal 10848
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
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class
index 45f236aaad3c91ed9a6ce7b8df5c80565051e719..06031cbb88424aba6ae1302ab7dd6d0f0982b52e 100644
GIT binary patch
delta 36
scmZ3XwL)vdO#wj-1`Y;I1_1^w1}O$@1_cJK&94NGGc#&W-Xu~60HDhV;{X5v
delta 36
scmZ3XwL)vdO#wko1`Y--1_1_b1}O#|1_cJ~&94NGGc)Q;-Xu~60HHJp=>Px#
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/RootLayoutController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/RootLayoutController.class
index 622daaa07bf5fb8669ce5cc9373b3fdafca6be46..b4140357c2889d53743a6e76e50633463ec60f71 100644
GIT binary patch
delta 482
zcmX@W^@@}0)W2Q(7#J8#7;H9jg)>ghV^n06oIHV1#7KsRft7)ci$RV-ft^8~kwGRa
zu`DsILccgUH7`{^IX|zYC_hI(Brz!<F)x*eL6Jde@-;>i85NLnRYnHx^wLay-^9#3
z$ASWG26YBab_R{fYD{X(S`6Bg{h56E^m!OK8MwF@3>l2s8H^^cVp3%`VbGm?iOG>o
zg~5`C!F;kLa~eM@10w@310Mq;13v=;gZ|_`W-(7T21W)31}+9+1_lNmFq@S@gh7;n
zfq{`hj6oc#){cRRfr){EflW($D}%&F1_lNu1|hIMkf<mFD}&f%GZuLpDY)s*3`}6t
zM76dsNN;11)!M=!v5i4_CxaRjLpZttk_;jYQj;gLh}P>c=t8Y@gj&g|wS_@XdmDoR
zx+Yl$4hA`}yT!n6<Al1Kfq|33l);RFk%5uH9PS<npMik`;t&gT(-axl8I%~L5y8L#
MHI9+N3hZ5L0Fxm*_W%F@
delta 518
zcmaFGd4P-S)W2Q(7#J8#7;HCkg)?$x=4F;-Cgx;TrB04xR8f}VVc=%qVPxRQ$xloP
zNlYr{WME{F<zZlDVB=ztXHaBkP?)@wQIT1RL3#2?MiUuTkdPW919y69roL}tW}ag~
z0XKsNgBCl3=444GHD+xFoyks2zI+Be44e#HTnt7GChQExljkz2GMh5!O+L!x$fn9*
z#lv7RnTI)zpN)Z$ftP`gfsuiqfq}tzawD@?Jr@HL0|SEu0}F#BgD?XF0}lfu0|Nsq
zg9w8t0|NsSgBSxJ0}}%~0|Ns{HwOa)Sg$q%16Up7MzA6ws5AqE5|SZ|P(v6Q#2F-@
zmfA5efh}ay(%#A-xe=tAi2<Y?;tnkaRtD|K518c{r6;k7X3K12kki`2Ai0e}Wha9=
z6GJ${I*58b1`!5*kRecai^8qcWzd6K=?JxwQ)>%@zV<c-Lv%xo7&sV=CpWN&bDA-j
lGcYnRGFVJrz#?iYxsAaRU9A}dJA*lrg&c4Tt-&E-0|5W1J1_tM
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/Turntable.fxml b/Praktikum/VINF_MaerklinControl/bin/gui/view/Turntable.fxml
index ba51d6e..06a134e 100644
--- a/Praktikum/VINF_MaerklinControl/bin/gui/view/Turntable.fxml
+++ b/Praktikum/VINF_MaerklinControl/bin/gui/view/Turntable.fxml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ToggleButton?>
-<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
@@ -10,12 +9,9 @@
<children>
<HBox alignment="BOTTOM_CENTER" layoutX="70.0" layoutY="457.0" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0">
<children>
- <ToggleButton fx:id="turntableLeftButton" mnemonicParsing="false" text="<">
- <toggleGroup>
- <ToggleGroup fx:id="turntableDirection" />
- </toggleGroup></ToggleButton>
+ <Button fx:id="turntableLeftButton" mnemonicParsing="false" onAction="#handleTurnCCW" text="<" />
<ChoiceBox fx:id="slotChoiceBox" prefWidth="150.0" />
- <ToggleButton fx:id="turntableRightButton" mnemonicParsing="false" text=">" toggleGroup="$turntableDirection" />
+ <Button fx:id="turntableRightButton" mnemonicParsing="false" onAction="#handleTurnCW" text=">" />
</children>
</HBox>
</children>
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/TurntableController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/TurntableController.class
index 6002e2d46f0d8a69310753830b02a872538da8d9..00da853b45178b3a87ddd07aa3ff6ee1db3d7ef9 100644
GIT binary patch
delta 503
zcmcb@_KcJ3)W2Q(7#J8#7>p)z1&GV~WF?j*rd8+{C#UA6>L=&tl@#UY=x;1<XRPPV
zNX$#gNewA2%5!!O=VDM`P-16LWMtq@FU{2VP0Y-5EGXb%P-YNhWDqDREy^oNOoFTC
zU{Gab(DX?ysVYe=R`AZx%}vZp$+uE)DN4;KNzKVgEmFwI%*!rTNGVFqNX-KouFk`t
z!Jx^=z*(GH5?qp4QeRrk$RMf#cA$PvVqUs_a7j^SUb?kr7$XA@lH0&e)8S#z1-XPD
z)g|E^4El@=T6i5&l$xAT0&@u?16Oc<X;E^j+hjJTQbyLvHB4HJ9FvzbxiCsje#2zT
zs>r~~pgdWRS+QP_fssLofq}u9fr){Ufq_9#YYT(SHU@bRC8V;AL2V-g0|OI-C<6ln
z9|JQ31A`g^JA*od0D}gD7y|<X4@47#ID-TO0|O(276T3gwZR7Jp&O{dz`&r*z|Nq<
OAi$uD)kFiZ{e}Q(3~;Uh
delta 90
zcmaFHd4-MZ)W2Q(7#J8#7!)RQ1;{G<WF?j*rd8+{C#UA6>L=&tl@#UY=!fK|r{|<@
vENo|-{En%Xk$G|svlb)Q<mt>VjM9_uFx#>!Gq5tKPL^X)WMyDrVvq*_iFX>z
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
index 70a1dbb..fc13d48 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
@@ -13,7 +13,7 @@ import gui.model.Engine;
import gui.model.Switch;
import gui.model.Settings;
import gui.view.EngineController;
-//import gui.view.TurntableController;
+import gui.view.TurntableController;
import gui.view.RootLayoutController;
import gui.view.SettingsController;
import gui.view.SwitchListController;
@@ -39,7 +39,7 @@ public class MainApp extends Application {
private AnchorPane enginePane, turntablePane, settingsPane, switchListPane;
private EngineController engineController;
private SwitchListController switchListController;
-// private TurntableController turntableController;
+ private TurntableController turntableController;
private Settings configuration;
private SettingsController settingsController;
@@ -108,9 +108,6 @@ public class MainApp extends Application {
initTabs();
}
- /**
- * Initializes the root layout.
- */
public void initRootLayout() {
try {
// Load root layout from fxml file.
@@ -151,8 +148,8 @@ public class MainApp extends Application {
FXMLLoader turntableLoader = new FXMLLoader();
turntableLoader.setLocation(MainApp.class.getResource("view/Turntable.fxml"));
turntablePane = turntableLoader.load();
- //turntableController = turntableLoader.getController();
- //turntableController.setMainApp(this);
+ turntableController = turntableLoader.getController();
+ turntableController.setMainApp(this);
FXMLLoader settingsLoader = new FXMLLoader();
settingsLoader.setLocation(MainApp.class.getResource("view/Settings.fxml"));
@@ -164,7 +161,7 @@ public class MainApp extends Application {
// Add the tabs
tabs.add(new Tab("Loks", enginePane));
tabs.add(new Tab("Weichen", switchListPane));
- tabs.add(new Tab("Drehscheibe", turntablePane));
+ tabs.add(new Tab("Drehteller", turntablePane));
tabs.add(new Tab("Einstellungen", settingsPane));
rootController.loadTabs();
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java
index b3ce21f..98eded7 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java
@@ -37,11 +37,11 @@ public class EngineController {
*/
@FXML
private void initialize() {
- //engineChoiceBox.setItems(mainApp.getEngines()); doesn't work here (yet)
- engineSpeedSlider.setValue(0);
+ engineSpeedSlider.setValue(0);
engineFwdButton.setSelected(true); // initializes the forward Button as pressed
engineChoiceBox.getSelectionModel().selectedItemProperty().addListener(
(observable, oldValue, newValue) -> setSelectedEngine(newValue));
+
engineSpeedSlider.valueProperty().addListener(new ChangeListener<Number>() {
public void changed(ObservableValue<? extends Number> ov,
Number old_val, Number new_val) {
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/RootLayoutController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/RootLayoutController.java
index 8b41f4d..f47880d 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/RootLayoutController.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/RootLayoutController.java
@@ -17,27 +17,6 @@ public class RootLayoutController {
// Reference to the main application.
private MainApp mainApp;
- /**
- * The constructor.
- * The constructor is called before the initialize() method.
- */
- public RootLayoutController() {
- }
-
- /**
- * Initializes the controller class. This method is automatically called
- * after the fxml file has been loaded.
- */
- @FXML
- private void initialize() {
-
- }
-
- /**
- * Is called by the main application to give a reference back to itself.
- *
- * @param mainApp
- */
public void setMainApp(MainApp mainApp) {
this.mainApp = mainApp;
}
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchListController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchListController.java
index f083b8f..de5eebb 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchListController.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/SwitchListController.java
@@ -28,7 +28,7 @@ public class SwitchListController {
*/
@FXML
private void initialize() {
- //setSwitchControls(); // would be nice to do this here, doesn't work unti setMainApp has been called
+ //setSwitchControls(); // would be nice to do this here, doesn't work until setMainApp has been called
}
/**
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/Turntable.fxml b/Praktikum/VINF_MaerklinControl/src/gui/view/Turntable.fxml
index ba51d6e..06a134e 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/Turntable.fxml
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/Turntable.fxml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ToggleButton?>
-<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
@@ -10,12 +9,9 @@
<children>
<HBox alignment="BOTTOM_CENTER" layoutX="70.0" layoutY="457.0" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0">
<children>
- <ToggleButton fx:id="turntableLeftButton" mnemonicParsing="false" text="<">
- <toggleGroup>
- <ToggleGroup fx:id="turntableDirection" />
- </toggleGroup></ToggleButton>
+ <Button fx:id="turntableLeftButton" mnemonicParsing="false" onAction="#handleTurnCCW" text="<" />
<ChoiceBox fx:id="slotChoiceBox" prefWidth="150.0" />
- <ToggleButton fx:id="turntableRightButton" mnemonicParsing="false" text=">" toggleGroup="$turntableDirection" />
+ <Button fx:id="turntableRightButton" mnemonicParsing="false" onAction="#handleTurnCW" text=">" />
</children>
</HBox>
</children>
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/TurntableController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/TurntableController.java
index bca4915..0c8c6c1 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/TurntableController.java
+++ b/Praktikum/VINF_MaerklinControl/src/gui/view/TurntableController.java
@@ -1,38 +1,46 @@
package gui.view;
import gui.MainApp;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
-import javafx.scene.control.ToggleButton;
+import javafx.scene.control.Button;
import javafx.scene.control.ChoiceBox;
public class TurntableController {
-@FXML
-private ToggleButton turntableLeftButton;
-@FXML
-private ToggleButton turntableRightButton;
-@FXML
-private ChoiceBox<Number> slotChoiceBox;
-private MainApp mainApp;
+ @FXML
+ private Button turntableLeftButton;
+ @FXML
+ private Button turntableRightButton;
+ @FXML
+ private ChoiceBox<Number> slotChoiceBox;
+ private MainApp mainApp;
+
+ /**
+ * Initializes the controller class. This method is automatically called
+ * after the fxml file has been loaded.
+ */
+ @FXML
+ private void initialize() {
+
+ }
-/**
- * Initializes the controller class. This method is automatically called
- * after the fxml file has been loaded.
- */
-@FXML
-private void initialize() {
+ /**
+ * Is called by the main application to give a reference back to itself.
+ *
+ * @param mainApp
+ */
+ public void setMainApp(MainApp mainApp) {
+ this.mainApp = mainApp;
+
+ }
-}
-
-/**
- * Is called by the main application to give a reference back to itself.
- *
- * @param mainApp
- */
-public void setMainApp(MainApp mainApp) {
- this.mainApp = mainApp;
-
-}
+ public void handleTurnCCW (){
+ mainApp.turntableTurnCCW();
+ mainApp.setStatus("Letztes Kommando: Drehteller links drehen");
+ }
+
+ public void handleTurnCW (){
+ mainApp.turntableTurnCW();
+ mainApp.setStatus("Letztes Kommando: Drehteller rechts drehen");
+ }
}
--
GitLab