Runde Tasten und Leuchtfelder.

src/main/java/Enigma/GuiController.java

@@ -7,6 +7,7 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.paint.Color;
+import javafx.scene.shape.Circle;
 
 
 import java.util.ArrayList;
@@ -97,165 +98,154 @@ public class GuiController {
     @FXML
     private Button btnO;
 
-    @FXML
-    private Button btnLöschen;
 
     @FXML
-    private Button btnP1;
+    private MenuButton mBtnWalzPos1;
 
     @FXML
-    private Button btnY1;
+    private MenuButton mBtnWalzPos3;
 
     @FXML
-    private Button btnX1;
+    private MenuButton mBtnWalzPos2;
 
     @FXML
-    private Button btnC1;
+    private MenuButton mBtnNotchPos3;
 
     @FXML
-    private Button btnV1;
+    private MenuButton mBtnNotchPos2;
 
     @FXML
-    private Button btnB1;
+    private MenuButton mBtnStartPos1;
 
     @FXML
-    private Button btnN1;
+    private MenuButton mBtnStartPos3;
 
     @FXML
-    private Button btnM1;
+    private MenuButton mBtnStartPos2;
 
     @FXML
-    private Button btnL1;
+    private TextField tfrein;
 
     @FXML
-    private Button btnA1;
+    private TextField tfcodiert;
 
-    @FXML
-    private Button btnS1;
 
     @FXML
-    private Button btnD1;
+    private MenuButton mBtnNotchPos1;
 
     @FXML
-    private Button btnF1;
+    private TextField tfStecker1;
 
     @FXML
-    private Button btnG1;
+    private TextField tfStecker2;
 
     @FXML
-    private Button btnH1;
+    private TextField tfStecker3;
 
     @FXML
-    private Button btnJ1;
+    private TextField tfStecker4;
 
     @FXML
-    private Button btnK1;
+    private TextField tfStecker5;
 
     @FXML
-    private Button btnQ1;
+    private TextField tfStecker6;
 
     @FXML
-    private Button btnW1;
+    private TextField tfStecker7;
 
     @FXML
-    private Button btnE1;
+    private TextField tfStecker8;
 
     @FXML
-    private Button btnR1;
+    private TextField tfStecker9;
 
     @FXML
-    private Button btnT1;
-
+    private TextField tfStecker10;
     @FXML
-    private Button btnZ1;
+    private Label lblQ;
 
     @FXML
-    private Button btnU1;
+    private Label lblE;
 
     @FXML
-    private Button btnI1;
+    private Label lblW;
 
     @FXML
-    private Button btnO1;
-
+    private Label lblR;
 
     @FXML
-    private MenuButton mBtnWalzPos1;
+    private Label lblT;
 
     @FXML
-    private MenuButton mBtnWalzPos3;
+    private Label lblZ;
 
     @FXML
-    private MenuButton mBtnWalzPos2;
+    private Label lblO;
 
     @FXML
-    private MenuButton mBtnNotchPos3;
+    private Label lblI;
 
     @FXML
-    private MenuButton mBtnNotchPos2;
+    private Label lblU;
 
     @FXML
-    private MenuButton mBtnStartPos1;
+    private Label lblA;
 
     @FXML
-    private MenuButton mBtnStartPos3;
+    private Label lblD;
 
     @FXML
-    private MenuButton mBtnStartPos2;
+    private Label lblS;
 
     @FXML
-    private TextField tfrein;
+    private Label lblF;
 
     @FXML
-    private TextField tfcodiert;
-
+    private Label lblG;
 
     @FXML
-    private MenuButton mBtnNotchPos1;
+    private Label lblH;
 
     @FXML
-    private TextField tfStecker1;
+    private Label lblK;
 
     @FXML
-    private TextField tfStecker2;
+    private Label lblJ;
 
     @FXML
-    private TextField tfStecker3;
+    private Label lblP;
 
     @FXML
-    private TextField tfStecker4;
+    private Label lblX;
 
     @FXML
-    private TextField tfStecker5;
+    private Label lblY;
 
     @FXML
-    private TextField tfStecker6;
+    private Label lblC;
 
     @FXML
-    private TextField tfStecker7;
+    private Label lblV;
 
     @FXML
-    private TextField tfStecker8;
+    private Label lblB;
 
     @FXML
-    private TextField tfStecker9;
+    private Label lblL;
 
     @FXML
-    private TextField tfStecker10;
+    private Label lblM;
 
     @FXML
-    void leuchtTaste(MouseEvent e) {
-        while (e.getSource() == btnA){
-
-            btnA1.setStyle("-fx-background-color: #ff0000");
+    private Label lblN;
 
-          //  setText(btnA);
+    @FXML
+    void löschen() {
+        textEingabe=textEingabe.substring(0,textEingabe.length()-1);
+        tfrein.setText(textEingabe);
         }
 
-
-    }
-
-
     @FXML
     void btnempfangen() {
     }
@@ -307,7 +297,16 @@ public class GuiController {
         menu(mBtnStartPos3, bs);
         menu(mBtnStartPos2, bs);
 
-        assert btnL != null : "fx:id=\"btnL\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker1 != null : "fx:id=\"tfStecker1\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker2 != null : "fx:id=\"tfStecker2\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker3 != null : "fx:id=\"tfStecker3\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker4 != null : "fx:id=\"tfStecker4\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker5 != null : "fx:id=\"tfStecker5\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker6 != null : "fx:id=\"tfStecker6\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker7 != null : "fx:id=\"tfStecker7\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker8 != null : "fx:id=\"tfStecker8\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker9 != null : "fx:id=\"tfStecker9\" was not injected: check your FXML file 'gui.fxml'.";
+        assert tfStecker10 != null : "fx:id=\"tfStecker10\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnP != null : "fx:id=\"btnP\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnY != null : "fx:id=\"btnY\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnX != null : "fx:id=\"btnX\" was not injected: check your FXML file 'gui.fxml'.";
@@ -316,6 +315,7 @@ public class GuiController {
         assert btnB != null : "fx:id=\"btnB\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnN != null : "fx:id=\"btnN\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnM != null : "fx:id=\"btnM\" was not injected: check your FXML file 'gui.fxml'.";
+        assert btnL != null : "fx:id=\"btnL\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnA != null : "fx:id=\"btnA\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnS != null : "fx:id=\"btnS\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnD != null : "fx:id=\"btnD\" was not injected: check your FXML file 'gui.fxml'.";
@@ -333,7 +333,6 @@ public class GuiController {
         assert btnU != null : "fx:id=\"btnU\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnI != null : "fx:id=\"btnI\" was not injected: check your FXML file 'gui.fxml'.";
         assert btnO != null : "fx:id=\"btnO\" was not injected: check your FXML file 'gui.fxml'.";
-        assert btnLöschen != null : "fx:id=\"btnLöschen\" was not injected: check your FXML file 'gui.fxml'.";
         assert mBtnWalzPos1 != null : "fx:id=\"mBtnWalzPos1\" was not injected: check your FXML file 'gui.fxml'.";
         assert mBtnWalzPos3 != null : "fx:id=\"mBtnWalzPos3\" was not injected: check your FXML file 'gui.fxml'.";
         assert mBtnWalzPos2 != null : "fx:id=\"mBtnWalzPos2\" was not injected: check your FXML file 'gui.fxml'.";
@@ -345,107 +344,69 @@ public class GuiController {
         assert tfrein != null : "fx:id=\"tfrein\" was not injected: check your FXML file 'gui.fxml'.";
         assert tfcodiert != null : "fx:id=\"tfcodiert\" was not injected: check your FXML file 'gui.fxml'.";
         assert mBtnNotchPos1 != null : "fx:id=\"mBtnNotchPos1\" was not injected: check your FXML file 'gui.fxml'.";
-
-/*         ActionListener den Butten hinzufügen
-        btnA.setOnAction(e -> {
-            gedrueckteTaste(e);
-        });
-        btnB.setOnAction(e -> {gedrueckteTaste(e);});
-        btnC.setOnAction(e -> {gedrueckteTaste(e);});
-        btnD.setOnAction(e -> {gedrueckteTaste(e);});
-        btnE.setOnAction(e -> {gedrueckteTaste(e);});
-        btnF.setOnAction(e -> {gedrueckteTaste(e);});
-        btnG.setOnAction(e -> {gedrueckteTaste(e);});
-        btnH.setOnAction(e -> {gedrueckteTaste(e);});
-        btnI.setOnAction(e -> {gedrueckteTaste(e);});
-        btnJ.setOnAction(e -> {gedrueckteTaste(e);});
-        btnK.setOnAction(e -> {gedrueckteTaste(e);});
-        btnL.setOnAction(e -> {gedrueckteTaste(e);});
-        btnM.setOnAction(e -> {gedrueckteTaste(e);});
-        btnN.setOnAction(e -> {gedrueckteTaste(e);});
-        btnO.setOnAction(e -> {gedrueckteTaste(e);});
-        btnP.setOnAction(e -> {gedrueckteTaste(e);});
-        btnQ.setOnAction(e -> {gedrueckteTaste(e);});
-        btnR.setOnAction(e -> {gedrueckteTaste(e);});
-        btnS.setOnAction(e -> {gedrueckteTaste(e);});
-        btnT.setOnAction(e -> {gedrueckteTaste(e);});
-        btnU.setOnAction(e -> {gedrueckteTaste(e);});
-        btnV.setOnAction(e -> {gedrueckteTaste(e);});
-        btnW.setOnAction(e -> {gedrueckteTaste(e);});
-        btnX.setOnAction(e -> {gedrueckteTaste(e);});
-        btnY.setOnAction(e -> {gedrueckteTaste(e);});
-        btnZ.setOnAction(e -> {gedrueckteTaste(e);});
-
-
-        btnA.setOnMouseEntered (e->{
-            leuchtTaste(e);
-        });
-
-        btnA1.setOnMouseDragEntered (e -> {leuchtTaste(e);});
-        btnB1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnC1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnD1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnE1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnF1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnG1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnH1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnI1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnJ1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnK1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnL1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnM1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnN1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnO1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnP1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnQ1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnR1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnS1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnT1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnU1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnV1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnW1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnX1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnY1.setOnAction(e -> {gedrueckteTaste(e);});
-        btnZ1.setOnAction(e -> {gedrueckteTaste(e);});*/
-
-        leuchten(btnA, btnA1);
-        leuchten(btnB, btnB1);
-        leuchten(btnC,btnC1);
-        leuchten(btnD, btnD1);
-        leuchten(btnE, btnE1);
-        leuchten(btnF, btnF1);
-        leuchten(btnG, btnG1);
-        leuchten(btnH, btnH1);
-        leuchten(btnI, btnI1);
-        leuchten(btnJ,btnJ1);
-        leuchten(btnK, btnK1);
-        leuchten(btnL, btnL1);
-        leuchten(btnM, btnM1);
-        leuchten(btnN, btnN1);
-        leuchten(btnO, btnO1);
-        leuchten(btnP, btnP1);
-        leuchten(btnQ,btnQ1);
-        leuchten(btnR, btnR1);
-        leuchten(btnS, btnS1);
-        leuchten(btnT, btnT1);
-        leuchten(btnU, btnU1);
-        leuchten(btnV, btnV1);
-        leuchten(btnW, btnW1);
-        leuchten(btnX,btnX1);
-        leuchten(btnY, btnY1);
-        leuchten(btnZ, btnZ1);
+        assert lblQ != null : "fx:id=\"lblQ\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblE != null : "fx:id=\"lblE\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblW != null : "fx:id=\"lblW\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblR != null : "fx:id=\"lblR\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblT != null : "fx:id=\"lblT\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblZ != null : "fx:id=\"lblZ\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblO != null : "fx:id=\"lblO\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblI != null : "fx:id=\"lblI\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblU != null : "fx:id=\"lblU\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblA != null : "fx:id=\"lblA\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblD != null : "fx:id=\"lblD\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblS != null : "fx:id=\"lblS\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblF != null : "fx:id=\"lblF\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblG != null : "fx:id=\"lblG\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblH != null : "fx:id=\"lblH\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblK != null : "fx:id=\"lblK\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblJ != null : "fx:id=\"lblJ\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblP != null : "fx:id=\"lblP\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblX != null : "fx:id=\"lblX\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblY != null : "fx:id=\"lblY\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblC != null : "fx:id=\"lblC\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblV != null : "fx:id=\"lblV\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblB != null : "fx:id=\"lblB\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblL != null : "fx:id=\"lblL\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblM != null : "fx:id=\"lblM\" was not injected: check your FXML file 'gui.fxml'.";
+        assert lblN != null : "fx:id=\"lblN\" was not injected: check your FXML file 'gui.fxml'.";
+
+        leuchten(btnA, lblA);
+        leuchten(btnB, lblB);
+        leuchten(btnC,lblC);
+        leuchten(btnD, lblD);
+        leuchten(btnE, lblE);
+        leuchten(btnF, lblF);
+        leuchten(btnG, lblG);
+        leuchten(btnH, lblH);
+        leuchten(btnI, lblI);
+        leuchten(btnJ,lblJ);
+        leuchten(btnK, lblK);
+        leuchten(btnL, lblL);
+        leuchten(btnM, lblM);
+        leuchten(btnN, lblN);
+        leuchten(btnO, lblO);
+        leuchten(btnP, lblP);
+        leuchten(btnQ,lblQ);
+        leuchten(btnR, lblR);
+        leuchten(btnS, lblS);
+        leuchten(btnT, lblT);
+        leuchten(btnU, lblU);
+        leuchten(btnV, lblV);
+        leuchten(btnW, lblW);
+        leuchten(btnX,lblX);
+        leuchten(btnY, lblY);
+        leuchten(btnZ, lblZ);
+        leuchtencirc(btnA,circ);
     }
-
-
+    @FXML
+    private Button Q;
 
     /**
      * Auswertung welcher Button gedrückt wurde
      * @param e => ActionEvent des auslösenden Button
      */
     @FXML
-   // private void gedrueckteTaste(javafx.event.ActionEvent e) {
-
-
     private void gedrueckteTaste(ActionEvent e) {
 
         //TODO Anbindung an Klasse Hardware
@@ -475,6 +436,7 @@ public class GuiController {
         if (e.getSource() == btnX) setText(btnX);
         if (e.getSource() == btnY) setText(btnY);
         if (e.getSource() == btnZ) setText(btnZ);
+        if (e.getSource()==Q) setText(Q);
     }
     /**
      * schreibt Buchstaben des gedrückten Knopfes in Textfeld tfrein
@@ -487,13 +449,26 @@ public class GuiController {
         }
     }
 
-    private void leuchten(Button taste, Button leuchte){
+    @FXML
+    private Circle circ;
+
+    private void leuchtencirc(Button taste, Circle leuchte){
+        taste.setOnMousePressed(mouseEvent -> {
+            leuchte.setStyle("-fx-fill: #FFA500");
+        });
+        taste.setOnMouseReleased(mouseEvent -> {
+            leuchte.setStyle("-fx-background-color: "+ taste.getBackground());
+            leuchte.setStyle("-fx-border-color:  #000000");
+        });
+    }
+
+    private void leuchten(Button taste, Label leuchte){
         taste.setOnMousePressed(mouseEvent -> {
             leuchte.setStyle("-fx-background-color: #FFA500");
         });
         taste.setOnMouseReleased(mouseEvent -> {
-            //btnA1.setBackground(Background.EMPTY);
             leuchte.setStyle("-fx-background-color: "+ taste.getBackground());
+          //  leuchte.setStyle("-fx-border-color:  #000000");
         });
     }