Bug has been fixed

Signed-off-by: Victor Hertel <victor.hertel@web.de>
aerospaceresearch · Aug 15, 2017 · 92ef5d1 · 92ef5d1
1 parent 08ce931
commit 92ef5d1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java
@@ -409,7 +409,7 @@ public static boolean rebuildGui(String path, String pathMod, Stage stage) throw
             GuiBuilder.chartControlBuilder("gui/controller/ChartController.java", path);
             GuiBuilder.logBuilder("fxml/LogPanel.fxml", path);
             GuiBuilder.logControlBuilder("gui/controller/LogController.java", path);
-            GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
+            //GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
             GuiBuilder.currentStateBuilder("fxml/CurrentStatePanel.fxml", path);
 
             System.out.println("FXML has been reseted and regenerated completely.");
@@ -437,7 +437,7 @@ public static boolean rebuildGui(String path, String pathMod, Stage stage) throw
             }
             // Checks if STATE PROPERTIES has been modified since last compilation
             if (stateMod) {
-                GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
+                //GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
                 GuiBuilder.currentStateBuilder("fxml/CurrentStatePanel.fxml", path);
             }
             rebuildGui = true;

diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java
@@ -241,13 +241,13 @@ public static void chartBuilder(String filePath, String configPath) throws IOExc
                 + "<?import javafx.scene.layout.*?> \n");
 
         if (GNSS3dView) {
-            writer.println("<TabPane prefHeight=\"200.0\" prefWidth=\"200.0\" tabClosingPolicy=\"UNAVAILABLE\" BorderPane.alignment=\"CENTER\"> \n"
+            writer.println("<TabPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\" fx:controller = \"com.ksatstuttgart.usoc.gui.controller.ChartController\" prefHeight=\"200.0\" prefWidth=\"200.0\" tabClosingPolicy=\"UNAVAILABLE\" BorderPane.alignment=\"CENTER\"> \n"
                     + "   <tabs> \n"
                     + "    <Tab text=\"Graphs\"> \n"
                     + "      <content> \n");
         }
 
-        writer.println("<GridPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\" fx:controller = \"com.ksatstuttgart.usoc.gui.controller.ChartController\"> \n"
+        writer.println("<GridPane> \n"
                 + "  <columnConstraints> \n"
                 + "    <ColumnConstraints hgrow=\"SOMETIMES\" minWidth=\"10.0\" prefWidth=\"100.0\" /> \n"
                 + "    <ColumnConstraints hgrow=\"SOMETIMES\" minWidth=\"10.0\" prefWidth=\"100.0\" /> \n"

diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/ChartPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/ChartPanel.fxml
@@ -2,12 +2,12 @@
 <?import javafx.scene.control.*?> 
 <?import javafx.scene.layout.*?> 
 
-<TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER"> 
+<TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller = "com.ksatstuttgart.usoc.gui.controller.ChartController" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER"> 
    <tabs> 
     <Tab text="Graphs"> 
       <content> 
 
-<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller = "com.ksatstuttgart.usoc.gui.controller.ChartController"> 
+<GridPane> 
   <columnConstraints> 
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 

diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/MainFrame.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/MainFrame.fxml
@@ -27,10 +27,10 @@
           </Menu> 
         </menus> 
       </MenuBar> 
-   </top> 
+   </top>
 
-   <center> 
+   <center>
-      <fx:include source = "/fxml/ChartPanel.fxml" /> 
+       <fx:include source = "/fxml/ChartPanel.fxml" />
    </center> 
 
    <right> 

diff --git a/Universal-Space-Operations-Center/src/main/resources/testData/ChartPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/testData/ChartPanel.fxml
@@ -2,7 +2,7 @@
 <?import javafx.scene.control.*?> 
 <?import javafx.scene.layout.*?> 
 
-<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller = "com.ksatstuttgart.usoc.gui.controller.ChartController"> 
+<GridPane> 
   <columnConstraints> 
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />