GuiBuilder has been updated to set the TextArea ID in the LogPanelCon…

…troller Signed-off-by: Victor Hertel <victor.hertel@web.de>
aerospaceresearch · Aug 28, 2017 · b592243 · b592243
1 parent e03e385
commit b592243
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/...ations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java b/...ations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java
@@ -168,6 +168,8 @@ public void updateData(MessageController msgController, USOCEvent ue) {
         }
     }
 
+    @FXML private TextArea textArea1;
+
     @FXML 
     private void button11(ActionEvent event) { 
         // Automatically generated method button11() 

diff --git a/...al-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/setup/GuiBuilder.java b/...al-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/setup/GuiBuilder.java
@@ -718,7 +718,7 @@ public static void logPanelBuilder(String filePath, String configPath) throws Fi
             // Decides about textarea within the tab
             if (Boolean.parseBoolean(config.getProperty("textArea[" + counter + "]"))) {
                 writer.println("          <center> \n"
-                        + "            <TextArea prefHeight=\"200.0\" prefWidth=\"200.0\" BorderPane.alignment=\"CENTER\" /> \n"
+                        + "            <TextArea fx:id=\"textArea" + counter + "\" prefHeight=\"200.0\" prefWidth=\"200.0\" BorderPane.alignment=\"CENTER\" /> \n"
                         + "          </center>");
             }
             writer.println("        </BorderPane> \n"
@@ -993,6 +993,11 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
 
         // Loops through additional tabs
         for (int counter = 1; counter <= numberOfAddTabs; counter++) {
+            // Declares TextArea of individual tab
+            if (Boolean.parseBoolean(config.getProperty("textArea[" + counter + "]"))) {
+                writer.println("    @FXML private TextArea textArea" + counter + ";");
+            }
+            writer.println("");
             // Loops through control items within the tab
             int numberOfControlItems = ConfigHandler.countItems("control[" + counter + "]", configPath);
             for (int j = 1; j <= numberOfControlItems; j++) {

diff --git a/Universal-Space-Operations-Center/src/main/resources/config/config.properties b/Universal-Space-Operations-Center/src/main/resources/config/config.properties
@@ -36,7 +36,7 @@
 # After compiling once, set the option to false again.
 # Mandatory: YES
 # Expected input: boolean (true, false)
-RESET               =   false
+RESET               =   true
 
 # Activates StatePanel
 # Mandatory: YES

diff --git a/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties b/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties
@@ -20,7 +20,7 @@ y[2]=yLabel
 statePanel=true
 iridiumPanel=true
 y[5]=yLabel
-RESET=false
+RESET=true
 control[1][2]=label
 experimentName=experimentName
 chartTitle[2]=chartTitle

diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml
@@ -148,7 +148,7 @@
             </GridPane> 
           </top>
           <center> 
-            <TextArea prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" /> 
+            <TextArea fx:id="textArea1" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" /> 
           </center>
         </BorderPane> 
       </content>